Skip to content

Fix: open Currency RHP when updating workspace currency from Workflows#93098

Merged
roryabraham merged 1 commit into
mainfrom
claude-fixUpdateWorkspaceCurrencyNavigation
Jun 9, 2026
Merged

Fix: open Currency RHP when updating workspace currency from Workflows#93098
roryabraham merged 1 commit into
mainfrom
claude-fixUpdateWorkspaceCurrencyNavigation

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Pressing "Update workspace currency" in the Workflows → Payment "Add bank account" confirm modal did nothing, so the Currency RHP never opened.

The confirm handler confirmCurrencyChangeAndHideModal navigated deferred, via Navigation.setNavigationActionToMicrotaskQueue. The confirm modal uses useConfirmModal with shouldHandleNavigationBack: true, and when that modal hides, Modal.hideModal schedules a guarded window.history.back() on setTimeout(0) that only short-circuits if a new history entry was pushed in the meantime. Because the navigation was deferred past that setTimeout(0), the guard saw no new entry, ran history.back(), and cancelled the forward navigation.

This change navigates directly (synchronously) inside the handler — matching the working sibling WorkspaceInvoiceVBASection.confirmCurrencyChangeAndHideModal, which navigates to the identical WORKSPACE_OVERVIEW_CURRENCY route synchronously and is unaffected. This restores the synchronous-navigation contract the modal's guard relies on.

Fixed Issues

$ #93062
PROPOSAL: #93062 (comment)

Tests

// TODO: The human co-author must fill out the tests you ran before marking this PR as "ready for review".
// Please describe what tests you performed that validates your changes worked.

  1. Have a workspace with a non-supported currency for a business bank account
  2. Go to the workspace Workflows page
  3. Scroll to the Payment section and press "+ Add bank account"
  4. Press "Update workspace currency"
  5. Verify the Currency RHP opens to update the currency
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

// TODO: The human co-author must fill out the QA tests you ran before marking this PR as "ready for review".

  1. Have a workspace with a non-supported currency for a business bank account
  2. Go to the workspace Workflows page
  3. Scroll to the Payment section and press "+ Add bank account"
  4. Press "Update workspace currency"
  5. Verify the Currency RHP opens to update the currency
  • 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 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 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

MacOS: Chrome / Safari

The deferred navigation via setNavigationActionToMicrotaskQueue was being
silently undone by the confirm modal's guarded history.back(), so the
Currency RHP never opened. Navigate directly inside the confirm handler,
matching the working invoice VBA section.

Co-authored-by: Yauheni Horbach <ZhenjaHorbach@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor Author

No code fix is needed — all CI checks that test the code are green.

The only failing check is PR Author Checklist / checklist, and it's not a code problem. The job log shows:

You completed 0 out of 49 checklist items with 1 unfinished items
##[error]PR Author Checklist is not completely filled out. Please check every box to verify you've thought about the item.

It fails because the human-only sections of the PR description are still incomplete — the Tests / QA Steps sections and the PR Author Checklist checkbox haven't been filled in/ticked. I intentionally don't fill those out on a human's behalf, so this requires the PR's human co-author to:

  1. Complete the Tests and QA Steps sections.
  2. Tick the PR Author Checklist item(s).

Everything else passed — typecheck, all 8 test jobs, Storybook tests, ESLint, Prettier, React Compiler Compliance, all build variants, knip, spellcheck, and codecov. (baseline-perf-tests / branch-perf-tests were still running and are non-blocking.)

@ZhenjaHorbach

Copy link
Copy Markdown
Contributor

@MelvinBot
Open this PR

@MelvinBot
MelvinBot marked this pull request as ready for review June 9, 2026 17:01
@MelvinBot
MelvinBot requested a review from a team as a code owner June 9, 2026 17:01
@melvin-bot
melvin-bot Bot requested review from joekaufmanexpensify and thelullabyy and removed request for a team June 9, 2026 17:02
@melvin-bot

melvin-bot Bot commented Jun 9, 2026

Copy link
Copy Markdown

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 Marked this PR as ready for review.

@ZhenjaHorbach

ZhenjaHorbach commented Jun 9, 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 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
2026-06-09.19.25.15.mov
Android: mWeb Chrome
2026-06-09.19.25.15.mov
iOS: HybridApp
2026-06-09.20.09.17.mov
iOS: mWeb Safari
2026-06-09.19.18.56.mov
MacOS: Chrome / Safari
2026-06-09.19.17.11.mov

@pecanoro
pecanoro self-requested a review June 9, 2026 18:10
@ZhenjaHorbach

Copy link
Copy Markdown
Contributor

Works good!

@melvin-bot
melvin-bot Bot requested a review from roryabraham June 9, 2026 18:12
@roryabraham
roryabraham merged commit 42a0d0f into main Jun 9, 2026
42 of 46 checks passed
@roryabraham
roryabraham deleted the claude-fixUpdateWorkspaceCurrencyNavigation branch June 9, 2026 21:36
@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 No action needed — this PR has already been merged and all checks are currently passing (no failing checks remain). The earlier failures must have resolved before merge. If you're seeing a specific check that still looks red, let me know which one and I'll dig in.

@github-actions

github-actions Bot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Jun 9, 2026

Copy link
Copy Markdown
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
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.4.2-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 No help site changes required.

I reviewed the changes in this PR against the help site articles under App/docs/articles.

This is a pure navigation bug fix: it swaps deferred navigation (Navigation.setNavigationActionToMicrotaskQueue) for synchronous navigation so that pressing Update workspace currency in the Workflows → Payment "Add bank account" confirm modal correctly opens the Currency RHP. It restores already-intended behavior for an existing button.

There is no new feature, UI text, label, tab, or setting introduced — so there is nothing for the help site to document or update. The help articles describe what features do and how to use them, not the internal navigation mechanics this PR corrects.

Because no documentation update is needed, I did not create a draft help site PR.

@ZhenjaHorbach, please confirm you agree no help site updates are needed here. If you believe a related article should still be updated, let me know which flow and I'll draft the changes.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.4.4-1 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 Help site review — no documentation changes required.

This PR is a purely internal navigation-timing fix. It changes confirmCurrencyChangeAndHideModal to navigate synchronously instead of deferring via setNavigationActionToMicrotaskQueue, so the Update workspace currency button correctly opens the Currency RHP.

Why no docs are needed:

  • No new feature, UI element, setting, or user-facing label was added or renamed.
  • The button's intended behavior (opening the currency picker) is unchanged — the fix simply restores a flow that was silently failing.
  • Existing help articles such as Set the currency for your workspace already describe the correct, intended behavior and remain accurate.

Since this is a bug fix that restores already-documented behavior rather than a change to how the product works, the App/docs/articles content stays correct as-is. No draft help-site PR was created.

@ZhenjaHorbach, if you believe a help article should document this Workflows → Payment currency-update flow (it currently is not covered), let me know and I'll draft one.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 9.4.4-3 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 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