Preserve any passkeys in onyx when clearing the cache or logging out by rafecolton · Pull Request #86059 · Expensify/App

rafecolton · 2026-03-22T21:16:15Z

Hold for Expensify/react-native-onyx#759

Explanation of Change

Preserve passkey credential IDs when clearing Onyx cache. This matches the behavior of mobile native keys, which are similarly preserved through logout. The values are verified server-side and attached to an accountID, so there is no risk in storing them or in them being accessed by another account. This alleviates the need for frequent re-registration on the same browser.

cc @chuckdries @dariusz-biela

Fixed Issues

$ #86005
PROPOSAL: N/A

Tests

Register for a passkey by going through the Test flow in the Troubleshoot menu on web
Log out and back in
Go back to the Troubleshoot menu. Confirm the device is still listed as registered, and the Test button prompts for authentication only once (i.e. authenticate flow, not registration flow)

Verify that no errors appear in the JS console

Offline tests

N/A, online only

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

Screen.Recording.2026-03-22.at.2.14.23.PM.mov

dariusz-biela

The code looks good.

I checked it, and it covers all cases where onyx is cleared that weren't previously handled by KEYS_TO_PRESERVE.

I'm waiting for the merge PR with the manual tests [HOLD react-native-onyx#759]

…ection

To include Expensify/react-native-onyx#759

melvin-bot · 2026-03-23T18:43:31Z

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

codecov · 2026-03-23T18:51:51Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/actions/Delegate.ts	`31.63% <ø> (ø)`
src/libs/actions/Session/index.ts	`43.63% <ø> (ø)`
src/libs/actions/SignInRedirect.ts	`78.26% <100.00%> (+0.48%)`	⬆️
...ponents/MultifactorAuthentication/Context/Main.tsx	`12.56% <0.00%> (ø)`
... and 13 files with indirect coverage changes

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: cb14a626cc

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

src/libs/actions/SignInRedirect.ts

chuckdries · 2026-03-23T22:00:07Z

Looks like some kind of state issue in the case where the user signs out, then immediately signs back in, without refreshing the page. Registration gets stuck on the soft prompt. Perhaps we need to preserve hasEverRegisteredForMultifactorAuthentication as well?

macos chrome

app.pr.first.run.after.login.gets.stuck.mp4

rafecolton · 2026-03-23T23:00:20Z

Hmm, I am getting the same error 🤔

…ection

The first time through this flow, `deviceBiometricsState?.hasAcceptedSoftPrompt` hasn't loaded from onyx yet, so we re-enter the soft prompt, but then `softPromptApproved` _has_ loaded and prevents the button from showing. To fix this, use `softPromptApproved` as a gate too, so the first time through, we don't get stuck

rafecolton · 2026-03-24T00:54:03Z

Alright @chuckdries, I pushed a fix to the bug you described. Claude claims the same issue existed for mobile native and the fix applies there too, but I was not able to reproduce the issue on Android, only on web with passkey.

Edit: I'm not sure it's quite right actually. I think we shouldn't be showing the soft prompt at all once you're registered unless you fully uninstall the app / manually delete the passkey entry out of onyx. Exploring a little more.

rafecolton · 2026-03-24T01:16:06Z

Here's a video showing the bug is fixed:

Screen.Recording.2026-03-23.at.5.56.21.PM.mov

dariusz-biela · 2026-03-24T10:30:12Z

src/components/MultifactorAuthentication/Context/Main.tsx

