Guard policyID and bankAccountID for refetching bank account data by srikarparsi · Pull Request #84347 · Expensify/App

srikarparsi · 2026-03-06T00:48:02Z

Explanation of Change

Navigating from BankAccountPurposePage to ReimbursementAccountPage without a policyID caused an infinite loading screen because withPolicy waited on Onyx to resolve a policy that didn't exist, and ReimbursementAccountLoadingIndicator waited on hasACHDataBeenLoaded, which is only set after a backend fetch that is itself gated on policyIDParam being present.

This PR guards both checks on policyID being present since we don't need to load when there's no policy.

Fixed Issues

$ #84325
PROPOSAL:

Tests

Login to admin account.
Go to Account > Wallet > Add bank account > Make payments > US.
Ensure that you are able to connect a bank account through plaid or manullay

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

Screen.Recording.2026-03-05.at.7.57.37.PM.mov

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

srikarparsi · 2026-03-06T00:50:21Z

@MelvinBot can you please review this PR

MelvinBot · 2026-03-06T00:52:58Z

PR Review

I reviewed the changes in this PR. Here's my analysis:

What the PR Does

This PR fixes an infinite loading state when navigating from the BankAccountPurposePage → CountrySelection → ReimbursementAccountPage flow (personal wallet settings path). Two changes:

CountrySelection.tsx: Now passes personalPolicy?.id as policyID to navigateToBankAccountRoute. Previously no policyID was passed, defaulting to ''.
ReimbursementAccountPage.tsx: Conditionally skips clearReimbursementAccountDraft() when backTo === ROUTES.SETTINGS_BANK_ACCOUNT_PURPOSE, preserving the country/currency the user just selected.

Why It Works

Without a policyID, the fetchData function in ReimbursementAccountPage (ReimbursementAccountPage.tsx:211) exits early when both policyIDParam and bankAccountIDParam are falsy. This means reimbursement account data never loads, hasACHDataBeenLoaded stays false, and the loading indicator at line 500 displays indefinitely.

The draft protection is also needed because without it, clearReimbursementAccountDraft() wipes the country/currency that CountrySelection just stored, causing the setup flow to lose the user's selection.

Observations

Code logic looks correct — the fix addresses the root cause and the changes are minimal and focused.

A few items to note:

