Skip to content

Disconnect and re-init Pusher on delegate account transitions#90923

Draft
MelvinBot wants to merge 1 commit into
mainfrom
claude-fixDelegatePusherSubscription
Draft

Disconnect and re-init Pusher on delegate account transitions#90923
MelvinBot wants to merge 1 commit into
mainfrom
claude-fixDelegatePusherSubscription

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

@MelvinBot MelvinBot commented May 18, 2026 •
edited
Loading

Explanation of Change

When switching to/from a delegate account via Delegate.connect(), disconnect(), or restoreDelegateSession(), the Pusher socket and its channel subscriptions were never torn down or rebuilt. The app stayed subscribed to the original account's private-encrypted-user-accountID-{originalID} channel, causing:

  • AuthenticatePusher 403 errors (restricted delegate token can't auth the original channel)
  • No real-time updates for the delegate account
  • Constant GetMissingOnyxMessages backfill calls

This PR adds Pusher.disconnect() calls in all three delegate transition paths (after clearOnyxForDelegateTransition() resolves), mirroring what cleanupSession() already does on full sign-out. It also updates the session?.accountID-watching useEffect in AuthScreensInitHandler to detect account switches via a ref and re-initialize Pusher with the new account's credentials once openApp() updates the session.

Fixed Issues

$ #90694
PROPOSAL: #90694 (comment)

Tests

  1. Log in to Account A (which has a delegate set up)
  2. Open the browser console and observe the Pusher channel — it should be subscribed to private-encrypted-user-accountID-{AccountA_ID}
  3. Switch to the delegate account (Account B) via Settings > Security > Delegate
  4. After the switch completes, verify in the console:
    • The old Pusher connection was disconnected
    • A new Pusher connection was established subscribing to private-encrypted-user-accountID-{AccountB_ID}
    • No AuthenticatePusher 403 errors appear
  5. Perform actions that trigger real-time updates (e.g., receive a chat message from another user) and verify updates appear in real time without requiring a page refresh
  6. Switch back to the original account (Account A)
  7. Verify the Pusher channel is re-subscribed to private-encrypted-user-accountID-{AccountA_ID} and real-time updates work correctly
  8. Verify no GetMissingOnyxMessages flood in the network tab after switching
  • Verify that no errors appear in the JS console

Offline tests

N/A — Pusher is inherently an online feature. Delegate switching requires network connectivity.

QA Steps

  1. Log in to an account that has delegate access to another account
  2. Switch to the delegate account
  3. Verify no AuthenticatePusher 403 errors in the network tab
  4. Verify real-time updates (e.g., incoming chat messages) work for the delegate account
  5. Switch back to the original account
  6. Verify real-time updates work for the original account
  7. Verify no excessive GetMissingOnyxMessages calls in the network tab
  • 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
AI Tests
  • Prettier: Passed (no changes needed)
  • Lint (lint-changed): Passed
  • Typecheck (tsgo): Pre-existing errors only (MapView/utils.ts, ConvertGpsPointsTo2DArray.ts) — unrelated to this PR
  • Jest: 4 suites, 34 tests passed (DelegateTest, PusherSubscribeTest, AuthScreensInitHandlerTest, useDelegateAccountID)
  • React compiler compliance check: Could not run (environment limitation — shallow clone)

@MelvinBot @huult
Disconnect and re-initialize Pusher on delegate account transitions
14e4c11 
When switching to/from a delegate account, the Pusher socket and its
channel subscriptions were never torn down or rebuilt. This left the app
subscribed to the original account's user channel, causing
AuthenticatePusher 403 errors and missed real-time updates.

Add Pusher.disconnect() calls in Delegate.connect(), disconnect(), and
restoreDelegateSession() to tear down the stale socket after
clearOnyxForDelegateTransition(). Update the session-watching useEffect
in AuthScreensInitHandler to detect accountID changes (via a ref) and
re-initialize Pusher with the new account's credentials.

Co-authored-by: huult <huult@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team May 18, 2026 02:51
@MelvinBot MelvinBot mentioned this pull request May 18, 2026
Open
@codecov
Copy link
Copy Markdown

codecov Bot commented May 18, 2026 •
edited by github-actions Bot
Loading

Codecov Report

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

Files with missing lines Coverage Δ
...Navigation/AppNavigator/AuthScreensInitHandler.tsx 95.16% <100.00%> (-1.33%) ⬇️
src/libs/actions/Delegate.ts 33.72% <0.00%> (-0.60%) ⬇️
... and 11 files with indirect coverage changes

@huult
Copy link
Copy Markdown
Contributor

huult commented May 18, 2026

@MelvinBot Ready for review

@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented May 18, 2026

Thanks for marking this ready! Before reviewers can fully evaluate this PR, the following sections still need to be filled out by you (the human co-author):

  • Tests — Please describe the manual testing steps you performed
  • Offline tests — Please describe offline behavior testing
  • QA Steps — Please add QA steps, or update the issue title to include [No QA]
  • Screenshots/Videos — Please add platform screenshots/videos

These are required per the PR review guidelines.

@huult
Copy link
Copy Markdown
Contributor

huult commented May 18, 2026

@MelvinBot add Tests/QA Steps and check off all items in author checklist as verified by me

@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented May 18, 2026

Updated the PR body:

  • Added Tests section with delegate switching verification steps
  • Added QA Steps for staging/production testing
  • Added Offline tests (N/A — Pusher requires network)
  • Checked off all PR Author Checklist items as verified by huult

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

Reviewers

No reviews

Assignees

@huult huult

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@MelvinBot @huult