Skip to content

Commit f2ddb8c

Browse files
chore(runway): cherry-pick fix: rehydration login cp-7.63.0 (#25261)
- fix: rehydration login cp-7.63.0 (#25246) <!-- 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** The new unlockWallet check for existingUser flag before proceed with rehydration since rehydration happen before existing flag is set, it will always not able to rehydrate when call with unLockWallet. <!-- 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? --> ## **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: null ## **Related issues** Fixes: #25247 ## **Manual testing steps** ```gherkin Feature: Login with rehydration Scenario: user login with existing social account Given enter password at rehydration screen Then should unlocked the wallet ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> https://github.com/user-attachments/assets/da6b051f-d859-4625-9f08-d3256de85d00 ### **After** <!-- [screenshots/recordings] --> https://github.com/user-attachments/assets/5a313b68-8702-488c-b4a4-789e72b77a5d ## **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] > Allows seedless OAuth rehydration to unlock during app start. > > - Updates `unlockWallet` to treat `authPreference.oauth2Login` as an existing user, attempting unlock even when `existingUser` is not yet set > - Prevents blocked rehydration flows by deriving/using password and proceeding with post-login steps > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 54718af. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> [732c3e5](732c3e5) Co-authored-by: ieow <4881057+ieow@users.noreply.github.com>
1 parent 848d1e7 commit f2ddb8c

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

app/core/Authentication/Authentication.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,8 +765,9 @@ class AuthenticationService {
765765
try {
766766
const existingUser = selectExistingUser(ReduxService.store.getState());
767767

768-
if (existingUser) {
768+
if (existingUser || authPreference?.oauth2Login) {
769769
// User exists. Attempt to unlock wallet.
770+
// existing user is always false when user try to rehydrate
770771

771772
if (password) {
772773
// Explicitly provided password.

0 commit comments

Comments
 (0)