Fix employee lands on wallet page after adding PBA from expense details page by collectioneur · Pull Request #85212 · Expensify/App

collectioneur · 2026-03-13T10:08:27Z

deploy blocker when adding us-bank-account

Explanation of Change

Removed SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT from the SETTINGS_TO_RHP config in SETTINGS_TO_RHP.ts. When adding a PBA from the expense details page, this screen was incorrectly mapped to the wallet root, causing the app to navigate back to the wallet page instead of the expense details page after tapping Continue. The fix ensures correct back navigation to the originating screen (expense details) when the Add Bank Account flow is completed from that context.

Fixed Issues

$ #85191

Tests

Precondition:

Admin has set up bank account (VBA) in workspace settings
Admin has invited member to workspace
Employee has submitted expense in workspace chat
Admin has approved & paid employee's expense with VBA
Steps:
Navigate to staging.new.expensify.com or launch hybrid app
Log in as employee
Go to expense details page
Click "Add Bank account" button
Add personal bank account (use Regions bank >> 0000 checking account)
Tap Continue button on bank account added animation page
Observe user redirected to wallet page instead of expense details page

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

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-03-13.at.11.14.57.mov

deploy blocker when adding us-bank-account

melvin-bot · 2026-03-13T10:16:28Z

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

github-actions · 2026-03-13T10:21:30Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 829f7e7dbf

ℹ️ 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-03-13T10:24:10Z

src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts

        SCREENS.SETTINGS.REPORT_CARD_LOST_OR_DAMAGED_CONFIRM_MAGIC_CODE,
        SCREENS.SETTINGS.WALLET.PERSONAL_CARD_WARNING,
        SCREENS.SETTINGS.WALLET.PERSONAL_CARD_UPGRADE,
-        SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT,
    ],


Keep Add US bank account linked to Settings fullscreen

Removing this relation drops SCREENS.SETTINGS.ADD_US_BANK_ACCOUNT from RHP_TO_SETTINGS, so opening or refreshing settings/wallet/add-us-bank-account without an existing fullscreen route can no longer resolve to Settings in getMatchingFullScreenRoute(). In getAdaptedStateFromPath(), that route then falls back to REPORTS_SPLIT_NAVIGATOR for right-modals, which makes the success Continue handling in AddPersonalBankAccountPage behave like a report-origin flow and return users to inbox/report instead of Wallet.

Useful? React with 👍 / 👎.

Since add-us-bank-account can be accessed from almost any tab, the screen underneath this RHP needs to remain the same one we navigated from. I mistakenly moved this to settings, assuming the underlying screen only sets after a refresh, but it turns out it changes immediately. Because of this, I've reverted the changes back to the original behavior

mjasikowski · 2026-03-13T11:53:26Z

Let's merge and CP to staging

mjasikowski · 2026-03-13T11:53:39Z

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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

github-actions · 2026-03-13T12:11:59Z

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

github-actions · 2026-03-13T12:18:25Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-463f3e6-59ef620-3cc896fc4855ef5ba40036734a4bc5345cddb27f/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-463f3e6-59ef620-fc9867cb543d5054331d0806038591fe7b07c26c/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-13T12:22:37Z

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

IuliiaHerets · 2026-03-13T15:01:20Z

@mjasikowski @collectioneur Our tester, while checking this issue using the current ad-hoc build faced with the infinite loading when the confirm is clicked on the Let's double check page.
The issue is not reproduced on stg, and cannot be checked on the prod build.
Let us know if you are interested in this issue

Bug7102110_1773410821427.ScreenRecording_03-13-2026_09-51-47_1.mp4

collectioneur · 2026-03-13T15:26:47Z

Hi @IuliiaHerets, I'm happy to help look into this on Monday, but just a heads-up that this might not be related to my PR. I was migrating another page and didn't touch the button logic. I can definitely help investigate on Monday to see what's going on, but it feels like it could just be a random lag 🙂

…x-db-dynamic-routes (cherry picked from commit 463f3e6) (cherry-picked to staging by luacmartins)

OSBotify · 2026-03-13T18:22:36Z

🚀 Cherry-picked to staging by https://github.com/mjasikowski in version: 9.3.37-4 🚀

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

m-natarajan · 2026-03-13T21:14:43Z

User redirected to expense details page and not to wallet, Win 11/Chrome, 9.3.37-8

Recording.2529.mp4

OSBotify · 2026-03-16T10:08:34Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.37-10 🚀

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

OSBotify · 2026-03-16T10:33:39Z

🚀 Cherry-picked to staging by https://github.com/mjasikowski in version: 9.3.38-0 🚀

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

OSBotify · 2026-03-17T11:29:25Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.38-4 🚀

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

IuliiaHerets · 2026-03-17T13:04:13Z

@collectioneur Did you have a chance to check it?

I'm happy to help look into this on Monday, but just a heads-up that this might not be related to my PR. I was migrating another page and didn't touch the button logic. I can definitely help investigate on Monday to see what's going on, but it feels like it could just be a random lag 🙂

collectioneur · 2026-03-17T16:00:24Z

Hi @IuliiaHerets, yes, I've been testing this out, but I haven't managed to reproduce this bug 😞

Screen.Recording.2026-03-17.at.16.53.53.mov

jponikarchuk · 2026-03-17T17:30:11Z

@collectioneur QA team still can reproduce this issue on build v9.3.37-0 PR:85212 Ad-Hoc

screenrecording_03-17-2026_13-23-26_1.mp4

collectioneur · 2026-03-18T10:26:40Z

@IuliiaHerets I believe I’ve tracked down the root cause of this issue
It turns out that my PR branch included some previous changes from PR #82764, which was originally introduced to freeze screens to prevent unnecessary re-renders.
Here is a quick breakdown of what was happening:
While that PR optimized performance, it caused a regression where screens wouldn't update when they actually needed to.
This also affected the add-us-bank-account screen. When a user tapped "Submit" the screen would stay frozen and only trigger a re-render if the user tapped somewhere else on the screen.
I temporarily reverted those changes on my branch to test it out.
Here is what it looked like before:

Screen.Recording.2026-03-18.at.10.40.43.mov

Here is what it looks like after:

Screen.Recording.2026-03-18.at.11.12.26.mov

That PR was already reverted on main via PR #85198, so this bug is now resolved on main as well

fix

829f7e7

deploy blocker when adding us-bank-account

melvin-bot bot assigned collectioneur Mar 13, 2026

collectioneur marked this pull request as ready for review March 13, 2026 10:16

collectioneur requested review from a team as code owners March 13, 2026 10:16

melvin-bot bot requested review from brunovjk and heyjennahay and removed request for a team March 13, 2026 10:16

melvin-bot bot removed the request for review from a team March 13, 2026 10:16

mjasikowski approved these changes Mar 13, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Mar 13, 2026

View reviewed changes

This comment has been minimized.

Sign in to view

mjasikowski removed request for brunovjk and heyjennahay March 13, 2026 11:53

mjasikowski added CP Staging marks PRs that have been CP'd to staging and removed CP Staging marks PRs that have been CP'd to staging labels Mar 13, 2026

mjasikowski merged commit 463f3e6 into Expensify:main Mar 13, 2026
60 of 66 checks passed

OSBotify pushed a commit that referenced this pull request Mar 13, 2026

Merge pull request #85212 from software-mansion-labs/collectioneur/fi…

a306cdb

…x-db-dynamic-routes (cherry picked from commit 463f3e6) (cherry-picked to staging by luacmartins)

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Mar 13, 2026

OSBotify mentioned this pull request Mar 13, 2026

Deploy Checklist: New Expensify 2026-03-12 #85146

Closed

87 tasks

melvin-bot bot mentioned this pull request Mar 17, 2026

[Due for payment 2026-03-24] Bank account - Employee lands on wallet page after adding PBA from expense details page #85191

Closed

7 tasks

Conversation

collectioneur commented Mar 13, 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!

melvin-bot bot commented Mar 13, 2026

Uh oh!

github-actions bot commented Mar 13, 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 Mar 13, 2026

Choose a reason for hiding this comment

Uh oh!

collectioneur Mar 13, 2026

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

mjasikowski commented Mar 13, 2026

Uh oh!

mjasikowski commented Mar 13, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

github-actions bot commented Mar 13, 2026

Uh oh!

github-actions bot commented Mar 13, 2026

Uh oh!

OSBotify commented Mar 13, 2026

Uh oh!

IuliiaHerets commented Mar 13, 2026

Uh oh!

collectioneur commented Mar 13, 2026

Uh oh!

OSBotify commented Mar 13, 2026

Uh oh!

m-natarajan commented Mar 13, 2026

Uh oh!

OSBotify commented Mar 16, 2026

Uh oh!

OSBotify commented Mar 16, 2026

Uh oh!

OSBotify commented Mar 17, 2026

Uh oh!

IuliiaHerets commented Mar 17, 2026

Uh oh!

collectioneur commented Mar 17, 2026

Uh oh!

jponikarchuk commented Mar 17, 2026

Uh oh!

collectioneur commented Mar 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

collectioneur commented Mar 13, 2026 •

edited

Loading