Skip to content

[Payment due @mkhutornyi] Explain why Direct reimbursement blocks a workspace currency change - #106953

Merged
neil-marcellini merged 5 commits into
Expensify:mainfrom
hungvu193:fix-679348
Nov 19, 2026
Merged

neil-marcellini merged 5 commits into
Expensify:mainfrom
hungvu193:fix-679348

Conversation

@hungvu193

@hungvu193 hungvu193 commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

UpdateWorkspaceGeneralSettings currently blocks changing currency with direct reimbursement enabled, except for USD or AUD. However, in ND we still allow users to change currency without any feedback. In this PR, we added a modal to let user know which currency is allowed and how to turn off the direct reimbursement so they can change the currency.

Fixed Issues

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

Tests

  1. Sign in to Expensify Classic (OldDot) as an admin of a Collect or Control workspace whose currency is USD and that has no business bank account.
  2. Go to Settings > Workspaces > Choose your Workspace > Workflow > Payments.
  3. Select "Direct" reimbursement and don't add a bank account.
  4. In NewDot, go to Workspaces > Your workspace > Overview.
  5. Verify the Default currency row is still editable.
  6. Tap Default currency, search for HKD and select it.
  7. Verify a "Currency not available with direct reimbursement" modal appears and the currency stays USD.
  8. Tap Cancel and verify the modal closes and nothing changes.
  9. Select HKD again and tap "Go to workflows".
  10. Verify the workspace's Workflows page opens on the Payments tab.
  11. Turn Payments off and back on, so reimbursement is no longer Direct.
  12. Go back to Overview > Default currency and select HKD.
  13. Verify the currency changes to HKD with no modal.
  14. On another Direct workspace, select AUD.
  15. Verify the currency changes to AUD with no modal, because the server allows AUD on Direct workspaces.
  16. Take a USD workspace whose Payments are on but not Direct (no bank account), and turn on Force offline in NewDot's Troubleshoot settings.
  17. Change the workspace's Default currency to HKD.
  18. In Expensify Classic, set the same workspace's reimbursement to "Direct".
  19. Turn off Force offline in NewDot.
  20. Verify the currency returns to USD and "An error occurred while updating the workspace. Please try again." appears under the Default currency row.
  21. Dismiss the error and verify it disappears.
  • 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

  • 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 verified any copy / text that was added to the app 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 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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
Screen.Recording.2026-11-16.at.16.54.45.mov
iOS: mWeb Safari
Screen.Recording.2026-11-16.at.16.58.59.mov
MacOS: Chrome / Safari
Screen.Recording.2026-11-16.at.16.52.05.mov
Screen.Recording.2026-11-16.at.16.39.52.mov

@expensify-chore-bot

Copy link
Copy Markdown

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

  1. Look at the code and make sure there are no malicious changes.
  2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx bun ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx bun ./scripts/generateTranslations.ts --compare-ref main

@hungvu193

Copy link
Copy Markdown
Contributor Author

@MelvinBot review

@hungvu193

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 16, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-18T15:15:31.448477Z c35268e Manual request
ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@codecov

codecov Bot commented Nov 16, 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 96.21% <100.00%> (+0.05%) ⬆️
src/libs/PolicyUtils/payments.ts 94.93% <100.00%> (+0.34%) ⬆️
.../pages/workspace/WorkspaceOverviewCurrencyPage.tsx 79.36% <100.00%> (+0.79%) ⬆️
src/pages/workspace/WorkspaceOverviewPage.tsx 75.33% <50.00%> (+75.33%) ⬆️
... and 19 files with indirect coverage changes

@MelvinBot

Copy link
Copy Markdown
Contributor

Reviewed commit 8f5bc61: no blocking issues found.

  • Both targeted test suites passed: 857 tests.
  • Tests emitted duplicate-mock and React act(...) warnings.
  • Browser behavior and the server-side currency allowlists were not independently verified.

view run

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Chef's kiss.

Reviewed commit: 8f5bc61354

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

@hungvu193
hungvu193 marked this pull request as ready for review November 16, 2026 09:59
@hungvu193
hungvu193 requested review from a team as code owners November 16, 2026 09:59
@expensify-chore-bot
expensify-chore-bot Bot requested review from mkhutornyi and removed request for a team November 16, 2026 09:59
@expensify-chore-bot

