Skip to content

Fix bulk pay option visibility for reports with foreign transaction currencies - #98964

Merged
danieldoglas merged 1 commit into
Expensify:mainfrom
emkhalid:fix-95832-bulk-pay-currencies
Aug 20, 2026
Merged

danieldoglas merged 1 commit into
Expensify:mainfrom
emkhalid:fix-95832-bulk-pay-currencies

Conversation

@emkhalid

@emkhalid emkhalid commented Aug 19, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

In useSearchBulkActions, onlyShowPayElsewhere combined both report currencies and child transaction currencies into selectedCurrencies. When reports with foreign purchase currencies were bulk-selected, this triggered new Set(selectedCurrencies).size > 1, forcing onlyShowPayElsewhere to true and hiding the "Pay with [bank account]" option even when all selected reports shared the same workspace output currency and had a verified business bank account connected.
This fix updates onlyShowPayElsewhere to check report currencies when reports are selected, and only falls back to child transaction currencies when only transactions are selected.

Fixed Issues

$ #95832
PROPOSAL: #95832 (comment)

Tests

  1. Log in to an account with a workspace configured with a default output currency (e.g., USD) and a connected & verified business bank account (VBBA).
  2. Create 4 expense reports:
    • Report 1 & 2: containing only USD expenses.
    • Report 3 & 4: containing foreign currency expenses (e.g., EUR transactions converted to USD report currency).
  3. Submit and approve all 4 reports.
  4. Go to Search > Expenses / Spend > Ready to pay.
  5. Bulk select Report 3 and Report 4 (the reports with foreign currency transactions).
  6. Click on the bulk action / "Selected" menu and inspect the Pay dropdown options.
  7. Verify that the Pay with [bank account] option is displayed and not forced to only Mark as paid.
  8. Bulk select Report 1, 2, 3, and 4 together.
  9. Verify that the Pay with [bank account] option is still displayed and accessible.
  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

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

  • 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 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 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)
  • 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)
  • 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.
  • 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
fix-demo.webm

@emkhalid
emkhalid marked this pull request as ready for review August 19, 2026 10:14
@emkhalid
emkhalid requested review from a team as code owners August 19, 2026 10:14
@melvin-bot
melvin-bot Bot requested review from dylanexpensify and parasharrajat and removed request for a team and dylanexpensify August 19, 2026 10:14
@melvin-bot

melvin-bot Bot commented Aug 19, 2026

Copy link
Copy Markdown

@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 removed the request for review from a team August 19, 2026 10:14

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f9d5ed475c

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

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment on lines +619 to +623
selectedReports.length > 0
? selectedReports.map((report) => report.currency).filter(Boolean)
: Object.values(selectedTransactions)
.map((transaction) => transaction.currency)
.filter(Boolean);

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Include remaining transaction currencies in mixed selections

When a user selects a full expense report and also individual expenses from another report, selectedReports is non-empty while selectedTransactions still contains the additional selected rows; getPayOption() explicitly allows that mixed selection via shouldShowBulkOptionForRemainingTransactions. This branch now builds selectedCurrencies only from the full reports, so a remaining selected expense in another currency is ignored and the Pay menu can offer a bank-account payment using the first report's currency instead of forcing Pay elsewhere for a mixed-currency bulk pay.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

When selectedReports is non-empty, bulk pay operates at the report level and only pays the reports in selectedReports (see itemsToPay in onBulkPaySelected).

Child transactions of selected reports always populate selectedTransactions. Combining transaction currencies with report currencies was the root cause of this bug, as foreign expense currencies on single-currency reports forced onlyShowPayElsewhere = true. Therefore, prioritizing selectedReports currencies when reports are selected is intentional and aligns with the approved proposal.

@parasharrajat

Copy link
Copy Markdown
Member

Testing...

@parasharrajat parasharrajat left a comment •

Copy link
Copy Markdown
Member

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

🔲 iOS / native

Facing build issues.

🔲 iOS / Safari

21.08.2026_01.20.08_REC.mp4

🔲 MacOS / Chrome

21.08.2026_01.07.37_REC.mp4

🔲 Android / native

21.08.2026_01.18.28_REC.mp4

🎀 👀 🎀 C+ reviewed

@melvin-bot
melvin-bot Bot requested a review from danieldoglas August 20, 2026 19:52
@danieldoglas
danieldoglas merged commit 0a532d4 into Expensify:main Aug 20, 2026
46 of 93 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

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 OSBotify mentioned this pull request Aug 21, 2026
55 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/danieldoglas in version: 9.4.58-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

Help site review: no changes required

I reviewed the changes in this PR and no help site updates are needed under App/docs/articles.

Why: This is an internal-logic bug fix in src/hooks/useSearchBulkActions.ts. It changes how onlyShowPayElsewhere computes currencies — checking report currencies when reports are selected and only falling back to child transaction currencies when only transactions are selected. There are no user-facing label, feature, or flow changes; it simply restores the intended behavior so the "Pay with [bank account]" option isn't incorrectly hidden.

The relevant doc already documents this behavior correctly. Pay Expenses already states that bank accounts matching the report's currency appear as payment options, and to use Mark as paid otherwise. This fix brings the code in line with what the doc already says, so nothing in the article needs to change.

Because no documentation change is required, I did not create a draft help site PR.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Beamanator in version: 9.4.58-4 🚀

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

Bundle Size Analysis (Sentry):

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