Skip to content

perf: preload the Reports tab so the first Inbox open runs the warm path - #100042

Merged
JS00001 merged 16 commits into
Expensify:mainfrom
callstack-internal:preload-inbox-tab-warmup
Sep 21, 2026
Merged

JS00001 merged 16 commits into
Expensify:mainfrom
callstack-internal:preload-inbox-tab-warmup

Conversation

@BartekObudzinski

@BartekObudzinski BartekObudzinski commented Sep 1, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

The Inbox tab is lazy: true, so nothing mounts ReportsSplitNavigator until the first tap. That tap builds the sidebar and, on wide layouts, the central ReportScreen.

This dispatches CommonActions.preload for the Reports tab from AuthScreensInitHandler, in the first idle window after the app has data. React Navigation renders a preloaded tab as if lazy were false, so the navigator mounts in the background and the first tap runs the warm path.

Two gates hold it back: isLoadingApp has to be false, and the tab navigator has to have registered its state. The second one is load-bearing. A reload runs ReconnectApp, which never raises isLoadingApp, so without that gate the preload does nothing at all on a reload.

Two guards skip the preload when Reports is already the focused tab or already mounted, since there is nothing to warm in either case.

On a wide layout the preloaded navigator also mounts ReportScreen. Its OpenReport call marks the report read, so ReportFetchHandler holds that call while the tab is still preloaded and fires it once when the tab is opened. The first tap on a preloaded tab reuses the mounted screen instead of passing nested params, so it does not fire a second OpenReport.

Adds two span attributes, is_preloaded and waited_on_open_report.

Results

Very heavy account, from Sentry, 24h.

before after delta
web, ManualNavigateToInboxTab p50 528.8 ms 266.4 ms −50%
Android, cold first open 559 ms 376 ms −33%
web, ManualAppStartup p50 3517.6 ms 3523.2 ms +5.6 ms

Warm re-visits stay at 52 to 62 ms on every build and platform measured, which is the control for the rows above.

The spread widens, 517 to 545 ms before against 207 to 599 ms after. The preload removes the constant mount cost and exposes the variable part. In the slowest sample the same trace carries ManualOpenReport at 600 ms with a 477 ms POST /api/OpenReport inside it, so that tap was waiting on the network. On a wide layout the tap opens the last report, which the tab render does not control. The new waited_on_open_report attribute separates those from render-only navigations.

Warming only the lazy chunk, with a dynamic import and no navigation preload, was tried and gave nothing: 677 ms against a 656 ms baseline, with the chunk verified warm. The cost is the mount, not the chunk. Native has no lazy boundary at all, so there the preload only warms the mount.

Cost of the background mount

A preloaded route is not frozen by BottomTabView, which computes shouldFreeze as activityState === STATE_INACTIVE && !isPreloaded. It is not the "keeps re-rendering while invisible" failure mode you might expect.

On web the real protection is FreezeWrapper in ReportsSplitNavigator.tsx, which uses react-freeze and the preload does not touch it. freezeOnBlur there only sets display: none. Three React DevTools recordings show zero renders inside the subtree while another tab is focused, and heap stayed flat at 145 MB over 60 seconds of Onyx churn.

On native FreezeWrapper is a no-op, so the tab does stay unfrozen until the first tap. Measured with render probes while sending messages in the background: one render on Android, two on iOS. Two renders total, not two per message.

Fixed Issues

$ #100828
PROPOSAL:

Tests

  1. Sign in on web in a wide window so you land on Home or Search. Wait a few seconds, then click Inbox. Verify the chat list appears and no loading spinner is left on screen.
  2. Click between Home, Search and Inbox a few times. Verify each tab shows its own content and the Inbox list keeps its scroll position.
  3. Open a chat from the Inbox list, go to Search, then come back to Inbox. Verify the same chat is still open with its messages.
  4. Paste a direct link to a chat in the address bar so the app opens straight on it. Verify the chat loads and the list on the left shows the right chats.
  5. Stay on Home or Search for a minute without opening Inbox, while messages arrive on the account. Verify the app stays responsive and scrolling and typing feel normal.
  6. Sign out, sign in as a different account, then click Inbox. Verify you see only the new account's chats.
  7. Sign in fresh rather than reloading the page. Verify Inbox opens correctly on the first click.
  8. Repeat step 1 in a narrow window. Verify Inbox opens and the bottom tab bar works.
  9. On Android and on iOS, cold start the app, wait a few seconds, then tap Inbox. Verify the chat list appears and the app stays responsive.
  • Verify that no errors appear in the JS console

Offline tests

  1. Sign in, then go offline.
  2. Reload the app and wait for it to settle on Home.
  3. Click Inbox. Verify the cached chat list renders and the offline indicator behaves as it does today.
  4. Go back online. Verify the list updates.
  5. Sign in and go offline about three seconds after the app loads, before opening Inbox. Go back online, wait, then click Inbox. Verify the chat list still opens and no error screen appears.

QA Steps

