Add bank account pops the next step after magic code verification by jmusial · Pull Request #102522 · Expensify/App

jmusial · 2026-09-29T10:38:50Z

Explanation of Change

After magic code validation in Workflows > Add bank account, the verify account page now owns the navigation to the next setup step (using the entry screen's USD/non-USD choice).

VerifiedBankAccountFlowEntryPoint only prepares the data, so the two no longer race and pop the user back to "Connect manually / Log into your bank".

Fixed Issues

$ #101748
PROPOSAL:

Tests

Note

For dev purposes one can inject authenticated state instead on getting new magic code every time.
Onyx.merge('account', {validated: false});

Scenario 1: Connect manually on a USD workspace

Open app as an admin with an unvalidated account on a USD workspace with no bank account
Navigate to Workspace > Workflows > Payments > Add bank account
Tap "Connect manually"
Verify that the "Validate your account" magic code screen opens
Enter the magic code
Verify that you land on the Country step of the bank account setup

Scenario 2: Log into your bank on a USD workspace

Open app as an admin with an unvalidated account on a USD workspace with no bank account
Navigate to Workspace > Workflows > Payments > Add bank account
Tap "Log into your bank"
Enter the magic code
Verify that you land on the Country step of the bank account setup
Wait a few seconds
Verify that you stay on the Country step and are not sent back to the "Add bank account" screen
Continue past the Country step
Verify that the bank info step offers the Plaid login

Scenario 3: Connect manually on a non-USD workspace

Open app as an admin with an unvalidated account on a workspace whose default currency is not USD (e.g. EUR) and which has no bank account
Navigate to Workspace > Workflows > Payments > Add bank account
Verify that only "Connect manually" is shown
Tap "Connect manually" and enter the magic code
Verify that you land on the "Currency and country" step

Scenario 4: Admin who is already validated

Open app as an admin with a validated account on a USD workspace with no bank account
Navigate to Workspace > Workflows > Payments > Add bank account
Tap "Connect manually"
Verify that the magic code screen is skipped and you land directly on the Country step
Go back and tap "Log into your bank"
Verify that you land directly on the Country step

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-09-29.at.13.15.31.mov

Android: mWeb Chrome

Screen.Recording.2026-09-29.at.13.19.26.mov

iOS: Native

Screen.Recording.2026-09-29.at.13.06.03.mov

iOS: mWeb Safari

Screen.Recording.2026-09-29.at.13.23.59.mov

MacOS: Chrome / Safari

Screen.Recording.2026-09-29.at.12.55.24.mov

codecov · 2026-09-29T10:42:43Z

Codecov Report

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

Files with missing lines	Coverage Δ
...gation/AppNavigator/ModalStackNavigators/index.tsx	`7.66% <ø> (ø)`
...t/DynamicReimbursementAccountVerifyAccountPage.tsx	`100.00% <100.00%> (+100.00%)`	⬆️
...ementAccount/VerifiedBankAccountFlowEntryPoint.tsx	`0.00% <0.00%> (ø)`
src/ROUTES.ts	`31.57% <0.00%> (+0.43%)`	⬆️
... and 142 files with indirect coverage changes

melvin-bot · 2026-09-29T11:25:29Z

@aimane-chnaif 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]

jmusial · 2026-09-30T08:00:32Z

@aimane-chnaif kind bump

aimane-chnaif · 2026-09-30T08:01:35Z

On my list today

garrettmknight

Looks good from a product perspective

jmusial · 2026-10-02T08:46:49Z

@aimane-chnaif how is it going ?

aimane-chnaif · 2026-10-02T09:04:54Z

Please pull main

jmusial · 2026-10-05T08:40:55Z

@aimane-chnaif bumpity bump

aimane-chnaif · 2026-10-05T08:49:10Z

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
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 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 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)
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)
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately
- 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
- 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 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 the PR adds or modifies the UI:
- I asked an AI agent to review the changes for accessibility issues and addressed its findings.
- I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
- I verified all new/changed elements have meaningful accessible names and roles.
- I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
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

Android: mWeb Chrome

iOS: HybridApp

Screen.Recording.iPhone.18.Pro.10-05-2026.at.11.44.16.AM.mp4

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-10-05.at.11.42.24.AM.mov

aimane-chnaif · 2026-10-05T08:49:13Z

Not blocker but on mobile native, I noticed that navigation transition animation is reversed

Screen.Recording.iPhone.18.Pro.10-05-2026.at.11.44.16.AM.mp4

aimane-chnaif · 2026-10-05T08:49:18Z

@MelvinBot review

MelvinBot · 2026-10-05T08:55:03Z

Code review

The logic looks correct and CI is green apart from the checklist job. One change is needed to fix the reversed animation on native that you reported.

1. Reversed transition on native (needs fix)

Cause: After validation, VerifyAccountPageBase navigates with forceReplace: true (VerifyAccountPageBase.tsx:83). RHP screens default to animationTypeForReplace: 'pop' (useModalStackScreenOptions.ts:79). The USD and non-USD setup screens don't override this, so the forward step animates like a back step.

Fix: Add both destination screens to OPTIONS_PER_SCREEN in ModalStackNavigators/index.tsx:74. Other verify-then-replace flows already do this, for example PERSONAL_CARD_ADD_NEW and TRAVEL.DYNAMIC_VERIFY_ACCOUNT.

// Opened via forceReplace from the bank account verify page, so it needs a forward (push) transition
[SCREENS.REIMBURSEMENT_ACCOUNT_USD]: {
    animationTypeForReplace: 'push',
},
[SCREENS.REIMBURSEMENT_ACCOUNT_NON_USD]: {
    animationTypeForReplace: 'push',
},

After this change, the sub-page redirect in BusinessInfo.tsx:103 will also animate forward. That redirect replaces the non-USD screen too, so check it still looks right.

2. `backTo` lookup may be unnecessary (nit)

DynamicReimbursementAccountVerifyAccountPage.tsx:23-25 reads backTo from the entry route through useNavigationState. createDynamicRoute already merges the entry route's query (including backTo) into the verify path (createDynamicRoute.ts:57). getStateForDynamicRoute then puts those params on the verify route (getStateForDynamicRoute.ts:77). Your test also sets backTo on the verify route. You could add backTo to the param type and read route.params.backTo instead. I haven't tested this at runtime.

view run

jmusial · 2026-10-05T09:37:44Z

Not blocker but on mobile native, I noticed that navigation transition animation is reversed

Screen.Recording.iPhone.18.Pro.10-05-2026.at.11.44.16.AM.mp4

fixed

aimane-chnaif · 2026-10-05T09:46:16Z

Confirmed fix

ios.mp4

But is this true regression?

Back between bank account steps slides in forwards

The animationTypeForReplace: 'push' override on REIMBURSEMENT_ACCOUNT_USD / REIMBURSEMENT_ACCOUNT_NON_USD applies to every replace onto those screens, not just the one after validation.
The flows' Back calls Navigation.goBack(<previous step route>), and when that step isn't in the stack (e.g. after resuming with Continue setup), goUp turns it into a REPLACE, which now animates forwards.

Repro: Workspace with a partly set-up USD bank account > Workflows > Payments > open the bank account > Continue setup > press the back arrow. The previous step slides in from the right instead of the left.

jmusial · 2026-10-05T09:47:53Z

and removed redundant backTo from Melvins review

jmusial · 2026-10-07T08:40:13Z

@aimane-chnaif can we proceed here ?

aimane-chnaif · 2026-10-07T08:41:28Z

is this true regression?

What do you think of #102522 (comment)?

jmusial · 2026-10-07T09:12:37Z

Confirmed fix

ios.mp4
But is this true regression?

Back between bank account steps slides in forwards

The animationTypeForReplace: 'push' override on REIMBURSEMENT_ACCOUNT_USD / REIMBURSEMENT_ACCOUNT_NON_USD applies to every replace onto those screens, not just the one after validation. The flows' Back calls Navigation.goBack(<previous step route>), and when that step isn't in the stack (e.g. after resuming with Continue setup), goUp turns it into a REPLACE, which now animates forwards.

Repro: Workspace with a partly set-up USD bank account > Workflows > Payments > open the bank account > Continue setup > press the back arrow. The previous step slides in from the right instead of the left.

On a quick look I don't see an easy way fix all cases (there are ways, but feel hacky).

I guess the easies would be to revert this part and leave as is, but I'll defer to your opinions @aimane-chnaif @mountiny

aimane-chnaif · 2026-10-07T09:14:39Z

It's just code analysis from AI. As we don't have easy repro step and already edge case, not blocker. Let's see what bug QA team will find.

mountiny

Cool, yeah, let's give it a go.

OSBotify · 2026-10-07T19:58:19Z

