Skip to content

Decompose Expensify.tsx from delegate access, Fullstory init, screen share and priority mode#83307

Merged
mountiny merged 6 commits into
Expensify:mainfrom
callstack-internal:decompose-findings-2
Feb 24, 2026
Merged

Decompose Expensify.tsx from delegate access, Fullstory init, screen share and priority mode#83307
mountiny merged 6 commits into
Expensify:mainfrom
callstack-internal:decompose-findings-2

Conversation

@adhorodyski

@adhorodyski adhorodyski commented Feb 24, 2026

Copy link
Copy Markdown
Contributor

@mountiny @rlinoz

Explanation of Change

TLDR: this change improves React rendering at the root of the app by ~5%, making eg. report opening faster.
Tests I conducted: refreshed the app (from scratch) while on the same report.


This PR reduces root-level Onyx subscriptions in Expensify.tsx from 14 down to 6 by extracting 8 subscriptions into three isolated renderless components. Previously, every change to keys like ACCOUNT, USER_METADATA, or SCREEN_SHARE_REQUEST would cause a full re-render of the root Expensify component — including the entire navigation tree (NavigationRoot). By moving these subscriptions into dedicated components, their state changes are now scoped and do not bubble up to trigger unnecessary re-renders of the navigation tree.

Three new renderless components were created:

  • src/DelegateAccessHandler.tsx — Owns 5 subscriptions (ACCOUNT, STASHED_CREDENTIALS, STASHED_SESSION, HAS_LOADED_APP, IS_LOADING_APP) plus the delegate disconnect/mismatch logging and isLoadingApp recovery effects that previously lived in Expensify.tsx.
  • src/FullstoryInitHandler.tsx — Owns the USER_METADATA subscription and handles Fullstory initialization and Sentry context setting.
  • src/components/ScreenShareRequestModal.tsx — Owns the SCREEN_SHARE_REQUEST subscription and renders the ConfirmModal for screen-share requests from GuidesPlus agents.
  • src/PriorityModeHandler.tsx — Decompose Expensify.tsx: extract PriorityModeHandler.

Expensify.tsx was updated to use a narrowed accountIDSelector on SESSION (instead of subscribing to the full session object), remove all moved subscriptions, remove useNetwork(), drop now-unused imports, and clean up the propsToLog object and ExpensifyProps type.

This follows the same pattern as the prior DeepLinkHandler extraction, which demonstrated a 10–35% render performance improvement.

trace-report.txt

Screenshot 2026-02-24 at 11 42 02

before:
Screenshot 2026-02-24 at 11 30 40

after:
Screenshot 2026-02-24 at 11 29 22

Fixed Issues

$ #74367
$ #77173
$ #84149
PROPOSAL:

Tests

  1. Open up EApp.
  2. Validate that Fullstory still initiates correctly.
  3. Validate that DelegateAccess still works.
  4. Validate that the ScreenShareRequestModal opens up correctly with a guide request.
  5. Validate that changing priority mode calls openApp.

Offline tests

N/A

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

@adhorodyski adhorodyski changed the title [No QA] Decompose Expensify.tsx: extract renderless handlers for delegate access, Fullstory init, and screen share Decompose Expensify.tsx from delegate access, Fullstory init, and screen share Feb 24, 2026
@codecov

codecov Bot commented Feb 24, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/Expensify.tsx 88.79% <100.00%> (+4.94%) ⬆️
src/FullstoryInitHandler.tsx 100.00% <100.00%> (ø)
src/PriorityModeHandler.tsx 100.00% <ø> (ø)
src/hooks/useIsAuthenticated.tsx 100.00% <100.00%> (ø)
src/selectors/Session.ts 100.00% <100.00%> (ø)
src/DelegateAccessHandler.tsx 94.11% <94.11%> (ø)
src/components/ScreenShareRequestModal.tsx 14.28% <14.28%> (ø)
... and 8 files with indirect coverage changes

Replace `import * as User` with named imports to comply with
the no-restricted-syntax rule for @userActions.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Comment thread src/Expensify.tsx

if (splashScreenState === CONST.BOOT_SPLASH_STATE.VISIBLE) {
const propsToLog: Omit<ExpensifyProps & {isAuthenticated: boolean}, 'children' | 'session'> = {
const propsToLog = {

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.

I highly doubt this is useful to anyone. We can completely remove it or accept this strip.

@adhorodyski adhorodyski marked this pull request as ready for review February 24, 2026 10:51
@adhorodyski adhorodyski requested review from a team as code owners February 24, 2026 10:51
@melvin-bot melvin-bot Bot requested review from a team, Krishna2323 and heyjennahay and removed request for a team February 24, 2026 10:51
@melvin-bot

melvin-bot Bot commented Feb 24, 2026

Copy link
Copy Markdown

@Krishna2323 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 Julesssss and suneox and removed request for a team February 24, 2026 10:51
@melvin-bot

melvin-bot Bot commented Feb 24, 2026

Copy link
Copy Markdown

@suneox @Julesssss One of you needs to 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

Copy link
Copy Markdown
Contributor

Will be reviewing this in 30mins.

Comment thread src/DelegateAccessHandler.tsx
@Krishna2323

Copy link
Copy Markdown
Contributor

Reviewing...

@adhorodyski adhorodyski changed the title Decompose Expensify.tsx from delegate access, Fullstory init, and screen share Decompose Expensify.tsx from delegate access, Fullstory init, screen share and priority mode Feb 24, 2026
Isolate NVP_PRIORITY_MODE and COLLECTION.REPORT_DRAFT_COMMENT Onyx
subscriptions into a render-null handler component so changes to these
keys no longer re-render the entire Expensify component tree.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Comment thread src/Expensify.tsx
const [account] = useOnyx(ONYXKEYS.ACCOUNT);
const [session] = useOnyx(ONYXKEYS.SESSION);
const {preferredLocale} = useLocalize();
const [accountID] = useOnyx(ONYXKEYS.SESSION, {selector: accountIDSelector});

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 are now using selector for accountID but the component uses useIsAuthenticated on line 121 which subscribes to the full SESSION object. We can update useIsAuthenticated to use a selector (e.g., session?.authToken) so this component only re-renders when authToken actually changes.

This isn't something introduced by this PR, but it's a missed opportunity since the PR's goal is reducing root-level re-renders.

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.

fair, on it!

Comment thread src/DelegateAccessHandler.tsx
@adhorodyski

adhorodyski commented Feb 24, 2026

Copy link
Copy Markdown
Contributor Author

Sorry for last minute changes, pushed just one small further improvement that removes even more renders (PriorityModeHandler). No more changes to come.

@mountiny

Copy link
Copy Markdown
Contributor

@codex review

@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: 4199d88516

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

Comment thread src/Expensify.tsx
Add authTokenSelector to Session selectors and use it in useIsAuthenticated
to avoid re-renders on unrelated session field changes.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@Krishna2323

Krishna2323 commented Feb 24, 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_native.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: HybridApp
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome_1.mp4
web_chrome_3.mp4
web_chrome_2.mp4

@Krishna2323

Copy link
Copy Markdown
Contributor

I'm still working on the platform videos, will be done in 15mins

Comment thread src/components/ScreenShareRequestModal.tsx

@Krishna2323 Krishna2323 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.

LGTM and tests well! 🚀

The failing test doesn’t seem related. @adhorodyski, could you please confirm? Thanks!

@melvin-bot melvin-bot Bot requested a review from mountiny February 24, 2026 14:03
@adhorodyski

Copy link
Copy Markdown
Contributor Author

yeah just github's issues, resyncing now

@mountiny mountiny 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.

LGTM, thank you, going to move this ahead to avoid conflicts

@mountiny mountiny merged commit 0f4f47d into Expensify:main Feb 24, 2026
30 checks passed
@adhorodyski adhorodyski deleted the decompose-findings-2 branch February 24, 2026 15:32
@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.

@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

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

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

@izarutskaya

Copy link
Copy Markdown

Hi @adhorodyski QA team can't check Fullstory. Could you please validate it internally? Thank you in advance

@mountiny

Copy link
Copy Markdown
Contributor

@izarutskaya Yeah will do

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.3.26-8 🚀

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

@adhorodyski

Copy link
Copy Markdown
Contributor Author

Everything operational so far, thanks

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.

5 participants