Skip to content

[Payment due @suneox] Key supported ECUK countries by currency, populate from onyx, alphabetize correctly#96447

Merged
rafecolton merged 5 commits into
mainfrom
chuckdries/populate-ecuk-countries-from-auth
Jul 20, 2026
Merged

[Payment due @suneox] Key supported ECUK countries by currency, populate from onyx, alphabetize correctly#96447
rafecolton merged 5 commits into
mainfrom
chuckdries/populate-ecuk-countries-from-auth

Conversation

@chuckdries

Copy link
Copy Markdown
Contributor

Explanation of Change

  1. Replace the flat EXPENSIFY_UK_EU_SUPPORTED_COUNTRIES with a currency-keyed map. It now lives as CONST.EXPENSIFY_CARD_SUPPORTED_COUNTRIES_BY_CURRENCY, a temporary fallback used until the backend delivers the list via onyx update
  2. Add ONYXKEYS.CARD_SUPPORTED_COUNTRIES. getAvailableEuCountries and getEligibleBankAccountsForUkEuCard read the subset for the workspace's settlement currency from this Onyx key, falling back to the constant when it's absent. These drive the country picker in the VBBA onboarding flow and the eligible-bank-account picker (when an eligible VBBA already exists).
  3. Locale-sort the country picker by country name

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/661259
PROPOSAL:

Tests

EUR lists supported countries in alphabetical order

  1. Create workspace and set its currency to EUR
  2. Enable Expensify Card and go to the Expensify Card tab
  3. Begin the onboarding flow and press Add a bank account > connect manually
  4. Select Country
  5. Verify that the list of supported countries is this
Screenshot 2026-07-18 at 3 01 34 PM

GBP lists supported countries in alphabetical order

  1. Create workspace and set its currency to GBP
  2. Enable Expensify Card and go to the Expensify Card tab
  3. Begin the onboarding flow and press Add a bank account > connect manually
  4. Select Country
  5. Verify that the list of supported countries is this
Screenshot 2026-07-18 at 2 53 03 PM

Bank account picker filters by supported country

  1. Create a test account with a EUR workspace
  2. Use clitools.sh generator:corpay to create two Withdrawal, Business, Validated EUR bank accounts: one in ES, one in SI
  3. Make sure you see both in your Wallet page
  4. Go to the workspace > Expensify Card and go through the onboarding flow
  5. Validate that you see only one of the bank accounts (Spain/ES) in the list
image
  • Verify that no errors appear in the JS console

Offline tests

None

QA Steps

EUR lists supported countries in alphabetical order

  1. Create workspace and set its currency to EUR
  2. Enable Expensify Card and go to the Expensify Card tab
  3. Begin the onboarding flow and press Add a bank account > connect manually
  4. Select Country
  5. Verify that the list of supported countries is this
Screenshot 2026-07-18 at 3 01 34 PM

GBP lists supported countries in alphabetical order

  1. Create workspace and set its currency to GBP
  2. Enable Expensify Card and go to the Expensify Card tab
  3. Begin the onboarding flow and press Add a bank account > connect manually
  4. Select Country
  5. Verify that the list of supported countries is this
Screenshot 2026-07-18 at 2 53 03 PM
  • 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 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 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 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.
  • 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

@chuckdries
chuckdries requested a review from rafecolton July 18, 2026 22:13
@chuckdries chuckdries self-assigned this Jul 18, 2026
@chuckdries
chuckdries requested review from a team as code owners July 18, 2026 22:13
@melvin-bot
melvin-bot Bot requested review from daledah and joekaufmanexpensify and removed request for a team July 18, 2026 22:13
@melvin-bot

melvin-bot Bot commented Jul 18, 2026

Copy link
Copy Markdown

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

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b5297c0473

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

Comment thread src/components/SubStepForms/CountryFullStep.tsx Outdated
Comment thread src/pages/ReimbursementAccount/utils/getAvailableEuCountries.ts Outdated
Comment thread src/libs/CardUtils.ts Outdated
@codecov

codecov Bot commented Jul 18, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/CONST/index.ts 94.81% <ø> (ø)
src/ONYXKEYS.ts 100.00% <ø> (ø)
src/libs/CardUtils.ts 83.43% <100.00%> (+0.07%) ⬆️
src/libs/ExportOnyxState/common.ts 80.35% <ø> (ø)
...entAccount/utils/getAvailableCardCountryOptions.ts 100.00% <100.00%> (ø)
...pensifyCard/WorkspaceExpensifyCardBankAccounts.tsx 0.00% <0.00%> (ø)
...sifyCard/DynamicWorkspaceSettlementAccountPage.tsx 0.00% <0.00%> (ø)
...nsifyCard/WorkspaceExpensifyCardPageEmptyState.tsx 0.00% <0.00%> (ø)
src/components/SubStepForms/CountryFullStep.tsx 0.00% <0.00%> (ø)
... and 11 files with indirect coverage changes

