Chore/master sync 12.16.2 #32348

DDDDDanica · 2025-04-28T18:04:41Z

Description

Related issues

Fixes:

Manual testing steps

Go to this page...

Screenshots/Recordings

Before

After

Pre-merge author checklist

I've followed MetaMask Contributor Docs and MetaMask Extension Coding Standards.
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 format if applicable
I’ve applied the right labels on the PR (see labeling guidelines). 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.

Runway bumped your version to 12.16.2 Co-authored-by: runway-github[bot] <73448015+runway-github[bot]@users.noreply.github.com>

) cp-12.16.2 (#32301) CP: #32179 **Issue:** Firefox's updated Add-on policies (as of February 2024) require that metrics opt-in be shown immediately upon onboarding. Currently, MetaMask shows a "Welcome" page first, followed by the MetaMetrics opt-in page, which no longer complies with Firefox's requirements. This is a **temporary** solution, we plan on updating the onboarding flow completely in the near future **Solution:** - Modified the onboarding flow specifically for Firefox users to show the MetaMetrics opt-in page as the first screen - Maintained the original flow (Welcome page first) for all other browsers - Implementation detects Firefox using `getPlatform()` and conditionally adjusts the page order This change ensures compliance with Firefox's [updated Add-on policies](https://extensionworkshop.com/documentation/publish/add-on-policies/#data-disclosure-collection-and-management) while maintaining the existing experience for users on other platforms. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/32179?quickstart=1) Fixes: [32173](#32173) Firefox Testing: 1. Remove MetaMask extension if already installed 2. Install fresh extension on Firefox 3. Verify that the MetaMetrics opt-in page appears as the first screen 4. Complete the onboarding flow to ensure all subsequent pages appear correctly Other Browsers Testing: 1. Repeat steps 1-3 on Chrome, Brave, Edge, and Opera 2. Verify that these browsers maintain the original flow (Welcome page first) 3. Ensure the complete onboarding flow works as expected  1. Welcome page 2. MetaMetrics opt-in page https://github.com/user-attachments/assets/eea4eeb0-c89e-407f-99be-651ad49680a6 Firefox onboarding flow: 1. MetaMetrics opt-in page 2. Welcome page https://github.com/user-attachments/assets/86f50ddf-a7f7-451c-8ac1-95317deb8036 Other browsers remain unchanged: 1. Welcome page 2. MetaMetrics opt-in page https://github.com/user-attachments/assets/eea4eeb0-c89e-407f-99be-651ad49680a6 - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/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-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [x] 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.  ## **Description**  [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/32301?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings**  ### **Before**  ### **After**  ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/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-extension/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. --------- Co-authored-by: Vince Howard <vincenguyenhoward@gmail.com>

… exclude metametrics id data (#32304) - chore: cp-12.16.2 Make "Dapp Viewed" event exclude metametrics id data (#32207) ## **Description** Per [this slack thread](https://consensys.slack.com/archives/CTQAGKY5V/p1745413333736539), we should exclude metametrics Id data from `Dapp Viewed` events [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/32207?quickstart=1) ## Before ![Screenshot 2025-04-23 at 4 43 56 PM](https://github.com/user-attachments/assets/64aa00eb-7954-4aef-8473-18bc71f60f02) ## After ![Screenshot 2025-04-23 at 4 26 06 PM](https://github.com/user-attachments/assets/ef577b43-ba38-49bc-a332-18d7429dccf4) ## **Related issues** Fixes: https://github.com/MetaMask/MetaMask-planning/issues/4743 ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/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-extension/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. --------- Co-authored-by: Mark Stacey <mark.stacey@consensys.net> [349cd2e](349cd2e) --------- Co-authored-by: Alex Donesky <adonesky@gmail.com> Co-authored-by: Mark Stacey <mark.stacey@consensys.net> Co-authored-by: Danica Shen <zhaodanica@gmail.com>

## **Description**  [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/32327?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings**  ### **Before**  ### **After**  ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/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-extension/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.  ## **Description**  [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/32336?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings**  ### **Before**  ### **After**  ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/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-extension/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. Co-authored-by: javiergarciavera <76975121+javiergarciavera@users.noreply.github.com>

feat:12.16.2

…2.16.2

github-actions · 2025-04-28T18:04:54Z

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.

DDDDDanica · 2025-04-28T18:05:29Z

app/scripts/background.js

-    category: MetaMetricsEventCategory.InpageProvider,
-    referrer: {
-      url: origin,
+  controller.metaMetricsController.trackEvent(


Comes from hotfix: f57f142

DDDDDanica · 2025-04-28T18:05:54Z

app/scripts/lib/rpc-method-middleware/handlers/request-accounts.js

+        referrer: {
+          url: origin,
+        },
+        properties: {


Comes from hotfix: f57f142

DDDDDanica · 2025-04-28T18:06:12Z

app/scripts/lib/rpc-method-middleware/handlers/request-accounts.test.ts

+        {
+          category: 'inpage_provider',
+          event: 'Dapp Viewed',
+          properties: {


Comes from hotfix: f57f142

DDDDDanica · 2025-04-28T18:06:22Z

app/scripts/lib/rpc-method-middleware/handlers/wallet-createSession/handler.test.ts

-        is_first_visit: true,
-        number_of_accounts: 3,
-        number_of_accounts_connected: 4,
+    expect(sendMetrics).toHaveBeenCalledWith(


Comes from hotfix: f57f142

DDDDDanica · 2025-04-28T18:06:28Z

app/scripts/lib/rpc-method-middleware/handlers/wallet-createSession/handler.ts

+          referrer: {
+            url: origin,
+          },
+          properties: {


Comes from hotfix: f57f142

metamaskbot · 2025-04-28T18:06:31Z

✨ Files requiring CODEOWNER review ✨

🖥️ @MetaMask/wallet-ux

ui/pages/onboarding-flow/metametrics/metametrics.js
ui/pages/onboarding-flow/onboarding-flow-switch/onboarding-flow-switch.js
ui/pages/onboarding-flow/welcome/welcome.js

DDDDDanica · 2025-04-28T18:06:51Z

test/e2e/flask/solana/common-solana.ts


 const SOLANA_URL_REGEX_MAINNET =
-  /^https:\/\/solana-mainnet\.infura\.io\/v3\/.*/u;
+  /^https:\/\/solana-(mainnet|devnet)\.infura\.io\/v3\/.*/u;


Comes from flaky flask e2e test fix: f2e26fc

DDDDDanica · 2025-04-28T18:06:57Z

test/e2e/flask/solana/common-solana.ts

-    .thenCallback(() => {
-      return response;
-    });
+  return await mockServer.forGet(SOLANA_TOKEN_API).thenCallback(() => {


Comes from flaky flask e2e test fix: f2e26fc

DDDDDanica · 2025-04-28T18:07:16Z

test/e2e/page-objects/flows/onboarding.flow.ts

    await driver.navigate();
  }
+
+  if (process.env.SELENIUM_BROWSER === Browser.FIREFOX) {


comes from hotfix f57f142

DDDDDanica · 2025-04-28T18:07:20Z

test/e2e/page-objects/flows/onboarding.flow.ts

-    await onboardingMetricsPage.clickIAgreeButton();
-  } else {
-    await onboardingMetricsPage.clickNoThanksButton();
+  if (process.env.SELENIUM_BROWSER !== Browser.FIREFOX) {


comes from hotfix f57f142

DDDDDanica · 2025-04-28T18:07:27Z

test/e2e/page-objects/flows/onboarding.flow.ts

  console.log('Starting the import of SRP onboarding flow');
  await driver.navigate();

+  if (process.env.SELENIUM_BROWSER === Browser.FIREFOX) {


comes from hotfix f57f142

metamaskbot · 2025-04-28T18:44:59Z

Builds ready [2ac078c]

builds: chrome, firefox
builds (beta): chrome
builds (flask): chrome, firefox
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
bundle size: Bundle Size Stats
user-actions-benchmark: User Actions Stats
storybook: Storybook
typescript migration: Dashboard
all CircleCI artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
- common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
- content-script: 0
- offscreen: 0

UI Startup Metrics (1216 ± 57 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1216	1116	1454	57	1252	1317
			load	1054	941	1301	64	1182	990
			domContentLoaded	1047	935	1292	64	936	991
			domInteractive	17	13	60	7	16	30
			firstPaint	730	83	1301	421	233	970
			backgroundConnect	8	4	41	6	8	9
			firstReactRender	22	16	142	14	21	39
			getState	12	5	28	7	7	8
			initialActions	0	0	1	0	0	1
			loadScripts	802	682	1049	65	834	916
			setupStore	9	5	29	5	7	9
	Webpack	Home	uiStartup	2072	1636	2646	236	2242	2401
			load	1619	1317	2168	195	1740	1996
			domContentLoaded	1612	1310	2165	192	1730	1992
			domInteractive	17	12	71	12	14	56
			firstPaint	162	69	347	52	229	82
			backgroundConnect	24	9	125	17	26	58
			firstReactRender	179	55	361	114	85	94
			getState	14	3	248	24	6	9
			initialActions	3	1	8	1	3	6
			loadScripts	1607	1307	2163	188	1726	1961
			setupStore	23	6	250	39	28	9
Firefox	Browserify	Home	uiStartup	1482	1247	1941	142	1539	1832
			load	1328	1103	1759	140	1411	1656
			domContentLoaded	1328	1102	1759	140	1411	1655
			domInteractive	109	37	195	27	89	98
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	21	13	63	7	23	32
			firstReactRender	24	20	53	4	25	33
			getState	9	4	49	7	8	9
			initialActions	0	0	1	0	0	1
			loadScripts	1309	1080	1742	140	1396	1638
			setupStore	7	4	39	4	7	8
	Webpack	Home	uiStartup	1634	1436	2000	138	1732	1902
			load	1415	1225	1723	127	1520	1663
			domContentLoaded	1415	1225	1723	127	1520	1663
			domInteractive	100	39	191	27	87	98
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	23	15	52	7	24	43
			firstReactRender	36	28	56	5	39	48
			getState	10	5	41	6	8	9
			initialActions	0	0	1	0	1	1
			loadScripts	1395	1209	1705	128	1499	1645
			setupStore	8	5	31	4	8	9

Gudahtt

LGTM!

runway-github bot and others added 6 commits April 24, 2025 17:05

Bump version to 12.16.2 (#32239)

27d28c4

Runway bumped your version to 12.16.2 Co-authored-by: runway-github[bot] <73448015+runway-github[bot]@users.noreply.github.com>

Merge pull request #32254 from MetaMask/Version-v12.16.2

09ceb74

feat:12.16.2

Merge remote-tracking branch 'origin/master' into chore/master-sync-1…

2ac078c

…2.16.2

DDDDDanica requested a review from a team as a code owner April 28, 2025 18:04

metamaskbot added the team-extension-platform Extension Platform team label Apr 28, 2025

DDDDDanica commented Apr 28, 2025

View reviewed changes

Gudahtt approved these changes Apr 28, 2025

View reviewed changes

Gudahtt merged commit 2621ca2 into Version-v12.17.0 Apr 28, 2025
162 checks passed

Gudahtt deleted the chore/master-sync-12.16.2 branch April 28, 2025 19:55

github-actions bot locked and limited conversation to collaborators Apr 28, 2025

Chore/master sync 12.16.2 #32348

Chore/master sync 12.16.2 #32348

Uh oh!

Conversation

DDDDDanica commented Apr 28, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related issues

Manual testing steps

Screenshots/Recordings

Before

After

Pre-merge author checklist

Pre-merge reviewer checklist

Uh oh!

github-actions bot commented Apr 28, 2025

Uh oh!

DDDDDanica Apr 28, 2025 • 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

metamaskbot commented Apr 28, 2025

✨ Files requiring CODEOWNER review ✨

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

metamaskbot commented Apr 28, 2025

Uh oh!

Gudahtt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

DDDDDanica commented Apr 28, 2025 •

edited by github-actions bot

Loading

DDDDDanica Apr 28, 2025 •

edited

Loading