Skip to content

Fix doubled OpenApp on delegate (copilot) account switch#89254

Merged
mountiny merged 5 commits intoExpensify:mainfrom
callstack-internal:perf/fix-doubled-OpenApp
May 1, 2026
Merged

Fix doubled OpenApp on delegate (copilot) account switch#89254
mountiny merged 5 commits intoExpensify:mainfrom
callstack-internal:perf/fix-doubled-OpenApp

Conversation

@TMisiukiewicz
Copy link
Copy Markdown
Contributor

@TMisiukiewicz TMisiukiewicz commented Apr 30, 2026

Explanation of Change

When a user switches into a copilot/delegate account via the account switcher, OpenApp was firing twice — the first call resolves with skeletons visible, then a second OpenApp runs while skeletons are still visible, causing a noticeable double-loading experience on large accounts.

Two independent root causes, both fixed:

  1. NetworkState reconfigure path: The CONNECT_AS_DELEGATE response updates SESSION.accountID. The SESSION subscriber in NetworkState.ts called configureAndSubscribe() to rebuild the NetInfo subscription. Re-subscribing emits a synthetic null → true transition as NetInfo tears down its internal state during reconfigure, which the listener treated as a network recovery event → Reconnect.reconnect()openApp(). Fixed by adding a suppressNextReachabilityRestored flag that is set only on reconfigure calls (detected via unsubscribeNetInfo !== null at entry). The flag suppresses the synthetic post-reconfigure recovery transition and clears once reachability settles. Boot/normal behavior is unchanged.

  2. DelegateAccessHandler recovery effect path: Onyx.clear(KEYS_TO_PRESERVE_DELEGATE_ACCESS) preserved HAS_LOADED_APP=true but not IS_LOADING_APP. Right after the clear, the state was briefly hasLoadedApp=true && isLoadingApp=undefined — exactly the trigger for the recovery effect at src/DelegateAccessHandler.tsx:62, which fired its own openApp() in the few microtasks before openApp's optimistic data merged IS_LOADING_APP=true. Fixed via a new clearOnyxForDelegateTransition() helper that merges IS_LOADING_APP=true before clearing, so the post-clear render always sees IS_LOADING_APP=true. Used at all 4 call sites that previously called Onyx.clear(KEYS_TO_PRESERVE_DELEGATE_ACCESS) directly.

Test coverage added in tests/unit/NetworkStateReachabilityTest.ts (reconfigure suppression + regression guard for genuine offline→online after reconfigure) and tests/actions/DelegateTest.ts (helper test).

Fixed Issues

$ #89265
PROPOSAL:

Tests

  1. Sign in to an account that has copilot/delegate access configured.
  2. Open DevTools → Network tab and filter requests by OpenApp.
  3. Open the account switcher (top-left avatar) and switch into a copilot account that has a lot of data (so OpenApp takes a noticeable time to resolve).
  4. Verify exactly one OpenApp request fires in the Network tab — before the fix, two were observed (the second queued behind the first, running once the first resolved).
  5. Switch back to the original (delegator) account.
  6. Verify again that exactly one OpenApp request fires.
  7. Verify no errors appear in the JS console during any of the above.
  8. Verify the UI transitions cleanly from skeletons to loaded data (no flash / double-loading).
  • Verify that no errors appear in the JS console

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

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 30, 2026

Codecov Report

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

Files with missing lines Coverage Δ
src/libs/NetworkState.ts 92.09% <100.00%> (+0.42%) ⬆️
src/libs/actions/Session/index.ts 42.95% <0.00%> (ø)
src/libs/actions/Delegate.ts 34.31% <40.00%> (+0.78%) ⬆️
... and 12 files with indirect coverage changes

@TMisiukiewicz TMisiukiewicz marked this pull request as ready for review April 30, 2026 08:50
@TMisiukiewicz TMisiukiewicz requested review from a team as code owners April 30, 2026 08:50
@melvin-bot melvin-bot Bot requested review from abzokhattab and trjExpensify and removed request for a team April 30, 2026 08:50
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented Apr 30, 2026

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

Copy link
Copy Markdown

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

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: 4b95796dc0

ℹ️ 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/libs/NetworkState.ts
@abzokhattab
Copy link
Copy Markdown
Contributor

@MelvinBot review

@abzokhattab
Copy link
Copy Markdown
Contributor

@codex review

@MelvinBot
Copy link
Copy Markdown
Contributor

Code Review

Well-structured PR that correctly identifies and fixes two independent root causes. The two-layer defense (NetworkState suppression + Onyx transition helper) is the right approach.

Approve with minor suggestions.

Suggestions

  1. Narrow race window (low severity, acceptable): If a genuine network outage coincides exactly with a reconfigure (device goes offline and recovers in the ~100ms between configure() and the first NetInfo callback settling), the real recovery would be suppressed. This is self-healing (next ping cycle at 60s detects reachability), and the window is extremely narrow — acceptable tradeoff, but worth noting in a comment.

  2. Consider a test for false clearing the suppression flag: The tests cover the synthetic null→true suppression and the "real offline→online after settle" regression guard, but there's no test for a real false event arriving during the suppression window (before the synthetic true). That scenario should clear the flag (NetworkState.ts:338-339) and allow the subsequent true to fire recovery. A test would make this behavior explicit.

  3. Nit — prevIsInternetReachable is intentionally not reset on reconfigure: A brief comment at line ~277 noting this is intentional would help future readers. The existing prevIsInternetReachable !== true guard at line 328 already prevents spurious recovery when prev=true, and the suppression flag specifically handles the null→true synthetic pattern.

Detailed analysis

NetworkState fix — correct:

  • Flag is set only on reconfigure (detected via unsubscribeNetInfo !== null), leaving boot untouched.
  • Flag clears on the first definitive state (true or false), not on transient null/undefined — correct, because null is emitted during NetInfo teardown/rebuild.
  • The existing prevIsInternetReachable !== undefined boot guard is unaffected.

clearOnyxForDelegateTransition — correct:

  • Onyx.merge(IS_LOADING_APP, true) followed by Onyx.clear([...KEYS_TO_PRESERVE, IS_LOADING_APP]) ensures IS_LOADING_APP is preserved as true through the clear.
  • IS_LOADING_APP has no registered default in initialKeyStates, so no conflict between preservation and default-reset logic.
  • All 4 call sites (connect, disconnect, restoreDelegateSession, setupNewDotAfterTransitionFromOldDot) are updated.

Tests — solid:

  • DelegateTest.ts verifies three key post-conditions: IS_LOADING_APP === true, HAS_LOADED_APP === true (preserved), non-preserved key cleared.
  • NetworkStateReachabilityTest.ts covers both suppression and the regression guard (real offline→online after reconfigure fires correctly).

@chatgpt-codex-connector
Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Keep it up!

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

@TMisiukiewicz
Copy link
Copy Markdown
Contributor Author

Code Review

Well-structured PR that correctly identifies and fixes two independent root causes. The two-layer defense (NetworkState suppression + Onyx transition helper) is the right approach.

Approve with minor suggestions.

Suggestions

  1. Narrow race window (low severity, acceptable): If a genuine network outage coincides exactly with a reconfigure (device goes offline and recovers in the ~100ms between configure() and the first NetInfo callback settling), the real recovery would be suppressed. This is self-healing (next ping cycle at 60s detects reachability), and the window is extremely narrow — acceptable tradeoff, but worth noting in a comment.
  2. Consider a test for false clearing the suppression flag: The tests cover the synthetic null→true suppression and the "real offline→online after settle" regression guard, but there's no test for a real false event arriving during the suppression window (before the synthetic true). That scenario should clear the flag (NetworkState.ts:338-339) and allow the subsequent true to fire recovery. A test would make this behavior explicit.
  3. Nit — prevIsInternetReachable is intentionally not reset on reconfigure: A brief comment at line ~277 noting this is intentional would help future readers. The existing prevIsInternetReachable !== true guard at line 328 already prevents spurious recovery when prev=true, and the suppression flag specifically handles the null→true synthetic pattern.

Detailed analysis

  1. No action needed here
  2. The flag-clearing path is already covered by the existing "genuine offline→online after a SESSION reconfigure"
  3. Inlined comments at the reconfigure site already explain why prev is intentionally not reset

@mountiny
Copy link
Copy Markdown
Contributor

@MelvinBot please create new dedicated App issuefor this PR and assign mountiny and the pull reuqest author. Link the issue here

@mountiny
Copy link
Copy Markdown
Contributor

@abzokhattab can you please prioritize the review? Thanks

@MelvinBot
Copy link
Copy Markdown
Contributor

🤖 Created dedicated issue: #89265 — assigned to mountiny and TMisiukiewicz.

@abzokhattab
Copy link
Copy Markdown
Contributor

reviewing it

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Fixes a double-OpenApp request when switching into a copilot/delegate account by preventing two separate “recovery” paths from triggering an extra reconnect/open sequence.

Changes:

  • Add a reconfigure-only suppression window in NetworkState to ignore NetInfo’s synthetic post-reconfigure reachability “recovery”.
  • Introduce clearOnyxForDelegateTransition() to preserve IS_LOADING_APP=true across delegate-transition Onyx.clear() so DelegateAccessHandler doesn’t trigger a duplicate openApp().
  • Add/extend unit tests to cover the reconfigure suppression behavior and the new Onyx-clear helper behavior.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
src/libs/NetworkState.ts Suppresses synthetic reachability-restored events after NetInfo reconfigure to avoid unwanted reconnect/openApp.
src/libs/actions/Delegate.ts Adds clearOnyxForDelegateTransition() and updates delegate flows to use it.
src/libs/actions/Session/index.ts Uses clearOnyxForDelegateTransition() during OldDot→NewDot delegate switch flow.
tests/unit/NetworkStateReachabilityTest.ts Adds regression tests for reconfigure suppression and real outage recovery behavior.
tests/actions/DelegateTest.ts Adds a unit test for clearOnyxForDelegateTransition() preserving IS_LOADING_APP and clearing non-preserved keys.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +163 to +164
// resets prev to undefined on reconfigure so the new subscription's first transitions
// are treated like boot, not recovery.
Comment thread src/libs/actions/Delegate.ts
@abzokhattab
Copy link
Copy Markdown
Contributor

abzokhattab commented Apr 30, 2026

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
Screen.Recording.2026-04-30.at.17.52.28.mov
Android: mWeb Chrome
Screen.Recording.2026-04-30.at.17.56.26.mov
iOS: HybridApp
Screen.Recording.2026-04-30.at.17.50.21.mov

iOS: mWeb Safari

Screen.Recording.2026-04-30.at.17.56.26.mov
MacOS: Chrome / Safari
Screen.Recording.2026-04-30.at.17.48.18.mov

Copy link
Copy Markdown
Contributor

@abzokhattab abzokhattab left a comment

Choose a reason for hiding this comment

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

LGTM 🚀🚀

@github-actions
Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

Copy link
Copy Markdown
Contributor

@trjExpensify trjExpensify left a comment

Choose a reason for hiding this comment

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

Definitely seems roughly twice as fast to switch to me when comparing against staging.

Adhoc build:

2026-04-30_23-43-08.mp4

Staging:

2026-04-30_23-43-58.mp4

Copy link
Copy Markdown
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Great! Thanks for such a quick fix

@mountiny mountiny merged commit 14a7d1b into Expensify:main May 1, 2026
55 of 57 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 1, 2026

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

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented May 1, 2026

✋ 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

OSBotify commented May 4, 2026

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

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

@MelvinBot
Copy link
Copy Markdown
Contributor

No help site changes are required for this PR.

This is a purely internal performance fix that prevents OpenApp from firing twice during delegate/copilot account switching. The changes are limited to network state suppression logic (NetworkState.ts), an Onyx clear helper (Delegate.ts), and its usage in Session/index.ts — plus associated tests. There are no user-facing feature changes, UI modifications, or workflow changes that would need to be reflected in the help site documentation.

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.

7 participants