Fix held expenses auto-approved without hold modal in selection mode by Krishna2323 · Pull Request #87651 · Expensify/App

Krishna2323 · 2026-04-10T16:02:23Z

Explanation of Change

Fixed Issues

$ #87644
PROPOSAL:

Tests

Prerequisite: Account has at least one workspace.
Prerequisite 2: Delayed submissions, approvals and payments enabled.

Open the Expensify app.
Open workspace chat,
Create three manual expenses.
Open the expenses report.
Long tap and select one of the expenses.
Tap on dropdown menu > "Hold"
Enter any reason and save.
Select all the expenses on report.
Tap on dropdown menu and select "Submit"
Select all the expenses again.
Tap on dropdown menu > "Approve"
Verify "Confirm approval amount" is shown

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests
Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

andriod_native.mp4

Android: mWeb Chrome

andriod_mWeb.mp4

iOS: Native

ios_hybrid.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

melvin-bot · 2026-04-10T16:03:22Z

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

Krishna2323 · 2026-04-10T16:10:21Z

Hmm seems like its not working, it was working when I tested a few mins back.

MelvinBot · 2026-04-10T16:14:22Z

Code Review: PR #87651

The change is minimal and well-scoped. Two observations:

1. shouldCallAfterModalHide is already applied by ButtonWithDropdownMenu

ButtonWithDropdownMenu/index.tsx:311 unconditionally sets shouldCallAfterModalHide: true on every item it passes to PopoverMenu. Both rendering paths for these actions (ButtonWithDropdownMenu directly and MoneyReportHeaderKYCDropdown → SettlementButton → ButtonWithDropdownMenu) go through this wrapper. So the explicit addition on the approve/pay items is redundant at runtime — it's overridden by the same value.

That said, the explicit flag documents intent clearly ("this action opens another modal"), so it's fine to keep. But it means the actual fix is likely the removal of the iOS InteractionManager workaround, not the shouldCallAfterModalHide addition. Could you confirm which change actually resolved the bug? If the InteractionManager removal is the real fix, it's worth noting that in the PR description so reviewers understand the mechanism.

2. Parallel implementation in MoneyReportHeader.tsx

MoneyReportHeader.tsx:1200-1234 has its own selectionModeReportLevelActions with identical approve/pay actions but without shouldCallAfterModalHide. If this explicit flag matters for any reason (e.g., future refactor that removes the ButtonWithDropdownMenu auto-application), the same treatment should be applied there for consistency. Not a blocker since ButtonWithDropdownMenu handles it today, but worth noting.

Overall the InteractionManager removal is a good simplification — shouldCallAfterModalHide is the proper mechanism for deferring callbacks until after the popover dismisses, making the platform-specific workaround unnecessary.

chatgpt-codex-connector · 2026-04-10T16:22:33Z

Codex Review: Didn't find any major issues. Delightful!

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

…unt failure Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2026-04-10T16:35:07Z

@situchan ready for review, works on android native

Krishna2323 · 2026-04-10T16:51:37Z

@codex review

chatgpt-codex-connector · 2026-04-10T17:02:11Z

Codex Review: Didn't find any major issues. Can't wait for the next one!

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

…old check Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2026-04-10T19:06:46Z

The issue was that hasHeldExpenses(reportID) reads transaction data from a Onyx.connect subscription (deprecatedReportsTransactions), which can be stale. In selection mode, this cache didn't reflect the current held state, so isAnyTransactionOnHold was always false, causing approvals to bypass the hold menu.

The primary button (on MoneyReportHeader) works fine because it uses useOnyx.

The fix passes the reactive transactions (from useOnyx / useReportTransactionsCollection) directly to hasHeldExpenses, bypassing the stale static cache entirely.

@MelvinBot confirm this

MelvinBot · 2026-04-10T19:09:00Z

Your analysis is correct.

Confirmed: hasHeldExpenses(reportID) and hasOnlyHeldExpenses(reportID) default to reading from deprecatedReportsTransactions — a static module-level variable populated by Onyx.connect at ReportUtils.ts:1154-1178. This cache can lag behind React component re-renders, so in selection mode isAnyTransactionOnHold was stale (false), bypassing the hold menu.

Both functions accept an optional allReportTransactions parameter (ReportUtils.ts:10835, ReportUtils.ts:10844). When provided, it bypasses the static cache entirely. Your fix correctly passes the reactive transactions from the hook, matching the pattern already used in useMoneyReportHeaderStatusBar (line 77).

The getReportTransactions helper even has a migration comment (ReportUtils.ts:1301) noting that deprecatedReportsTransactions is being phased out and callers should pass transactions explicitly — which is exactly what this PR does.

situchan · 2026-04-10T19:24:10Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
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

android.mp4

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

situchan · 2026-04-10T19:36:27Z

The bug is flaky.
I have ever reproduced this while testing original PR but not reproduced when trying to record video and report. So I thought this was one-time issue and not reported.
The root cause is stale transaction data from Onyx module level connect. That's why we're making great efforts on useOnyx migration.

