chore(runway): cherry-pick a172652 #21831
Merged
+2,204
−102
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… Onboarding token management (#21594) <!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** <!-- Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: 1. What is the reason for the change? 2. What is the improvement/solution? --> This PR improves the Onboarding flow by adding coverage for several edge cases and refining the token management strategy for the onboarding token. These updates ensure more reliable handling of onboarding sessions and reduce potential authentication inconsistencies. ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: Added coverage for edge cases in the Onboarding flow CHANGELOG entry: Improved onboarding token management strategy CHANGELOG entry: Enhanced session reliability and authentication consistency ## **Related issues** Fixes: ## **Manual testing steps** ```gherkin Feature: my feature name Scenario: user [verb for user action] Given [describe expected initial app state] When user [verb for user action] Then [describe expected outcome] ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Enhances card onboarding and authentication with access-only token storage, onboarding redirects, robust auth-error handling/cleanup, and extensive test coverage and i18n updates. > > - **Onboarding/Auth flows**: > - `CardAuthentication`: Redirects to `Routes.CARD.ONBOARDING.ROOT` and sets `onboardingId` when `verificationState === 'PENDING'` or `phase` exists; keeps OTP step handling. > - `ConfirmEmail`: Adds resend cooldown, validation, Redux updates for IDs, navigates to `CARD.AUTHENTICATION` for existing accounts, and shows toast. > - `SetPhoneNumber`: Adjusts area code selector width. > - **Session/Auth handling in Home**: > - `CardHome`: Detects auth errors via `isAuthenticationError`, clears keychain (`removeCardBaanxToken`), resets Redux auth state/location/token fields, and navigates to `Routes.CARD.WELCOME`; disables retry on auth errors. > - **Token management**: > - Support access-only onboarding tokens: make `refreshToken*` optional in `CardTokenData`, update `cardTokenVault` validation/storage. > - Store access token post address registration in `PhysicalAddress`/`MailingAddress` using `mapCountryToLocation` + `extractTokenExpiration`; set Redux auth state and location. > - `handleLocalAuthentication`: Handle access-only tokens with 5‑min buffer, improved cleanup/logging. > - **SDK/Auth**: > - `CardSDK.getCardDetails`: Throw `INVALID_CREDENTIALS` on 401. > - `useCardProviderAuthentication`: Treat OTP/PENDING/phase as early-return states. > - **Utilities**: > - New `isAuthenticationError`, `mapCountryToLocation`, `extractTokenExpiration` (with tests). > - **Redux**: > - Add/consume actions: `setOnboardingId`, `setContactVerificationId`, `setIsAuthenticatedCard`, `setAuthenticatedPriorityToken*`, `setUserCardLocation`. > - **Tests**: > - Major additions/overhauls for `ConfirmEmail`, `MailingAddress`, `handleLocalAuthentication`, and `extractTokenExpiration`. > - **i18n**: > - Update onboarding strings (confirm email messaging, KYC text/buttons). > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 3c81f92. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> --------- Co-authored-by: sophieqgu <[email protected]>
|
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
|
metamaskbot
added
the
release-7.58.0
|
No release label on PR. Adding release label release-7.58.0 on PR, as PR was cherry-picked in branch 7.58.0. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR improves the Onboarding flow by adding coverage for several edge
cases and refining the token management strategy for the onboarding
token. These updates ensure more reliable handling of onboarding
sessions and reduce potential authentication inconsistencies.
Changelog
CHANGELOG entry: Added coverage for edge cases in the Onboarding flow
CHANGELOG entry: Improved onboarding token management strategy
CHANGELOG entry: Enhanced session reliability and authentication
consistency
Related issues
Fixes:
Manual testing steps
Screenshots/Recordings
Before
After
Pre-merge author checklist
Docs and MetaMask Mobile
Coding
Standards.
if applicable
guidelines).
Not required for external contributors.
Pre-merge reviewer checklist
app, test code being changed).
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
Note
Improves card onboarding/login flows, adds robust auth error handling and access-token storage, and introduces utilities/tests for onboarding token management.
onboardingIdin Redux.cardTokenVault: support access-only tokens (optional refresh token), validate accordingly.handleLocalAuthentication: handle access-only tokens (5‑min buffer), clear on expiry, refresh and persist full tokens; clearer logs.CardSDK.getCardDetailsthrowsINVALID_CREDENTIALSon 401; email/phone verification endpoints and auth flow refinements.useCardProviderAuthentication: treat OTP/pending/phase states as intermediate; proceed only after token exchange; set auth state/location.useRegisterPersonalDetails: cleanup and naming consistency.extractTokenExpiration(default 5 hours) andmapCountryToLocationhelpers.isAuthenticationErrorhelper to classify auth failures.Written by Cursor Bugbot for commit e94d8c1. This will update automatically on new commits. Configure here.
Co-authored-by: sophieqgu [email protected] a172652