Welcome message wrong link 33230 #33723

samilabud · 2023-12-28T19:39:47Z

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

Open the app
Open #announce of workspace of which you are admin
Click on header and open settings - >welcome message
Copy the link and paste in the report
Modify the link and send eg: Add 's' in the end
Click on modified link and observe that nothing happens

Verify that no errors appear in the JS console

Offline tests

n/a

QA Steps

Open the app
Open #announce of workspace of which you are admin
Click on header and open settings - >welcome message
Copy the link and paste in the report
Modify the link and send eg: Add 's' in the end
Click on modified link and observe that nothing happens

Verify that no errors appear in the JS console

PR Author Checklist

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

melvin-bot · 2023-12-28T19:39:52Z

@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]

shubham1206agra · 2023-12-29T08:42:36Z

src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts

+        const reportActionID = route?.params?.reportActionID;
+        const regexValidReportActionID = new RegExp(/^\d*$/);
+        if (reportActionID && !regexValidReportActionID.test(reportActionID)) {
+            Navigation.goBack(ROUTES.HOME);


@roryabraham I am thinking we should go to report without any reportId in this case. What do you think?

No, I think HOME is ok. It's the same effect as report w/o any reportID, right?

roryabraham · 2023-12-29T22:05:56Z

@samilabud it looks like there are merge conflicts that need to be resolved here

roryabraham · 2023-12-30T00:22:55Z

This is ready for another review @shubham1206agra

shubham1206agra · 2024-01-01T08:04:28Z

src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts

+        const reportActionID = route?.params?.reportActionID;
+        const regexValidReportActionID = new RegExp(/^\d*$/);
+        if (reportActionID && !regexValidReportActionID.test(reportActionID)) {
+            Navigation.goBack(ROUTES.HOME);
+            return;
+        }


@samilabud We should move this logic inside if (route?.params?.reportID) {

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.

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.

shubham1206agra · 2024-01-01T15:40:56Z

src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts

+            const reportActionID = route?.params?.reportActionID;
+            const regexValidReportActionID = new RegExp(/^\d*$/);
+            if (reportActionID && !regexValidReportActionID.test(reportActionID)) {
+                Navigation.navigate(ROUTES.HOME);


Lets navigate to the report without the reportActionID in this case instead.

… valid

shubham1206agra · 2024-01-01T16:20:19Z

src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts

@@ -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();


Is there a reason for this line to be above this logic?

Not really, additional lines were removed.

shubham1206agra · 2024-01-01T16:28:33Z

src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts

            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;
+            }


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

It makes sense, thank you!

shubham1206agra · 2024-01-01T16:59:55Z

src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts

+            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;
+            }


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.

Can you change to this?

shubham1206agra · 2024-01-01T17:24:56Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Screen.Recording.2024-01-01.at.9.55.49.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-01-01.at.10.40.56.PM.mov

iOS: Native

Screen.Recording.2024-01-01.at.10.50.04.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-01-01.at.10.36.22.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-01-01.at.10.31.30.PM.mov

MacOS: Desktop

Screen.Recording.2024-01-01.at.10.46.29.PM.mov

shubham1206agra · 2024-01-02T05:55:27Z

@roryabraham The jest test is failing due to current month is January

roryabraham · 2024-01-02T21:24:43Z

Agree the failing tests are unrelated

melvin-bot · 2024-01-02T21:25:57Z

@roryabraham looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

roryabraham · 2024-01-02T21:26:10Z

Not an emergency, see last comment

OSBotify · 2024-01-02T21:30:03Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2024-01-02T23:52:28Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.4.21-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	failure ❌
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2024-01-04T18:55:04Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.21-4 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	cancelled 🔪
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

OSBotify · 2024-01-04T19:19:54Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.21-4 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	cancelled 🔪
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

OSBotify · 2024-01-04T20:17:21Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.21-4 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

samilabud requested a review from a team as a code owner December 28, 2023 19:39

melvin-bot bot requested review from shubham1206agra and removed request for a team December 28, 2023 19:39

shubham1206agra reviewed Dec 29, 2023

View reviewed changes

samilabud added 2 commits December 29, 2023 19:14

Fixed Welcome message - Hmm its not here not displayed for wrong link

c5a8392

Merge branch 'main' into welcome_message_wrong_link_33230

f630d73

samilabud force-pushed the welcome_message_wrong_link_33230 branch from 5d50bb2 to f630d73 Compare December 29, 2023 23:28

roryabraham requested a review from shubham1206agra December 30, 2023 00:22

shubham1206agra reviewed Jan 1, 2024

View reviewed changes

samilabud added 3 commits January 1, 2024 10:04

Moved logic inside the condition that validates the report ID

12eefc2

Changed goback to using navigate to go home

05c1cfb

Merge branch 'main' into welcome_message_wrong_link_33230

9025a25

shubham1206agra reviewed Jan 1, 2024

View reviewed changes

Redirecting to same report page without reportActionID when it is not…

6b1a002

… valid

shubham1206agra reviewed Jan 1, 2024

View reviewed changes

Additional lines removed

80503c8

shubham1206agra reviewed Jan 1, 2024

View reviewed changes

Confirming ready to open app after reportActionID validation

513ee80

shubham1206agra reviewed Jan 1, 2024

View reviewed changes

samilabud added 2 commits January 1, 2024 13:32

Added suggestion to redirect

becc82a

Fixed lint issue

36ef4ed

shubham1206agra approved these changes Jan 2, 2024

View reviewed changes

melvin-bot bot requested a review from roryabraham January 2, 2024 05:54

roryabraham approved these changes Jan 2, 2024

View reviewed changes

roryabraham merged commit 8ec1fc0 into Expensify:main Jan 2, 2024
15 of 16 checks passed

melvin-bot bot added the Emergency label Jan 2, 2024

roryabraham removed the Emergency label Jan 2, 2024

github-actions bot mentioned this pull request Jan 2, 2024

Deploy Checklist: New Expensify 2024-01-02 #33855

Closed

58 tasks

melvin-bot bot mentioned this pull request Jan 4, 2024

[HOLD for payment 2024-01-11] [$500] Welcome message - Hmm its not here not displayed for wrong link #33230

Closed

6 tasks

samilabud deleted the welcome_message_wrong_link_33230 branch April 29, 2024 16:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Welcome message wrong link 33230 #33723

Welcome message wrong link 33230 #33723

samilabud commented Dec 28, 2023 •

edited

Loading

melvin-bot bot commented Dec 28, 2023

shubham1206agra Dec 29, 2023

roryabraham Dec 29, 2023

roryabraham commented Dec 29, 2023

roryabraham commented Dec 30, 2023

shubham1206agra Jan 1, 2024

shubham1206agra Jan 1, 2024

samilabud Jan 1, 2024 •

edited

Loading

shubham1206agra Jan 1, 2024

shubham1206agra Jan 1, 2024

samilabud Jan 1, 2024

shubham1206agra Jan 1, 2024

samilabud Jan 1, 2024

shubham1206agra Jan 1, 2024

shubham1206agra Jan 1, 2024

shubham1206agra commented Jan 1, 2024

shubham1206agra commented Jan 2, 2024

roryabraham commented Jan 2, 2024

melvin-bot bot commented Jan 2, 2024

roryabraham commented Jan 2, 2024

OSBotify commented Jan 2, 2024

OSBotify commented Jan 2, 2024

OSBotify commented Jan 4, 2024

OSBotify commented Jan 4, 2024

OSBotify commented Jan 4, 2024

Welcome message wrong link 33230 #33723

Welcome message wrong link 33230 #33723

Conversation

samilabud commented Dec 28, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 28, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

roryabraham commented Dec 29, 2023

roryabraham commented Dec 30, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

samilabud Jan 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shubham1206agra commented Jan 1, 2024

Reviewer Checklist

Screenshots/Videos

shubham1206agra commented Jan 2, 2024

roryabraham commented Jan 2, 2024

melvin-bot bot commented Jan 2, 2024

roryabraham commented Jan 2, 2024

OSBotify commented Jan 2, 2024

OSBotify commented Jan 2, 2024

OSBotify commented Jan 4, 2024

OSBotify commented Jan 4, 2024

OSBotify commented Jan 4, 2024

samilabud commented Dec 28, 2023 •

edited

Loading

samilabud Jan 1, 2024 •

edited

Loading