Login via deeplink should open modal in request money

[dukenv0307]

Details

Login via deep link should open the modal in Request money

Fixed Issues

$ https://github.com/Expensify/App/issues/29115 PROPOSAL: https://github.com/Expensify/App/issues/29115#issuecomment-1754801666

Tests

1. Open a request money report or raise one and open it
2. Click on the description or merchant and copy the URL
3. Logout and paste the URL
4. Login and observe that the app opens the correct description or merchant modal

• [x] Verify that no errors appear in the JS console

Offline tests

QA Steps

1. Open a request money report or raise one and open it
2. Click on the description or merchant and copy the URL
3. Logout and paste the URL
4. Login and observe that the app opens the correct description or merchant modal

• [x] Verify that no errors appear in the JS console

PR Author Checklist

• [x] I linked the correct issue in the ### Fixed Issues section above
• [x] I wrote clear testing steps that cover the changes made in this PR
  • [x] I added steps for local testing in the Tests section
  • [x] I added steps for the expected offline behavior in the Offline steps section
  • [x] I added steps for Staging and/or Production testing in the QA steps section
  • [x] I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
  • [x] 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)
  • [x] I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
• [x] I included screenshots or videos for tests on all platforms
• [x] I ran the tests on all platforms & verified they passed on:
  • [x] Android: Native
  • [x] Android: mWeb Chrome
  • [x] iOS: Native
  • [x] iOS: mWeb Safari
  • [x] MacOS: Chrome / Safari
  • [x] MacOS: Desktop
• [x] I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
• [x] I followed proper code patterns (see Reviewing the code)
  • [x] 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)
  • [x] I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
  • [x] I verified that comments were added to code that is not self explanatory
  • [x] 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.
  • [x] I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • [x] If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
  • [x] I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
  • [x] 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.
  • [x] 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.
  • [x] I verified the JSDocs style guidelines (in STYLE.md) were followed
• [x] If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
• [x] I followed the guidelines as stated in the Review Guidelines
• [x] I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
• [x] I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
• [x] 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
• [x] I verified that if a function's arguments changed that all usages have also been updated correctly
• [x] If any new file was added I verified that:
  • [x] 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
• [x] If a new CSS style is added I verified that:
  • [x] A similar style doesn't already exist
  • [x] The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
• [x] 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.
• [x] 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)
• [x] 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.
• [x] 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.
• [x] If the PR modifies the form input styles:
  • [x] I verified that all the inputs inside a form are aligned with each other.
  • [x] I added Design label so the design team can review the changes.
• [x] 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.
• [x] 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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

https://github.com/Expensify/App/assets/129500732/4d106dc6-624b-4154-a9c1-9855a57267d2

iOS: Native

https://github.com/Expensify/App/assets/129500732/ed475b9f-23e2-4420-a308-8a0eaa1d60b1

iOS: mWeb Safari

https://github.com/Expensify/App/assets/129500732/e60bcff8-67bc-4460-bc55-c57c39991f3b

MacOS: Chrome / Safari

https://github.com/Expensify/App/assets/129500732/c0e8c2da-e2ec-4376-9d46-d1900e94f4c3

MacOS: Desktop

https://github.com/Expensify/App/assets/129500732/5f51cea0-a8d4-48ec-b9f8-e116da65b5e7

[melvin-bot[bot]]

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

[abdulrahuman5196]

@dukenv0307 Any update on the above?

[dukenv0307]

Update today.

[dukenv0307]

@abdulrahuman5196 I responded in the review thread.

[abdulrahuman5196]

@dukenv0307 The changes doesn't seem to work properly in my testing.

https://github.com/Expensify/App/assets/46707890/ec47301f-1f73-48a9-b302-1101a01327e2

https://github.com/Expensify/App/assets/46707890/98805514-d05b-4ab4-846d-f68578c4eec1

[dukenv0307]

@abdulrahuman5196 I believe the bug mentioned here is not related to my code change. The current behavior of the app is signing in via deeplink does not take the user to the correct report in the URL -> this causes OpenReport API not to get called, leading to infinite loading

Please check the video attached below for more details.

https://github.com/Expensify/App/assets/129500732/b1a37f8f-3246-46fe-a7d7-9611fdf7d9b7

I think we'd better put this on hold to find the PR or issue that caused this new bug

[abdulrahuman5196]

Will take a review today

[dukenv0307]

@abdulrahuman5196 Friendly bump.

[abdulrahuman5196]