github-actions · 2026-04-10T19:46:28Z

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

Fix held expenses auto-approved without hold modal in selection mode (cherry picked from commit d7e938b) (cherry-picked to staging by roryabraham)

github-actions · 2026-04-10T19:51:13Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #87651.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-d7e938b-7151ed3-c8e409e6c11b18f70529265037fe2b7fe3fd2a1f/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-d7e938b-7151ed3-0b324e39bdbb4b0f12e2b15d4e700c5532ba8b7b/index.html

Web 🕸️
https://87651.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-10T19:54:53Z

✋ 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 · 2026-04-10T20:20:56Z

🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.3.58-5 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-10T20:22:20Z

No help site changes are required for this PR.

This is a bug fix in src/hooks/useSelectionModeReportActions.ts that passes transactions to held-expense utility functions so the hold confirmation modal correctly appears during approval in selection mode. No user-facing features, workflows, settings, or UI labels were added, removed, or renamed — so no documentation updates are needed under App/docs/articles.

OSBotify · 2026-04-13T20:22:18Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.3.58-9 🚀

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

OSBotify · 2026-04-13T20:35:30Z

🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.3.59-0 🚀

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

Bundle Size Analysis (Sentry):

Android

MelvinBot · 2026-04-13T20:36:34Z

No help site changes are required for this PR.

The change is a code-only bug fix in src/hooks/useSelectionModeReportActions.ts — it passes the transactions parameter to hasHeldExpensesReportUtils and hasOnlyHeldExpensesReportUtils so held expenses are correctly detected in selection mode. This doesn't introduce, rename, or remove any user-facing features, settings, or workflows that would need documentation updates.

OSBotify · 2026-04-13T20:58:09Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.3.58-9 🚀

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

OSBotify · 2026-04-16T03:32:11Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.3.59-4 🚀

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

Fix held expenses auto-approved without hold modal in selection mode

90a84dd

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

melvin-bot Bot assigned Krishna2323 Apr 10, 2026

Krishna2323 marked this pull request as ready for review April 10, 2026 16:03

Krishna2323 requested review from a team as code owners April 10, 2026 16:03

melvin-bot Bot requested a review from situchan April 10, 2026 16:03

melvin-bot Bot requested review from trjExpensify and removed request for a team April 10, 2026 16:03

Defer hold menu opening in selection mode approve/pay to fix modal mo…

3b56852

…unt failure Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 added 2 commits April 11, 2026 00:24

fix: pass reactive transactions to hasHeldExpenses to prevent stale h…

0c4f625

…old check Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Revert InteractionManager workaround, keep reactive transactions fix

ef05e9d

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

roryabraham requested a review from puneetlath April 10, 2026 19:22

roryabraham approved these changes Apr 10, 2026

View reviewed changes

situchan approved these changes Apr 10, 2026

View reviewed changes

roryabraham merged commit d7e938b into Expensify:main Apr 10, 2026
31 of 32 checks passed

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Apr 10, 2026

OSBotify mentioned this pull request Apr 10, 2026

Deploy Checklist: New Expensify 2026-04-10 #87562

Closed

87 tasks

melvin-bot Bot mentioned this pull request Apr 13, 2026

[Due for payment 2026-04-23] [Due for payment 2026-04-20] Report - Held expense is automatically unheld after bulk approving report. #87644

Closed

7 tasks

MelvinBot mentioned this pull request Apr 14, 2026

Steph's chat with Melvin #87829

Closed

situchan mentioned this pull request May 14, 2026

[Due for payment 2026-07-08] [$250] Show Submit/Approve/Pay options when all expenses within a report are selected #72502

Closed

Conversation

Krishna2323 commented Apr 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Apr 10, 2026

Uh oh!

Krishna2323 commented Apr 10, 2026

Uh oh!

MelvinBot commented Apr 10, 2026

Uh oh!

chatgpt-codex-connector Bot commented Apr 10, 2026

Uh oh!

Krishna2323 commented Apr 10, 2026

Uh oh!

Krishna2323 commented Apr 10, 2026

Uh oh!

chatgpt-codex-connector Bot commented Apr 10, 2026

Uh oh!

Krishna2323 commented Apr 10, 2026

Uh oh!

MelvinBot commented Apr 10, 2026

Uh oh!

situchan commented Apr 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

situchan commented Apr 10, 2026

Uh oh!

Uh oh!

github-actions Bot commented Apr 10, 2026

Uh oh!

github-actions Bot commented Apr 10, 2026

Uh oh!

OSBotify commented Apr 10, 2026

Uh oh!

OSBotify commented Apr 10, 2026

Uh oh!

MelvinBot commented Apr 10, 2026

Uh oh!

OSBotify commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 13, 2026

Uh oh!

MelvinBot commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Krishna2323 commented Apr 10, 2026 •

edited

Loading

situchan commented Apr 10, 2026 •

edited

Loading