Show correct currency when selecting linked feeds by rafecolton · Pull Request #93331 · Expensify/App

rafecolton · 2026-06-11T21:08:46Z

Explanation of Change

Fixed Issues

$ #93332
PROPOSAL:

Tests

Set up an account on a private domain, verify it, and verify your domain
Create a GBP workspace, set it as your default, and configure it for Expensify cards
Configure a domain EC feed for the same user/domain
Navigate to the GBP feed ECard issuing page
Open the feed selection dropdown above the current balance and select the USD domain
1. Confirm the balance shows in USD
2. Go through the issuing steps for a physical card (any limit) and confirm the currency is correct at each step in the RHP and on the feed page once issuing is complete.
3. Repeat for virtual card
Select the GBP workspace in the dropdown. Repeat the steps and confirm currency correctly shows as GBP.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests. Optionally, add a USD domain or workspace feed to an account that is already set up for GBP - no need to set up a new GBP account. (Assign to @joekaufmanexpensify)

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

Screen.Recording.2026-06-11.at.4.34.40.PM.mov

Function can be called without a card, with card settings only

…ency

codecov · 2026-06-11T21:17:43Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/CardUtils.ts	`82.29% <100.00%> (ø)`
.../pages/settings/Wallet/ExpensifyCardPage/index.tsx	`73.26% <100.00%> (ø)`
...ce/expensifyCard/DynamicExpensifyCardLimitPage.tsx	`0.00% <0.00%> (ø)`
...xpensifyCard/DynamicExpensifyCardLimitTypePage.tsx	`0.00% <0.00%> (ø)`
...orkspace/expensifyCard/WorkspaceCardsListLabel.tsx	`0.00% <0.00%> (ø)`
...xpensifyCard/WorkspaceExpensifyCardDetailsPage.tsx	`0.00% <0.00%> (ø)`
.../workspace/expensifyCard/issueNew/AssigneeStep.tsx	`0.00% <0.00%> (ø)`
...e/expensifyCard/WorkspaceExpensifyCardListPage.tsx	`0.00% <0.00%> (ø)`
src/hooks/useCurrencyForExpensifyCard.ts	`0.00% <0.00%> (ø)`
... and 38 files with indirect coverage changes

melvin-bot · 2026-06-11T23:39:43Z

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c6be59dd33

ℹ️ 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 · 2026-06-11T23:44:18Z