rafecolton
rafecolton previously approved these changes Jul 19, 2026

@rafecolton rafecolton left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks really good!

Comment thread src/CONST/index.ts Outdated
},

EXPENSIFY_UK_EU_SUPPORTED_COUNTRIES: ['BE', 'DK', 'ES', 'FI', 'IE', 'LT', 'LU', 'LV', 'NL', 'PL', 'SE', 'GB', 'GI'],
// Temporary hard-coded fallback for the Expensify Card supported countries keyed by settlement currency

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NAB

Suggested change
// Temporary hard-coded fallback for the Expensify Card supported countries keyed by settlement currency
// Hard-coded fallback for the Expensify Card supported countries keyed by settlement currency

rafecolton
rafecolton previously approved these changes Jul 19, 2026
@chuckdries
chuckdries requested a review from suneox July 19, 2026 02:35
@suneox

suneox commented Jul 19, 2026

Copy link
Copy Markdown
Contributor

I'm starting the review on this one

@suneox

suneox commented Jul 19, 2026

Copy link
Copy Markdown
Contributor

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
CleanShot.2026-07-19.at.10.45.13.1.mp4
Android: mWeb Chrome
CleanShot.2026-07-19.at.10.45.13.mp4
iOS: HybridApp
CleanShot.2026-07-19.at.11.04.32.2.mp4
iOS: mWeb Safari
CleanShot.2026-07-19.at.11.09.07.4.mp4
MacOS: Chrome / Safari
CleanShot.2026-07-19.at.11.07.43.3.mp4
Automation test 1 1-eur-country-picker-sorted 1 2-step-1-lv-lt-lu-name-order-PASS 1 3-gbp-picker-gb-gi 1 4-step-1-gibraltar-visible-in-gbp-picker-PASS 2 1-step-1-gbp-outside-cardflow-250-countries 2 2-step-1-gbp-picker-unlocked-cardflow-PASS 2 3-step-1-country-locked-spain-accountNumber-PASS 3 1-step-1-eur-bank-picker-es-yes-si-no-PASS 3 2-step-1-gbp-bank-picker-gb-gi-shown-es-filtered-PASS 3 3-step-1-eur-account-gb-filtered-narrowing-PASS 4 2-step-1-backend-override-france-germany-PASS 4 4-step-1-empty-object-empty-picker-PASS 5 1-step-1-usd-routes-us-flow-no-crash-PASS 5 2-step-1-empty-banklist-no-crash-PASS 5 4-step-1-export-onyx-surface-key-in-safeSet-PASS


export default function getAvailableEuCountries(): Record<string, string> {
return Object.fromEntries(europeanCountries.filter(([code]) => ukEuSupportedCountrySet.has(code)));
export default function getAvailableEuCountries(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NAB: getAvailableEuCountries now returns GB/GI for GBP, so the "Eu" in the name is slightly misleading. We can rename it to something likegetAvailableCardCountries/getCardSupportedCountryOptions in a follow-up.

@suneox suneox left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall LGTM. Just a remaining minor naming thing, not a blocker.

@melvin-bot
melvin-bot Bot requested a review from NicolasBonet July 19, 2026 04:36
@melvin-bot

melvin-bot Bot commented Jul 19, 2026

Copy link
Copy Markdown

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

@melvin-bot melvin-bot Bot changed the title Key supported ECUK countries by currency, populate from onyx, alphabetize correctly [Payment due @suneox] Key supported ECUK countries by currency, populate from onyx, alphabetize correctly Jul 19, 2026
@melvin-bot

melvin-bot Bot commented Jul 19, 2026

Copy link
Copy Markdown

🎯 @suneox, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/661259.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

@rafecolton
rafecolton removed the request for review from daledah July 19, 2026 07:08
@rafecolton
rafecolton removed the request for review from NicolasBonet July 19, 2026 07:08
@rafecolton
rafecolton merged commit e0a1d2a into main Jul 20, 2026
43 checks passed
@rafecolton
rafecolton deleted the chuckdries/populate-ecuk-countries-from-auth branch July 20, 2026 06:27
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants