fix: do not refresh draft txn after redirect #44363

dominictb · 2024-06-25T03:03:40Z

Details

avoid txn in Onyx get reset after IOU confirmation page refresh

Fixed Issues

$ #40936
PROPOSAL: #40936 (comment)

Tests

Go to the app
Tap fab -- submit expense - scan
Upload an image using camera
Select a user
Enter description and save it
Refresh the page

Result: On refreshing scan submit expense confirmation page all details must not be disappeared

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go to the app
Tap fab -- submit expense - scan
Upload an image using camera
Select a user
Enter description and save it
Refresh the page

Result: On refreshing scan submit expense confirmation page all details must not be disappeared

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 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).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
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)
I followed proper code patterns (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
  - 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:
- 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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 followed the guidelines as stated in the Review Guidelines
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)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design 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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

compressed_android.webm.mp4

iOS: Native

iOS: mWeb Safari

compressed_simulator.mp4.mp4

MacOS: Chrome / Safari

compressed_web.mov.mp4

MacOS: Desktop

melvin-bot · 2024-06-25T03:05:04Z

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

src/libs/actions/IOU.ts

src/pages/iou/request/IOURequestStartPage.tsx

Signed-off-by: dominictb <tb-dominic@outlook.com>

s77rt · 2024-06-26T15:20:12Z

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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design 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

Android: mWeb Chrome

mweb-chrome.mov

iOS: Native

iOS: mWeb Safari

mweb-safari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

s77rt · 2024-06-26T15:38:30Z

src/pages/iou/request/IOURequestStartPage.tsx

+        // if transaction is from global create, the original behavior is that the user can change the recipient reportID
+        // without having to reset the whole transaction, hence we don't need to re-init the transaction in this case
+        if (transaction?.isFromGlobalCreate && transaction.transactionID) {
+            IOU.resetMoneyRequestReportID(transaction.transactionID, reportID, isFromGlobalCreate);
+            return;
+        }


We don't need this anymore. Now the back button uses the transaction's report id

Sorry, what do you mean?

When navigating back to the participants page we will use the transaction's report id in the uri param. Thus the condition above transaction?.reportID === reportID will be met and we won't init the money request.

https://github.com/Expensify/App/pull/44363/files#diff-5e5fc302dd5db871d26e30f810bc0606beccb7f50ae6ed6535cd93aaee98c280R193 in here, I only update this to fix the extra bug that I mentioned in the last PR

When you reload a scan IOU request in the confirmation step, it still use the route.params.reportID to navigate back to the start step if it couldn't load the image locally

In navigateToStartStepIfScanFileCannotBeRead can we navigate to the scan step?

Actually, tested it and confirmed that it still renders the IOURequestStartPage component.

@s77rt feel free to re-test it and let me know. Thanks!

In navigateToStartStepIfScanFileCannotBeRead we navigate the user to ROUTES.MONEY_REQUEST_CREATE_TAB_SCAN

App/src/libs/actions/IOU.ts

Line 6968 in 937c418

IOUUtils.navigateToStartMoneyRequestStep(requestType, iouType, transactionID, reportID);

.

What I'm asking is to change the route here so the user is navigated to ROUTES.MONEY_REQUEST_STEP_SCAN and remove IOU.resetMoneyRequestReportID as it won't be needed anymore

Screen.Recording.2024-06-28.at.4.52.32.PM.mov

Alright, let me test that and get back to you shortly

@s77rt updated in the latest commit!

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

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

Signed-off-by: dominictb <tb-dominic@outlook.com>

This reverts commit c857885.

This reverts commit da44443.

This reverts commit 5cd9f11.

This reverts commit d10afcb.

during initMoneyRequest Signed-off-by: dominictb <tb-dominic@outlook.com>

Signed-off-by: dominictb <tb-dominic@outlook.com>

s77rt · 2024-07-10T14:47:28Z

src/libs/actions/IOU.ts

+            reportID,
+            isFromGlobalCreate,
+            created,
+            currency,
+            transactionID: newTransactionID,


Why are we resetting all these props? Shouldn't be just the report id?

The idea is that the transaction should look like it is re-created, so the data like reportID, created, currency, even transactionID (a bit redundant), isFromGlobalCreated should be updated, but the other old data will be kept intact since iouRequestType is the same

src/libs/actions/IOU.ts

Signed-off-by: dominictb <tb-dominic@outlook.com> Signed-off-by: dominictb <tb-dominic@outlook.com>

s77rt

Looks good just a NAB comment

src/libs/actions/IOU.ts

Signed-off-by: dominictb <tb-dominic@outlook.com>

s77rt · 2024-07-11T11:46:24Z

@dominictb Can you please add missing screenshots / videos?

dominictb · 2024-07-11T12:05:11Z

Alright will do!

dominictb · 2024-07-11T14:09:37Z

@s77rt you mean supplementing the evidence for the new test case that we discussed or supplying the evidence for mobile platforms? I think in mobile platform we couldn't refresh the confirmation page, hence this bug doesn't apply.

OSBotify · 2024-07-11T14:55:34Z

✋ 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-07-15T21:04:14Z

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.0.7-3 🚀

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