+        // delete and reinstall the app. Their keys are preserved in the secure store, but they'll be shown
+        // the "do you want to enable Face ID" system prompt again, so we want to ensure they see the soft
+        // prompt first.
+        if (!deviceBiometricsState?.hasAcceptedSoftPrompt && !softPromptApproved) {


I checked it, and the fix works.

However, I noticed one more bug.

When we have passkeys registered and log in again, a soft prompt appears, but according to the design, we should be taken directly to the authorization screen.

In my opinion, we should add something like this:

const areLocalCredentialsKnownToServer = await biometrics.areLocalCredentialsKnownToServer(); const isRegistrationRequired = !areLocalCredentialsKnownToServer && !isRegistrationComplete; if (isRegistrationRequired && !deviceBiometricsState?.hasAcceptedSoftPrompt && !softPromptApproved) {

chuckdries

I agree with Dariusz that ideally we would not show the soft prompt to the user in this flow, but I don't think it's that big a deal and it fixes the bug, so I'm approving

chuckdries · 2026-03-24T14:29:32Z

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

passkey.preserve.works.android.chrome.mp4

iOS: mWeb Safari

passkey.preserve.works.ios.safari.mp4

MacOS: Chrome / Safari

passkey.preserve.works.chrome.mp4

Julesssss · 2026-03-24T17:56:00Z

@chuckdries @dariusz-biela is this ready to be merged? (asking as we have perf improvements held on this)

chuckdries · 2026-03-24T19:41:07Z

@Julesssss We talked it over in slack and Rafe wanted to see if we could improve the behavior for this flow. Are you just holding to bring in the Onyx upgrade? We're happy to rebase if someone else upgrades Onyx to or above the version we need, no need to hold on that on our account.

rafecolton · 2026-03-24T19:52:06Z

We can also merge and make the other changes as a follow up

rafecolton · 2026-03-24T19:53:05Z

I'd rather not rebase over other onyx changes in case those end up getting reverted

rafecolton · 2026-03-24T22:27:25Z

Since this solves the core issue and other PRs are blocked waiting to bump the version of react-native-onyx, I'm going to merge this now and address Dariusz's feedback as a separate, followup issue.

github-actions · 2026-03-24T22:28:12Z

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

github-actions · 2026-03-24T22:34:33Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-3c51463-2cd04ad-1382b0bf72193e54416bf222ba15cf8f611277f4/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-3c51463-2cd04ad-7ada591b2d8385436f5465ba1574f2514a30dadb/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-24T22:36:55Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

Preserve any passkeys in onyx when clearing the cache or logging out

8d8b425

melvin-bot bot assigned rafecolton Mar 22, 2026

dariusz-biela reviewed Mar 23, 2026

View reviewed changes

rafecolton added 2 commits March 23, 2026 11:23

Merge remote-tracking branch 'origin/main' into preserve-passkey-coll…

74afd4c

…ection

Update react-native-onyx to 3.0.51

cb14a62

To include Expensify/react-native-onyx#759

rafecolton changed the title ~~[HOLD react-native-onyx#759] Preserve any passkeys in onyx when clearing the cache or logging out~~ Preserve any passkeys in onyx when clearing the cache or logging out Mar 23, 2026

rafecolton marked this pull request as ready for review March 23, 2026 18:43

rafecolton requested review from a team as code owners March 23, 2026 18:43

melvin-bot bot requested a review from ShridharGoel March 23, 2026 18:43

melvin-bot bot requested review from trjExpensify and removed request for a team March 23, 2026 18:43

rafecolton requested review from chuckdries and removed request for ShridharGoel and trjExpensify March 23, 2026 18:45

chatgpt-codex-connector bot reviewed Mar 23, 2026

View reviewed changes

src/libs/actions/SignInRedirect.ts Show resolved Hide resolved

rafecolton added 2 commits March 23, 2026 16:03

Merge remote-tracking branch 'origin/main' into preserve-passkey-coll…

49a177b

…ection

Reformat comment

f6f0876

situchan mentioned this pull request Mar 24, 2026

Bump Onyx to 3.0.52 #85210

Open

53 tasks

dariusz-biela reviewed Mar 24, 2026

View reviewed changes

situchan mentioned this pull request Mar 24, 2026

[HOLD] [NO QA] Update react-native-onyx version #86195

Open

54 tasks

chuckdries approved these changes Mar 24, 2026

View reviewed changes

rafecolton merged commit 3c51463 into main Mar 24, 2026
44 of 48 checks passed

rafecolton deleted the preserve-passkey-collection branch March 24, 2026 22:27

rafecolton mentioned this pull request Mar 24, 2026

[ECUK/EU] First biometric auth after log out/in sees unnecessary soft prompt #86284

Open

Conversation

rafecolton commented Mar 22, 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!

dariusz-biela left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Mar 23, 2026

Uh oh!

codecov bot commented Mar 23, 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!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chuckdries commented Mar 23, 2026

Uh oh!

rafecolton commented Mar 23, 2026

Uh oh!

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

Uh oh!

Uh oh!

rafecolton commented Mar 24, 2026

Uh oh!

dariusz-biela Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

dariusz-biela Mar 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dariusz-biela Mar 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

chuckdries left a comment

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Julesssss commented Mar 24, 2026

Uh oh!

chuckdries commented Mar 24, 2026

Uh oh!

rafecolton commented Mar 24, 2026

Uh oh!

rafecolton commented Mar 24, 2026

Uh oh!

rafecolton commented Mar 24, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 24, 2026

Uh oh!

github-actions bot commented Mar 24, 2026

Uh oh!

OSBotify commented Mar 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

rafecolton commented Mar 22, 2026 •

edited

Loading

codecov bot commented Mar 23, 2026 •

edited by github-actions bot

Loading

rafecolton commented Mar 24, 2026 •

edited

Loading

dariusz-biela Mar 24, 2026 •

edited

Loading

dariusz-biela Mar 24, 2026 •

edited

Loading

chuckdries commented Mar 24, 2026 •

edited

Loading