chore(runway): cherry-pick fix(oauth): sync marketing opt-in and analytics after OAuth rehydration unlock cp-7.72.0#28255
Merged
Conversation
…ytics after OAuth rehydration unlock cp-7.72.0 (#28230) <!-- 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? --> After a seedless / social-account wallet unlock on the OAuth rehydration screen, local marketing consent and analytics could drift from the account’s server-side marketing opt-in. That meant user profile properties and preference events were not reliably aligned with `getMarketingOptInStatus` until some other flow ran. This change calls `OAuthService.getMarketingOptInStatus()` immediately after a successful unlock on `OAuthRehydration`, then: - Dispatches `setDataCollectionForMarketing` so Redux matches the server flag. - Updates MetaMetrics identity with `HAS_MARKETING_CONSENT`. - Fires `ANALYTICS_PREFERENCE_SELECTED` with `updated_after_onboarding: true`, `location: 'oauth_rehydration'`, and `account_type` from the seedless auth connection. Failures are logged and do not block unlock. Unit tests assert the marketing sync runs on the happy path and is skipped when navigation does not complete that path. ## **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: #28249 ## **Manual testing steps** ```gherkin Feature: OAuth rehydration marketing opt-in sync Scenario: Successful unlock syncs marketing preference and analytics Given the user completes social / seedless onboarding and reaches OAuth rehydration And the app can reach OAuth marketing opt-in APIs When the user enters a valid password and unlock succeeds Then local marketing data collection state should match the server opt-in response And analytics should record preference / identity updates for marketing consent (verify in debug / staging tooling if available) Scenario: Unlock path that does not complete rehydration navigation Given a flow where OAuth rehydration does not navigate to home after unlock (e.g. error or alternate path covered by tests) When unlock handling does not take the success path that replaces with onboarding home Then marketing opt-in sync should not run (no redundant or incorrect preference sync) ``` ## **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 - [ ] 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] > **Medium Risk** > Touches the post-unlock path of `OAuthRehydration` by adding a background network call plus Redux/analytics side effects; failures are best-effort but bugs here could desync consent state or misfire analytics. > > **Overview** > After a successful OAuth rehydration unlock, the app now fetches server-side marketing consent via `OAuthService.getMarketingOptInStatus()` and **syncs it locally**. > > The unlock flow dispatches `setDataCollectionForMarketing`, updates MetaMetrics identity (`HAS_MARKETING_CONSENT`), and emits `ANALYTICS_PREFERENCE_SELECTED` with `updated_after_onboarding`, `location: 'oauth_rehydration'`, and an `account_type` derived from the seedless `authConnection`; errors are logged and do not block unlock. > > Tests were updated to mock `analytics`/`getMarketingOptInStatus`, assert the sync runs on the successful rehydration path, verify Redux + analytics payloads, and confirm the sync is skipped for the *outdated password* (non-oauth2) unlock path. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 0738153. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
Contributor
|
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. |
ieow
approved these changes
Apr 1, 2026
Contributor
|
false alarm. |
Contributor
🔍 Smart E2E Test Selection⏭️ Smart E2E selection skipped - skip-smart-e2e-selection label found All E2E tests pre-selected. |
|
Contributor
|
✅ E2E Fixture Validation — Schema is up to date |
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
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
After a seedless / social-account wallet unlock on the OAuth rehydration
screen, local marketing consent and analytics could drift from the
account’s server-side marketing opt-in. That meant user profile
properties and preference events were not reliably aligned with
getMarketingOptInStatusuntil some other flow ran.This change calls
OAuthService.getMarketingOptInStatus()immediatelyafter a successful unlock on
OAuthRehydration, then:setDataCollectionForMarketingso Redux matches the serverflag.
HAS_MARKETING_CONSENT.ANALYTICS_PREFERENCE_SELECTEDwithupdated_after_onboarding: true,location: 'oauth_rehydration', andaccount_typefrom theseedless auth connection.
Failures are logged and do not block unlock. Unit tests assert the
marketing sync runs on the happy path and is skipped when navigation
does not complete that path.
Changelog
CHANGELOG entry: null
Related issues
Fixes: #28249
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
Medium Risk
Touches the post-unlock path of
OAuthRehydrationby adding abackground network call plus Redux/analytics side effects; failures are
best-effort but bugs here could desync consent state or misfire
analytics.
Overview
After a successful OAuth rehydration unlock, the app now fetches
server-side marketing consent via
OAuthService.getMarketingOptInStatus()and syncs it locally.The unlock flow dispatches
setDataCollectionForMarketing, updatesMetaMetrics identity (
HAS_MARKETING_CONSENT), and emitsANALYTICS_PREFERENCE_SELECTEDwithupdated_after_onboarding,location: 'oauth_rehydration', and anaccount_typederived from theseedless
authConnection; errors are logged and do not block unlock.Tests were updated to mock
analytics/getMarketingOptInStatus,assert the sync runs on the successful rehydration path, verify Redux +
analytics payloads, and confirm the sync is skipped for the outdated
password (non-oauth2) unlock path.
Written by Cursor
Bugbot for commit
0738153. This will update automatically
on new commits. Configure
here.