+    // The selected feed can belong to a different policy/domain than the one being viewed
+    // (e.g. a US feed linked to a GBP policy), so derive the currency from the feed itself.
+    if (fundID && cardSettings) {
+        return getCardOrFeedCurrency(undefined, cardSettings);


Preserve policy currency when feed settings lack currency

When a GBP/EUR workspace's selected feed settings have loaded but don't include the optional currency field (for example legacy/nested GB settings), this branch returns getCardOrFeedCurrency(undefined, cardSettings). With no card, that helper has no feedCountry, so after failing to find settings.currency it falls through to USD instead of the previous policy.outputCurrency; the list and issue-card flow will display and store USD for that GBP/EUR feed. Please fall back to the policy currency or infer the program from settings when the feed settings don't carry a currency.

Useful? React with 👍 / 👎.

don't include the optional currency field (for example legacy/nested GB settings)

AFAIK this is not a real thing, there are no "legacy" GB settings, the program hasn't even launched yet

joekaufmanexpensify

Good for product 👍

chuckdries · 2026-06-12T18:16:38Z

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

MacOS: Chrome / Safari

us.feed.on.gbp.workspace.works.mp4

DylanDylann · 2026-06-15T14:09:18Z

Because the checklist has already been filled out, I will skip reviewing this PR. Thanks for your help, @chuckdries

github-actions · 2026-06-15T16:30:25Z

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

github-actions · 2026-06-15T16:36:26Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-0ed8197edfb-c748b00-546440878eebf621bc0c9795560e9817349943e5/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-0ed8197-c748b00-69e0f55ab92ea3a2f6766b16204405a1489d00e4/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-15T18:13:16Z

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

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

Bundle Size Analysis (Sentry):

iOS

MelvinBot · 2026-06-15T18:15:05Z

🤖 No help site changes required.

This PR is an internal bug fix: it corrects the currency displayed on the Expensify Card issuing screen when a selected feed belongs to a workspace/domain denominated in a different currency than the default workspace (e.g. selecting a USD feed under a GBP workspace now shows $ instead of £). It does this by deriving the currency from the feed's own settings rather than the viewed policy.

There is no new feature, UI element, tab, setting, or workflow change — the fix makes existing balance/limit display match the actual feed currency, consistent with what the Wallet page already showed.

I reviewed App/docs/articles (both new-expensify/expensify-card/ and connect-credit-cards/). The help site does not document the currency-display logic for linked card feeds, so there is nothing to update. Because no changes are needed, I did not open a draft docs PR.

If you believe a customer-facing article should be added or updated to explain multi-currency feed behavior, let me know and I'll draft it.

OSBotify · 2026-06-15T19:04:22Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

izarutskaya · 2026-06-15T19:54:29Z

Hi @rafecolton @joekaufmanexpensify For some reason we can't create a GBP bank account. It's currently pending verification with Expensify. Are we missing something? Probably internal QA. Thanks

chuckdries · 2026-06-15T20:05:35Z

@izarutskaya We are still working on allowing y'all to test UK/EU expensify cards. Paging @joekaufmanexpensify to test this in mean time, as per PR description

joekaufmanexpensify · 2026-06-16T17:31:59Z

Working on QA 👍

joekaufmanexpensify · 2026-06-16T17:38:07Z

QA passed. Working well! Checked it off.

OSBotify · 2026-06-16T19:45:26Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.8-3 🚀

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

rafecolton added 6 commits June 11, 2026 11:23

Rename function and add comment to explain versitility

03c648b

Function can be called without a card, with card settings only

Refactor useCurrencyForExpensifyCard hook to incorporate fundID

122c7f5

Use renamed functions, pass fundID where applicable

b8d6bd3

Use a less-overhead method to determine which disclaimer to show

33b173f

Add fundID to assignee step to show correct currency there too

7bd76e1

Merge remote-tracking branch 'origin/main' into linked-card-feed-curr…

eadba48

…ency

rafecolton self-assigned this Jun 11, 2026

Spellcheck

c6be59d

rafecolton marked this pull request as ready for review June 11, 2026 23:39

rafecolton requested review from a team as code owners June 11, 2026 23:39

melvin-bot Bot requested a review from ahmedGaber93 June 11, 2026 23:39

melvin-bot Bot requested review from joekaufmanexpensify and removed request for a team June 11, 2026 23:39

rafecolton requested review from DylanDylann and chuckdries and removed request for ahmedGaber93 June 11, 2026 23:40

chatgpt-codex-connector Bot reviewed Jun 11, 2026

View reviewed changes

joekaufmanexpensify approved these changes Jun 12, 2026

View reviewed changes

chuckdries approved these changes Jun 12, 2026

View reviewed changes

chuckdries merged commit 0ed8197 into main Jun 15, 2026
40 of 43 checks passed

chuckdries deleted the linked-card-feed-currency branch June 15, 2026 16:08

OSBotify mentioned this pull request Jun 15, 2026

Deploy Checklist: New Expensify 2026-06-15 #93604

Closed

62 tasks

melvin-bot Bot mentioned this pull request Jun 16, 2026

[Due for payment 2026-06-23] ECard issuing screen shows wrong currency when a feed from another currency's workspace/domain is selected #93332

Closed

Conversation

rafecolton commented Jun 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!

codecov Bot commented Jun 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!

melvin-bot Bot commented Jun 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 11, 2026

Choose a reason for hiding this comment

Uh oh!

rafecolton Jun 12, 2026

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

DylanDylann commented Jun 15, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jun 15, 2026

Uh oh!

github-actions Bot commented Jun 15, 2026

Uh oh!

OSBotify commented Jun 15, 2026

Uh oh!

MelvinBot commented Jun 15, 2026

Uh oh!

OSBotify commented Jun 15, 2026

Uh oh!

izarutskaya commented Jun 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

joekaufmanexpensify commented Jun 16, 2026

Uh oh!

joekaufmanexpensify commented Jun 16, 2026

Uh oh!

OSBotify commented Jun 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

rafecolton commented Jun 11, 2026 •

edited

Loading

codecov Bot commented Jun 11, 2026 •

edited by github-actions Bot

Loading

chuckdries commented Jun 12, 2026 •

edited

Loading

izarutskaya commented Jun 15, 2026 •

edited

Loading

chuckdries commented Jun 15, 2026 •

edited

Loading