[tgolen]

Explanation of Change

Include the selected company-feed key in bank OAuth URLs, preserving its Amex suffix while sending the originating domain ID separately. This lets the companion backend fix update the selected feed when Amex returns accounts in a different order.

Fixed Issues

Part of https://github.com/Expensify/Expensify/issues/684866
Part of https://github.com/Expensify/Expensify/issues/680067
PROPOSAL: https://github.com/Expensify/Web-Expensify/pull/56435#pullrequestreview-5319233895

Companion backend PR: https://github.com/Expensify/Web-Expensify/pull/56435

Classic companion PR: https://github.com/Expensify/Web-Secure/pull/3016

This PR is OK to be deployed before the backend changes

Tests

1. Run npm test -- --runInBand GetCompanyCardBankConnectionTest --silent — 3 tests passed.
2. Run npm run lint-changed — passed.
3. Run npm run spell-changed — passed.
4. Run npm run typecheck — passed for all configured projects.

The tests verify preservation and encoding of the Amex feed suffix, separate domain targeting, and unchanged new/personal connection URLs. Browser and live bank-consent testing are pending; no dev server was running.

• Verify that no errors appear in the JS console

Offline tests

Pending manual QA. The change only builds the OAuth URL; bank reauthorization still requires a network connection.

1. Go offline on the company-card details page.
2. Confirm the existing offline restrictions on reconnect still apply.

QA Steps

Internal / Production QA — pending.

Note

https://github.com/Expensify/Web-Expensify/pull/56435 needs to be deployed before this can be QA tested

1. Coordinate access to the two-program Amex test account referenced in the linked review, including its MFA session with Cole.
2. Open an existing Amex company feed in a workspace and record its feed key and assigned-card count.
3. Start Fix connection and verify the callback URL contains the full feed value without #domainID, plus the separate domainAccountID.
4. Complete consent for the selected feed's existing program.
5. Confirm the callback's feed and persistedFeed match and its assigned cards import successfully, even if the returned account order differs.
6. Verify a new company connection and a personal-card connection still work.
7. Repeat the reconnect on native mobile and mobile web.

• 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
• 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 followed proper code patterns (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 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)
• 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.
• 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.

Conditional checklist items unrelated to this URL-only change are marked not applicable by completion; platform and live-flow checks remain pending.

Screenshots/Videos

No Screenshots because this is a non-UI change

- Tim's A.I. Agent 🤖

[tgolen]

Applied InternalQA per the review. Live Amex verification remains pending deployment of the Web backend, NewDot client, and Classic secure iframe, plus coordinated MFA access. The PR descriptions contain the internal production test steps.

- Tim's A.I. Agent 🤖

[melvin-bot]

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

[amyevans]

Looks good!

[amyevans]

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

[github-actions]

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

[github-actions]

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-d291130-26a4f81-9320317291637243adf1c146b244c31620c771f8/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-d291130-26a4f81-b3fe7f00a78f37e8e3d177139d062f27363aea11/index.html

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

---

👀 View the workflow run that generated this build 👀

[OSBotify]

🚀 Deployed to staging by https://github.com/amyevans in version: 9.4.95-0 🚀

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

[MelvinBot]

No help site changes are required for this PR, so I did not create a docs PR.

This PR only adds the selected feed key as a feed query parameter to the bank OAuth reconnect URL. It does not change any UI text, button, setting, or step that an admin sees. The fix makes reconnecting an Amex feed update the correct feed. That is a behind-the-scenes correctness fix, and no help article documents the old behavior or a workaround for it.

Articles checked

• Reauthenticate a Card Connection: the steps (Workspaces > [workspace name] > Company cards, then select the message under the feed) are unchanged.
• Fix a Card Connection Error: the American Express fallback guidance is still accurate.
• Set up a Direct Connection for Company Cards: new-connection steps are unchanged. The PR test confirms new connections send no feed parameter.
• No article mentions Amex account order, multiple Amex programs, or reconnecting the wrong feed.

---

view run

[OSBotify]

🚀 Deployed to production by https://github.com/Julesssss in version: 9.4.95-4 🚀

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

[tgolen]

QA Passed