Skip to content

chore(runway): cherry-pick fix(engagement): gate marketing-consent sheet on MetaMetrics cp-7.80.0#31041

Merged
sleepytanya merged 1 commit into
release/7.80.0from
runway-cherry-pick-7.80.0-1780518957
Jun 4, 2026
Merged

chore(runway): cherry-pick fix(engagement): gate marketing-consent sheet on MetaMetrics cp-7.80.0#31041
sleepytanya merged 1 commit into
release/7.80.0from
runway-cherry-pick-7.80.0-1780518957

Conversation

@runway-github

@runway-github runway-github Bot commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

Description

Previously, the push onboarding sheets could trigger analytics.optIn()
when MetaMetrics was off, effectively using the marketing-consent flow
to enable MetaMetrics in a less than clear way. This is not desired.
This PR simplifies the action taken after accepting the push pre-prompt.
It reduces the risk of the existing code.

This PR:

  • Adds a isMetaMetricsEnabled gate in usePushPrePromptVariant so the
    marketing_consent variant is never returned when MetaMetrics is off (the
    push_permission variant is unaffected)
  • Strips analytics.optIn(), updateCachedConsent(), and the
    device/user-settings trait generation from useEnableMarketingConsent —
    the hook now only operates when MetaMetrics is already on
  • Removes is_metrics_opted_in from the ANALYTICS_PREFERENCE_SELECTED
    event property, since this flow no longer touches metrics opt-in state
  • Adds test coverage for the missing push×MetaMetrics×dataCollection
    combinations

Changelog

CHANGELOG entry: Remove the ability for the push onboarding flow to
toggle MetaMetrics opt-in state.

Related issues

Fixes:

Manual testing steps

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

Before

After

Pre-merge author checklist

Performance checks (if applicable)

  • I've tested on Android
    • Ideally on a mid-range device; emulator is acceptable
  • I've tested with a power user scenario
  • Use these power-user
    SRPs

    to import wallets with many accounts and tokens
  • I've instrumented key operations with Sentry traces for production
    performance metrics
  • See trace() for usage and
    addToken
    for an example

For performance guidelines and tooling, see the Performance
Guide
.

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. 9ff8bd7

…eet on MetaMetrics cp-7.80.0 (#31028)

<!--
Please submit this PR as a draft initially.

Do not mark it as "Ready for review" until this PR meets the canonical
Definition of Ready For Review in `docs/readme/ready-for-review.md`.

In short: the template must be materially complete (not just section
titles
present), all status checks must be currently passing, and the only
expected
follow-up commits must be reviewer-driven.
-->

## **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?
-->

Previously, the push onboarding sheets could trigger analytics.optIn()
when MetaMetrics was off, effectively using the marketing-consent flow
to enable MetaMetrics in a less than clear way. This is not desired.
This PR simplifies the action taken after accepting the push pre-prompt.
It reduces the risk of the existing code.

  This PR:
- Adds a isMetaMetricsEnabled gate in usePushPrePromptVariant so the
marketing_consent variant is never returned when MetaMetrics is off (the
push_permission variant is unaffected)
- Strips analytics.optIn(), updateCachedConsent(), and the
device/user-settings trait generation from useEnableMarketingConsent —
the hook now only operates when MetaMetrics is already on
- Removes is_metrics_opted_in from the ANALYTICS_PREFERENCE_SELECTED
event property, since this flow no longer touches metrics opt-in state
- Adds test coverage for the missing push×MetaMetrics×dataCollection
combinations

## **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: Remove the ability for the push onboarding flow to
toggle MetaMetrics opt-in state.

## **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**

<!--
Every checklist item must be consciously assessed before marking this PR
as
"Ready for review". A checked box means you deliberately considered that
responsibility, not that you literally performed every action listed.

Unchecked boxes are ambiguous: they are not an implicit "N/A" and they
are not
a silent "skip". See `docs/readme/ready-for-review.md` for the full
checklist
semantics.
-->

- [ ] 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).
- [ ] I've completed the PR template to the best of my ability
- [ ] I've included tests if applicable
- [ ] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] 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.

#### Performance checks (if applicable)

- [ ] I've tested on Android
  - Ideally on a mid-range device; emulator is acceptable
- [ ] I've tested with a power user scenario
- Use these [power-user
SRPs](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93)
to import wallets with many accounts and tokens
- [ ] I've instrumented key operations with Sentry traces for production
performance metrics
- See [`trace()`](/app/util/trace.ts) for usage and
[`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274)
for an example

For performance guidelines and tooling, see the [Performance
Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers).

## **Pre-merge reviewer checklist**

<!--
Reviewer checklist items follow the same semantics as the author
checklist: an
unchecked box is ambiguous, a checked box means the reviewer consciously
assessed that responsibility. See `docs/readme/ready-for-review.md`.
-->

- [ ] 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.
@runway-github runway-github Bot requested a review from a team as a code owner June 3, 2026 20:36
@github-actions

github-actions Bot commented Jun 3, 2026

Copy link
Copy Markdown
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.

@mm-token-exchange-service mm-token-exchange-service Bot added the team-bots Bot team (for MetaMask Bot, Runway Bot, etc.) label Jun 3, 2026
@github-actions

github-actions Bot commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

🔍 Smart E2E Test Selection

⏭️ Smart E2E selection skipped - PR targets a release or stable branch (release/* or stable)

All E2E tests pre-selected.

View GitHub Actions results

@github-actions github-actions Bot added the size-M label Jun 3, 2026
@sleepytanya sleepytanya added the skip-sonar-cloud Only used for bypassing sonar cloud when failures are not relevant to the changes. label Jun 4, 2026
@sleepytanya sleepytanya enabled auto-merge (squash) June 4, 2026 01:14
@sleepytanya sleepytanya merged commit e821303 into release/7.80.0 Jun 4, 2026
581 of 594 checks passed
@sleepytanya sleepytanya deleted the runway-cherry-pick-7.80.0-1780518957 branch June 4, 2026 01:15
@github-actions github-actions Bot locked and limited conversation to collaborators Jun 4, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

size-M skip-sonar-cloud Only used for bypassing sonar cloud when failures are not relevant to the changes. team-bots Bot team (for MetaMask Bot, Runway Bot, etc.)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants