[PERF] Isolate modals from Expensify.tsx by jmusial · Pull Request #85449 · Expensify/App

jmusial · 2026-03-16T18:21:16Z

Explanation of Change

This PR move the six global modals out of Expensify and into a dedicated React.memo-wrapped child component. This eliminates ~3–8ms of wasted reconciliation per commit without changing any modal behavior or visual output.

Fixed Issues

$ #85634
PROPOSAL: on slack

Tests

Some of the modal scenarios check:

Emoji modal

Log into the app
Go to any chat
Press emoji icon in composer
Modal appears

App review modal

Log into the app
Open browser console
paste Onyx.set('nvp_appReview', {trigger: 'smartscan'});
Modal appears

Update modal

Log into the app
Open browser console
paste Onyx.set('updateRequired', true);
Modal appears

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

Screen.Recording.2026-03-19.at.17.26.03.mov

Perf related screenshots

Web

IOS

jmusial · 2026-03-17T10:12:07Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b3729c107f

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

chatgpt-codex-connector · 2026-03-17T10:19:57Z

src/ExpensifyGlobalModals.tsx

+    );
+}
+
+export default ExpensifyGlobalModals;


Memoize global modal container to prevent parent-driven rerenders

ExpensifyGlobalModals is exported as a normal function component, so it still rerenders every time Expensify rerenders (route/session/splash updates), which means the full global modal subtree is reconciled on those commits just like before. In this performance refactor, that prevents the intended isolation of modal work and leaves the optimization largely ineffective unless the component is wrapped with React.memo (or equivalent bailout).

Useful? React with 👍 / 👎.

Wrong, Codex please acknowledge the React Compiler exists

jmusial · 2026-03-19T15:14:26Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 04aadfa2db

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

chatgpt-codex-connector · 2026-03-19T15:31:09Z

src/libs/Navigation/AppNavigator/AuthScreens.tsx

            <KeyboardShortcutsHandler />
            <ThreeDSAuthHandler />
            <UserStatusHandler />
+            <AuthenticatedGlobalModals />


Gate authenticated modal managers on app init completion

Mounting AuthenticatedGlobalModals here removes the old shouldInit guard from Expensify (isNavigationReady && hasAttemptedToOpenPublicRoom && !!preferredLocale). NavigationRoot renders <AppNavigator /> before its onReady callback flips isNavigationReady, so persisted startup state like ONYXKEYS.SCREEN_SHARE_REQUEST or ONYXKEYS.NVP_APP_REVIEW can now open ConfirmModals during the splash/OldDot handoff instead of after bootstrapping finishes. That changes cold-start behavior for authenticated users in a way the previous code explicitly avoided.

Useful? React with 👍 / 👎.

This is a valid concern. In order to keep AuthenticatedGlobalModals in AuthScreens we'd need to either prop drill it or make it available from context. IMO not worth the trouble.

Reverting to the OG idea of just decomposing them

melvin-bot · 2026-03-19T16:28:13Z

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

adhorodyski · 2026-03-19T16:33:45Z

src/Expensify.tsx

-                </>
-            )}
-
+            {shouldInit && <GlobalModals updateAvailable={updateAvailable} />}


updateAvailable does not seem like a valid concern of GlobalModals. Can we subscribe inside instead?

I see only the UpdateAppModal can fetch this and render accordingly

yeah, left it here to keep logging on src/Expensify.tsx#213 intact and not duplicte subscriptions, but sure can move it down.

adhorodyski · 2026-03-19T16:35:31Z

src/GlobalModals.tsx

