Display correct card currency by rafecolton · Pull Request #84826 · Expensify/App

rafecolton · 2026-03-11T00:32:43Z

Explanation of Change

We were relying on getCurrencyKeyByCountryCode to determine what card currency to show. While the function did literally what the name suggested, the country's currency is not necessarily the card program currency.

There is no list of card program currency by country in App, so instead of duplicating the list, which would be brittle, or pulling in the list to App, we add currency to the card NVPs sent by Auth (see https://github.com/Expensify/Auth/pull/20370)

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/610038
PROPOSAL: N/A

Tests

Create a GBP policy and set it up to issue cards
Issue a physical card to another user on the policy
Log in as that user and use a Gibraltar address when ordering the card (ensure Gibraltar is the country)
Confirm that on both the card details page and home page, the currency shows as £ and not GIP

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Before:

After:

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

melvin-bot · 2026-03-11T00:44:30Z

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

rafecolton · 2026-03-11T00:45:12Z

Note @joekaufmanexpensify if you want to test this outside dev, you'll have to wait until https://github.com/Expensify/Auth/pull/20370 is deployed

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 098815ef5c

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

src/pages/settings/Wallet/ExpensifyCardPage/index.tsx

codecov · 2026-03-11T02:13:05Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/CONST/index.ts	`93.54% <ø> (ø)`
src/libs/CurrencyUtils.ts	`87.50% <ø> (-1.39%)`	⬇️
src/pages/home/AssignedCardsSection/index.tsx	`23.07% <ø> (+1.64%)`	⬆️
.../pages/settings/Wallet/ExpensifyCardPage/index.tsx	`63.71% <100.00%> (-0.94%)`	⬇️
src/libs/CardUtils.ts	`84.12% <66.66%> (-0.46%)`	⬇️
... and 17 files with indirect coverage changes

chuckdries · 2026-03-11T16:18:06Z

I see your comment about a fallback mechanism, noting that the happy path here passes tests

chrome

ios

android

joekaufmanexpensify

Good for product. I can QA this on staging once it's ready

rafecolton · 2026-03-11T21:32:31Z

@heekinho noted a potential issue here so I will test that too

…currency

rafecolton · 2026-03-14T01:24:23Z

Ready for re-review @chuckdries, I tested with https://github.com/Expensify/Auth/pull/20395 and confirmed it works great

src/pages/workspace/receiptPartners/ChangeReceiptBillingAccountPage.tsx

src/libs/CardUtils.ts

DylanDylann · 2026-03-14T07:53:11Z

src/libs/CardUtils.ts

+    if (settings?.currency) {
+        return settings.currency;
+    }


@rafecolton I can see that card.nameValuePairs.currency exists on my account, but settings.currency is still unavailable. Is it expected that settings.currency is only available in some cases and not for all accounts?

Hm I assumed so but I'm actually not sure. What's your accountID? I can look it up.

this is my AccountID: 18600054

I found 110 test cards, all are on US workspaces or domains. None of them have currency set, nor do any of ours for any of our US policies, so that seems expected. Importantly, it would produce the correct result here. Currency is always present in the settings for EU/UK account settings.

…currency

rafecolton · 2026-03-14T20:23:48Z

@DylanDylann after merging main, the lint error I observed earlier disappeared. Note that until https://github.com/Expensify/Auth/pull/20395 is deployed, currency will always display USD for physical cards until they are ordered. Once a physical card is ordered and awaiting activation, it will show the correct currency.

DylanDylann · 2026-03-15T03:24:37Z

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

melvin-bot · 2026-03-15T03:27:31Z

@Beamanator 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 · 2026-03-15T03:27:33Z

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

An E/App issue has been created to issue payment here: #85301.

DylanDylann · 2026-03-15T03:30:47Z

@rafecolton I haven’t tested with a UK/EU card yet because I need Jairo to run his server so I can use his testing account. I can do that on Monday, but I approved first in case we want to merge this PR soon.

github-actions · 2026-03-16T16:30:09Z

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

github-actions · 2026-03-16T16:34:44Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-58616be-a6a9d5f-67aff241e9e59e4d00ddfc2b8c090bc34471907d/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-58616be-a6a9d5f-ae8cd9cb4d9c28b1b0240dd3d59fc01738f396e8/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-16T16:37:40Z

✋ 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-17T11:55:47Z

🚀 Deployed to staging by https://github.com/chuckdries in version: 9.3.39-0 🚀

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

joekaufmanexpensify · 2026-03-18T12:15:34Z

Tested and works well on staging!

OSBotify · 2026-03-18T13:02:53Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.39-3 🚀

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

rafecolton added 3 commits March 10, 2026 17:26

Add currency field to card NVP data

8379d05

Use card currency nvp instead of getCurrencyKeyByCountryCode

2fd4224

Remove unused getCurrencyKeyByCountryCode function

098815e

rafecolton requested a review from chuckdries March 11, 2026 00:32

rafecolton self-assigned this Mar 11, 2026

rafecolton marked this pull request as ready for review March 11, 2026 00:44

rafecolton requested review from a team as code owners March 11, 2026 00:44

melvin-bot bot requested a review from nyomanjyotisa March 11, 2026 00:44

melvin-bot bot requested review from heyjennahay and removed request for a team March 11, 2026 00:44

rafecolton requested review from joekaufmanexpensify and removed request for heyjennahay and nyomanjyotisa March 11, 2026 00:44

chatgpt-codex-connector bot reviewed Mar 11, 2026

View reviewed changes

src/pages/settings/Wallet/ExpensifyCardPage/index.tsx Outdated Show resolved Hide resolved

chuckdries previously approved these changes Mar 11, 2026

View reviewed changes

joekaufmanexpensify previously approved these changes Mar 11, 2026

View reviewed changes

joekaufmanexpensify added the InternalQA This pull request required internal QA label Mar 11, 2026

rafecolton changed the title ~~[HOLD Auth#20370] Display correct card currency~~ [HOLD] Display correct card currency Mar 12, 2026

rafecolton added 2 commits March 13, 2026 15:31

Merge remote-tracking branch 'origin/main' into display-correct-card-…

fd6ada9

…currency

More robust fallback for getting card currency

49693ce

rafecolton dismissed stale reviews from chuckdries and joekaufmanexpensify via 49693ce March 13, 2026 23:31

rafecolton force-pushed the display-correct-card-currency branch from 192502a to ab51e2f Compare March 14, 2026 00:38

rafecolton requested a review from chuckdries March 14, 2026 01:15

rafecolton changed the title ~~[HOLD] Display correct card currency~~ Display correct card currency Mar 14, 2026

rafecolton requested a review from DylanDylann March 14, 2026 01:24

rafecolton commented Mar 14, 2026

View reviewed changes

src/pages/workspace/receiptPartners/ChangeReceiptBillingAccountPage.tsx Outdated Show resolved Hide resolved

DylanDylann reviewed Mar 14, 2026

View reviewed changes

rafecolton added 2 commits March 14, 2026 13:03

Address lint errors

36044cf

Merge remote-tracking branch 'origin/main' into display-correct-card-…

a1cd814

…currency

rafecolton force-pushed the display-correct-card-currency branch from ab51e2f to a1cd814 Compare March 14, 2026 20:03

rafecolton requested a review from DylanDylann March 14, 2026 20:23

DylanDylann approved these changes Mar 15, 2026

View reviewed changes

melvin-bot bot requested a review from Beamanator March 15, 2026 03:27

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

[Due for Payment 2026-03-24] Payment issue for E/App PR#84826 #85301

Open

rafecolton removed the request for review from Beamanator March 15, 2026 08:25

chuckdries approved these changes Mar 16, 2026

View reviewed changes

chuckdries merged commit 58616be into main Mar 16, 2026
36 of 38 checks passed

chuckdries deleted the display-correct-card-currency branch March 16, 2026 16:29

OSBotify mentioned this pull request Mar 17, 2026

Deploy Checklist: New Expensify 2026-03-17 #85529

Closed

75 tasks

Conversation

rafecolton commented Mar 11, 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 11, 2026

Uh oh!

rafecolton commented Mar 11, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

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

chuckdries commented Mar 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

rafecolton commented Mar 11, 2026

Uh oh!

rafecolton commented Mar 14, 2026

Uh oh!

Uh oh!

Uh oh!

DylanDylann Mar 14, 2026

Choose a reason for hiding this comment

Uh oh!

rafecolton Mar 14, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann Mar 14, 2026

Choose a reason for hiding this comment

Uh oh!

rafecolton Mar 14, 2026

Choose a reason for hiding this comment

Uh oh!

rafecolton commented Mar 14, 2026

Uh oh!

DylanDylann commented Mar 15, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 15, 2026

Uh oh!

melvin-bot bot commented Mar 15, 2026

Uh oh!

DylanDylann commented Mar 15, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 16, 2026

Uh oh!

github-actions bot commented Mar 16, 2026

Uh oh!

OSBotify commented Mar 16, 2026

Uh oh!

OSBotify commented Mar 17, 2026

Uh oh!

joekaufmanexpensify commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

rafecolton commented Mar 11, 2026 •

edited

Loading

codecov bot commented Mar 11, 2026 •

edited by github-actions bot

Loading

chuckdries commented Mar 11, 2026 •

edited

Loading