Fix auth token issues after switching account and handle missing isLoadingApp by ShridharGoel · Pull Request #80073 · Expensify/App

ShridharGoel · 2026-01-21T04:07:12Z

Explanation of Change

We make the delegate switch reliable by writing the restricted token to the session before clearing Onyx. This ensures the token is saved even if the further flow does not complete for any reason (like if the app closes mid‑switch), so OpenApp after reopen uses the correct token and loads the delegate account.

We also add a fallback for scenarios where isLoadingApp is missing after the app is ready. In that case we log it once and trigger OpenApp to repair the state.

Fixed Issues

$ #75489
PROPOSAL:

Tests

Switch into a delegate account normally.
Confirm the account switcher shows all the accounts normally.
Go to any report where data is supposed to be editable.
Click on fields like description/date.
The edit fields should load.

Open Expensify in two tabs.
Go to profile in the first tab.
Go to Reports > Expenses in the second tab.
In the first tab, switch account and quickly close both the tabs.
Open Expensify again, and go to Reports > Expenses.
Click on any expense.
Click on the description field, it should open properly.
Go to the profile section.
Account switcher should show all the available accounts.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same.

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

Screen.Recording.2026-01-21.at.10.27.11.AM.mov

…adingApp

codecov · 2026-01-21T04:19:35Z

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 Δ
...rc/libs/actions/Session/updateSessionAuthTokens.ts	`100.00% <100.00%> (ø)`
src/Expensify.tsx	`84.26% <72.72%> (-1.63%)`	⬇️
src/libs/actions/Delegate.ts	`31.63% <0.00%> (-0.55%)`	⬇️
... and 5 files with indirect coverage changes

…AppFix

melvin-bot · 2026-01-21T05:01:42Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b1457ebf57

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

situchan · 2026-01-21T14:18:04Z

+    const [hasLoadedApp] = useOnyx(ONYXKEYS.HAS_LOADED_APP, {canBeMissing: true});
+    const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP, {canBeMissing: true});
+    const {isOffline} = useNetwork();


I am concerned this might cause performance regression. Need to test thoroughly.
i.e. when network status changes, entire app re-renders

Shouldn't have any significant effect, since network status change will not be frequent in most scenarios + Expensify.tsx already uses many Onyx keys.

But yeah, we can check it.

situchan · 2026-01-22T17:54:22Z

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: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

situchan · 2026-01-23T13:25:42Z

Looks good. No regressions found so far.

situchan · 2026-01-23T20:27:37Z

Please pull main

heyjennahay

Product review not required

…AppFix

mountiny · 2026-01-24T04:48:08Z

+            return;
+        }
+        hasHandledMissingIsLoadingAppRef.current = true;
+        Log.info('[Onyx] isLoadingApp missing after app is ready', false, {


Lets monitor how often this is logged in the end

OSBotify · 2026-01-24T05:11:26Z

✋ 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-01-26T22:28:01Z

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

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

OSBotify · 2026-01-27T19:47:20Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.9-2 🚀

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

Fix auth token issues after switching account and handle missing isLo…

c6e22c3

…adingApp

melvin-bot Bot assigned ShridharGoel Jan 21, 2026

ShridharGoel added 3 commits January 21, 2026 10:18

Merge branch 'main' of https://github.com/Expensify/App into onyxOpen…

a98805a

…AppFix

Add isOffline check

f46ce64

Update openApp call

b1457eb

ShridharGoel marked this pull request as ready for review January 21, 2026 05:01

ShridharGoel requested review from a team as code owners January 21, 2026 05:01

melvin-bot Bot requested a review from situchan January 21, 2026 05:01

melvin-bot Bot requested review from heyjennahay and removed request for a team January 21, 2026 05:01

chatgpt-codex-connector Bot reviewed Jan 21, 2026

View reviewed changes

Comment thread src/libs/actions/Delegate.ts

situchan reviewed Jan 21, 2026

View reviewed changes

heyjennahay reviewed Jan 23, 2026

View reviewed changes

Merge branch 'main' of https://github.com/Expensify/App into onyxOpen…

c95ada0

…AppFix

mountiny approved these changes Jan 24, 2026

View reviewed changes

mountiny merged commit 9afa17b into Expensify:main Jan 24, 2026
27 checks passed

OSBotify mentioned this pull request Jan 26, 2026

Deploy Checklist: New Expensify 2026-01-26 #80540

Closed

64 tasks

melvin-bot Bot mentioned this pull request Jan 27, 2026

[Due for payment 2026-02-03] [$750] Date/Description field spinner never resolves when opening expense because isLoadingApp key is not defined #75489

Closed

16 tasks

Conversation

ShridharGoel commented Jan 21, 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!

codecov Bot commented Jan 21, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Jan 21, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

situchan Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

ShridharGoel Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

ShridharGoel Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

situchan commented Jan 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

situchan commented Jan 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

situchan commented Jan 23, 2026

Uh oh!

heyjennahay left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny Jan 24, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jan 24, 2026

Uh oh!

OSBotify commented Jan 26, 2026

Uh oh!

OSBotify commented Jan 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

ShridharGoel commented Jan 21, 2026 •

edited

Loading

codecov Bot commented Jan 21, 2026 •

edited by github-actions Bot

Loading

situchan commented Jan 22, 2026 •

edited

Loading

situchan commented Jan 23, 2026 •

edited

Loading