Missing linked issue: The Fixed Issues section is empty ($ / PROPOSAL: are blank). Consider linking the issue this fixes so it can be tracked and closed properly.
Missing test steps: The Tests and QA Steps sections only contain "Verify that no errors appear in the JS console." Specific steps for reproducing the original bug and verifying the fix would be helpful for reviewers and QA — e.g.:
- Go to Settings → Wallet → Add bank account
- Select a purpose, then select a country
- Verify the ReimbursementAccountPage loads correctly (no endless spinner)
Guard for personalPolicy?.id: If personalPolicy is undefined (e.g., hasn't loaded from Onyx yet), policyID will be undefined and navigateToBankAccountRoute defaults it to '' — reproducing the original bug. Is there a loading gate in the BankAccountPurposePage flow that ensures personalPolicy is available before the user reaches CountrySelection? Worth confirming this path is safe.
isPolicyAdmin check: When policyIDParam is the personal policy ID, line 504 checks !isPolicyAdmin(policy). If the user isn't considered an admin of their personal policy for any reason, they'd see a "not found" view. This should be fine for typical cases since users are admin of their personal policy, but worth keeping in mind.

Verdict

The code changes are sound and well-scoped. I'd recommend addressing the missing linked issue and test steps in the PR description before merging.

This reverts commit 50bf69b.

blimpich · 2026-03-06T01:01:44Z

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 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

melvin-bot · 2026-03-06T01:27:52Z

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

srikarparsi · 2026-03-06T01:32:20Z

Un-assigning @dukenv0307 as we'll review this internally

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7304a8009f

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

github-actions · 2026-03-06T02:58:32Z

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

codecov · 2026-03-06T02:58:39Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/pages/workspace/withPolicy.tsx	`100.00% <100.00%> (ø)`
.../ReimbursementAccount/ReimbursementAccountPage.tsx	`0.00% <0.00%> (ø)`
... and 126 files with indirect coverage changes

Guard policyID and bankAccountID for refetching bank account data (cherry picked from commit a0f0b9d) (cherry-picked to staging by blimpich)

github-actions · 2026-03-06T03:03:12Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-a0f0b9d-f02633f-ff5644b0b753bf1eb7aef8318374a6f40fd2d3ad/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-a0f0b9d-f02633f-302305426e673931bb11d6b70079fceced0b4b84/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-06T03:06:26Z

✋ 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-03-06T03:35:36Z

🚀 Cherry-picked to staging by https://github.com/blimpich in version: 9.3.31-12 🚀

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

Pass in personal policy to avoid endless loading

9f30078

melvin-bot bot assigned srikarparsi Mar 6, 2026

blimpich previously approved these changes Mar 6, 2026

View reviewed changes

check backTo

50bf69b

srikarparsi dismissed blimpich’s stale review via 50bf69b March 6, 2026 00:51

Revert "check backTo"

f63b40e

This reverts commit 50bf69b.

blimpich previously approved these changes Mar 6, 2026

View reviewed changes

change fix

7304a80

srikarparsi dismissed blimpich’s stale review via 7304a80 March 6, 2026 01:15

srikarparsi marked this pull request as ready for review March 6, 2026 01:27

srikarparsi requested review from a team as code owners March 6, 2026 01:27

melvin-bot bot requested review from dukenv0307 and removed request for a team March 6, 2026 01:27

melvin-bot bot requested review from joekaufmanexpensify and removed request for a team March 6, 2026 01:27

srikarparsi removed the request for review from dukenv0307 March 6, 2026 01:32

chatgpt-codex-connector bot reviewed Mar 6, 2026

View reviewed changes

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx Outdated Show resolved Hide resolved

francoisl previously approved these changes Mar 6, 2026

View reviewed changes

blimpich previously approved these changes Mar 6, 2026

View reviewed changes

add bank account id

6cc368d

srikarparsi dismissed stale reviews from blimpich and francoisl via 6cc368d March 6, 2026 02:00

blimpich approved these changes Mar 6, 2026

View reviewed changes

srikarparsi changed the title ~~Pass in personal policy to avoid endless loading~~ Guard policyID and bankAccountID for refetching bank account data Mar 6, 2026

srikarparsi merged commit a0f0b9d into main Mar 6, 2026
50 of 53 checks passed

srikarparsi deleted the srikar-passPersonalPolicy branch March 6, 2026 02:58

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

Merge pull request #84347 from Expensify/srikar-passPersonalPolicy

17249f4

Guard policyID and bankAccountID for refetching bank account data (cherry picked from commit a0f0b9d) (cherry-picked to staging by blimpich)

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

OSBotify mentioned this pull request Mar 6, 2026

Deploy Checklist: New Expensify 2026-03-04 #84164

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Guard policyID and bankAccountID for refetching bank account data#84347

Guard policyID and bankAccountID for refetching bank account data#84347
srikarparsi merged 5 commits intomainfrom
srikar-passPersonalPolicy

srikarparsi commented Mar 6, 2026 •

edited

Loading

Uh oh!

srikarparsi commented Mar 6, 2026

Uh oh!

MelvinBot commented Mar 6, 2026

Uh oh!

blimpich commented Mar 6, 2026

Uh oh!

melvin-bot bot commented Mar 6, 2026

Uh oh!

srikarparsi commented Mar 6, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Mar 6, 2026

Uh oh!

codecov bot commented Mar 6, 2026 •

edited by github-actions bot

Loading

Uh oh!

github-actions bot commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

srikarparsi commented Mar 6, 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!

srikarparsi commented Mar 6, 2026

Uh oh!

MelvinBot commented Mar 6, 2026

PR Review

What the PR Does

Why It Works

Observations

Verdict

Uh oh!

blimpich commented Mar 6, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 6, 2026

Uh oh!

srikarparsi commented Mar 6, 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!

github-actions bot commented Mar 6, 2026

Uh oh!

codecov bot commented Mar 6, 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!

github-actions bot commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

srikarparsi commented Mar 6, 2026 •

edited

Loading

codecov bot commented Mar 6, 2026 •

edited by github-actions bot

Loading