Copy link
Copy Markdown

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

@expensify-chore-bot
expensify-chore-bot Bot requested review from twisterdotcom and removed request for a team November 16, 2026 09:59
@mkhutornyi

mkhutornyi commented Nov 16, 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 any copy / text that was added to the app 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 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
test1.mov
test2.mov

Comment thread src/languages/en.ts Resolved
Comment thread src/CONST/index.ts Resolved
@mkhutornyi

Copy link
Copy Markdown
Contributor

There's conflict

@hungvu193
hungvu193 requested a review from mkhutornyi November 18, 2026 03:43
@hungvu193

Copy link
Copy Markdown
Contributor Author

Addressed all your reviews @mkhutornyi. Could you review again? Ty

@twisterdotcom twisterdotcom 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.

LGTM

Comment thread src/CONST/index.ts
// The server only lets a workspace with Direct reimbursement switch to these currencies. The list copies the server's own
// direct reimbursement list, which also includes SGD, so it is kept apart from DIRECT_REIMBURSEMENT_CURRENCIES above.
get CURRENCIES_ALLOWED_ON_DIRECT_WORKSPACE_CHANGE() {
return [this.CURRENCY.AUD, this.CURRENCY.CAD, this.CURRENCY.EUR, this.CURRENCY.GBP, this.CURRENCY.USD, this.CURRENCY.SGD];

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.

The description contradicts the code.
The Explanation still says the server blocks every currency "except for USD or AUD", and step 15 repeats it.
The code allows six: AUD, CAD, EUR, GBP, USD and SGD.

@mkhutornyi

Copy link
Copy Markdown
Contributor

I think error message is more closer to the next row (Timezone) instead of current row (Default currency).
This is pre-existing style on main, not changed here so out of scope.

Screenshot 2026-11-18 at 2 54 41 PM Screenshot 2026-11-18 at 2 54 44 PM

@expensify-chore-bot

Copy link
Copy Markdown

@neil-marcellini 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 Explain why Direct reimbursement blocks a workspace currency change [Payment due @mkhutornyi] Explain why Direct reimbursement blocks a workspace currency change Nov 18, 2026
@melvin-bot

melvin-bot Bot commented Nov 18, 2026

Copy link
Copy Markdown

🎯 @mkhutornyi, 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/679348.

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.

@MelvinBot

Copy link
Copy Markdown
Contributor

No actionable regressions found in static review of c35268e.

Reviewed currency restrictions, onboarding flows, modal navigation, Payments remediation, and currency-error display/dismissal.

No tests run, as requested. Runtime behavior and the server-side currency allowlist were not independently verified.


view run

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Another round soon, please!

Reviewed commit: c35268ea0c

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

@neil-marcellini neil-marcellini 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.

Looks good thanks.

Two NABs from AI that seem legit. You could do it in a follow up.

4. The new currency list retypes the existing one (new this pass)

CURRENCIES_ALLOWED_ON_DIRECT_WORKSPACE_CHANGE (index.ts:1874-1876) is DIRECT_REIMBURSEMENT_CURRENCIES two lines above plus SGD, written out again. If one list gains a currency, the other can quietly fall behind. Building it from the existing list makes the one difference visible:

get CURRENCIES_ALLOWED_ON_DIRECT_WORKSPACE_CHANGE() {
    return [...this.DIRECT_REIMBURSEMENT_CURRENCIES, this.CURRENCY.SGD];
}

5. Test mock wraps the real function for no reason (new this pass)

WorkspaceOverviewCurrencyPageTest.tsx:124-125 wraps the real helper in (...args) => requireActual(...).fn(...args). Assigning jest.requireActual<…>('@libs/PolicyUtils/payments').isCurrencyChangeBlockedByDirectReimbursement directly does the same. Tiny; skip if you like.

@neil-marcellini
neil-marcellini merged commit 4223c7e into Expensify:main Nov 19, 2026
41 of 44 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

Copy link
Copy Markdown
Contributor

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.5.52-1 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed — this PR explains an existing currency restriction with a self-contained in-app message and fixes error feedback; it adds no new feature or workflow and makes no existing article sentence incorrect.


view run

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.

6 participants