Login via deeplink should open modal in request money #31529

dukenv0307 · 2023-11-20T08:06:14Z

Details

Login via deep link should open the modal in Request money

Fixed Issues

$ #29115
PROPOSAL: #29115 (comment)

Tests

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

Verify that no errors appear in the JS console

Offline tests

QA Steps

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

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

chrome-resize.mov

iOS: Native

ios-resize.mov

iOS: mWeb Safari

safari-resize.mov

MacOS: Chrome / Safari

web-resize.mov

MacOS: Desktop

desktop-resize.mov

melvin-bot · 2023-11-20T12:01:03Z

@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 Kindly check on the comments

abdulrahuman5196 · 2023-11-24T08:35:15Z

src/pages/EditRequestPage.js

@@ -104,18 +123,34 @@ function EditRequestPage({report, route, parentReport, policyCategories, policyT
    // A flag for showing the tags page
    const shouldShowTags = isPolicyExpenseChat && (transactionTag || OptionsListUtils.hasEnabledOptions(lodashValues(policyTagList)));

+    const reportAction = ReportActionsUtils.getReportAction(parentReportID, parentReportActionID);
+
+    // For small screen, we don't call openReport API when we go to a sub report page by deeplink


Where are we calling openReport API separately for big screens?

If the said is true for small screen devices, shouldn't other types of reports be affected by the same? Like Task and edit Task?

We are calling openReport API in report screen but when we open a page by deeplink in small screen, LHN is displayed and we don't have access to report screen so openReport API isn't called.

Here we need transation data which is returned in OpenReport API but in Edit Task page we only use report data which is returned in OpenApp API.

abdulrahuman5196 · 2023-11-24T08:36:39Z

src/pages/EditRequestPage.js

+    const isTransactionLoadingRoute = lodashGet(transaction, 'comment.isLoading', false);
+    const isTransactionLoading = lodashGet(transaction, 'isLoading', false);
+
+    const isDataLoading = isLoadingReportData || isTransactionLoading || isTransactionLoadingRoute || _.isEmpty(transaction);


For checking if reportData is loaded, is it possible to use WithReportOrNotFound? So that we re-use existing functions?

If we use WithReportOrNotFound, we will show two loading pages one in HOC, and one on this page when OpenReport API is called that will make this page is flickered briefly.

abdulrahuman5196 · 2023-11-28T19:05:27Z

@dukenv0307 Any update on the above?

dukenv0307 · 2023-11-30T05:12:04Z

Update today.

…eeplink

dukenv0307 · 2023-11-30T09:19:11Z

@abdulrahuman5196 I responded in the review thread.

abdulrahuman5196 · 2023-12-07T17:50:56Z

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

Screen.Recording.2023-12-07.at.11.09.29.PM.mov

Screen.Recording.2023-12-07.at.11.11.22.PM.mov

dukenv0307 · 2023-12-08T12:02:41Z

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

deeplink-resize.mov

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

abdulrahuman5196 · 2023-12-18T07:56:36Z

Will take a review today

dukenv0307 · 2024-01-03T07:38:12Z

@abdulrahuman5196 Friendly bump.

abdulrahuman5196 · 2024-01-03T15:39:07Z

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

Screen.Recording.2024-01-03.at.9.01.51.PM.mov

dukenv0307 · 2024-01-11T09:25:36Z

@abdulrahuman5196 Updated. I fixed this issue in the past here #28641 but it was removed when we migrate ReportScreenIDSetter to Typescript.

dukenv0307 · 2024-01-26T09:45:52Z

@abdulrahuman5196 Any update here.

abdulrahuman5196 · 2024-01-28T15:17:53Z

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

dukenv0307 · 2024-01-28T15:36:08Z

@abdulrahuman5196 resolved conflict.

dukenv0307 · 2024-02-20T03:39:47Z

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

dukenv0307 · 2024-04-10T07:22:26Z

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

dukenv0307 · 2024-04-17T03:02:54Z

@abdulrahuman5196 Friendly bump.

abdulrahuman5196 · 2024-04-29T17:52:14Z

Checking now

abdulrahuman5196 · 2024-04-29T17:58:34Z

src/pages/iou/request/step/IOURequestStepDescription.tsx

@@ -225,8 +225,8 @@ const IOURequestStepDescriptionWithOnyx = withOnyx<IOURequestStepDescriptionProp
 })(IOURequestStepDescription);

 // eslint-disable-next-line rulesdir/no-negated-variables
-const IOURequestStepDescriptionWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepDescriptionWithOnyx);
+const IOURequestStepDescriptionWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepDescriptionWithOnyx);


@dukenv0307 I am not entirely sure on what changes we are making here since this PR is very old and the new changes are different than the accepted proposal.

Could you let me know the changes and why we need to do this and how will it fix the issue?

Could you let me know the changes and why we need to do this and how will it fix the issue?

@abdulrahuman5196 The bug still happens after we refactor the edit flow. The RCA is we don't have the logic to display the loading page when the report is loading. My solution is we will handle this in withWritableReportOrNotFound HOC so all pages of money request flow can display a loading page when the report is loading. That's why we have to wrap that HOC on the outside.

…eeplink

dukenv0307 · 2024-05-06T04:33:17Z

@abdulrahuman5196 Any update here.

…eeplink

abdulrahuman5196 · 2024-05-06T16:07:19Z

Checking now

abdulrahuman5196 · 2024-05-16T16:51:32Z

Checking again

…eeplink

abdulrahuman5196 · 2024-05-16T17:07:27Z

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

dukenv0307 · 2024-05-16T17:09:33Z

I can get OTP to login.

dukenv0307 · 2024-05-22T10:48:26Z

Whenever I pick this issue I am not getting OTPs 😪 due to site issues I think.

@abdulrahuman5196 Is this issue resolved?

…eeplink

abdulrahuman5196 · 2024-05-29T17:58:06Z

Checking now

abdulrahuman5196 · 2024-05-30T17:05:57Z

Checking now again

abdulrahuman5196 · 2024-05-30T18:22:20Z

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-05-30.at.11.40.51.PM.mp4

Android: mWeb Chrome

Screen.Recording.2024-05-30.at.11.46.18.PM.mp4

iOS: Native

Screen.Recording.2024-05-30.at.11.15.34.PM.mp4

iOS: mWeb Safari

Screen.Recording.2024-05-30.at.11.28.52.PM.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-05-30.at.11.00.08.PM.mp4

MacOS: Desktop

Screen.Recording.2024-05-30.at.11.10.41.PM.mp4

abdulrahuman5196

Changes looks good and works well. Reviewers checklist is also complete.

All yours. @robertjchen

🎀 👀 🎀
C+ Reviewed

robertjchen

LGTM, thanks!

OSBotify · 2024-05-31T06:07:12Z

✋ 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-06-06T12:33:15Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.79-11 🚀

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

fix: login via deeplink should open modal in request money

ece06a0

dukenv0307 changed the title ~~fix: login via deeplink should open modal in request money~~ Login via deeplink should open modal in request money Nov 20, 2023

dukenv0307 added 2 commits November 20, 2023 16:57

fix: conditions

585b3f9

open report when transaction is empty

7adeaef

dukenv0307 marked this pull request as ready for review November 20, 2023 12:00

dukenv0307 requested a review from a team as a code owner November 20, 2023 12:00

melvin-bot bot removed the request for review from a team November 20, 2023 12:01

melvin-bot bot requested a review from abdulrahuman5196 November 20, 2023 12:01

abdulrahuman5196 reviewed Nov 24, 2023

View reviewed changes

Merge branch 'main' into fix/29115-open-description-when-login-with-d…

78e9ce8

…eeplink

merge main

e859d6a

dukenv0307 added 2 commits January 3, 2024 14:46

fix lint

002c909

fix lint

58e7687

dukenv0307 added 2 commits January 11, 2024 15:20

merge main

9907af9

fix lint

01ab53d

merge main

eeedc25