✋ 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 · 2026-10-07T20:17:55Z

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

github-actions · 2026-10-07T20:23:05Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-5128ba6-a57d040-245dd6fcadf4477f52977b9c9c7da4be5d500f51/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-5128ba6-a57d040-ccdc075a04f7221062c0b69eb154b58fcff94ca1/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-10-08T19:44:40Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.5.6-0 🚀

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

MelvinBot · 2026-10-08T19:48:57Z

No help site update needed. This is a navigation bug fix: after you enter the magic code in Add bank account, you now stay on the next setup step as expected. No feature, label, or documented step changed.

view run

OSBotify · 2026-10-09T20:30:18Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.5.6-6 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

Add bank account pops the next step after magic code verification

00fbd7d

melvin-bot Bot assigned jmusial Sep 29, 2026

fix race

9a3f94a

jmusial marked this pull request as ready for review September 29, 2026 11:25

jmusial requested review from a team as code owners September 29, 2026 11:25

melvin-bot Bot requested review from aimane-chnaif and garrettmknight and removed request for a team September 29, 2026 11:25

melvin-bot Bot removed the request for review from a team September 29, 2026 11:25

garrettmknight previously approved these changes Oct 1, 2026

View reviewed changes

jmusial mentioned this pull request Oct 1, 2026

Fix - Add bank account shows Not Found for unvalidated admins #102765

Merged

43 tasks done

Merge branch 'main' into feat/add-bank-account-goes-to-next-step

961c753

fix screen push direction

6fe85f3

jmusial dismissed garrettmknight’s stale review via 6fe85f3 October 5, 2026 09:37

remove redundanr backTo

2116fe4

aimane-chnaif approved these changes Oct 7, 2026

View reviewed changes

melvin-bot Bot requested a review from mountiny October 7, 2026 09:15

mountiny approved these changes Oct 7, 2026

View reviewed changes

mountiny merged commit 5128ba6 into Expensify:main Oct 7, 2026
35 of 37 checks passed

OSBotify mentioned this pull request Oct 8, 2026

Deploy Checklist: New Expensify 2026-10-08 #103502

Closed

90 tasks done

melvin-bot Bot mentioned this pull request Oct 9, 2026

[Due for payment 2026-10-16] [Verify account] Workflows > Add bank account pops the next step after magic code verification #101748

Open

Conversation

jmusial commented Sep 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Scenario 1: Connect manually on a USD workspace

Scenario 2: Log into your bank on a USD workspace

Scenario 3: Connect manually on a non-USD workspace

Scenario 4: Admin who is already validated

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Sep 29, 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 Sep 29, 2026

Uh oh!

jmusial commented Sep 30, 2026

Uh oh!

aimane-chnaif commented Sep 30, 2026

Uh oh!

garrettmknight left a comment

Choose a reason for hiding this comment

Uh oh!

jmusial commented Oct 2, 2026

Uh oh!

aimane-chnaif commented Oct 2, 2026

Uh oh!

jmusial commented Oct 5, 2026

Uh oh!

aimane-chnaif commented Oct 5, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif commented Oct 5, 2026

Uh oh!

aimane-chnaif commented Oct 5, 2026

Uh oh!

MelvinBot commented Oct 5, 2026

Code review

1. Reversed transition on native (needs fix)

2. backTo lookup may be unnecessary (nit)

Uh oh!

jmusial commented Oct 5, 2026

Uh oh!

aimane-chnaif commented Oct 5, 2026

Back between bank account steps slides in forwards

Uh oh!

jmusial commented Oct 5, 2026

Uh oh!

jmusial commented Oct 7, 2026

Uh oh!

aimane-chnaif commented Oct 7, 2026

Uh oh!

jmusial commented Oct 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Back between bank account steps slides in forwards

Uh oh!

aimane-chnaif commented Oct 7, 2026

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Oct 7, 2026

Uh oh!

github-actions Bot commented Oct 7, 2026

Uh oh!

github-actions Bot commented Oct 7, 2026

Uh oh!

OSBotify commented Oct 8, 2026

Uh oh!

MelvinBot commented Oct 8, 2026

Uh oh!

OSBotify commented Oct 9, 2026

Uh oh!

jmusial commented Sep 29, 2026 •

edited

Loading

codecov Bot commented Sep 29, 2026 •

edited by github-actions Bot

Loading

2. `backTo` lookup may be unnecessary (nit)

jmusial commented Oct 7, 2026 •

edited

Loading