Fix copilot still persists by bernhardoj · Pull Request #69754 · Expensify/App

bernhardoj · 2025-09-03T10:00:54Z

Explanation of Change

Fixed Issues

$ #69133
PROPOSAL: #69133 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Prerequisite:

As User A, add User B as a copilot
Enable Debug mode and Use staging server

As User B, copilot into user A
Sign out
Login as User A
Verify the account is not in copilot mode anymore
Verify Debug mode and Use staging server are still enabled

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mp4

Android: mWeb Chrome

android.mweb.mp4

iOS: Native

ios.mp4

iOS: mWeb Safari

ios.mweb.mp4

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

desktop.mp4

melvin-bot · 2025-09-03T10:01:00Z

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

bernhardoj · 2025-09-03T10:23:53Z

I'm still having trouble running the app on Android native.

trjExpensify

No qualms for the product, nice catch.

hoangzinh · 2025-09-04T08:24:58Z

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

Screen.Recording.2025-09-06.at.21.43.15.android.mov

Android: mWeb Chrome

Screen.Recording.2025-09-06.at.21.50.35.andoir.chrome.mov

iOS: HybridApp

Screen.Recording.2025-09-07.at.13.42.34.ios.mov

iOS: mWeb Safari

Screen.Recording.2025-09-06.at.21.55.06.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2025-09-06.at.17.23.00.web.mov

MacOS: Desktop

Screen.Recording.2025-09-06.at.17.37.07.desktop.mov

bernhardoj · 2025-09-04T11:58:08Z

@hoangzinh regarding this one

we have to update code in both ND and Hybrid repos

will you handle the Hybrid code? Is it after this PR?

hoangzinh · 2025-09-04T13:26:25Z

@bernhardoj I will try to make a Hybrid PR in meanwhile. I think those PRs should merge together.

bernhardoj · 2025-09-04T13:33:15Z

Got it. Thanks!

hoangzinh

Can you also update type here

App/src/libs/actions/HybridApp/types.ts

Line 8 in 4387538

[ONYXKEYS.ACCOUNT]?: {shouldUseStagingServer: boolean};

hoangzinh · 2025-09-04T13:29:58Z

src/libs/actions/App.ts

    ONYXKEYS.PRESERVED_USER_SESSION,
    ONYXKEYS.HYBRID_APP,
+    ONYXKEYS.SHOULD_USE_STAGING_SERVER,
+    ONYXKEYS.IS_DEBUG_MODE_ENABLED,


We can only include ONYXKEYS.SHOULD_USE_STAGING_SERVER into KEYS_TO_PRESERVE list

ONYXKEYS.IS_DEBUG_MODE_ENABLED seems isn't kept after clear Onyx or signin/signout.

Just tested, and the debug mode is persisted.

w.mp4

Can you try to test when turn-on both Debug mode and "Use staging server"?

Screen.Recording.2025-09-04.at.22.28.23.mov

Oh yeah, that's really weird. Don't you think it's more like a bug, no? Like, why should the debug mode be turned off only if the staging server is on?

Oh, that's because of this

App/src/libs/actions/App.ts

Lines 641 to 643 in 3a05f5b

if (shouldUseStagingServer) {

Onyx.set(ONYXKEYS.ACCOUNT, {shouldUseStagingServer});

}

If the staging server is previously on, after Onyx.clear, we re-set the shouldUseStagingServer using Onyx.set. Not sure why this is needed because we already put ACCOUNT in KEYS_TO_PRESERVE.

@Julesssss, what are your thoughts on IS_DEBUG_MODE_ENABLED? It looks like we don't intend to keep this data when switching between OD-ND app, or sign in/out, or resetting Onyx data. Thus, I suggested we can remove it from KEYS_TO_PRESERVE list, but if you think we can leave them as the current implementation of this PR, I'm happy to keep them in the list. It's a troubleshooting config, thus I'm 50:50 on this.

Good spot. So there does seem to be good reason for keeping the staging flag, presumably for testing (original issue).

Not sure why this is needed because we already put ACCOUNT in KEYS_TO_PRESERVE.

So do you think that makes the shouldUseStagingServer condition redundant?

But yeah, similar to the staging env config, I think we should keep IS_DEBUG_MODE_ENABLED to allow us to test/debug flows that include signout.

hoangzinh · 2025-09-04T13:40:00Z

src/libs/actions/Delegate.ts

    ONYXKEYS.IS_SIDEBAR_LOADED,
    ONYXKEYS.NETWORK,
+    ONYXKEYS.SHOULD_USE_STAGING_SERVER,
+    ONYXKEYS.IS_DEBUG_MODE_ENABLED,


Same here, we can remove ONYXKEYS.IS_DEBUG_MODE_ENABLED. We can add back when it's nesessary.

Same as above, I think we should preserve this too.

hoangzinh · 2025-09-04T13:40:07Z

src/libs/actions/SignInRedirect.ts

    keysToPreserve.push(ONYXKEYS.DEVICE_ID);
-    keysToPreserve.push(ONYXKEYS.ACCOUNT);
+    keysToPreserve.push(ONYXKEYS.SHOULD_USE_STAGING_SERVER);
+    keysToPreserve.push(ONYXKEYS.IS_DEBUG_MODE_ENABLED);


Same here, we can remove ONYXKEYS.IS_DEBUG_MODE_ENABLED. We can add back when it's nesessary.

src/pages/ProfilePage.tsx

src/pages/ReportDetailsPage.tsx

bernhardoj · 2025-09-04T14:20:20Z

Can you also update type here
[ONYXKEYS.ACCOUNT]?: {shouldUseStagingServer: boolean};

Should I update to this?

[ONYXKEYS.SHOULD_USE_STAGING_SERVER]?: boolean;

hoangzinh · 2025-09-04T14:39:42Z

Yes, I think so.

bernhardoj · 2025-09-04T15:11:24Z

Done

hoangzinh · 2025-09-04T15:30:56Z

Hybrid PR is here https://github.com/Expensify/Mobile-Expensify/pull/13681

github-actions · 2025-09-05T17:12:54Z

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

github-actions · 2025-09-05T18:04:20Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪
Built from App PR #69754 Mobile-Expensify PR Expensify/Mobile-Expensify#13681.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/69754/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/69754/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/69754/NewExpensify.dmg	https://69754.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

hoangzinh · 2025-09-06T09:03:32Z

Thanks for confirming, @Julesssss. I will try to complete PR checklist today. @bernhardoj, how is it going with Android build?

bernhardoj · 2025-09-06T16:13:50Z

@hoangzinh just tried cleaning up and it worked. Added the recording!

hoangzinh

LGTM

OSBotify · 2025-09-09T03:28:04Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.2.3-0 🚀

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

OSBotify · 2025-09-09T18:19:50Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.2.5-0 🚀

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

OSBotify · 2025-09-09T21:21:48Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.2.8-0 🚀

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

OSBotify · 2025-09-10T22:59:44Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.2.8-4 🚀

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

bernhardoj added 2 commits September 3, 2025 17:33

fix account data is still persisted after log out

bddf03c

preserve use staging server and debug mode when switching copilot

d541899

bernhardoj requested review from a team as code owners September 3, 2025 10:00

melvin-bot bot assigned bernhardoj Sep 3, 2025

melvin-bot bot requested a review from hoangzinh September 3, 2025 10:00

melvin-bot bot removed the request for review from a team September 3, 2025 10:01

trjExpensify previously approved these changes Sep 3, 2025

View reviewed changes

Merge branch 'main' into fix/69133-copilot-still-persists

27f58be

bernhardoj dismissed trjExpensify’s stale review via 27f58be September 4, 2025 04:09

fix canBeMissing

65f281b

Merge branch 'main' into fix/69133-copilot-still-persists

12de25e

hoangzinh reviewed Sep 4, 2025

View reviewed changes

set default value

0cd9cf9

update type

14a6a4e

Merge branch 'main' into fix/69133-copilot-still-persists

42d3590

hoangzinh approved these changes Sep 7, 2025

View reviewed changes

melvin-bot bot requested a review from Julesssss September 7, 2025 06:45

Julesssss approved these changes Sep 8, 2025

View reviewed changes

Julesssss merged commit 0720808 into Expensify:main Sep 8, 2025
20 checks passed

github-actions bot mentioned this pull request Sep 8, 2025

Investigate workflow job failing on main: test / test (job 3) #70123

Closed

OSBotify mentioned this pull request Sep 9, 2025

Deploy Checklist: New Expensify 2025-09-09 #70157

Closed

83 tasks

dariusz-biela mentioned this pull request Sep 9, 2025

Removes the use of preservedShouldUseStagingServer from the clearOnyxAndResetApp function #69662

Closed

51 tasks

melvin-bot bot mentioned this pull request Sep 10, 2025

[Due for payment 2025-09-17] [$250] Copilot - Copilot mode persists after logout and re-login as regular user #69133

Closed

8 tasks

	if (shouldUseStagingServer) {
	Onyx.set(ONYXKEYS.ACCOUNT, {shouldUseStagingServer});
	}

Conversation

bernhardoj commented Sep 3, 2025 • 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 Sep 3, 2025

Uh oh!

bernhardoj commented Sep 3, 2025

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Sep 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

bernhardoj commented Sep 4, 2025

Uh oh!

hoangzinh commented Sep 4, 2025

Uh oh!

bernhardoj commented Sep 4, 2025

Uh oh!

hoangzinh left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bernhardoj commented Sep 4, 2025

Uh oh!

hoangzinh commented Sep 4, 2025

Uh oh!

bernhardoj commented Sep 4, 2025

Uh oh!

hoangzinh commented Sep 4, 2025

Uh oh!

github-actions bot commented Sep 5, 2025

Uh oh!

github-actions bot commented Sep 5, 2025

Uh oh!

hoangzinh commented Sep 6, 2025

Uh oh!

bernhardoj commented Sep 6, 2025

Uh oh!

hoangzinh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Sep 9, 2025

Uh oh!

OSBotify commented Sep 9, 2025

Uh oh!

bernhardoj commented Sep 3, 2025 •

edited

Loading

hoangzinh commented Sep 4, 2025 •

edited

Loading