Repository navigation
Fix bulk pay option visibility for reports with foreign transaction currencies - #98964
Conversation
|
@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] |
There was a problem hiding this comment.
💡 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".
| selectedReports.length > 0 | ||
| ? selectedReports.map((report) => report.currency).filter(Boolean) | ||
| : Object.values(selectedTransactions) | ||
| .map((transaction) => transaction.currency) | ||
| .filter(Boolean); |
There was a problem hiding this comment.
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 👍 / 👎.
There was a problem hiding this comment.
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.
|
Testing... |
There was a problem hiding this comment.
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 Issuessection 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
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - 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 verified the steps for local testing are in the
- 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.
toggleReportand notonIconClick). - 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)
- 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.
- 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 usingAvatarhave 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
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - 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
Avataris modified, I verified thatAvataris 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
Designlabel and/or tagged@Expensify/designso 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
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - 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
|
🚧 danieldoglas has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/danieldoglas in version: 9.4.58-0 🚀
|
Help site review: no changes requiredI reviewed the changes in this PR and no help site updates are needed under Why: This is an internal-logic bug fix in 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. |
|
🚀 Deployed to production by https://github.com/Beamanator in version: 9.4.58-4 🚀
Bundle Size Analysis (Sentry): |
Explanation of Change
In
useSearchBulkActions,onlyShowPayElsewherecombined both report currencies and child transaction currencies intoselectedCurrencies. When reports with foreign purchase currencies were bulk-selected, this triggerednew Set(selectedCurrencies).size > 1, forcingonlyShowPayElsewheretotrueand 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
onlyShowPayElsewhereto 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
Pay with [bank account]option is displayed and not forced to onlyMark as paid.Pay with [bank account]option is still displayed and accessible.Offline tests
N/A
QA Steps
Same as tests
// TODO: These must be filled out, or the issue title must include "[No QA]."
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectionAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
fix-demo.webm