OSBotify · 2024-07-15T22:12:58Z

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 9.0.7-4 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-07-17T00:18:37Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.7-8 🚀

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

OSBotify · 2024-07-18T13:49:35Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.8-6 🚀

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

fix: do not refresh draft txn after redirect

d10afcb

dominictb mentioned this pull request Jun 25, 2024

fix: do not reset txn if tab doesn't change #43503

Closed

50 tasks

dominictb marked this pull request as ready for review June 25, 2024 03:05

dominictb requested a review from a team as a code owner June 25, 2024 03:05

melvin-bot bot removed the request for review from a team June 25, 2024 03:05

melvin-bot bot requested a review from s77rt June 25, 2024 03:05

s77rt suggested changes Jun 25, 2024

View reviewed changes

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved

src/pages/iou/request/IOURequestStartPage.tsx Outdated Show resolved Hide resolved

dominictb added 2 commits June 26, 2024 19:10

Merge remote-tracking branch 'origin/main' into fix/40936-init-money-req

40bbcd7

fix: update explanation comment

5cd9f11

Signed-off-by: dominictb <tb-dominic@outlook.com>

s77rt suggested changes Jun 26, 2024

View reviewed changes

fix: navigate to scan page instead of start page

da44443

s77rt suggested changes Jul 1, 2024

View reviewed changes

src/pages/iou/request/step/IOURequestStepConfirmation.tsx Outdated Show resolved Hide resolved

src/pages/iou/request/step/IOURequestStepParticipants.tsx Outdated Show resolved Hide resolved

dominictb added 8 commits July 5, 2024 16:15

fix: move the user back to start page if no receipt upload

c857885

Signed-off-by: dominictb <tb-dominic@outlook.com>

Revert "fix: move the user back to start page if no receipt upload"

26dd780

This reverts commit c857885.

Revert "fix: navigate to scan page instead of start page"

fc9721d

This reverts commit da44443.

Revert "fix: update explanation comment"

7cc38de

This reverts commit 5cd9f11.

Revert "fix: do not refresh draft txn after redirect"

e77ee51

This reverts commit d10afcb.

Merge remote-tracking branch 'origin/main' into fix/40936-init-money-req

78260a1

fix: add a flag to keep the existing draft txn data

e456298

during initMoneyRequest Signed-off-by: dominictb <tb-dominic@outlook.com>

fix: update lint and prettier

23493ff

Signed-off-by: dominictb <tb-dominic@outlook.com>

s77rt suggested changes Jul 10, 2024

View reviewed changes

dominictb added 2 commits July 11, 2024 15:34

Merge remote-tracking branch 'origin/main' into fix/40936-init-money-req

db23adf

fix: update logic of checking shouldKeepData

2f5cd9b

Signed-off-by: dominictb <tb-dominic@outlook.com> Signed-off-by: dominictb <tb-dominic@outlook.com>

s77rt suggested changes Jul 11, 2024

View reviewed changes

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved

fix: remove redundant comment

07e9c6e

Signed-off-by: dominictb <tb-dominic@outlook.com>

s77rt approved these changes Jul 11, 2024

View reviewed changes

melvin-bot bot requested a review from puneetlath July 11, 2024 14:39

puneetlath approved these changes Jul 11, 2024

View reviewed changes

puneetlath merged commit e0635bc into Expensify:main Jul 11, 2024
15 checks passed

github-actions bot mentioned this pull request Jul 15, 2024

Deploy Checklist: New Expensify 2024-07-15 #45421

Closed

melvin-bot bot mentioned this pull request Jul 17, 2024

[HOLD for payment 2024-07-24] [$500] mWeb-Scan-On refreshing scan submit expense confirmation page all details are disappeared #40936

Closed

6 tasks

dominictb deleted the fix/40936-init-money-req branch July 28, 2024 03:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: do not refresh draft txn after redirect #44363

fix: do not refresh draft txn after redirect #44363

dominictb commented Jun 25, 2024

melvin-bot bot commented Jun 25, 2024

s77rt commented Jun 26, 2024 •

edited

Loading

s77rt Jun 26, 2024

dominictb Jun 26, 2024

s77rt Jun 26, 2024

dominictb Jun 27, 2024

s77rt Jun 27, 2024

dominictb Jun 28, 2024

dominictb Jun 28, 2024

s77rt Jun 28, 2024

dominictb Jul 1, 2024

dominictb Jul 1, 2024

s77rt Jul 10, 2024

dominictb Jul 11, 2024

s77rt left a comment

s77rt commented Jul 11, 2024

dominictb commented Jul 11, 2024

dominictb commented Jul 11, 2024

OSBotify commented Jul 11, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 17, 2024

OSBotify commented Jul 18, 2024

fix: do not refresh draft txn after redirect #44363

fix: do not refresh draft txn after redirect #44363

Conversation

dominictb commented Jun 25, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 25, 2024

s77rt commented Jun 26, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

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

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

s77rt left a comment

Choose a reason for hiding this comment

s77rt commented Jul 11, 2024

dominictb commented Jul 11, 2024

dominictb commented Jul 11, 2024

OSBotify commented Jul 11, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 17, 2024

OSBotify commented Jul 18, 2024

s77rt commented Jun 26, 2024 •

edited

Loading