Skip to content

[NoQA] fix: prompt to update workspace currency to USD when enabling central invoicing#85285

Merged
blimpich merged 2 commits intoExpensify:mainfrom
ikevin127:ikevin127-travelUSDGuard
Mar 16, 2026
Merged

[NoQA] fix: prompt to update workspace currency to USD when enabling central invoicing#85285
blimpich merged 2 commits intoExpensify:mainfrom
ikevin127:ikevin127-travelUSDGuard

Conversation

@ikevin127
Copy link
Contributor

Explanation of Change

When a user attempts to enable Travel Invoicing (Central Invoicing), the workspace currency is strictly required to be USD. Previously, attempting to enable it with a non-USD currency would result in a BE error under the switch toggle.

This PR addresses this by implementing a proactive currency check within the WorkspaceTravelInvoicingSection component. If the workspace's output currency is not USD, the user is now presented with a confirmation modal prompting them to update it (same flow used by Expensify Card).

Upon confirmation, the logic automatically updates the workspace currency to USD and seamlessly continues the enablement flow, mirroring the pattern currently used for the Expensify Card setup. Tests were also added to cover this new modal flow.

Fixed Issues

$ #85247
PROPOSAL:

Tests

Precondition: Must be on a private domain email account and have Travel Invoicing beta enabled.

I. Normal Enablement Flow (Non-USD Workspace)

  1. Open a workspace and navigate to Settings > Workspaces -> [Select a Workspace] -> More features -> Travel.
  2. Ensure the workspace currency is currently set to something other than USD (e.g. CAD, GBP).
  3. Toggle "Central invoicing" on.
  4. Verify the modal appears prompting you to change the currency to USD.
  5. Click "Update to USD" and verify that the currency updates, the modal closes, and the setup flow continues smoothly.

II. Cross-Device Verification (Simulating External Change)

  1. Open a workspace and navigate to Settings > Workspaces -> [Select a Workspace] -> More features -> Travel.
  2. Ensure the workspace currency is currently set to something other than USD.
  3. Toggle "Central invoicing" on to trigger the "Update to USD" modal. Do not confirm the modal.
  4. Either open Expensify on another device (same account/workspace) or in another incognito window, navigate to the workspace, and manually change the workspace currency to USD.
  5. Go back to the original device/window where the modal is open.
  6. Verify that the "Update to USD" modal automatically closes once the currency change syncs, and subsequent toggling of "Central invoicing" works as expected.
  • Verify that no errors appear in the JS console

Offline tests

  1. Open a workspace and navigate to Settings > Workspaces -> [Select a Workspace] -> More features -> Travel.
  2. Ensure the workspace currency is currently set to something other than USD.
  3. Disconnect from the internet (turn off Wi-Fi/data).
  4. Toggle "Central invoicing" on.
  5. Verify the modal appears prompting you to change the currency to USD.
  6. Click "Update to USD".
  7. Verify that the changes are made optimistically (the flow continues as if the currency was updated).
  8. Reconnect to the internet.
  9. Verify that the changes successfully sync with the server once back online without errors.

QA Steps

Same as tests.

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

I. Normal Enablement Flow (Non-USD Workspace)

web-user.mov

II. Cross-Device Verification (Simulating External Change)

web-remote-user.mov

@ikevin127 ikevin127 requested review from a team as code owners March 14, 2026 00:49
@melvin-bot melvin-bot bot requested review from parasharrajat and removed request for a team March 14, 2026 00:49
@melvin-bot
Copy link

melvin-bot bot commented Mar 14, 2026

@parasharrajat 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 requested review from trjExpensify and removed request for a team March 14, 2026 00:49
@blimpich blimpich requested review from blimpich and rlinoz and removed request for trjExpensify March 14, 2026 01:07
@codecov
Copy link

codecov bot commented Mar 14, 2026

Codecov Report

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

Files with missing lines Coverage Δ
...rkspace/travel/WorkspaceTravelInvoicingSection.tsx 74.21% <64.51%> (+6.92%) ⬆️
... and 16 files with indirect coverage changes

const [isPayBalanceModalVisible, setIsPayBalanceModalVisible] = useState(false);

// Ref to track if the "Update to USD" modal is open
const isCurrencyModalOpen = useRef(false);
Copy link
Member

Choose a reason for hiding this comment

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

I think we can extend the useConfirmModal hook via context to have a new property that tells about the visibility of the modal instead of using this ref.

@parasharrajat
Copy link
Member

II. Cross-Device Verification (Simulating External Change)

While this is a good feature, it could look like a bug to the user as the modal is closed without any feedback. In the other case, if the user changes the currency to USD again, I don't see any issue in that, so in my opinion we should remove this cross-device change.

cc: @blimpich @rlinoz

@ikevin127
Copy link
Contributor Author

I think we can extend the useConfirmModal hook via context to have a new property that tells about the visibility of the modal instead of using this ref.

I was just following the implementation used by Expensify Card (WorkspaceExpensifyCardPageEmptyState) without any changes as to ensure that they both work the same. I think ref is fine since it doesn't trigger re-render as opposed to a useConfirmModal exported variable.

@blimpich To confirm whether we want to refactor the logic that's now used by both Expensify Card and Travel Invoicing to a useConfirmModal exported variable as opposed to using ref like we currently do.

Same for:

II. Cross-Device Verification (Simulating External Change)

While this is a good feature, it could look like a bug to the user as the modal is closed without any feedback. In the other case, if the user changes the currency to USD again, I don't see any issue in that, so in my opinion we should remove this cross-device change.

I was just following the implementation used by Expensify Card, if we want to change that only for Travel Invoicing, then we would have 2 different behaviours when it comes to same user changing things from a different session.

I assume that was added for a reason / past issue: if things are changed from a different session, then the same user on older session will still get the "workspace must have USD currency" error despite that not being true from a BE perspective 🤷

@parasharrajat
Copy link
Member

Ok, sounds good. Thanks for clarifications.

@parasharrajat
Copy link
Member

parasharrajat commented Mar 14, 2026

Screenshots

🔲 iOS / native

15.03.2026_18.08.51_REC.mp4

🔲 iOS / Safari

15.03.2026_18.07.14_REC.mp4

🔲 MacOS / Chrome

15.03.2026_17.49.45_REC.mp4

🔲 Android / native

15.03.2026_18.02.47_REC.mp4

Copy link
Member

@parasharrajat parasharrajat left a comment

Choose a reason for hiding this comment

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

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.

🎀 👀 🎀 C+ reviewed

@blimpich blimpich merged commit 81a244a into Expensify:main Mar 16, 2026
37 of 38 checks passed
@github-actions
Copy link
Contributor

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

@OSBotify
Copy link
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.

@OSBotify
Copy link
Contributor

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

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

@OSBotify
Copy link
Contributor

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

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

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.

5 participants