Welcome message wrong link 33230#33723
Merged
roryabraham merged 10 commits intoJan 2, 2024
Merged
Conversation
|
@shubham1206agra Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
Contributor
There was a problem hiding this comment.
@roryabraham I am thinking we should go to report without any reportId in this case. What do you think?
Contributor
There was a problem hiding this comment.
No, I think HOME is ok. It's the same effect as report w/o any reportID, right?
Contributor
|
@samilabud it looks like there are merge conflicts that need to be resolved here |
5d50bb2 to
f630d73
Compare
Contributor
|
This is ready for another review @shubham1206agra |
Comment on lines
+47
to
+52
| const reportActionID = route?.params?.reportActionID; | ||
| const regexValidReportActionID = new RegExp(/^\d*$/); | ||
| if (reportActionID && !regexValidReportActionID.test(reportActionID)) { | ||
| Navigation.goBack(ROUTES.HOME); | ||
| return; | ||
| } |
Contributor
There was a problem hiding this comment.
@samilabud We should move this logic inside if (route?.params?.reportID) {
Contributor
There was a problem hiding this comment.
And one more thing, lets not use Navigation.goBack(ROUTES.HOME), use Navigation.navigate instead as this is causing to go back in the stack to previously opened report instead of staying on the same report.
Contributor
Author
There was a problem hiding this comment.
Fixed thanks!, it seems there is a test failing on the main branch, I'm going to keep testing on the main until I see it is fixed and let you know.
| const reportActionID = route?.params?.reportActionID; | ||
| const regexValidReportActionID = new RegExp(/^\d*$/); | ||
| if (reportActionID && !regexValidReportActionID.test(reportActionID)) { | ||
| Navigation.navigate(ROUTES.HOME); |
Contributor
There was a problem hiding this comment.
Lets navigate to the report without the reportActionID in this case instead.
| @@ -45,6 +47,14 @@ function ReportScreenIDSetter({route, reports, policies, navigation, isFirstTime | |||
| // Don't update if there is a reportID in the params already | |||
| if (route?.params?.reportID) { | |||
| App.confirmReadyToOpenApp(); | |||
Contributor
There was a problem hiding this comment.
Is there a reason for this line to be above this logic?
Contributor
Author
There was a problem hiding this comment.
Not really, additional lines were removed.
Comment on lines
49
to
+55
| App.confirmReadyToOpenApp(); | ||
| const reportActionID = route?.params?.reportActionID; | ||
| const regexValidReportActionID = new RegExp(/^\d*$/); | ||
| if (reportActionID && !regexValidReportActionID.test(reportActionID)) { | ||
| Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(route?.params?.reportID)); | ||
| return; | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| App.confirmReadyToOpenApp(); | |
| const reportActionID = route?.params?.reportActionID; | |
| const regexValidReportActionID = new RegExp(/^\d*$/); | |
| if (reportActionID && !regexValidReportActionID.test(reportActionID)) { | |
| Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(route?.params?.reportID)); | |
| return; | |
| } | |
| const reportActionID = route?.params?.reportActionID; | |
| const regexValidReportActionID = new RegExp(/^\d*$/); | |
| if (reportActionID && !regexValidReportActionID.test(reportActionID)) { | |
| Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(route?.params?.reportID)); | |
| return; | |
| } | |
| App.confirmReadyToOpenApp(); |
Do this instead
Contributor
Author
There was a problem hiding this comment.
It makes sense, thank you!
Comment on lines
+49
to
+54
| const reportActionID = route?.params?.reportActionID; | ||
| const regexValidReportActionID = new RegExp(/^\d*$/); | ||
| if (reportActionID && !regexValidReportActionID.test(reportActionID)) { | ||
| Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(route?.params?.reportID)); | ||
| return; | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| const reportActionID = route?.params?.reportActionID; | |
| const regexValidReportActionID = new RegExp(/^\d*$/); | |
| if (reportActionID && !regexValidReportActionID.test(reportActionID)) { | |
| Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(route?.params?.reportID)); | |
| return; | |
| } | |
| const reportActionID = route?.params?.reportActionID; | |
| const regexValidReportActionID = new RegExp(/^\d*$/); | |
| if (reportActionID && !regexValidReportActionID.test(reportActionID)) { | |
| navigation.setParams({reportActionID: ''}); | |
| } |
Sorry, but this works better.
Contributor
There was a problem hiding this comment.
Can you change to this?
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: NativeScreen.Recording.2024-01-01.at.9.55.49.PM.movAndroid: mWeb ChromeScreen.Recording.2024-01-01.at.10.40.56.PM.moviOS: NativeScreen.Recording.2024-01-01.at.10.50.04.PM.moviOS: mWeb SafariScreen.Recording.2024-01-01.at.10.36.22.PM.movMacOS: Chrome / SafariScreen.Recording.2024-01-01.at.10.31.30.PM.movMacOS: DesktopScreen.Recording.2024-01-01.at.10.46.29.PM.mov |
shubham1206agra
approved these changes
Jan 2, 2024
Contributor
|
@roryabraham The jest test is failing due to current month is January |
roryabraham
approved these changes
Jan 2, 2024
Contributor
|
Agree the failing tests are unrelated |
|
@roryabraham looks like this was merged without a test passing. Please add a note explaining why this was done and remove the |
Contributor
|
Not an emergency, see last comment |
Contributor
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
58 tasks
Contributor
|
🚀 Deployed to staging by https://github.com/roryabraham in version: 1.4.21-0 🚀
|
6 tasks
Contributor
|
🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.21-4 🚀
|
1 similar comment
Contributor
|
🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.21-4 🚀
|
Contributor
|
🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.21-4 🚀
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Details
We are not validating the URL route for the second parameter when we are building our routes for 'r' parameter, here we going edit the component ReportScreenIDSetter
and validate the reportActionID which should be numeric, and if not return the user to the last report page (chat window).
Fixed Issues
$ #33230
PROPOSAL: #33230 (comment)
Tests
Offline tests
n/a
QA Steps
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)myBool && <MyComponent />.src/languages/*files and using the translation methodWaiting for Copylabel for a copy review on the original GH to get the correct copy.STYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel so the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
n/a
Android: mWeb Chrome
Android.Chrome.-.Test.Deep.Link.mp4
iOS: Native
n/a
iOS: mWeb Safari
Iphone.Safari.-.Test.Deep.Link.mp4
MacOS: Chrome / Safari
Chrome.Mac.-.Test.Deep.Link.mp4
MacOS: Desktop
n/a