Fix iOS freeze on locked-account pay in selection mode (#95026) by Krishna2323 · Pull Request #95063 · Expensify/App

Krishna2323 · 2026-07-01T15:41:52Z

Explanation of Change

Fixed Issues

$ #95026
PROPOSAL:

Tests

Preconditions:
- Account has a payable report: from 2 expenses
- Lock the account

Open Hybrid app
Open the payable report
Select all transactions
Tap on 'X selected' button
Select Pay > Mark as paid

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

android_hybrid.mp4

Android: mWeb Chrome

android_mWeb.mp4

iOS: Native

ios_hybrid.mp4

iOS: mWeb Safari

ios_mWeb.mp4

MacOS: Chrome / Safari

web_chrome.mp4

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

codecov · 2026-07-01T15:50:19Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/libs/actions/Search.ts	`40.03% <100.00%> (ø)`
...aderActions/MoneyReportHeaderSelectionDropdown.tsx	`0.93% <0.00%> (ø)`
.../MoneyRequestReportView/SelectionToolbar/index.tsx	`76.04% <0.00%> (ø)`
src/hooks/useSelectionModeReportActions.ts	`94.28% <60.00%> (ø)`
...rModalPresentationAfterPopoverDismiss/index.ios.ts	`0.00% <0.00%> (ø)`
...deferModalPresentationAfterPopoverDismiss/index.ts	`0.00% <0.00%> (ø)`
src/hooks/useSelectionModePayment.ts	`61.76% <50.00%> (+0.14%)`	⬆️
... and 19 files with indirect coverage changes

melvin-bot · 2026-07-01T15:52:47Z

@rojiphil 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-07-01T15:55:27Z

@rojiphil, sorry for the ping, but @situchan will be handling this as part of #72502.

situchan · 2026-07-02T08:11:11Z

@codex review

MelvinBot · 2026-07-02T08:15:43Z

Review

The fix is sound and well-scoped. It resolves the iOS freeze by deferring the blocking-modal presentation until the payment popover's dismiss animation finishes (via InteractionManager.runAfterInteractions), avoiding the modal-on-modal present-while-dismissing case.

The refactor in useSelectionModeReportActions.ts:219-223 that drops the synchronous shouldBlockAction(iouPaymentType) early-return is safe — basePaymentSelect already calls shouldBlockAction internally at useSelectionModePayment.ts:274, so behavior is preserved and the previous double-invocation is removed. Both consumers (SelectionToolbar and MoneyReportHeaderSelectionDropdown) route through the deferred shouldBlockAction, so all paths are covered.

A few non-blocking questions/suggestions:

Inconsistent deferral in Search.ts. In handleBulkPayItemSelected, the locked/delegate modals are now deferred, but the !isUserValidated → VERIFY_ACCOUNT navigate (L1658-1660) and the shouldRestrictUserBillableActions → RESTRICTED_ACTION navigate (L1653-1655) are not. Yet the analogous !isUserValidated navigation is deferred in useSelectionModePayment.ts:132-135. If those routes open an RHP/modal that can hit the same present-while-dismissing freeze, they'd still be affected. Was the difference intentional (route push vs. native modal present behaving differently on iOS)?
confirmPayment isn't deferred. useSelectionModePayment.ts:146-149 still calls showDelegateNoAccessModal() synchronously. If that path can run while a menu/popover is dismissing, it could reproduce the same freeze. Likely out of scope, but worth confirming it isn't reachable in that state.
Reuse the new helper. useSelectionModeReportActions.ts:205 and L220 still call InteractionManager.runAfterInteractions directly — the same pattern the new deferModalPresentationAfterPopoverDismiss helper wraps. If the helper is intentionally scoped to "modal presentation" only, the current naming is fine; otherwise consider routing these through it (or a more general name) so the pattern lives in one place.
Minor — naming. The helper is named deferModalPresentationAfterPopoverDismiss but is also used to wrap a Navigation.navigate(...) route push (L133), which isn't a modal presentation. Not a blocker, just a slight semantic mismatch.

The added test mock at handleActionButtonPressTest.ts:14-17 (running the deferred callback synchronously) is the right approach for keeping the assertions intact.

Note: I reviewed the logic but could not execute the unit test in my environment, so please confirm CI passes.

situchan · 2026-07-02T08:16:51Z

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

Android: HybridApp

Screen.Recording.2026-07-02.at.9.51.20.AM.mov

Android: mWeb Chrome

iOS: HybridApp

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

chatgpt-codex-connector · 2026-07-02T08:17:53Z

Codex Review: Didn't find any major issues. Already looking forward to the next diff.

Reviewed commit: 9dfcb77bab

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

situchan · 2026-07-02T08:53:57Z

Regression in android: Locked account modal shows 2 times

Screen.Recording.2026-07-02.at.9.49.32.AM.mov

production

Screen.Recording.2026-07-02.at.9.51.20.AM.mov

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

Krishna2323 · 2026-07-02T12:24:47Z

Regression in android: Locked account modal shows 2 times

Fixed:

Monosnap.screencast.2026-07-02.17-45-41.mp4

Monosnap.screencast.2026-07-02.17-52-47.mp4

situchan · 2026-07-02T14:30:39Z

+ * On iOS, presenting a modal while another modal is dismissing freezes the app.
+ */
+function deferModalPresentationAfterPopoverDismiss(presentModal: () => void) {
+    if (getPlatform() !== CONST.PLATFORM.IOS) {


Please use separate files as per our platform philosophy

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

chatgpt-codex-connector · 2026-07-02T14:50:02Z

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

Reviewed commit: 787022ac1a

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

melvin-bot · 2026-07-02T14:50:24Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #95026 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

MelvinBot · 2026-07-02T14:52:15Z

🤖 Reviewed the change. The approach is sound — deferring the blocking modal until the popover's dismiss transition completes is the right fix for the iOS "present-a-modal-while-another-is-dismissing" freeze, and the platform-split util (index.ts no-op / index.ios.ts via TransitionTracker) matches existing patterns like AttachmentModalHandler/index.ios.ts and showConfirmModalAfterMoreMenuDismiss.ts. The double-defer guard in useSelectionModeReportActions.ts:202-214 (calling shouldBlockAction without the defer flag because it's already inside runAfterTransitions) is correct. runAfterTransitions also has a MAX_TRANSITION_START_WAIT_MS fallback, so the modal is guaranteed to eventually show even if no transition registers. 👍

A few things worth confirming before merge:

1. Inconsistent deferral of the verify-account / restricted-action navigations in Search.ts (main question)
In useSelectionModePayment.shouldBlockAction, all three blocking branches are deferred — including the VERIFY_ACCOUNT navigation (L141). But in handleBulkPayItemSelected, only the delegate and locked-account modals are deferred — the RESTRICTED_ACTION (L1654) and VERIFY_ACCOUNT (L1659) navigations still fire synchronously. If those routes present an RHP/modal over the still-dismissing popover, could the same freeze occur on the Search bulk-pay path? If navigation (vs. a JS showConfirmModal) is immune to the freeze, then it'd be good to know that — and it also raises the question of whether deferring the VERIFY_ACCOUNT navigation in shouldBlockAction is even necessary.

2. Naming / JSDoc
deferModalPresentationAfterPopoverDismiss is also used to wrap Navigation.navigate(VERIFY_ACCOUNT), which isn't strictly a modal presentation. Minor — consider a slightly more general name or a JSDoc note that it also covers deferred navigations.

3. Test coverage
The only updated test is handleActionButtonPressTest.ts, and its mock makes the defer a synchronous pass-through — so it verifies the modal still shows, but not the deferral itself. The two hook changes have no unit coverage. Given this is an iOS-timing bug that's hard to unit-test, that's understandable, but it does mean the regression guard rests entirely on the manual iOS video. Worth a note that CI won't catch a future regression here.

None of these block the core fix — (1) is the one I'd want an answer on. Nice, targeted change otherwise.

Fix iOS freeze on locked-account pay in selection mode (Expensify#95026)

9dfcb77

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

melvin-bot Bot assigned Krishna2323 Jul 1, 2026

Krishna2323 marked this pull request as ready for review July 1, 2026 15:52

Krishna2323 requested review from a team as code owners July 1, 2026 15:52

melvin-bot Bot requested review from heyjennahay and rojiphil and removed request for a team July 1, 2026 15:52

melvin-bot Bot removed the request for review from a team July 1, 2026 15:52

Krishna2323 mentioned this pull request Jul 1, 2026

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

Open

situchan reviewed Jul 2, 2026

View reviewed changes

Comment thread src/hooks/useSelectionModeReportActions.ts Outdated

Krishna2323 added 2 commits July 2, 2026 17:30

Merge upstream/main into krishna2323/issue/95026

7969db0

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

fix prettier.

5cdbdc1

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

Merge branch 'Expensify:main' into krishna2323/issue/95026

9a9c604

situchan reviewed Jul 2, 2026

View reviewed changes

Split deferModal helper into platform-specific files

787022a

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

situchan approved these changes Jul 2, 2026

View reviewed changes

melvin-bot Bot requested a review from marcaaron July 2, 2026 14:50

Uh oh!

Conversation

Krishna2323 commented Jul 1, 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!

codecov Bot commented Jul 1, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Jul 1, 2026

Uh oh!

Krishna2323 commented Jul 1, 2026

Uh oh!

Uh oh!

situchan commented Jul 2, 2026

Uh oh!

MelvinBot commented Jul 2, 2026

Review

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

chatgpt-codex-connector Bot commented Jul 2, 2026

Uh oh!

situchan commented Jul 2, 2026

Uh oh!

Krishna2323 commented Jul 2, 2026

Uh oh!

situchan Jul 2, 2026

Choose a reason for hiding this comment

Uh oh!

Krishna2323 Jul 2, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot commented Jul 2, 2026

Uh oh!

melvin-bot Bot commented Jul 2, 2026

Uh oh!

MelvinBot commented Jul 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Krishna2323 commented Jul 1, 2026 •

edited

Loading

codecov Bot commented Jul 1, 2026 •

edited by github-actions Bot

Loading

situchan commented Jul 2, 2026 •

edited

Loading