@dukenv0307 I doubt if the route is returned wrongly. I just wrapped the EditRequestPage with WithReportOrNotFound and printed the received reportID it had proper reportID. I think there could be something else happening here.

Code change I Made.

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 49067d1c7b..f292a636b8 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -156,8 +156,8 @@ const ROUTES = {
         getRoute: (reportID: string) => `r/${reportID}` as const,
     },
     EDIT_REQUEST: {
-        route: 'r/:threadReportID/edit/:field',
-        getRoute: (threadReportID: string, field: ValueOf<typeof CONST.EDIT_REQUEST_FIELD>) => `r/${threadReportID}/edit/${field}` as const,
+        route: 'r/:reportID/edit/:field',
+        getRoute: (reportID: string, field: ValueOf<typeof CONST.EDIT_REQUEST_FIELD>) => `r/${reportID}/edit/${field}` as const,
     },
     EDIT_CURRENCY_REQUEST: {
         route: 'r/:threadReportID/edit/currency',
diff --git a/src/pages/EditRequestPage.js b/src/pages/EditRequestPage.js
index e41f30779f..855f39be4b 100644
--- a/src/pages/EditRequestPage.js
+++ b/src/pages/EditRequestPage.js
@@ -29,6 +29,7 @@ import EditRequestReceiptPage from './EditRequestReceiptPage';
 import EditRequestTagPage from './EditRequestTagPage';
 import reportActionPropTypes from './home/report/reportActionPropTypes';
 import reportPropTypes from './reportPropTypes';
+import withReportOrNotFound from './home/report/withReportOrNotFound';

 const propTypes = {
     /** Route from navigation */
@@ -285,6 +286,7 @@ EditRequestPage.displayName = 'EditRequestPage';
 EditRequestPage.propTypes = propTypes;
 EditRequestPage.defaultProps = defaultProps;
 export default compose(
+    withReportOrNotFound(),
     withOnyx({
         report: {
             key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`,
diff --git a/src/pages/home/report/withReportOrNotFound.tsx b/src/pages/home/report/withReportOrNotFound.tsx
index cf2c0d5aca..5c10e6cb81 100644
--- a/src/pages/home/report/withReportOrNotFound.tsx
+++ b/src/pages/home/report/withReportOrNotFound.tsx
@@ -73,7 +73,10 @@ export default function (

         return withOnyx<TProps & RefAttributes<TRef>, OnyxProps>({
             report: {
-                key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID}`,
+                key: ({route}) => {
+                    console.log("Abdul Test" + JSON.stringify(route))
+                    return `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID || route.params.threadReportID}`
+                },
             },
             isLoadingReportData: {

Video of testing:

https://github.com/Expensify/App/assets/46707890/34e7097c-bd45-41d2-9d27-5e1baa6ee3ac

[dukenv0307]

@abdulrahuman5196 Updated. I fixed this issue in the past here https://github.com/Expensify/App/issues/28641 but it was removed when we migrate ReportScreenIDSetter to Typescript.

[dukenv0307]

@abdulrahuman5196 Any update here.

[abdulrahuman5196]

Will check tomorrow. @dukenv0307 Meanwhile could you kindly fix the merge conflicts.

[dukenv0307]

@abdulrahuman5196 resolved conflict.

[dukenv0307]

@abdulrahuman5196 I think we should hold this until EditRequestPage is removed.

[abdulrahuman5196]

@abdulrahuman5196 I think we should hold this until EditRequestPage is removed.

Oh. This PR got missed.

Why should we wait on? If so could you share the links and reasoning?

[dukenv0307]

Because we're refactor money request flow. And after that, EditRequestPage will be removed.

[dukenv0307]

@abdulrahuman5196 What do you think about my comment above.

[abdulrahuman5196]

@dukenv0307 Could you provide references of the refractor? Any GH for reference to confirm?

[dukenv0307]

@abdulrahuman5196 It's here https://github.com/Expensify/App/issues/29107

[dukenv0307]

@abdulrahuman5196 Updated the PR to add a new solution after refactor by adding the logic to show the loading page in WithWritableReportOrNotFound.

[dukenv0307]

@abdulrahuman5196 Friendly bump.

[abdulrahuman5196]

Checking now

[dukenv0307]

@abdulrahuman5196 Any update here.

[abdulrahuman5196]

Checking now

[abdulrahuman5196]

Checking again

[abdulrahuman5196]

Whenever I pick this issue I am not getting OTPs :sleepy: due to site issues I think. https://expensify.slack.com/archives/C01GTK53T8Q/p1715879150080079

[dukenv0307]

I can get OTP to login.