Fix redirection after iou by koko57 · Pull Request #62486 · Expensify/App

koko57 · 2025-05-21T14:48:22Z

Explanation of Change

Fixed Issues

$ #62370
PROPOSAL: -

Tests

Go to the Reports page, select any tab other than Expenses
Click FAB button -> Create Expense
Go through the flow
Verify that after confirmation the RHP is closed, but the page doesn't switch to the Expense tab

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

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 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 used JaimeGPT to get English > Spanish translation. I then posted it 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.ts 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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
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

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-05-21.at.16.42.05.mp4

MacOS: Desktop

koko57 · 2025-05-21T14:50:35Z

Spotted a bug while working on it (also reproducible on main):
-> after choosing a participant we're redirected to the Amount step not to the Confirmation step. It doesn't happen when we choose ourselves as a participant

Screen.Recording.2025-05-21.at.16.32.11.mp4

melvin-bot · 2025-05-21T14:50:49Z

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

koko57 · 2025-05-26T13:43:14Z

@getusha friendly bump

getusha · 2025-05-27T13:02: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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- 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 there are no new alerts related to the canBeMissing param for useOnyx
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 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.ts 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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: HybridApp

Screen.Recording.2025-06-02.at.12.37.43.in.the.afternoon.mov

Android: mWeb Chrome

Screen.Recording.2025-06-02.at.10.26.52.in.the.morning.mov

iOS: HybridApp

Screen.Recording.2025-06-02.at.11.51.38.in.the.morning.mov

iOS: mWeb Safari

Screen.Recording.2025-06-02.at.10.24.55.in.the.morning.mov

MacOS: Chrome / Safari

Screen.Recording.2025-06-02.at.10.23.25.in.the.morning.mov

MacOS: Desktop

Screen.Recording.2025-06-02.at.10.29.00.in.the.morning.mov

getusha · 2025-05-27T13:32:36Z

src/libs/actions/IOU.ts

        InteractionManager.runAfterInteractions(() => removeDraftTransactions());
        if (!requestMoneyInformation.isRetry) {
-            dismissModalAndOpenReportInInboxTab(backToReport ?? activeReportID);
+            dismissModalAndOpenReportInInboxTab(backToReport ?? activeReportID, !!transaction.isFromReportsPageDragAndDrop);


transaction wouldn't have isFromReportsPageDragAndDrop at this point @koko57
As we are saving it to a draft transaction.

@koko57 I might be wrong, but I assume it seems to work because !!transaction.isFromReportsPageDragAndDrop is always false. which means we wouldn't be redirected if we initiate the request on drop.

@getusha you're not wrong - my bad, I haven't thought it through. Maybe it's just better to revert the changes I made for the Stage 2 Multi Drop. I would just leave the changes for refactoring initMoneyRequest in this PR, so I don't have to cherry-pick this commit to the Stage 4 #62650 (comment)

Now I don't have a better idea to handle this, I also see some new problems related to having several transactionDrafts - so my suggestion here - revert the change (as we're not using the Search Page drag-and-drop) and leave only the changes with initMoney refactor. I would fix this problem later, when finishing the whole feature. The original problem would be solved. WDYT?

that makes sense 👍

…actor

koko57 · 2025-05-29T09:51:02Z

@lakchote @getusha changes reverted, conflicts resolved

getusha · 2025-05-29T18:35:05Z

src/pages/iou/request/IOURequestStartPage.tsx

    const prevTransactionReportID = usePrevious(transaction?.reportID);