Same as tests.

  • 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 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 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)
  • 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.
  • 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
iOS: mWeb Safari
MacOS: Chrome / Safari

@BartekObudzinski BartekObudzinski changed the title perf: preload the Reports tab so the first Inbox open runs the warm path [WIP] perf: preload the Reports tab so the first Inbox open runs the warm path Sep 1, 2026
@codecov

codecov Bot commented Sep 1, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/CONST/index.ts 91.52% <ø> (ø)
...nts/Navigation/NavigationTabBar/InboxTabButton.tsx 93.47% <100.00%> (+0.29%) ⬆️
.../NavigationTabBar/getReusableReportsTabStateKey.ts 100.00% <ø> (ø)
src/hooks/useIsInPreloadedTab.ts 100.00% <100.00%> (ø)
src/hooks/useMarkAsRead.ts 96.29% <100.00%> (+0.17%) ⬆️
...Navigation/AppNavigator/AuthScreensInitHandler.tsx 90.00% <100.00%> (+1.36%) ⬆️
.../AppNavigator/Navigators/ReportsSplitNavigator.tsx 95.00% <100.00%> (+0.26%) ⬆️
src/libs/Navigation/helpers/tabNavigatorUtils.ts 100.00% <100.00%> (ø)
src/libs/Scheduler/index.ts 100.00% <100.00%> (ø)
src/pages/inbox/ReportFetchHandler.tsx 90.16% <100.00%> (+1.22%) ⬆️
... and 42 files with indirect coverage changes

@github-actions

github-actions Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@github-actions

github-actions Bot commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@github-actions

github-actions Bot commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@github-actions

github-actions Bot commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@melvin-bot

melvin-bot Bot commented Sep 10, 2026

Copy link
Copy Markdown

@DylanDylann 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 a team and removed request for a team September 10, 2026 11:39
@DylanDylann

Copy link
Copy Markdown
Contributor

Actually, I'm not aligned with this change because it renders the Inbox tab before the user has even touched it, which is risky and could cause unexpected issues. Using isInPreloadedTab to block certain actions feels like a workaround to me, it only fixes things case by case, and I'm concerned we won't be able to cover all the bugs that could arise once we ship this change. Note that the logic in the Inbox is quite complex, involving focus, unread state, and more.

One more thing, we have a fallback timer inside scheduleWhenIdle, so putting a lot of work here could keep the thread busy and affect other flows. For the preload action specifically, I also wouldn't expect it to run in the fallbackTimer.

@DylanDylann

Copy link
Copy Markdown
Contributor

cc @mountiny for another perspective on this change

@BartekObudzinski

Copy link
Copy Markdown
Contributor Author

Some my thoughts @DylanDylann

  1. Why preload and not something simpler
    lazy: false moves the mount into startup, ManualAppStartup went from 3.5s to 6.6s. Warming only the lazy chunk changed nothing, the cost is the mount. Preload was the only option that cut the tap and left startup flat: web p50 529ms to 266ms, cold Android 559ms to 376ms, startup within 6ms.

  2. The new state, and what runs in it
    You are right, a preloaded tab is a state the Inbox never had. Blurred tabs are frozen today. A preloaded tab mounts without focus. On web FreezeWrapper freezes it right after mount, so mount effects run once and nothing renders until the tap. On native the tree stays live until the tap.

So the question is what fires on a mount without focus. I went through every effect in ReportsSplitNavigator, ReportScreen, ReportFetchHandler, ReportActionsList, ReportFooter, useMarkAsRead, the composer and the sidebar. useIsFocused is false for a preloaded route, and most writes already sit behind it, including composer autofocus and the keypress handler. Three writes did not. OpenReport and the first ReadNewestAction are behind isInPreloadedTab now. The only other side effect is the Pusher leaving events subscription, which fires on every ReportScreen mount today and is read only. Render cost is in the PR description: one to two renders per background message on native, zero on web once frozen.

  1. isInPreloadedTab is the same shape as isFocused
    ReportFetchHandler already gates several effects on isFocused because a screen can be mounted while the user is elsewhere. Preload is one more reason for that, named. We also already pre mount before the user acts: usePreMountDestination and SearchRouterWarmup, both through the same Scheduler.scheduleWhenIdle.

  2. Fallback timer
    Agreed. The preload should not run through the 300ms starvation fallback. I will add an opt out to scheduleWhenIdle in the same push, so this call only runs at real idle. SearchRouterWarmup has the same issue, follow up.

  3. Catching what we did not think of
    The tap span already carries is_preloaded and waited_on_open_report. I will add a span around the preload dispatch itself, and reports_tab_preloaded on ManualAppStartup. Then we watch the first week on staging and production. If startup moves or the tap does not improve, we revert. If it holds, we keep it.

@BartekObudzinski

Copy link
Copy Markdown
Contributor Author

