[Internal QA] Add missed cleanup after login as another user by s77rt · Pull Request #86673 · Expensify/App

s77rt · 2026-03-30T16:45:01Z

Explanation of Change

Usually when a user login we set a cleanup function

App/src/libs/Navigation/AppNavigator/AuthScreensInitHandler.tsx

Lines 145 to 147 in 71ea695

    
           return () => { 
        
               Session.cleanupSession(); 
        
           };

that runs after they log out which cancels outgoing requests and other clean up logic.

However, when we have a session already and we login as another user (this happens on supportal - and maybe on delegate access too) then that cleanup logic is not set and we return early

App/src/libs/Navigation/AppNavigator/AuthScreensInitHandler.tsx

Line 99 in 71ea695

return;

Now, if you login as another user (supportal into another account) then there may be a race condition where the requests of the previous user are still ongoing and their onyx data will merge afterwards. At this point although you are logged in as the second user, the UI may show some data from the previous user.

This PR adds the necessary cleanup logic so that when you supportal into another account, the requests of the previous account are cleared.

Fixed Issues

$ #83698
PROPOSAL:

Tests

Supportal into account A
Close tab
Supportal into account B
Go to workspaces and verify that the listed workspaces are only that of account B
Repeat test several times

Verify that no errors appear in the JS console

Offline tests

QA Steps

Internal

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

melvin-bot · 2026-03-30T16:45:16Z

@jjcoffee 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 · 2026-03-30T16:45:22Z

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

s77rt · 2026-03-30T18:00:19Z

@tgolen Do you want to test this?

tgolen · 2026-03-30T21:04:53Z

Sure, I will test it in a few minutes.

tgolen · 2026-03-30T22:07:01Z

I couldn't reproduce the original bug anymore, so you've either fixed it, or it's difficult to reproduce.

s77rt · 2026-03-30T23:55:06Z

It's kinda difficult to reproduce, I noticed that I can only reproduce if I first supportal into a heavy account then supportal into another lighter account. The OpenApp of the heavy account will take seconds and its data will merge after onyx is cleared. The bug reproduction is timing related. Using network throttling may help.

If you are still unable to reproduce, I think we should still merge the PR assuming the RCA and solution makes sense.

tgolen · 2026-03-31T15:15:33Z

Yep, I think we should go ahead and merge this, even if we can't reproduce it. Thanks!

s77rt · 2026-04-03T17:59:48Z

@tgolen Let's merge this

tgolen · 2026-04-04T03:38:16Z

I think this still needs a review from @jjcoffee

jjcoffee · 2026-04-06T08:10:34Z

Since this is Internal QA, does this need a full review or just blind approval?

s77rt · 2026-04-06T12:13:26Z

@jjcoffee You can review the code. As for testing you can try this alternative test to verify things didn't break

Have an account with copilot access to two other accounts
Copilote into first account
Open workspace and verify only workspaces of that account is displayed
Copilote into second account
Open workspace and verify only workspaces of that second account is displayed

jjcoffee · 2026-04-07T08:03:42Z

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 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-app-2026-04-07_10.34.11.mp4

Android: mWeb Chrome

android-chrome-2026-04-07_10.37.43.mp4

iOS: HybridApp

ios-app-2026-04-07_10.20.54.mp4

iOS: mWeb Safari

ios-safari-2026-04-07_10.22.49.mp4

MacOS: Chrome / Safari

desktop-chrome-2026-04-07_10.16.15.mp4

jjcoffee · 2026-04-07T08:04:24Z

@s77rt Can you merge main to see if it fixes the perf test?

jjcoffee

LGTM! Tests well and code change makes sense.

melvin-bot · 2026-04-07T08:39:32Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #83698 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

github-actions · 2026-04-08T00:27:22Z

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

github-actions · 2026-04-08T00:31:47Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #86673.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-e96892b-37e8f9e-4de43d6e576c0db900841da940005f39c9f5654f/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-e96892b-37e8f9e-4b0cf8fe5f6888fd7874d56be3e5c6638a6aaa3c/index.html

Web 🕸️
https://86673.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-08T00:37:04Z

✋ 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 · 2026-04-09T00:57:09Z

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 9.3.55-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-09T01:01:41Z

No help site changes are required for this PR.

This is an internal bug fix that adds a session cleanup callback during supportal transitions. It doesn't affect any user-facing features, UI, settings, or workflows documented in the help site.

OSBotify · 2026-04-10T00:47:27Z

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 9.3.57-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-10T00:48:31Z

No help site documentation changes are required for this PR.

This change is purely internal — it adds a Session.cleanupSession() callback when transitioning between user sessions (supportal). No user-facing features, settings, UI elements, or workflows are affected.

add missed cleanup when loggin-in as another user

da8107a

melvin-bot bot assigned s77rt Mar 30, 2026

s77rt marked this pull request as ready for review March 30, 2026 16:45

s77rt requested review from a team as code owners March 30, 2026 16:45

melvin-bot bot requested review from heyjennahay and jjcoffee and removed request for a team March 30, 2026 16:45

melvin-bot bot requested review from a team and sobitneupane March 30, 2026 16:45

melvin-bot bot removed the request for review from a team March 30, 2026 16:45

s77rt mentioned this pull request Mar 30, 2026

[$250] Support login shows workspaces from both support account and user account #83698

Open

7 tasks

jjcoffee approved these changes Apr 7, 2026

View reviewed changes

melvin-bot bot requested a review from aldo-expensify April 7, 2026 08:39

Merge branch 'main' into clean-session-callback-changed-user

c36fa0f

aldo-expensify approved these changes Apr 8, 2026

View reviewed changes

aldo-expensify merged commit e96892b into Expensify:main Apr 8, 2026
31 checks passed

OSBotify mentioned this pull request Apr 9, 2026

Deploy Checklist: New Expensify 2026-04-09 #87435

Open

66 tasks

Conversation

s77rt commented Mar 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 30, 2026

Uh oh!

melvin-bot bot commented Mar 30, 2026

Uh oh!

s77rt commented Mar 30, 2026

Uh oh!

tgolen commented Mar 30, 2026

Uh oh!

tgolen commented Mar 30, 2026

Uh oh!

s77rt commented Mar 30, 2026

Uh oh!

tgolen commented Mar 31, 2026

Uh oh!

s77rt commented Apr 3, 2026

Uh oh!

tgolen commented Apr 4, 2026

Uh oh!

jjcoffee commented Apr 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

s77rt commented Apr 6, 2026

Uh oh!

jjcoffee commented Apr 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

jjcoffee commented Apr 7, 2026

Uh oh!

jjcoffee left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Apr 7, 2026

Uh oh!

Uh oh!

github-actions bot commented Apr 8, 2026

Uh oh!

github-actions bot commented Apr 8, 2026

Uh oh!

OSBotify commented Apr 8, 2026

Uh oh!

OSBotify commented Apr 9, 2026

Uh oh!

MelvinBot commented Apr 9, 2026

Uh oh!

OSBotify commented Apr 10, 2026

Uh oh!

MelvinBot commented Apr 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

s77rt commented Mar 30, 2026 •

edited

Loading

jjcoffee commented Apr 6, 2026 •

edited

Loading

jjcoffee commented Apr 7, 2026 •

edited

Loading