+    // Clear out the temporary expense if the reportID in the URL has changed from the transaction's reportID.
+    useFocusEffect(


we removed this here https://github.com/Expensify/App/pull/61829/files#diff-58df38b4de0f1004e4272ddff9c794051956250a26c86027addb1a6763b09237L73-L83

could you pull main?

@getusha done!

koko57 · 2025-06-02T08:50:56Z

@getusha friendly bump on this one

dangrous · 2025-06-02T19:13:34Z

oh no, waited too long - looks like there are conflicts

koko57 · 2025-06-03T06:01:11Z

@dangrous @lakchote conflicts resolved

dangrous · 2025-06-03T15:36:40Z

looks like we need a prettier update, then should be good to go

koko57 · 2025-06-03T16:32:52Z

@dangrous done!

OSBotify · 2025-06-03T20:48:09Z

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

github-actions · 2025-06-04T16:43:46Z

🚀 Deployed to staging by https://github.com/dangrous in version: 9.1.59-0 🚀

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

github-actions · 2025-06-05T21:23:55Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.1.59-7 🚀

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

koko57 added 2 commits May 21, 2025 16:05

fix: refactor initMoneyRequest

ae356e1

fix: redirect only when drag and drop

689a0ab

koko57 marked this pull request as ready for review May 21, 2025 14:50

koko57 requested a review from a team as a code owner May 21, 2025 14:50

melvin-bot bot requested a review from getusha May 21, 2025 14:50

melvin-bot bot removed the request for review from a team May 21, 2025 14:50

koko57 mentioned this pull request May 21, 2025

[Due for payment 2025-06-12] [Multi-Files Drag-and-Drop] Reports - After submitting expense while in Expense Reports page, app returns to Reports #62370

Closed

8 tasks

koko57 added 3 commits May 21, 2025 16:58

fix: lint

c094260

fix: typecheck

31f7b47

fix: switch

13f7b0a

koko57 added 2 commits May 26, 2025 15:43

Merge branch 'main' into fix/62370-fix-redirection-after-iou

7a98dc7

fix: typecheck

7e10d7f

getusha reviewed May 27, 2025

View reviewed changes

Merge branch 'main' into fix/62370-fix-redirection-after-iou

c010097

koko57 mentioned this pull request May 27, 2025

[InternalQA] Split screen drop zone #62650

Merged

50 tasks

fix: revert changes, remove isFromReportsPageDragAndDrop from the ref…

b2e74cf

…actor

lakchote self-requested a review May 29, 2025 09:31

fix: resolve conflicts

2b29c88

koko57 requested a review from getusha May 29, 2025 10:00

getusha reviewed May 29, 2025

View reviewed changes

koko57 added 2 commits May 30, 2025 08:50

Merge branch 'main' into fix/62370-fix-redirection-after-iou

c981303

fix: remove unnecessary code

73ec774

koko57 requested a review from getusha May 30, 2025 06:54

getusha approved these changes Jun 2, 2025

View reviewed changes

melvin-bot bot requested a review from dangrous June 2, 2025 09:39

lakchote previously approved these changes Jun 2, 2025

View reviewed changes

dangrous previously approved these changes Jun 2, 2025

View reviewed changes

dangrous mentioned this pull request Jun 2, 2025

[READY FOR PAYMENT ?][$250] Reports - When creating new expense while inside report, user is automatically navigated out #62733

Closed

8 tasks

fix: resolve conflicts

2b0314d

koko57 dismissed stale reviews from dangrous and lakchote via 2b0314d June 3, 2025 06:00

fix: prettier

2b52c7d

dangrous approved these changes Jun 3, 2025

View reviewed changes

dangrous merged commit 1665aed into Expensify:main Jun 3, 2025
16 checks passed

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

Deploy Checklist: New Expensify 2025-06-04 #63458

Closed

91 tasks

koko57 deleted the fix/62370-fix-redirection-after-iou branch August 28, 2025 08:30

Conversation

koko57 commented May 21, 2025 • edited by roryabraham Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

koko57 commented May 21, 2025

Uh oh!

melvin-bot bot commented May 21, 2025

Uh oh!

koko57 commented May 26, 2025

Uh oh!

getusha commented May 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

getusha May 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

getusha May 27, 2025

Choose a reason for hiding this comment

Uh oh!

koko57 May 27, 2025

Choose a reason for hiding this comment

Uh oh!

getusha May 29, 2025

Choose a reason for hiding this comment

Uh oh!

koko57 commented May 29, 2025

Uh oh!

getusha May 29, 2025

Choose a reason for hiding this comment

Uh oh!

koko57 May 30, 2025

Choose a reason for hiding this comment

Uh oh!

koko57 commented Jun 2, 2025

Uh oh!

dangrous commented Jun 2, 2025

Uh oh!

koko57 commented Jun 3, 2025

Uh oh!

dangrous commented Jun 3, 2025

Uh oh!

koko57 commented Jun 3, 2025

Uh oh!

Uh oh!

OSBotify commented Jun 3, 2025

Uh oh!

github-actions bot commented Jun 4, 2025

Uh oh!

github-actions bot commented Jun 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

koko57 commented May 21, 2025 •

edited by roryabraham

Loading

getusha commented May 27, 2025 •

edited

Loading

getusha May 27, 2025 •

edited

Loading