Pushed some small fixes to make this safer.

  • Don't start an open report span on the preloaded tap. Nothing would ever close it, because the list already rendered by then.
  • Replay the public room join when the tab opens. It used to get dropped, since the sign in it reacts to is only true for one render.
  • Move the mark as read hold below the reset flag, so a held pass can't leave a stale flag behind and make the next mark as read skip.

I also merged main and measured again, 5 runs each on the same commit.

With preload: 461ms average.
Without: 807ms average.

That's 347ms faster, about 43%

@BartekObudzinski

Copy link
Copy Markdown
Contributor Author

FYI I'm off tomorrow, coming back on Monday, try to find someone from CK to check if there is any action required

@mountiny

Copy link
Copy Markdown
Contributor

I feel like that is just a general concern with the preloading and we already use that elsewhere right @WojtekBoman @sumo-slonik so technically it's not a new pattern and I am not sure how to avoid these concerns you have @DylanDylann

@WojtekBoman

WojtekBoman commented Sep 18, 2026 •

Copy link
Copy Markdown
Contributor

I feel like that is just a general concern with the preloading and we already use that elsewhere right @WojtekBoman @sumo-slonik so technically it's not a new pattern and I am not sure how to avoid these concerns you have @DylanDylann

We previously used preloading, but this optimization mechanism was disabled after the introduction of TabNavigator. In the past, we had to push a new SplitNavigator onto the stack for every transition, whereas now we reuse them. The screen is mounted for the first time only when navigating to a specific tab, and this PR optimizes precisely that scenario.

The issue caused by the preloading mechanism is the CPU spike on web (fixed by #84025). I believe now the preloading should work better, in this version we're preloading only one tab and it happens on an idle callback.

Furthermore, when I worked on this topic, LHNOptionsList subscribed to whole Onyx collections at the list level, so mounting the LHN in the background subscribed to every report action, transaction and violation in the account at once. It has been optimized in #86227.

I think the main disadvantage is the fact that we're not freezing the Inbox on native platforms. It costs extra memory and users might not even open that page during their session, though I don't know how common those sessions are.
I'd also consider hiding it behind a beta so we can turn it off easily if any issues appear (but it's NAB).

That said, the gain here is clear, so I'm in favor of this change 🫡

The 300ms starvation fallback fires even on a busy thread, so the Reports tab mount could land
right where other flows were competing for it. Let callers opt out and wait for real idle.
@DylanDylann

DylanDylann commented Sep 21, 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
  • 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

Screen.Recording.2026-09-21.at.18.54.16.mov

@BartekObudzinski

Copy link
Copy Markdown
Contributor Author

I added the change you asked for. The preload now waits for real idle time, so it does not start from the 300ms fallback timer. Are you able to review the PR again? @DylanDylann

@DylanDylann DylanDylann left a comment

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.

Good to go

@melvin-bot
melvin-bot Bot requested a review from JS00001 September 21, 2026 11:55
Comment thread src/pages/inbox/ReportFetchHandler.tsx Resolved
@JS00001
JS00001 merged commit d9e09a1 into Expensify:main Sep 21, 2026
36 of 38 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

🚧 JS00001 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

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/JS00001 in version: 9.4.91-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes are required for this PR, so I did not create a draft docs PR.

This is a pure performance change. It preloads the Reports tab navigator so the first Inbox open runs the warm path. Nothing a help site reader sees changes: no new feature, no new setting, no renamed tab or button, and no copy.

What I checked

Every changed file is internal navigation, hooks, or tests — no src/languages/* file and no docs/ file is touched:

Read state is the one behavior worth calling out, and it is unchanged. Preloading the tab mounts ReportScreen on wide layouts, which would normally fire OpenReport and mark the report read before the user ever opened Inbox. The PR deliberately holds that call until the tab is actually opened, so a chat still becomes read at the moment the user opens it. That means Navigating-New-Expensify.md (Inbox tab, Unread filter and its count badge) and Prioritize-and-Pin-Chats.md (#focus, which depends on unread state) both stay accurate as written.

I also searched docs/articles for content describing tab loading, spinners, or preload behavior. The help site documents what each tab is for, not how fast it mounts, so there is nothing that this change makes stale.

If you would still like a docs PR for something specific here, tell me which article and what you want it to say and I will open one.

@BartekObudzinski — you asked me to close with "please review the linked help site PR and confirm it reflects the current behavior, then mark the linked help site PR Ready for review." There is no linked help site PR to review, because I found no docs that need updating. If you disagree, reply and I will open one.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.4.91-3 🚀

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

Bundle Size Analysis (Sentry):

return;
}

navigationRef.dispatch({...CommonActions.preload(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR), target});

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.

Heads up, coming from #101938.

This preload mounts ReportsSplitNavigator with only [Inbox] and no params. When the user later taps the Inbox tab on narrow layout, React Navigation dispatches NAVIGATE Inbox to the mounted navigator, SplitRouter turns it into popToTop(), and that returns null at index 0, logging "The 'state' or 'screen' passed in the params couldn't be applied to the navigator with the screens: 'Inbox', 'Report'."

Fixed in #103746.

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.

9 participants