fix: Login: Refreshing "Enter 2FA code" page shows empty Sign In screen

[mohammadjafarinejad]

Explanation of Change

clearStorageAndRedirect() was clearing CREDENTIALS and ACCOUNT from Onyx during the 2FA step, sending users back to an empty sign-in page on refresh. Added connectWithoutView listeners for SESSION and CREDENTIALS, and now preserve both Onyx keys when !authToken && !!validateCode (incomplete sign-in).

Fixed Issues

$ #82588
PROPOSAL: #82588 (comment)

Tests

1. Enable 2FA, go to staging, enter email + magic code to reach the 2FA screen.
2. Refresh — should still show the 2FA prompt (not a blank sign-in page).
3. Verify normal sign-out still clears credentials (no pre-filled email after signing out).

• Verify that no errors appear in the JS console

Offline tests

None, requires internet connection

QA Steps

Same as test.

• 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 verified there are no new alerts related to the canBeMissing param for useOnyx
• 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.mp4

Android: mWeb Chrome

android-web.mp4

iOS: Native

ios.mp4

iOS: mWeb Safari

ios-web.mp4

MacOS: Chrome / Safari

web.mp4

[codecov]

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/actions/SignInRedirect.ts	77.77% <80.00%> (+0.63%)	⬆️
... and 626 files with indirect coverage changes

[melvin-bot]

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

[github-actions]

PR Review — #83121

Summary: This PR preserves CREDENTIALS and ACCOUNT Onyx keys during clearStorageAndRedirect() when the user is mid-2FA sign-in (magic code entered, 2FA not yet completed), preventing a page refresh from sending them back to an empty sign-in screen.

What looks good

• Follows the established file pattern exactly: module-level variables + connectWithoutView + conditional preservation in keysToPreserve.
• Comment clearly explains the "why" for the conditional preservation.
• The condition !currentSessionAuthToken && !!currentCredentialsValidateCode is a reasonable heuristic for detecting the incomplete 2FA state.

Concerns

1. Credentials preserved during explicit sign-out (Medium severity)

When a user explicitly signs out via signOutAndRedirectToSignIn(), the server-side signOut() API is called first, which may clear or invalidate the session — but the module-level currentSessionAuthToken could already be undefined at that point (since Onyx clears it). If currentCredentialsValidateCode is still set (e.g., the user enabled 2FA, reached the 2FA screen, then chose to sign out), the isIncompleteSignIn condition would be true, and CREDENTIALS + ACCOUNT would be preserved through the sign-out. This means after an explicit sign-out, the user might see their email pre-filled on the sign-in page, which contradicts the test step: "Verify normal sign-out still clears credentials (no pre-filled email after signing out)."

Could you confirm that signOutAndRedirectToSignIn() calls the signOut() API (which clears session/credentials on the server) before redirectToSignIn() clears Onyx? If currentSessionAuthToken is still present when clearStorageAndRedirect runs during explicit sign-out, this concern would be resolved. But if the Onyx SESSION callback fires (setting currentSessionAuthToken = undefined) before clearStorageAndRedirect executes, the condition could incorrectly trigger.

2. validateCode may persist after completing sign-in (Low severity)

After the user successfully completes 2FA and receives a full authToken, is credentials.validateCode cleared from Onyx? If it persists indefinitely after a successful sign-in, then the isIncompleteSignIn condition would be false (because currentSessionAuthToken would be truthy), so it would not cause issues during normal sign-out. But it is worth verifying that the validateCode is cleaned up after successful authentication to keep the condition robust.

Verdict

The approach is sound and the code quality is good. The main area to verify is the interaction with explicit sign-out — specifically whether the Onyx SESSION callback could fire (clearing currentSessionAuthToken) before clearStorageAndRedirect runs during signOutAndRedirectToSignIn(), which would incorrectly preserve credentials.

[JmillsExpensify]

LGTM for product.