fix bank account ending shows incorrect BA after reselect

[apeyada]

Explanation of Change

• Don't explicitly set bankAccountID in CONNECT_BANK_ACCOUNT_WITH_PLAID api as it's automatically set in backend..
• Delete pending bank account after switch

Fixed Issues

$ #81946
PROPOSAL: #81946 (comment)

Tests

Precondition: User with a workspace that has the Invoices feature enabled.

1. Go to the Invoices page of a workspace.
2. Click Add Bank Account
3. Finish Plaid the Connect
4. Select the ...0000 account and click Next
5. Click the back button and select the ...1111 account
6. Continue with the info of a VBA and finish adding the bank account
7. Verify that the bank account ending after connecting shows the correct bank account is ...1111

• Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

• Verify that no errors appear in the JS console

PR Author Checklist

• I linked the correct issue in the ### Fixed Issues section above
• I wrote clear testing steps that cover the changes made in this PR
  • I added steps for local testing in the Tests section
  • I added steps for the expected offline behavior in the Offline steps section
  • I added steps for Staging and/or Production testing in the QA steps section
  • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
• I included screenshots or videos for tests on all platforms
• I ran the tests on all platforms & verified they passed on:
  • Android: Native
  • Android: mWeb Chrome
  • iOS: Native
  • iOS: mWeb Safari
  • MacOS: Chrome / Safari
  • MacOS: Desktop
• I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
• I verified there are no new alerts related to the canBeMissing param for useOnyx
• I followed proper code patterns (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
    • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
  • 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 followed the guidelines as stated in the Review Guidelines
• I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
• 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
• I verified that if a function's arguments changed that all usages have also been updated correctly
• 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 new assets were added or existing ones were modified, I verified that:
  • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
  • The assets load correctly across all supported platforms.
• 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.
• I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

[melvin-bot]

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

[codecov]

Codecov Report

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

Files with missing lines	Coverage Δ
...ges/ReimbursementAccount/USD/BankInfo/BankInfo.tsx	0.00% <0.00%> (ø)
... and 17 files with indirect coverage changes

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 04df0132f2

ℹ️ 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]

Delete pending bank account only when Plaid account changed

deletePaymentBankAccount() is called on every Plaid submit whenever bankAccountID exists, but there is no check that the user actually switched to a different Plaid account. In the common back-navigation case (user returns to Bank Info and presses Next with the same selection), this deletes the in-progress VBBA and can reset/discard data entered in later steps (requestor/company/owners), forcing the flow to restart unexpectedly. The delete should be gated on an actual account change (e.g., comparing previous vs newly selected plaidAccountID).

Useful? React with 👍 / 👎.

[MelvinBot]

The review comment raises a valid point — deletePaymentBankAccount is called unconditionally on every Plaid submit, even if the user didn't change their account selection.

Proposed fix: Gate the delete on an actual account change by comparing achData.plaidAccountID (previously saved) with the newly selected plaidAccountID from the form draft.

  } else if (setupType === CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID) {
-     if (bankAccountID) {
+     const previousPlaidAccountID = reimbursementAccount?.achData?.plaidAccountID;
+     const newPlaidAccountID = data[BANK_INFO_STEP_KEYS.PLAID_ACCOUNT_ID];
+     if (bankAccountID && previousPlaidAccountID && previousPlaidAccountID !== newPlaidAccountID) {
          deletePaymentBankAccount(bankAccountID, undefined);
      }

This way deletePaymentBankAccount only fires when:

1. A bank account already exists (bankAccountID is truthy)
2. There was a previously saved Plaid account (previousPlaidAccountID exists)
3. The user actually picked a different account (previousPlaidAccountID !== newPlaidAccountID)

If the user navigates back and re-submits the same selection, the existing VBBA and any data entered in later steps (requestor/company/owners) are preserved.

[MelvinBot]

PR Review

Overall: The changes look correct and well-guarded. Two observations:

1. Sequencing of delete → connect (low risk, but worth noting)

deletePaymentBankAccount is fire-and-forget (optimistic), called immediately before connectBankAccountWithPlaid. This is safe because both go through the sequential API command queue — but there's no explicit dependency between them. If the delete fails server-side, the connect will still proceed and create a new account, which is the desired outcome. No action needed, just flagging for awareness.

2. The plaidAccountIDChanged guard is correctly defensive

const plaidAccountIDChanged = !!bankAccountID && !!previousPlaidAccountID && previousPlaidAccountID !== newPlaidAccountID;

This properly handles:

• First-time setup (previousPlaidAccountID is undefined) → no delete, passes existing bankAccountID
• Same account re-submit (back-navigate, same selection) → no delete, preserves VBBA data
• Actual account switch → deletes old account, passes CONST.DEFAULT_NUMBER_ID to create fresh

One edge case to consider: if a user switches accounts multiple times before completing the flow (e.g., selects A → B → A), the second switch back to A will still delete and recreate. This seems acceptable since the VBBA data from B wouldn't be valid for A anyway.

No blocking issues found.

[chatgpt-codex-connector]

Codex Review: Didn't find any major issues. 🚀

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

[joekaufmanexpensify]

Good for product