Skip to content

Defer navigation in ConfirmModal onConfirm to prevent screen freeze#85189

Draft
MelvinBot wants to merge 1 commit intomainfrom
claude-fixModalFreezeOnNavigate
Draft

Defer navigation in ConfirmModal onConfirm to prevent screen freeze#85189
MelvinBot wants to merge 1 commit intomainfrom
claude-fixModalFreezeOnNavigate

Conversation

@MelvinBot
Copy link
Contributor

@MelvinBot MelvinBot commented Mar 13, 2026

Explanation of Change

When a ConfirmModal on the More Features page dismisses and navigates simultaneously (e.g., clicking "Go to Expensify Cards" in the workflow warning modal), the ScreenFreezeWrapper introduced by PR #82764 suspends the component tree via useLayoutEffect before the ReanimatedModal's useEffect can process the visibility change and start the close transition. This leaves the modal overlay blocking all input, making the app appear frozen.

This PR wraps the Navigation.navigate() calls in requestAnimationFrame() within the onConfirm handlers of three ConfirmModal instances that navigate away from the page. This gives the modal time to start its close transition before the screen is frozen — matching the existing fix pattern already applied in AttachmentModalBaseContent.

Fixed Issues

$ #85184
PROPOSAL: #85184 (comment)

Tests

  1. Navigate to a workspace that has Expensify Cards enabled with at least one card using a Smart Limit
  2. Go to workspace settings > More Features
  3. Click the locked Workflows toggle switch
  4. Click the "Go to Expensify Cards" button in the confirmation modal
  5. Verify the app navigates to the Expensify Card page without freezing
  • Verify that no errors appear in the JS console

Offline tests

This change only affects navigation timing after a modal dismiss. Offline behavior is not affected since the navigation is local (no network calls).

QA Steps

  1. Navigate to a workspace that has Expensify Cards enabled with at least one card using a Smart Limit
  2. Go to workspace settings > More Features
  3. Click the locked Workflows toggle switch
  4. Click "Go to Expensify Cards" in the confirmation modal
  5. Verify the app navigates to the Expensify Card page without freezing
  6. Also verify the organize and integrate warning modals (if triggerable by having an accounting connection) navigate without freezing
  • 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 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

Android: Native

No UI changes — navigation timing only.

Android: mWeb Chrome

No UI changes — navigation timing only.

iOS: Native

No UI changes — navigation timing only.

iOS: mWeb Safari

No UI changes — navigation timing only.

MacOS: Chrome / Safari

No UI changes — navigation timing only.

@MelvinBot @situchan
Defer navigation in ConfirmModal onConfirm to prevent screen freeze
66857f9 
When ConfirmModal dismisses and navigates simultaneously, the
ScreenFreezeWrapper suspends the component tree before the modal's
close-transition useEffect can run, leaving the modal overlay blocking
all input. Wrapping Navigation.navigate in requestAnimationFrame gives
the modal time to start closing before the screen is frozen.

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team March 13, 2026 06:34
@MelvinBot MelvinBot mentioned this pull request Mar 13, 2026
Closed
7 tasks
@codecov
Copy link

codecov bot commented Mar 13, 2026 •
edited by github-actions bot
Loading

Codecov Report

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

Files with missing lines Coverage Δ
src/pages/workspace/WorkspaceMoreFeaturesPage.tsx 0.00% <0.00%> (ø)
... and 10 files with indirect coverage changes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@situchan situchan

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@MelvinBot @situchan