Fix not found page appear when openning edit page by deeplink

07a70af

dukenv0307 mentioned this pull request Apr 19, 2024

[HOLD for payment 2024-06-13] [$500] Login with edit description does not open edit description page #29115

Closed

6 tasks

merge main

843be86

abdulrahuman5196 reviewed Apr 29, 2024

View reviewed changes

Merge branch 'main' into fix/29115-open-description-when-login-with-d…

d2b1fd7

…eeplink

Merge branch 'main' into fix/29115-open-description-when-login-with-d…

8ea33c2

…eeplink

merge main

b037e7f

Merge branch 'main' into fix/29115-open-description-when-login-with-d…

4ed9add

…eeplink

Merge branch 'main' into fix/29115-open-description-when-login-with-d…

0103f4c

…eeplink

abdulrahuman5196 approved these changes May 30, 2024

View reviewed changes

melvin-bot bot requested a review from robertjchen May 30, 2024 18:24

robertjchen approved these changes May 31, 2024

View reviewed changes

robertjchen merged commit 1ce235f into Expensify:main May 31, 2024
16 checks passed

github-actions bot mentioned this pull request Jun 4, 2024

Deploy Checklist: New Expensify 2024-06-04 #43037

Closed

ZhenjaHorbach mentioned this pull request Jun 5, 2024

[$250] Track Expense - Hmm..not here page on selecting category with no existing workspace #43073

Closed

6 tasks

sobitneupane mentioned this pull request Aug 9, 2024

[hold for payment 2024-08-26] [$250] Submit expense - Not here page displayed in the background after a refresh #46774

Closed

6 tasks

Login via deeplink should open modal in request money #31529

Login via deeplink should open modal in request money #31529

Conversation

dukenv0307 commented Nov 20, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 20, 2023

abdulrahuman5196 left a comment

Choose a reason for hiding this comment

abdulrahuman5196 Nov 24, 2023

Choose a reason for hiding this comment

dukenv0307 Nov 30, 2023 • edited Loading

Choose a reason for hiding this comment

abdulrahuman5196 Nov 24, 2023

Choose a reason for hiding this comment

dukenv0307 Nov 30, 2023

Choose a reason for hiding this comment

abdulrahuman5196 commented Nov 28, 2023

dukenv0307 commented Nov 30, 2023

dukenv0307 commented Nov 30, 2023

abdulrahuman5196 commented Dec 7, 2023

dukenv0307 commented Dec 8, 2023

abdulrahuman5196 commented Dec 18, 2023

dukenv0307 commented Jan 3, 2024

abdulrahuman5196 commented Jan 3, 2024

dukenv0307 commented Jan 11, 2024

dukenv0307 commented Jan 26, 2024

abdulrahuman5196 commented Jan 28, 2024

dukenv0307 commented Jan 28, 2024

dukenv0307 commented Feb 20, 2024

dukenv0307 commented Apr 10, 2024

dukenv0307 commented Apr 17, 2024

abdulrahuman5196 commented Apr 29, 2024

abdulrahuman5196 Apr 29, 2024

Choose a reason for hiding this comment

dukenv0307 May 2, 2024

Choose a reason for hiding this comment

dukenv0307 commented May 6, 2024

abdulrahuman5196 commented May 6, 2024

abdulrahuman5196 commented May 16, 2024

abdulrahuman5196 commented May 16, 2024

dukenv0307 commented May 16, 2024

dukenv0307 commented May 22, 2024

abdulrahuman5196 commented May 29, 2024

abdulrahuman5196 commented May 30, 2024

abdulrahuman5196 commented May 30, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

abdulrahuman5196 left a comment

Choose a reason for hiding this comment

robertjchen left a comment

Choose a reason for hiding this comment

OSBotify commented May 31, 2024

OSBotify commented Jun 6, 2024

dukenv0307 commented Nov 20, 2023 •

edited

Loading

dukenv0307 Nov 30, 2023 •

edited

Loading

abdulrahuman5196 commented May 30, 2024 •

edited

Loading