Skip to content

perf: wrap FAB popover content in Activity to deprioritize hidden updates - #86866

Merged
rlinoz merged 4 commits into
Expensify:mainfrom
callstack-internal:perf/fab-menu-activity-optimization
Apr 10, 2026
Merged

rlinoz merged 4 commits into
Expensify:mainfrom
callstack-internal:perf/fab-menu-activity-optimization

Conversation

@leshniak

@leshniak leshniak commented Apr 1, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

The FAB popover menu tree contains 9 menu item components with 56 useOnyx calls (~95 active subscribers at runtime). These subscribers fire on every Pusher event even when the popover is closed, which is the vast majority of the user's session.

This PR wraps the popover content in React 19's <Activity> component:

  • mode="hidden" when the popover is closed — React deprioritizes updates, so menu item subscribers stop processing Onyx changes
  • mode="visible" when the popover opens — React flushes any pending state before painting, so items always show current data

The mode transitions are tied to onModalWillShow / onModalHide callbacks so the content stays visible during the fade-out animation.

Measured results (perf-test, 500 reports):

  • Active Onyx subscribers: 95 → 23 (-76%)
  • CPU time on idle FAB rendering: ~29% reduction

Fixed Issues

$ #87158
PROPOSAL:

Tests

  1. Open the app on any screen with the bottom navigation bar visible
  2. Verify the FAB button renders normally
  3. Tap the FAB button to open the popover menu
  4. Verify all menu items appear with correct labels and icons (Expense, Track Distance, Create Report, New Chat, Invoice, Travel, Test Drive, New Workspace, Quick Action — visibility depends on account configuration)
  5. Tap any menu item and verify it navigates correctly
  6. Open the FAB menu again, use keyboard arrow keys to navigate items — verify focus moves correctly
  7. Press Escape or tap outside to close the menu — verify fade-out animation plays smoothly
  8. Long-press the FAB button — verify scan action triggers correctly
  9. On wide layout: verify the receipt scan button next to FAB works
  • Verify that no errors appear in the JS console

Offline tests

  1. Go offline
  2. Open the FAB popover menu
  3. Verify all menu items still appear and respond to taps
  4. Verify navigation works as expected in offline mode

QA Steps

Same as tests above.

  • 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
Android: mWeb Chrome
iOS: Native
xd.mp4
iOS: mWeb Safari
MacOS: Chrome / Safari
xd.mp4

leshniak and others added 3 commits March 31, 2026 16:58
Menu item children (9 components with ~46 Onyx subscriptions total)
were always mounted even when the popover was closed. Now they mount
only when the menu opens, eliminating idle subscription cost on the
main screen.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Keep children mounted during the close animation by deferring
unmount to onModalHide instead of gating on isVisible directly.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@leshniak leshniak changed the title Perf/fab menu activity optimization perf: wrap FAB popover content in Activity to deprioritize hidden updates Apr 3, 2026
@leshniak
leshniak marked this pull request as ready for review April 7, 2026 19:23
@leshniak
leshniak requested review from a team as code owners April 7, 2026 19:23
@melvin-bot
melvin-bot Bot requested a review from situchan April 7, 2026 19:23
@melvin-bot

melvin-bot Bot commented Apr 7, 2026

Copy link
Copy Markdown

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

@melvin-bot
melvin-bot Bot requested review from joekaufmanexpensify and removed request for a team April 7, 2026 19:23
@situchan

situchan commented Apr 7, 2026 •

Copy link
Copy Markdown
Contributor

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.mov
Android: mWeb Chrome
mchrome.mov
iOS: HybridApp
ios.mov
iOS: mWeb Safari
msafari.mov
MacOS: Chrome / Safari
web.mov

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c851447b7f

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

@MelvinBot

Copy link
Copy Markdown
Contributor

Nice idea — using <Activity> to deprioritize hidden Onyx subscribers is a solid optimization target. However, there's a bug that prevents the optimization from working after the first open/close cycle.

The issue: PopoverWithMeasuredContentBase has a React.memo comparator (line 232-234) that short-circuits all re-renders when isVisible stays false:

if (prevProps.isVisible === nextProps.isVisible && nextProps.isVisible === false) {
    return true; // skip re-render
}

When the popover closes:

  1. isVisible → false — re-render allowed, but contentActivityMode is still 'visible'
  2. Fade-out animation plays
  3. onModalHide fires → setContentActivityMode('hidden')
  4. FABPopoverMenu re-renders, but the memo sees false → false and blocks it
  5. <Activity mode="hidden"> never reaches the DOM

So after the first open, Activity is stuck at mode="visible" forever. The children stay mounted (because prevIsVisible is stuck at true due to the same memo block — line 212), and their useOnyx subscriptions remain active and fully prioritized.

Suggested fix: Derive mode directly from isVisible instead of using state + callbacks:

- const [contentActivityMode, setContentActivityMode] = useState<ActivityProps['mode']>(isVisible ? 'visible' : 'hidden');
  ...
- onModalWillShow={() => setContentActivityMode('visible')}
- onModalHide={() => setContentActivityMode('hidden')}
  ...
- <Activity mode={contentActivityMode}>
+ <Activity mode={isVisible ? 'visible' : 'hidden'}>

This way mode="hidden" is set in the same render that flips isVisible to false (which passes through the memo), so it actually takes effect. Activity mode="hidden" doesn't visually hide content — it just tells React's scheduler to deprioritize updates — so the fade-out animation should be unaffected.


Everything else looks good — correct <Activity> API usage, clean diff, and the measured performance gains are compelling if this propagation issue is fixed.

@joekaufmanexpensify

Copy link
Copy Markdown
Contributor

No product review needed

@joekaufmanexpensify
joekaufmanexpensify removed their request for review April 8, 2026 15:56
<View style={shouldUseNarrowLayout ? styles.flexGrow1 : [styles.createMenuContainer, styles.pv0, styles.flex1]}>
<View style={styles.pv4}>{children}</View>
</View>
<Activity mode={contentActivityMode}>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're not using isVisible ? 'visible' : 'hidden' directly here because of modal animation, right?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're not using isVisible ? 'visible' : 'hidden' directly here because of modal animation, right?

correct.

@situchan

situchan commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

Please complete author checklist

@melvin-bot
melvin-bot Bot requested a review from rlinoz April 9, 2026 11:24
@rlinoz

rlinoz commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

@leshniak I think you are missing some checks, can you use the most up to date template please?

https://raw.githubusercontent.com/Expensify/App/main/.github/PULL_REQUEST_TEMPLATE.md

@leshniak

leshniak commented Apr 9, 2026

Copy link
Copy Markdown
Contributor Author

@leshniak I think you are missing some checks, can you use the most up to date template please?

https://raw.githubusercontent.com/Expensify/App/main/.github/PULL_REQUEST_TEMPLATE.md

@rlinoz Updated

@leshniak
leshniak requested a review from situchan April 9, 2026 20:42
@melvin-bot
melvin-bot Bot requested a review from rlinoz April 9, 2026 20:51
@rlinoz
rlinoz merged commit 48ac55e into Expensify:main Apr 10, 2026
53 of 70 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

✋ 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 OSBotify mentioned this pull request Apr 13, 2026
89 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/rlinoz in version: 9.3.59-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site changes required.

This PR is a purely internal performance optimization — it wraps the FAB popover content in React 19's <Activity> component to deprioritize hidden Onyx subscribers. No user-facing features, labels, menu items, or workflows were added, removed, or renamed.

@OSBotify

Copy link
Copy Markdown
Contributor

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

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

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants