[CBN] Non-USD flow refactor by koko57 · Pull Request #83308 · Expensify/App

koko57 · 2026-02-24T09:32:56Z

Explanation of Change

Fixed Issues

$ #79048
PROPOSAL:

Tests

Prerequisites: being an admin of at least one workspace, the workspace should have global reimbursements supported currency (EUR, CAD, AUD or GBP)

Go to Workspace > Workflows
Click Add bank account
Verify that the Country and Currency is filled in with supported values (EU Countries, Canada, Austrania or UK)
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 one of the countries
Repeat steps 4-6 from the previous scenario

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]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-03-03.at.16.17.07.mp4

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-03-03.at.16.08.56.mp4

codecov · 2026-02-24T09:40:02Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/CONST/index.ts	`95.20% <ø> (ø)`
src/SCREENS.ts	`100.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`76.92% <ø> (ø)`
...mbursementAccount/ConnectedVerifiedBankAccount.tsx	`0.00% <ø> (ø)`
...BeneficialOwnerDetailsFormSubSteps/DateOfBirth.tsx	`0.00% <ø> (ø)`
...fo/BeneficialOwnerDetailsFormSubSteps/Last4SSN.tsx	`0.00% <ø> (ø)`
...erInfo/BeneficialOwnerDetailsFormSubSteps/Name.tsx	`0.00% <ø> (ø)`
...BeneficialOwnerDetailsFormSubSteps/Nationality.tsx	`0.00% <ø> (ø)`
...alOwnerDetailsFormSubSteps/OwnershipPercentage.tsx	`0.00% <ø> (ø)`
...ntAccount/NonUSD/BusinessInfo/subSteps/Address.tsx	`0.00% <ø> (ø)`
... and 45 more
... and 10 files with indirect coverage changes

koko57 · 2026-03-13T16:23:27Z

@arosiclair I needed to reintroduce backTo param to fix this bug - #83308 (comment) - because the previous solution wasn't working for the wallet page and other locations from where we can enter the flow. We will remove it after the backTo -> dynamic routes project #73825 is finished.

LMK if you're ok with that.

I'm still working on improving the redirection (discussed here #83308 (comment))

in the meantime, @dukenv0307 could you please run another round of review?

dukenv0307 · 2026-03-16T02:53:52Z

Looks better now

Screen.Recording.2026-03-16.at.09.52.02.mov

arosiclair · 2026-03-16T18:44:49Z

@arosiclair I needed to reintroduce backTo param to fix this bug - #83308 (comment) - because the previous solution wasn't working for the wallet page and other locations from where we can enter the flow. We will remove it after the backTo -> dynamic routes project #73825 is finished.

LMK if you're ok with that.

Yup makes sense to me 👍

…n its substeps

koko57 · 2026-03-17T17:39:34Z

@dukenv0307 I think I improved redirection enough, also fixed some issues with missing data when navigating back. Could you please run another round of the review?

dukenv0307 · 2026-03-19T03:04:52Z

@koko57 We're working on the PR to improve the animation, should we hold this PR until #85531 is merged?

koko57 · 2026-03-19T08:04:47Z

@koko57 We're working on the PR to improve the animation, should we hold this PR until #85531 is merged?

@dukenv0307 no we don't really have to - I changed the mechanism to navigate to each substep explicitly, so we don't have this redirection on the hook level. And when navigating explicitly we don't have the navigation problem.

So even if we decide to change that we can always do it in the PR when we'll remove the backTo param (After dynamic navigation project is finished).

dukenv0307 · 2026-03-20T02:09:21Z

okay, on it now

dukenv0307 · 2026-03-20T02:36: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.2026-03-20.at.09.31.39.mov

Android: mWeb Chrome

Screen.Recording.2026-03-20.at.09.24.48.mov

iOS: HybridApp

Screen.Recording.2026-03-20.at.09.27.15.mov

iOS: mWeb Safari

Screen.Recording.2026-03-20.at.09.23.04.mov

MacOS: Chrome / Safari

Screen.Recording.2026-03-20.at.09.18.54.mov

dukenv0307 · 2026-03-23T02:12:59Z

@koko57 We got the conflict

koko57 · 2026-03-23T08:36:15Z

conflicts resolved

arosiclair

Wow this was even bigger than I thought it would be. Just a few comments

arosiclair · 2026-03-23T15:14:25Z

src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx

+    [SCREENS.REIMBURSEMENT_ACCOUNT_NON_USD]: {
+        animationTypeForReplace: 'pop',
+    },


Is this change still necessary? We made some related changes in this PR recently: https://github.com/Expensify/App/pull/85531/changes

arosiclair · 2026-03-23T16:09:15Z

src/pages/ReimbursementAccount/NonUSD/BeneficialOwnerInfo/BeneficialOwnerInfo.tsx

+    const ownerKeys = reimbursementAccountDraft?.beneficialOwnerKeys ?? beneficialOwnersDraftValues.beneficialOwnerKeys;
+
+    useEffect(() => {
+        if (reimbursementAccountDraft?.beneficialOwnerKeys || beneficialOwnersDraftValues.beneficialOwnerKeys.length === 0) {


Suggested change

if (reimbursementAccountDraft?.beneficialOwnerKeys || beneficialOwnersDraftValues.beneficialOwnerKeys.length === 0) {

if (!reimbursementAccountDraft?.beneficialOwnerKeys || beneficialOwnersDraftValues.beneficialOwnerKeys.length === 0) {

Is this right?

arosiclair · 2026-03-23T19:11:26Z

src/pages/ReimbursementAccount/NonUSD/utils/getDraftValuesForSignerInfo.ts

+
+type DraftValuesForSignerInfo = {
+    isUserDirector: boolean;
+    [key: string]: string | boolean;


The keys for this result object seem fixed. Can we add them all to the type?

arosiclair · 2026-03-23T19:18:56Z

src/pages/ReimbursementAccount/NonUSD/NonUSDVerifiedBankAccountFlowPage.tsx

+
+    const isAUD = currency === CONST.CURRENCY.AUD;
+    const pages = useMemo(() => {
+        const filtered = isDocusignStepRequired ? allPages : allPages.filter((p) => p.pageName !== PAGE_NAME.DOCUSIGN);


Suggested change

const filtered = isDocusignStepRequired ? allPages : allPages.filter((p) => p.pageName !== PAGE_NAME.DOCUSIGN);

const filteredPages = isDocusignStepRequired ? allPages : allPages.filter((p) => p.pageName !== PAGE_NAME.DOCUSIGN);

arosiclair · 2026-03-23T19:19:05Z

src/pages/ReimbursementAccount/NonUSD/NonUSDVerifiedBankAccountFlowPage.tsx

+    const isAUD = currency === CONST.CURRENCY.AUD;
+    const pages = useMemo(() => {
+        const filtered = isDocusignStepRequired ? allPages : allPages.filter((p) => p.pageName !== PAGE_NAME.DOCUSIGN);
+        return filtered.map((p) => {


Suggested change

return filtered.map((p) => {

return filtered.map((page) => {

koko57 added 3 commits February 23, 2026 18:19

feat: new routes for non-usd flow

3266f7e

feat: new non-usd entry point

274962f

feat: props for major steps

fed84fd

melvin-bot bot assigned koko57 Feb 24, 2026

koko57 added 6 commits February 25, 2026 11:06

chore: change url names

6d276df

feat: add sub page names

97def17

feat: migrate bank info step to sub pages

9212c8b

feat: migrate business info step to sub pages

1e3e66e

chore: change SubStepProps to SubPageProps

1f7ed2d

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

caffb61

koko57 changed the title ~~Refactor/79048 enable payments flow~~ [CBN] Non-USD flow refactor Feb 26, 2026

koko57 added 15 commits February 26, 2026 18:15

fix: add missing param

a4502ec

fix: add currentSubPage prop

b704184

fix: currency fix

b58536c

feat: create separate pages for forms

36426cf

feat: migrate beneficial owner and signer step

379235b

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

d39fbeb

fix: delay focus on inputs

fac6957

fix: change prop name

887c6d7

feat: handle finishing the flow

c5e2860

fix: minor fix

c073e36

fix: prevent skipping agreements step

0f0844a

fix: resolve conflicts

76b4082

fix: currency mismatch, navigate to subPage

4028313

fix: move isComingFromExpensifyCard to Onyx

ebfb86d

fix: prettier

ac973c3

koko57 marked this pull request as ready for review March 3, 2026 15:53

koko57 requested review from a team as code owners March 3, 2026 15:53

fix: add backTo to connect with existing account page

3b682cf

koko57 added 2 commits March 16, 2026 13:44

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

f20ebab

fix: make navigating between main steps explicit

a462176

koko57 added 6 commits March 17, 2026 11:09

fix: navigation animation

272cf1e

fix: get proper data for beneficial owner step, fix navigating betwee…

af52305

…n its substeps

fix: minor improvements

ab29b46

fix: navigation improvements

9f0bc4f

fix: get proper data for signer info step

85e9800

fix: some other minor improvements

c6c3a29

koko57 requested review from MrMuzyk and dukenv0307 March 17, 2026 17:38

koko57 added 4 commits March 18, 2026 09:20

fix: eslint

68ea132

fix: eslint

0fbf839

fix: remove unnecessary param

de96780

fix: remove shouldRedirect

7aa794c

dukenv0307 approved these changes Mar 20, 2026

View reviewed changes

melvin-bot bot requested a review from arosiclair March 20, 2026 02:36

fix: resolve conflicts

217c1e4

fix: typescript

1c56690

arosiclair requested changes Mar 23, 2026

View reviewed changes

	if (reimbursementAccountDraft?.beneficialOwnerKeys \|\| beneficialOwnersDraftValues.beneficialOwnerKeys.length === 0) {
	if (!reimbursementAccountDraft?.beneficialOwnerKeys \|\| beneficialOwnersDraftValues.beneficialOwnerKeys.length === 0) {

	const filtered = isDocusignStepRequired ? allPages : allPages.filter((p) => p.pageName !== PAGE_NAME.DOCUSIGN);
	const filteredPages = isDocusignStepRequired ? allPages : allPages.filter((p) => p.pageName !== PAGE_NAME.DOCUSIGN);

Conversation

koko57 commented Feb 24, 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 Feb 24, 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 Mar 13, 2026

Uh oh!

dukenv0307 commented Mar 16, 2026

Uh oh!

arosiclair commented Mar 16, 2026

Uh oh!

koko57 commented Mar 17, 2026

Uh oh!

dukenv0307 commented Mar 19, 2026

Uh oh!

koko57 commented Mar 19, 2026

Uh oh!

dukenv0307 commented Mar 20, 2026

Uh oh!

dukenv0307 commented Mar 20, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

dukenv0307 commented Mar 23, 2026

Uh oh!

koko57 commented Mar 23, 2026

Uh oh!

arosiclair left a comment

Choose a reason for hiding this comment

Uh oh!

arosiclair Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

arosiclair Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

arosiclair Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

arosiclair Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

arosiclair Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

koko57 commented Feb 24, 2026 •

edited

Loading

codecov bot commented Feb 24, 2026 •

edited by github-actions bot

Loading