[CBN] USD flow refactor by koko57 · Pull Request #86645 · Expensify/App

koko57 · 2026-03-30T11:55:50Z

Explanation of Change

Fixed Issues

$ #79048
PROPOSAL: -

Tests

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

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-04-01.at.10.18.15.mp4

Android: mWeb Chrome

iOS: Native

Screen.Recording.2026-03-31.at.16.17.32.mp4

Screen.Recording.2026-03-31.at.16.15.19.mp4

iOS: mWeb Safari

Screen.Recording.2026-03-30.at.16.46.15.mp4

MacOS: Chrome / Safari

Screen.Recording.2026-03-30.at.14.41.57.mp4

codecov · 2026-03-30T12:14:57Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/CONST/index.ts	`93.65% <ø> (ø)`
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% <ø> (ø)`
...mbursementAccount/USD/BankInfo/subSteps/Manual.tsx	`0.00% <ø> (ø)`
.../BeneficialOwnerDetailsFormSubSteps/AddressUBO.tsx	`0.00% <ø> (ø)`
...eficialOwnerDetailsFormSubSteps/DateOfBirthUBO.tsx	`0.00% <ø> (ø)`
...eneficialOwnerDetailsFormSubSteps/LegalNameUBO.tsx	`0.00% <ø> (ø)`
... and 42 more
... and 22 files with indirect coverage changes

koko57 · 2026-04-01T11:58:01Z

🚨 EDIT: the problem is only with emulator, but leaving this comment to make sure we're aware of this problem

I'm opening the PR for review, despite finding an issue on Android web

Video:

Screen.Recording.2026-04-01.at.10.16.19.mp4

I'm still investigating the issue, but I don't want to block the PR on that. I also checked main - it's occurring there as well, both in non-USD flow and in the missing personal details. It's only happening for the pages that use the useSubPage hook and logic. It wasn't happening for sure when we worked on and reviewed the PR for non-USD flow. Looks like some changes later affected these flows.

Video for missing details flow on main:

Screen.Recording.2026-04-01.at.12.27.05.mp4

~~I will check if anybody has already reported this problem, if not @arosiclair I think we should open a separate issue for that. Please, LMK what do you think.~~

dukenv0307 · 2026-04-01T15:46:09Z

src/pages/ReimbursementAccount/USD/BusinessInfo/subSteps/IndustryCode/IndustryCodeSelector.tsx

            <SelectionList
-                data={codeOptions}
+                ref={selectionListRef}
+                data={isReady ? codeOptions : []}


Why do we use isReady here? It dont see any issue when enabling autofocus

there was a problem with focus and the animation that couln't be resolved like above (shouldDelayFocus) - without it we had a janky/cut off animation for this step. To fix this we delay rendering the full list until after the page transition animation completes and also delay the focus.

dukenv0307 · 2026-04-01T15:48:52Z

src/pages/ReimbursementAccount/USD/CompleteVerification/CompleteVerification.tsx


-    // eslint-disable-next-line @typescript-eslint/no-deprecated
-    const {componentToRender: SubStep, isEditing, screenIndex, nextScreen, prevScreen, moveTo, goToTheLastStep} = useSubStep({bodyContent, startFrom: 0, onFinished: submit});
+    const {CurrentPage, isEditing, pageIndex, nextPage, prevPage, moveTo} = useSubPage<SubPageProps>({pages, startFrom: 0, onFinished: submit, buildRoute});


same as above, if pages contain 1 item only, do we need to use useSubPage?

dukenv0307 · 2026-04-01T15:54:37Z

Complete the flow is-user-ubo -> is-anyone-else-ubo -> confirm-agreements
In confirm-agreements page, refresh
Go back
Observe the flow is-user-ubo page is shown instead of is-anyone-else-ubo

Screen.Recording.2026-04-01.at.22.38.48.mov

dukenv0307 · 2026-04-01T15:54:48Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 78ba0f5a37

ℹ️ 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".

src/pages/ReimbursementAccount/USD/USDVerifiedBankAccountFlowPage.tsx

src/pages/ReimbursementAccount/USD/ConnectBankAccount/components/FinishChatCard.tsx

koko57 · 2026-04-02T08:09:21Z

Complete the flow is-user-ubo -> is-anyone-else-ubo -> confirm-agreements

In confirm-agreements page, refresh

Go back

Observe the flow is-user-ubo page is shown instead of is-anyone-else-ubo

Screen.Recording.2026-04-01.at.22.38.48.mov

@dukenv0307 I will try to fix it, but BeneficialOwners step is a bit complicated - you would need either go to the ubo's list or is anyone an ubo. You can check on staging - we always navigate back to the first step

EDIT: fixed

koko57 · 2026-04-02T10:03:40Z

@dukenv0307 I think it's ready for re-review

dukenv0307 · 2026-04-02T14:16:42Z

Great, lemme take a look again

dukenv0307 · 2026-04-02T14:51:44Z

src/pages/ReimbursementAccount/USD/BusinessInfo/subSteps/IndustryCode/IndustryCodeSelector.tsx

    const [shouldDisplayChildItems, setShouldDisplayChildItems] = useState(false);
    const {translate} = useLocalize();

+    useEffect(() => {


I think we should use useFocusEffect

This is intentionally only on mount - we're deferring the list render until the navigation transition finishes. useFocusEffect would make it run on every focus, resetting isReady each time and showing an empty list unnecessarily when the user navigates back.

@koko57 It'll cause the inconsistency because if we go back, other inputs will be focused automatically

Screen.Recording.2026-04-02.at.22.48.32.mov

@dukenv0307 I don't understand - how this would affect other inputs

this is only a change that will work on this step

and if you meant that the input on the IndustryCode step won't be focused when you go back to this step - no worries - it is focused correctly

Screen.Recording.2026-04-02.at.18.11.03.mp4

and if you meant that the input on the IndustryCode step won't be focused when you go back to this step - no worries - it is focused correctly

That's weird, it doesn't work on my side

@arosiclair can you please trigger the adhoc build?

@dukenv0307 you're right - I checked once again and the focus is not happening. Previously I entered the flow from the partially setup bank account so the page was not in the stack, so it mounted

@dukenv0307 done! thanks for pointing this out!

dukenv0307 · 2026-04-02T15:03:17Z

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-04-02.at.22.10.18.mov

Android: mWeb Chrome

Screen.Recording.2026-04-02.at.21.53.25.mov

iOS: HybridApp

Screen.Recording.2026-04-02.at.21.56.57.mov

iOS: mWeb Safari

Screen.Recording.2026-04-02.at.21.47.50.mov

MacOS: Chrome / Safari

Screen.Recording.2026-04-02.at.21.42.59.mov

dukenv0307 · 2026-04-02T15:11:27Z

@koko57 Great job. I left 1 minor comment, the rest looks good

koko57 · 2026-04-02T15:34:15Z

I left 1 minor comment

@dukenv0307 this one #86645 (comment) ? - I've already answered #86645 (comment)

koko57 · 2026-04-03T09:42:21Z

SpellCheck fail for unrelated change

github-actions · 2026-04-03T14:07:14Z

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

github-actions · 2026-04-03T14:11:56Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-d06355a-466923a-90cb2553f2833a5dded73cc72fc26cb4a9d017c8/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-d06355a-466923a-c1ddcdd3fc64574fcdaa84040f5bde46e69349a9/index.html

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

👀 View the workflow run that generated this build 👀

dukenv0307 · 2026-04-03T14:44:34Z

@koko57 Thank you. I've approved the PR but we still have 1 failed check. I assume it doesn't come from our PR

koko57 · 2026-04-03T14:54:18Z

@dukenv0307 yes, it seems that it's from another PR. I will merge with main once again in a while

koko57 · 2026-04-03T16:50:26Z

@dukenv0307 after merging with main the spell check was still failing, so I fixed it here (although it's not from our PR)

arosiclair · 2026-04-03T14:55:53Z

src/hooks/useReimbursementAccountSubmit.ts

+ * @param onSubmit - callback that navigates to the next step
+ * @returns markSubmitting - call this right after firing the API action
+ */
+export default function useReimbursementAccountSubmit(onSubmit?: () => void) {


Suggested change

export default function useReimbursementAccountSubmit(onSubmit?: () => void) {

export default function useReimbursementAccountSubmitCallback(onSubmit?: () => void) {

arosiclair · 2026-04-03T15:13:15Z

src/pages/ReimbursementAccount/USD/BeneficialOwnerInfo/BeneficialOwnerDetailsFormPages.tsx

+        if (isEditing) {
+            Navigation.goBack(buildRoute(SUB_PAGE_NAMES.CONFIRMATION));
+            return;
+        }


Is this necessary or should the confirmation page already be the previous route in the history?

arosiclair · 2026-04-03T15:24:38Z

src/pages/ReimbursementAccount/USD/BeneficialOwnerInfo/BeneficialOwnersStep.tsx

+        if (currentSubPage === SUB_PAGE_NAMES.IS_USER_UBO) {
+            setDraftValues(ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM, {ownsMoreThan25Percent: value});

-            // User is an owner but there are 4 other owners already added, so we remove last one


Can we keep this comment?

arosiclair · 2026-04-03T15:33:21Z

src/pages/ReimbursementAccount/USD/BeneficialOwnerInfo/BeneficialOwnersStep.tsx

+        } else if (currentSubPage === SUB_PAGE_NAMES.IS_ANYONE_ELSE_UBO) {
+            navigateBackToSubPage(SUB_PAGE_NAMES.IS_USER_UBO);
+        } else if (currentSubPage === SUB_PAGE_NAMES.UBOS_LIST && !canAddMoreUBOS) {
+            navigateBackToSubPage(SUB_PAGE_NAMES.IS_ANYONE_ELSE_UBO);
+        } else if (currentSubPage === SUB_PAGE_NAMES.UBOS_LIST && isAnyoneElseUBO) {
+            navigateBackToSubPage(SUB_PAGE_NAMES.ARE_THERE_MORE_UBOS);
+        } else if (currentSubPage === SUB_PAGE_NAMES.UBOS_LIST && isUserUBO && !isAnyoneElseUBO) {
+            navigateBackToSubPage(SUB_PAGE_NAMES.IS_ANYONE_ELSE_UBO);


Why are these still necessary? Would the previous route in the history not be correct in these cases?

arosiclair · 2026-04-03T15:46:48Z

src/pages/ReimbursementAccount/USD/BusinessInfo/subSteps/IndustryCode/IndustryCodeSelector.tsx

+    useFocusEffect(
+        useCallback(() => {
+            const timeout = setTimeout(() => {
+                setIsReady(true);
+                selectionListRef.current?.focusTextInput();
+            }, CONST.ANIMATED_TRANSITION);
+
+            return () => clearTimeout(timeout);
+        }, []),
+    );


Can you add a comment explaining why this is necessary?

arosiclair · 2026-04-03T15:52:12Z

src/CONST/index.ts

+                INCORPORATION_DATE: 'incorporation-date',
+                INCORPORATION_STATE: 'incorporation-state',
+                INCORPORATION_CODE: 'incorporation-code',


Can you update these routes to match what we have in the doc? A few others seem to differ as well

koko57 added 17 commits March 24, 2026 12:08

feat: create new route and add to config

87ab095

fix: change page names

cbcebe8

feat: migrate main steps

b9608e5

feat: change props

2deff29

fix: route fixes

131310d

fix: types

07ba024

feat: migrate substeps to sub pages

a31ac82

fix: delay focus on inputs

1879cc6

fix: focus for industry step

8019251

fix: resolve conflicts

b3d5bc9

fix: navigation conflicting route names

11ab86b

Merge branch 'main' into refactor/79048-enable-payments-usd-flow

3f49189

fix: handle backTo param

ab5534a

fix: navigating back from UBO step

4f045ff

Merge branch 'main' into refactor/79048-enable-payments-usd-flow

29f8c33

fix: show loading before navigating to the next step

05534d6

fix: show proper success page

3eaf0f5

melvin-bot bot assigned koko57 Mar 30, 2026

koko57 changed the title ~~Refactor: Enable Payments USD flow~~ [CBN] USD flow refactor Mar 30, 2026

koko57 added 7 commits March 30, 2026 14:17

fix: remove unnecessary comment

2d34201

fix: eslint, prettier

befbf49

fix: minor fix

fdf92e3

fix: onfido step

ff25202

Merge branch 'main' into refactor/79048-enable-payments-usd-flow

049c2da

fix: remove unused import

507fc44

fix: eslint

78ba0f5

koko57 mentioned this pull request Mar 30, 2026

[CBN] Refactor the enable payments flow (USD & Intl') #79048

Open

fix: minor fix

580ca4a

dukenv0307 reviewed Apr 1, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Apr 1, 2026

View reviewed changes

src/pages/ReimbursementAccount/USD/USDVerifiedBankAccountFlowPage.tsx Show resolved Hide resolved

src/pages/ReimbursementAccount/USD/ConnectBankAccount/components/FinishChatCard.tsx Show resolved Hide resolved

koko57 added 2 commits April 2, 2026 09:23

fix: remove useSubPage for BankInfo page

875c157

fix: remove useSubPage for CompleteVerification page

c4b3b84

fix: beneficial owners step

5b5f8a8

koko57 requested a review from dukenv0307 April 2, 2026 10:03

dukenv0307 reviewed Apr 2, 2026

View reviewed changes

koko57 added 2 commits April 3, 2026 09:36

fix: resolve conflicts

779cb18

fix: change useEffect to useFocusEffet

d06355a

koko57 requested a review from dukenv0307 April 3, 2026 09:34

dukenv0307 approved these changes Apr 3, 2026

View reviewed changes

melvin-bot bot requested a review from arosiclair April 3, 2026 14:42

koko57 added 2 commits April 3, 2026 16:55

Merge branch 'main' into refactor/79048-enable-payments-usd-flow

82e54e3

fix: add PINATM to cspell

8299b90

arosiclair requested changes Apr 3, 2026

View reviewed changes

	export default function useReimbursementAccountSubmit(onSubmit?: () => void) {
	export default function useReimbursementAccountSubmitCallback(onSubmit?: () => void) {

Conversation

koko57 commented Mar 30, 2026 • edited 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 Mar 30, 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!

koko57 commented Apr 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dukenv0307 commented Apr 1, 2026

Uh oh!

dukenv0307 commented Apr 1, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

koko57 commented Apr 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

koko57 commented Apr 2, 2026

Uh oh!

dukenv0307 commented Apr 2, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dukenv0307 commented Apr 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

dukenv0307 commented Apr 2, 2026

Uh oh!

koko57 commented Apr 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

koko57 commented Apr 3, 2026

Uh oh!

github-actions bot commented Apr 3, 2026

Uh oh!

github-actions bot commented Apr 3, 2026

Uh oh!

dukenv0307 commented Apr 3, 2026

Uh oh!

koko57 commented Apr 3, 2026

koko57 commented Mar 30, 2026 •

edited

Loading

codecov bot commented Mar 30, 2026 •

edited by github-actions bot

Loading

koko57 commented Apr 1, 2026 •

edited

Loading

koko57 commented Apr 2, 2026 •

edited

Loading

dukenv0307 commented Apr 2, 2026 •

edited

Loading

koko57 commented Apr 2, 2026 •

edited

Loading