+function GlobalModals({updateAvailable}: GlobalModalsProps) {
+    return (
+        <>
+            {!!updateAvailable && <UpdateAppModal />}


yeah we can for sure subscribe to this internally instead

joekaufmanexpensify · 2026-03-19T22:04:12Z

No product review needed

ShridharGoel · 2026-03-19T22:22:08Z

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 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: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

codecov · 2026-03-20T10:12:04Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/Expensify.tsx	`87.82% <100.00%> (-0.31%)`	⬇️
src/GlobalModals.tsx	`100.00% <100.00%> (ø)`
src/components/UpdateAppModal.tsx	`25.00% <66.66%> (ø)`
... and 143 files with indirect coverage changes

mountiny

Thank you!

github-actions · 2026-03-20T12:46:06Z

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

OSBotify · 2026-03-20T12:47:06Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-03-20T12:50:19Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-111acdb-fe6e12a-3794e7177f866b89660ee875e22e1cc6b33126a0/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-111acdb-fe6e12a-c2e4e52dd4c3b18d9aa456573fc568050ff894b6/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-23T09:50:51Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.3.42-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

isolate modals from Expensify.tsx

41a0653

melvin-bot bot assigned jmusial Mar 16, 2026

jmusial changed the title ~~Isolate modals from Expensify.tsx~~ [PERF] Isolate modals from Expensify.tsx Mar 17, 2026

jmusial added 4 commits March 17, 2026 10:04

Merge branch 'main' into perf/move-global-modals-out-of-expensify-tsx

74e5754

Merge branch 'main' into perf/move-global-modals-out-of-expensify-tsx

9f8b078

cleanup after merge main

d3eaf16

remove redundant memo

b3729c1

chatgpt-codex-connector bot reviewed Mar 17, 2026

View reviewed changes

mountiny mentioned this pull request Mar 18, 2026

[$250] Isolate Expensify's global modals #85634

Open

jmusial added 2 commits March 19, 2026 11:24

Merge branch 'main' into perf/move-global-modals-out-of-expensify-tsx

f8f84a7

move most modals to be only available from Authenticated users context

04aadfa

Merge branch 'main' into perf/move-global-modals-out-of-expensify-tsx

c12f748

chatgpt-codex-connector bot reviewed Mar 19, 2026

View reviewed changes

jmusial added 2 commits March 19, 2026 17:04

revert to previous approach

eb3755e

cleanup

2ae5313

jmusial marked this pull request as ready for review March 19, 2026 16:28

jmusial requested review from a team as code owners March 19, 2026 16:28

melvin-bot bot requested review from ShridharGoel and joekaufmanexpensify and removed request for a team March 19, 2026 16:28

melvin-bot bot removed the request for review from a team March 19, 2026 16:28

adhorodyski reviewed Mar 19, 2026

View reviewed changes

joekaufmanexpensify removed their request for review March 19, 2026 22:04

move updateAvailable subscription inside the modal

0e6ad22

ShridharGoel approved these changes Mar 20, 2026

View reviewed changes

melvin-bot bot requested a review from mountiny March 20, 2026 10:10

mountiny approved these changes Mar 20, 2026

View reviewed changes

mountiny merged commit 111acdb into Expensify:main Mar 20, 2026
32 of 33 checks passed

MelvinBot mentioned this pull request Mar 20, 2026

[Preparing the UI] [No QA] Revamp search page actions bar #85508

Open

52 tasks

OSBotify mentioned this pull request Mar 23, 2026

Deploy Checklist: New Expensify 2026-03-23 #86080

Open

69 tasks

Conversation

jmusial commented Mar 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Emoji modal

App review modal

Update modal

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Perf related screenshots

Web

IOS

Uh oh!

jmusial commented Mar 17, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

adhorodyski Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

jmusial commented Mar 19, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

jmusial Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Mar 19, 2026

Uh oh!

adhorodyski Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

adhorodyski Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

jmusial Mar 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jmusial Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

adhorodyski Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify commented Mar 19, 2026

Uh oh!

ShridharGoel commented Mar 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

codecov bot commented Mar 20, 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!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Mar 20, 2026

Uh oh!

OSBotify commented Mar 20, 2026

Uh oh!

github-actions bot commented Mar 20, 2026

Uh oh!

jmusial commented Mar 16, 2026 •

edited

Loading

jmusial Mar 20, 2026 •

edited

Loading

ShridharGoel commented Mar 19, 2026 •

edited

Loading

codecov bot commented Mar 20, 2026 •

edited by github-actions bot

Loading