Fix: Expensify Cards incorrectly display workspace default currency instead of card currency by allgandalf · Pull Request #65481 · Expensify/App

allgandalf · 2025-07-04T06:44:26Z

Explanation of Change

Fixed Issues

$ #64644
PROPOSAL: #64644 (comment)

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

Precondition:

A workspace with Expensify Cards feed added
Cards are issued and assigned

Navigate to Workspace Overview > Default Currency
Change the default currency from USD to INR
Navigate to the Expensify Cards page

Verify that the currency is still displayed as USD $

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

Screen.Recording.2025-07-04.at.12.13.54.PM.mov

MacOS: Desktop

melvin-bot · 2025-07-04T06:44:32Z

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

DylanDylann · 2025-07-05T07:17:08Z

@allgandalf Please complete your PR

Update GH actions failed
Update the test step to include a verify step
Update all videos

allgandalf · 2025-07-06T16:23:31Z

@DylanDylann ready for re-review

DylanDylann · 2025-07-07T09:15:12Z

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

Screen.Recording.2025-07-07.at.16.31.17.mov

Android: mWeb Chrome

Screen.Recording.2025-07-07.at.16.27.12.mov

iOS: HybridApp

Screen.Recording.2025-07-07.at.16.31.45.mov

iOS: mWeb Safari

Screen.Recording.2025-07-07.at.16.28.13.mov

MacOS: Chrome / Safari

Screen.Recording.2025-07-07.at.16.17.54.mov

MacOS: Desktop

Screen.Recording.2025-07-07.at.16.25.10.mov

DylanDylann

LGTM

mountiny · 2025-07-07T09:45:12Z

-    const policyCurrency = useMemo(() => policy?.outputCurrency ?? CONST.CURRENCY.USD, [policy]);
-    const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`);
-    const [cardManualBilling] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_MANUAL_BILLING}${workspaceAccountID}`);
+    const policyCurrency = CONST.CURRENCY.USD;


@allgandalf Can you please add an explanation comment here that this is now temporary as at the moment the expensify cards are only available in USD

mountiny · 2025-07-07T10:31:39Z

-    const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`);
-    const [cardManualBilling] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_MANUAL_BILLING}${workspaceAccountID}`);
+    // Currently Expensify Cards only support USD, once support for more currencies is implemented, we will need to update this
+    const policyCurrency = CONST.CURRENCY.USD;


Noted this in DM, but can you please update this to settlementCurrency?

mountiny · 2025-07-07T10:31:49Z


-    const policyCurrency = useMemo(() => policy?.outputCurrency ?? CONST.CURRENCY.USD, [policy]);
+    // Currently Expensify Cards only support USD, once support for more currencies is implemented, we will need to update this
+    const policyCurrency = CONST.CURRENCY.USD;


settlementCurrency

github-actions · 2025-07-07T11:32:49Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.77-1 🚀

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

github-actions · 2025-07-08T21:02:31Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.77-2 🚀

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

Show only USD currency symbol for expensify cards

fccaf9b

allgandalf requested a review from a team as a code owner July 4, 2025 06:44

melvin-bot Bot requested review from DylanDylann and removed request for a team July 4, 2025 06:44

mountiny assigned allgandalf Jul 5, 2025

fix prettier and esLint

8b43fdb

DylanDylann approved these changes Jul 7, 2025

View reviewed changes

melvin-bot Bot requested a review from mountiny July 7, 2025 09:35

mountiny previously approved these changes Jul 7, 2025

View reviewed changes

add explanatory comments

39d2f47

allgandalf dismissed mountiny’s stale review via 39d2f47 July 7, 2025 10:15

mountiny approved these changes Jul 7, 2025

View reviewed changes

mountiny merged commit 2b1c55e into Expensify:main Jul 7, 2025
19 checks passed

mountiny reviewed Jul 7, 2025

View reviewed changes

github-actions Bot mentioned this pull request Jul 7, 2025

Deploy Checklist: New Expensify 2025-07-07 #65549

Closed

54 tasks

BlameGPT mentioned this pull request Jul 8, 2025

[$250] Connect BA-"Connect bank account" is displayed in WS settings after successfully adding a BA #65604

Closed

8 tasks

nlemma mentioned this pull request Jul 8, 2025

[Due for payment 2025-08-01] [$250] Admin can change the WS currency that is already connected to the USD bank account #65647

Closed

8 tasks

melvin-bot Bot mentioned this pull request Jul 8, 2025

[Due for payment 2025-07-16][$250] Expensify Cards incorrectly display workspace default currency instead of card currency #64644

Closed

16 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Expensify Cards incorrectly display workspace default currency instead of card currency #65481

Fix: Expensify Cards incorrectly display workspace default currency instead of card currency #65481
mountiny merged 3 commits into
Expensify:mainfrom
allgandalf:showUSDCurrency

allgandalf commented Jul 4, 2025 •

edited

Loading

Uh oh!

melvin-bot Bot commented Jul 4, 2025

Uh oh!

DylanDylann commented Jul 5, 2025

Uh oh!

allgandalf commented Jul 6, 2025

Uh oh!

DylanDylann commented Jul 7, 2025 •

edited

Loading

Uh oh!

DylanDylann left a comment

Uh oh!

mountiny Jul 7, 2025

Uh oh!

Uh oh!

mountiny Jul 7, 2025

Uh oh!

mountiny Jul 7, 2025

Uh oh!

github-actions Bot commented Jul 7, 2025

Uh oh!

github-actions Bot commented Jul 8, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

allgandalf commented Jul 4, 2025 • 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 Jul 4, 2025

Uh oh!

DylanDylann commented Jul 5, 2025

Uh oh!

allgandalf commented Jul 6, 2025

Uh oh!

DylanDylann commented Jul 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

DylanDylann left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mountiny Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

mountiny Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Jul 7, 2025

Uh oh!

github-actions Bot commented Jul 8, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

allgandalf commented Jul 4, 2025 •

edited

Loading

DylanDylann commented Jul 7, 2025 •

edited

Loading