feat: 79048 restore reverted usd flow by MrMuzyk · Pull Request #88193 · Expensify/App

MrMuzyk · 2026-04-17T10:27:35Z

Explanation of Change

Restores previously reverted refactor of USD flow
Fixes flickering bug for USD and non USD reimbursement account flow on mWeb Android by disabling animations on these platforms in these 2 flows

Fixed Issues

$ #79048
$ #87658
PROPOSAL:

Tests

Same as QA steps

Verify that no errors appear in the JS console

Offline tests

QA Steps

Prerequisites: being an admin of at least one workspace, the workspace tested should have USD as the workspace currency

Go to Workspace > Workflows
Click Add bank account
Verify that the Country and Currency is filled in with
Go through the flow, fill in all the fields
Click browser / native back button
Verify that you're redirected to the previous step, not out of the flow
Go to Wallet
Click Add bank account
On the Bank Purpose Page choose Make Payments
Choose United States
Repeat steps 4-6 from the previous scenario
Go through the whole flow - verify that you can add the bank account both in the Wallet and in the Workflows

Partially setup bank accounts

Start adding the bank account in the wallet
Leave the flow in the middle (on any step after Bank Info)
Verify that the account is added with a "Action required" badge
Click this account
Verify that the proper major step opens
Go back and forth a few steps
Verify that the navigation between the steps works as expected

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mp4

Android: mWeb Chrome

android.mweb.mp4

iOS: Native

ios-native.mp4

iOS: mWeb Safari

ios-web.mp4

MacOS: Chrome / Safari

web.mp4

codecov · 2026-04-17T10:38:59Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/CONST/index.ts	`92.30% <ø> (ø)`
src/SCREENS.ts	`100.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`76.92% <ø> (ø)`
src/libs/ReimbursementAccountUtils.ts	`53.84% <ø> (+11.91%)`	⬆️
...mbursementAccount/ConnectedVerifiedBankAccount.tsx	`0.00% <ø> (ø)`
...tAccount/ReimbursementAccountVerifyAccountPage.tsx	`0.00% <ø> (ø)`
.../BeneficialOwnerDetailsFormSubSteps/AddressUBO.tsx	`0.00% <ø> (ø)`
...eficialOwnerDetailsFormSubSteps/DateOfBirthUBO.tsx	`0.00% <ø> (ø)`
...eneficialOwnerDetailsFormSubSteps/LegalNameUBO.tsx	`0.00% <ø> (ø)`
...nerDetailsFormSubSteps/SocialSecurityNumberUBO.tsx	`0.00% <ø> (ø)`
... and 43 more
... and 13 files with indirect coverage changes

melvin-bot · 2026-04-20T08:33:27Z

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

melvin-bot · 2026-04-20T08:33:32Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 95b7b1b053

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-04-20T08:50:42Z

+        if (pageIndex === 0) {
+            if (isEditingCreatedBeneficialOwner) {
+                Navigation.goBack(buildRoute(SUB_PAGE_NAMES.UBOS_LIST));
+            } else {
+                Navigation.goBack(buildRoute(SUB_PAGE_NAMES.IS_USER_UBO));


Return to the immediate previous UBO question

Pressing back on the first page of a new beneficial-owner details form always sends users to is-user-ubo, even when they entered the form from is-anyone-else-ubo/are-there-more-ubos. That skips intermediate state and makes back navigation inconsistent with the prior flow, so users can be bounced to the start of the UBO questionnaire instead of the step they just came from.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-04-20T08:50:43Z

            verifyIdentityForBankAccount(Number(bankAccountID), {...onfidoData, applicantID: onfidoApplicantID}, policyID);
            updateReimbursementAccountDraft({isOnfidoSetupComplete: true});
+            onSubmit?.();
        },


Wait for identity verification result before advancing

This advances to the next major page immediately after dispatching verifyIdentityForBankAccount, without waiting for the request outcome. If that call fails (e.g., transient backend/network failure), the user is still moved to Company info despite identity verification not being completed, which can produce confusing downstream errors and an invalid step sequence.

Useful? React with 👍 / 👎.

MrMuzyk · 2026-04-20T11:13:18Z

Not ready just yet, had to put out of draft to test something

MrMuzyk · 2026-04-20T14:49:10Z

@arosiclair Unfortunately the fix that I thought I had didn't work as expected so Im still fighting with flickering bug

I have one platform specific workaround in the works but it still needs some tweaks. I have some other issues that require my attention too so I'll pause here (for tomorrow at least).

I'll try to get back to it ASAP 🤞

joekaufmanexpensify

Good for product

…-internal/refactor/79048-enable-payments-usd-flow"" This reverts commit d3e1c54. # Conflicts: # src/libs/ReimbursementAccountUtils.ts

…ernal/fix/87615-87610-usd-refactor-regressions"" This reverts commit 6be9f6a.

MrMuzyk · 2026-04-24T09:04:00Z

Im back on it today

MrMuzyk · 2026-04-24T14:21:48Z

I think Ive finally managed to find a fix. I'll conclude testing next week and we will proceed here finally 🤞

…/79048-restore-reverted-usd-flow

MrMuzyk · 2026-05-05T11:21:38Z

Decided to disable animations in USD and non USD reimbursement account flows as per comment

It is ready for review now @dukenv0307

…/79048-restore-reverted-usd-flow

dukenv0307 · 2026-05-06T15:53:43Z

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.2026-05-06.at.22.52.54.mov

Android: mWeb Chrome

Screen.Recording.2026-05-06.at.22.46.00.mov

iOS: HybridApp

Screen.Recording.2026-05-06.at.22.49.56.mov

iOS: mWeb Safari

Screen.Recording.2026-05-06.at.22.43.47.mov

MacOS: Chrome / Safari

Screen.Recording.2026-05-06.at.22.41.31.mov

dukenv0307 · 2026-05-06T15:54:10Z

Looks good to me and tests well

arosiclair · 2026-05-07T13:05:03Z

Alright I created #89915 to track the disabled animations. If we find a better approach, we can re-enable it there.

github-actions · 2026-05-07T13:06:00Z

🚧 @arosiclair has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-05-07T13:10:19Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #88193.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-8390f03-8d97ded-7244d63ac1759650486c61ce71845fe39aded959/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-8390f03-8d97ded-cf624e7f3cd65975756430eb17e0ea50ed73299a/index.html

Web 🕸️
https://88193.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-07T13:14:01Z

✋ 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 · 2026-05-08T15:40:31Z

🚀 Deployed to staging by https://github.com/arosiclair in version: 9.3.69-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

mitarachim · 2026-05-11T06:38:14Z

Deploy Blocker #90144 was identified to be related to this PR.

OSBotify · 2026-05-11T23:41:00Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.69-18 🚀

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

melvin-bot Bot assigned MrMuzyk Apr 17, 2026

MrMuzyk mentioned this pull request Apr 17, 2026

[Due for payment 2026-06-17] [Due for payment 2026-06-04] [CBN] Refactor the enable payments flow (USD & Intl') #79048

Closed

MrMuzyk marked this pull request as ready for review April 20, 2026 08:33

MrMuzyk requested review from a team as code owners April 20, 2026 08:33

melvin-bot Bot requested review from a team and dukenv0307 and removed request for a team April 20, 2026 08:33

melvin-bot Bot requested review from arosiclair and joekaufmanexpensify and removed request for a team April 20, 2026 08:33

melvin-bot Bot removed the request for review from a team April 20, 2026 08:33

chatgpt-codex-connector Bot reviewed Apr 20, 2026

View reviewed changes

joekaufmanexpensify previously approved these changes Apr 20, 2026

View reviewed changes

koko57 and others added 6 commits April 24, 2026 09:41

staRevert "Revert "Merge pull request Expensify#86645 from callstack…

bcebb53

…-internal/refactor/79048-enable-payments-usd-flow"" This reverts commit d3e1c54. # Conflicts: # src/libs/ReimbursementAccountUtils.ts

Revert "Revert "Merge pull request Expensify#87624 from callstack-int…

80ae82f

…ernal/fix/87615-87610-usd-refactor-regressions"" This reverts commit 6be9f6a.

fix: compiler

df7dc42

fix: flickering issue

7ebd5ad

fix: lint

74f6bfd

fix: back handler in UBO step

6567db3

MrMuzyk dismissed joekaufmanexpensify’s stale review via 6567db3 April 24, 2026 07:41

MrMuzyk force-pushed the refactor/79048-restore-reverted-usd-flow branch from cc5b30d to 6567db3 Compare April 24, 2026 07:41

Merge branch 'main' of https://github.com/Expensify/App into refactor…

5fcfe4a

…/79048-restore-reverted-usd-flow

MrMuzyk added 4 commits May 4, 2026 13:00

fix: revert last change

48c2076

Merge branch 'main' of https://github.com/Expensify/App into refactor…

254a3d5

…/79048-restore-reverted-usd-flow

fix: disble reimbursement account flow animations for mweb chrome

4b069fc

fix: lint

e338cb4

MrMuzyk added 2 commits May 6, 2026 10:39

Merge branch 'main' of https://github.com/Expensify/App into refactor…

ac5c59d

…/79048-restore-reverted-usd-flow

Merge branch 'main' of https://github.com/Expensify/App into refactor…

0d25bc5

…/79048-restore-reverted-usd-flow

dukenv0307 approved these changes May 6, 2026

View reviewed changes

arosiclair approved these changes May 7, 2026

View reviewed changes

arosiclair merged commit 8390f03 into Expensify:main May 7, 2026
40 checks passed

KJ21-ENG mentioned this pull request May 7, 2026

[Due for payment 2026-06-16] [$250] Android mWeb - Animations are disabled in the enable payments (BBA) flow #89915

Closed

7 tasks

OSBotify mentioned this pull request May 8, 2026

Deploy Checklist: New Expensify 2026-05-08 #90006

Closed

OSBotify mentioned this pull request May 11, 2026

Bank Account - Click device back on success modal direct to Add BA flow and unable to continue #90144

Closed

7 tasks

lakchote mentioned this pull request May 11, 2026

[CP Staging] Revert "feat: 79048 restore reverted usd flow" #90199

Merged

MrMuzyk mentioned this pull request May 14, 2026

feat: Refator USD flow to use useSubPage #90302

Merged

52 tasks

applause-bot Bot mentioned this pull request May 27, 2026

[Due for payment 2026-06-09] Wallet - Continue setup and Start over button do not appear after returning to initial page #91884

Closed

7 tasks

oqildev mentioned this pull request May 28, 2026

[$250] dd BA- After clicking "Update details" name is empty, user is dropped out after clicking Next #91157

Open

7 tasks

VickyStash mentioned this pull request May 28, 2026

Fix Continue setup and Start over button do not appear after returning to initial page #91939

Merged

52 tasks

This was referenced May 30, 2026

iOS - Expensify card - Swiping back on the successful screen reopens bank account flow #92143

Closed

Confirm currency & country page reappears (1st step not skipped) when re-adding BA #92723

Closed

VickyStash mentioned this pull request Jun 5, 2026

Fix BBA PENDING state validation #92773

Merged

52 tasks

Conversation

MrMuzyk commented Apr 17, 2026 • edited by arosiclair 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!

codecov Bot commented Apr 17, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Apr 20, 2026

Uh oh!

melvin-bot Bot commented Apr 20, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

MrMuzyk commented Apr 20, 2026

Uh oh!

MrMuzyk commented Apr 20, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

MrMuzyk commented Apr 24, 2026

Uh oh!

MrMuzyk commented Apr 24, 2026

Uh oh!

MrMuzyk commented May 5, 2026

Uh oh!

dukenv0307 commented May 6, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

dukenv0307 commented May 6, 2026

Uh oh!

arosiclair commented May 7, 2026

Uh oh!

Uh oh!

github-actions Bot commented May 7, 2026

Uh oh!

github-actions Bot commented May 7, 2026

Uh oh!

OSBotify commented May 7, 2026

Uh oh!

OSBotify commented May 8, 2026

Uh oh!

mitarachim commented May 11, 2026

Uh oh!

OSBotify commented May 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

MrMuzyk commented Apr 17, 2026 •

edited by arosiclair

Loading

codecov Bot commented Apr 17, 2026 •

edited by github-actions Bot

Loading