fix: multichain support on dapp connected site popover cp-13.5.0 #36881

PatrykLucka · 2025-10-15T09:48:49Z

Description

This PR fixes issue with the DaPP permissions icon showing wrong network for Solana only DaPP.

Changelog

CHANGELOG entry: Fixed a bug with the DaPP permissions icon showing wrong network for Solana only DaPP

Related issues

Fixes: #36825

Manual testing steps

Navigate to SOL only dapp (Orca, Jupiter)
Connect to DaPP
Notice Badge icon

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.

Note

Refactors active network detection to be multichain-aware (EVM and Solana) via a selector, updates the connected site popover to use it, adds safeguards, and adjusts/extends tests and fixtures.

Selectors:
- getDappActiveNetwork: Derives active network from ordered connected accounts; supports EVM and non‑EVM (Solana) via scopes; returns { ...network, isEvm }; uses getMultichainNetworkConfigurationsByChainId.
- Adds use of getOrderedConnectedAccountsForActiveTab; updates tests for new logic.
- getMetaMaskAccountsOrdered: Safeguards spreading when address missing.
UI:
- ConnectedSitePopover: Replaces manual domain-based lookup with getDappActiveNetwork; removes useMemo and unused selectors.
Tests:
- New/updated tests for selector (ui/selectors/dapp.test.ts) covering EVM, Solana, and null paths.
- Updates to popover/menu/routes tests to include required state (domains, selectedNetworkClientId, keyrings.metadata, internalAccounts, permissionHistory, multichain configs/accounts).
Test data:
- Extend fixtures with additional accounts/addresses and keyring metadata in mock-send-state.json and onboarding data.

^{Written by Cursor Bugbot for commit 98c125e. This will update automatically on new commits. Configure here.}

github-actions · 2025-10-15T09:49:01Z

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 · 2025-10-15T09:51:23Z

✨ Files requiring CODEOWNER review ✨

👨‍🔧 @MetaMask/core-extension-ux (3 files, +64 -32)

📁 ui/
- 📁 components/
  - 📁 multichain/
    - 📁 connected-site-menu/
      - 📄 connected-site-menu.test.js +24 -1
    - 📁 connected-site-popover/
      - 📄 connected-site-popover.test.tsx +36 -0
      - 📄 connected-site-popover.tsx +4 -31

metamaskbot · 2025-10-15T10:15:16Z

📊 Page Load Benchmark Results

Current Commit: 3abb653 | Date: 10/15/2025

📄 Localhost MetaMask Test Dapp

Samples: 100

Summary

pageLoadTime-> current mean value: 1.06s (±70ms) 🟡 | historical mean value: 1.06s ⬆️ (historical data)
domContentLoaded-> current mean value: 742ms (±68ms) 🟢 | historical mean value: 741ms ⬆️ (historical data)
firstContentfulPaint-> current mean value: 78ms (±13ms) 🟢 | historical mean value: 78ms ⬆️ (historical data)

📈 Detailed Results

Metric	Mean	Std Dev	Min	Max	P95	P99
pageLoadTime	1.06s	70ms	1.02s	1.35s	1.26s	1.35s
domContentLoaded	742ms	68ms	707ms	1.01s	942ms	1.01s
firstPaint	78ms	13ms	60ms	196ms	88ms	196ms
firstContentfulPaint	78ms	13ms	60ms	196ms	88ms	196ms
largestContentfulPaint	0ms	0ms	0ms	0ms	0ms	0ms

Results generated automatically by MetaMask CI

metamaskbot · 2025-10-15T10:15:30Z

Builds ready [3abb653]

builds: chrome, firefox
builds (beta): chrome, firefox
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 artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7, 8
- common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
- content-script: 0
- offscreen: 0

UI Startup Metrics (1238 ± 74 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1238	1106	1605	74	1276	1360
			load	1058	954	1396	69	1094	1169
			domContentLoaded	1052	948	1381	68	1086	1164
			domInteractive	18	13	95	10	17	39
			firstPaint	727	97	1175	423	1085	1146
			backgroundConnect	249	236	281	8	253	265
			firstReactRender	28	18	127	12	29	46
			getState	14	5	86	11	16	26
			initialActions	5	0	32	5	6	13
			loadScripts	809	694	1126	67	843	921
			setupStore	10	5	31	4	11	20
	Webpack	Home	uiStartup	837	720	1167	74	849	1024
			load	631	582	962	72	641	867
			domContentLoaded	623	575	953	71	631	845
			domInteractive	15	11	46	7	14	35
			firstPaint	192	57	963	191	193	725
			backgroundConnect	21	11	49	6	25	32
			firstReactRender	27	16	50	7	32	36
			getState	9	4	19	3	11	13
			initialActions	3	0	11	2	4	6
			loadScripts	620	574	942	68	630	834
			setupStore	10	6	17	3	12	13
Firefox	Browserify	Home	uiStartup	1435	1239	1883	116	1499	1716
			load	1206	1058	1360	78	1279	1331
			domContentLoaded	1206	1058	1360	78	1279	1331
			domInteractive	99	33	282	47	105	230
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	32	23	60	8	35	52
			firstReactRender	29	25	59	5	31	35
			getState	10	4	126	15	8	20
			initialActions	6	2	201	21	3	13
			loadScripts	1185	1043	1335	77	1254	1311
			setupStore	12	6	70	12	10	51
	Webpack	Home	uiStartup	1561	1364	2054	119	1586	1868
			load	1328	1186	1642	79	1361	1507
			domContentLoaded	1328	1186	1642	79	1361	1507
			domInteractive	97	31	425	60	101	160
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	34	19	91	13	39	68
			firstReactRender	33	26	80	8	34	41
			getState	11	4	107	16	9	28
			initialActions	4	1	61	7	3	15
			loadScripts	1305	1169	1567	76	1337	1484
			setupStore	14	6	213	23	10	37

Bundle size diffs [🚨 Warning! Bundle size has increased!]

background: 1.22 KiB (0.03%)
ui: 90 Bytes (0%)
common: 8.08 KiB (0.1%)

metamaskbot · 2025-10-15T13:56:18Z

📊 Page Load Benchmark Results

Current Commit: 3f10837 | Date: 10/15/2025

📄 Localhost MetaMask Test Dapp

Samples: 100

Summary

pageLoadTime-> current mean value: 1.04s (±68ms) 🟡 | historical mean value: 1.05s ⬇️ (historical data)
domContentLoaded-> current mean value: 716ms (±66ms) 🟢 | historical mean value: 740ms ⬇️ (historical data)
firstContentfulPaint-> current mean value: 75ms (±9ms) 🟢 | historical mean value: 78ms ⬇️ (historical data)

📈 Detailed Results

Metric	Mean	Std Dev	Min	Max	P95	P99
pageLoadTime	1.04s	68ms	1.01s	1.31s	1.25s	1.31s
domContentLoaded	716ms	66ms	684ms	980ms	924ms	980ms
firstPaint	75ms	9ms	60ms	144ms	84ms	144ms
firstContentfulPaint	75ms	9ms	60ms	144ms	84ms	144ms
largestContentfulPaint	0ms	0ms	0ms	0ms	0ms	0ms

Results generated automatically by MetaMask CI

metamaskbot · 2025-10-15T13:56:24Z

Builds ready [3f10837]

builds: chrome, firefox
builds (beta): chrome, firefox
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 artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7, 8
- common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
- content-script: 0
- offscreen: 0

UI Startup Metrics (1247 ± 68 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1247	1109	1462	68	1290	1363
			load	1070	965	1262	65	1111	1185
			domContentLoaded	1064	962	1249	64	1106	1176
			domInteractive	18	13	54	7	17	38
			firstPaint	637	82	1198	429	1068	1170
			backgroundConnect	250	237	291	8	254	265
			firstReactRender	26	19	47	6	27	40
			getState	15	6	69	8	18	27
			initialActions	4	0	27	4	6	12
			loadScripts	820	715	989	63	862	932
			setupStore	9	6	28	3	10	18
	Webpack	Home	uiStartup	840	714	1362	92	848	1030
			load	633	580	1187	89	634	857
			domContentLoaded	626	574	1179	88	626	846
			domInteractive	16	11	67	9	14	37
			firstPaint	167	57	937	165	179	599
			backgroundConnect	21	11	50	7	25	32
			firstReactRender	27	16	81	9	32	34
			getState	9	3	16	3	11	13
			initialActions	3	0	10	2	4	6
			loadScripts	623	572	1168	86	624	835
			setupStore	10	5	36	4	12	13
Firefox	Browserify	Home	uiStartup	1383	1225	1765	99	1431	1567
			load	1168	1045	1358	73	1217	1333
			domContentLoaded	1168	1045	1356	73	1217	1332
			domInteractive	96	33	355	44	100	204
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	33	22	105	11	37	54
			firstReactRender	28	24	57	6	29	38
			getState	8	5	62	6	8	13
			initialActions	4	1	46	5	3	8
			loadScripts	1146	1027	1340	71	1194	1275
			setupStore	11	6	170	16	10	17
	Webpack	Home	uiStartup	1597	1395	2142	125	1638	1830
			load	1358	1211	1591	78	1406	1502
			domContentLoaded	1357	1211	1590	78	1406	1502
			domInteractive	98	31	346	53	106	175
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	37	21	155	18	40	66
			firstReactRender	35	27	82	10	36	51
			getState	10	3	133	14	10	26
			initialActions	5	1	64	8	4	14
			loadScripts	1333	1193	1550	73	1381	1473
			setupStore	16	6	230	26	12	66

Bundle size diffs [🚨 Warning! Bundle size has increased!]

background: 1.64 KiB (0.04%)
ui: 1.6 KiB (0.02%)
common: 9.31 KiB (0.11%)

metamaskbot · 2025-10-15T14:27:01Z

📊 Page Load Benchmark Results

Current Commit: 98c125e | Date: 10/15/2025

📄 Localhost MetaMask Test Dapp

Samples: 100

Summary

pageLoadTime-> current mean value: 1.04s (±70ms) 🟡 | historical mean value: 1.05s ⬇️ (historical data)
domContentLoaded-> current mean value: 727ms (±68ms) 🟢 | historical mean value: 738ms ⬇️ (historical data)
firstContentfulPaint-> current mean value: 75ms (±11ms) 🟢 | historical mean value: 78ms ⬇️ (historical data)

📈 Detailed Results

Metric	Mean	Std Dev	Min	Max	P95	P99
pageLoadTime	1.04s	70ms	1.00s	1.31s	1.25s	1.31s
domContentLoaded	727ms	68ms	694ms	994ms	935ms	994ms
firstPaint	75ms	11ms	60ms	172ms	84ms	172ms
firstContentfulPaint	75ms	11ms	60ms	172ms	84ms	172ms
largestContentfulPaint	0ms	0ms	0ms	0ms	0ms	0ms

Results generated automatically by MetaMask CI

metamaskbot · 2025-10-15T14:27:06Z

Builds ready [98c125e]

builds: chrome, firefox
builds (beta): chrome, firefox
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 artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7, 8
- common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
- content-script: 0
- offscreen: 0

UI Startup Metrics (1260 ± 74 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1260	1117	1519	74	1309	1393
			load	1082	966	1282	68	1132	1211
			domContentLoaded	1076	961	1277	68	1125	1206
			domInteractive	17	14	41	5	17	35
			firstPaint	708	117	1287	431	1100	1164
			backgroundConnect	254	241	282	7	258	266
			firstReactRender	27	19	58	6	29	40
			getState	15	5	40	7	19	31
			initialActions	5	1	47	6	7	15
			loadScripts	828	718	1020	65	873	951
			setupStore	11	6	31	5	13	24
	Webpack	Home	uiStartup	818	702	1082	58	833	920
			load	619	570	920	60	632	745
			domContentLoaded	611	565	896	58	623	727
			domInteractive	15	11	50	7	13	34
			firstPaint	180	54	764	165	194	589
			backgroundConnect	21	9	47	7	25	31
			firstReactRender	26	16	36	6	31	33
			getState	9	3	14	3	11	13
			initialActions	3	0	7	2	4	6
			loadScripts	609	563	886	56	621	716
			setupStore	9	5	14	2	11	13
Firefox	Browserify	Home	uiStartup	1425	1220	1787	117	1482	1697
			load	1195	1036	1461	89	1255	1348
			domContentLoaded	1195	1036	1460	89	1255	1348
			domInteractive	100	33	274	49	105	236
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	37	20	304	31	38	80
			firstReactRender	29	25	56	4	30	37
			getState	8	5	33	5	8	17
			initialActions	5	1	64	7	4	14
			loadScripts	1170	1018	1400	83	1219	1322
			setupStore	14	6	137	20	10	51
	Webpack	Home	uiStartup	1593	1418	2156	134	1654	1875
			load	1362	1201	1748	100	1448	1520
			domContentLoaded	1362	1200	1747	100	1448	1520
			domInteractive	101	31	518	72	108	322
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	38	19	99	16	42	80
			firstReactRender	34	26	83	12	34	77
			getState	9	5	64	6	9	15
			initialActions	5	1	51	7	3	15
			loadScripts	1337	1184	1721	95	1415	1494
			setupStore	14	6	247	25	10	38

Bundle size diffs [🚨 Warning! Bundle size has increased!]

background: 1.64 KiB (0.04%)
ui: 2.52 KiB (0.04%)
common: 9.34 KiB (0.11%)

adonesky1 · 2025-10-15T20:35:08Z

Just checked and on main requesting via the solana wallet standard only gets a solana scope permission

Screen.Recording.2025-10-15.at.3.23.54.PM.mov

But on your PR we're getting all EVM chains as well:

Screen.Recording.2025-10-15.at.3.28.19.PM.mov

so there is a regression. It seems the regression in the other direction (request via EVM provider and get EVM plus Solana) is already on main

PatrykLucka · 2025-10-16T09:09:45Z

@adonesky1 Thank you for testing it carefully! 🙏 I just tested it again and it is working correctly, I'm pretty sure the reason it was not working correctly for you is because of the E2E Test Dapp using the same domain as solana test dapp. I saw on your video when you switched tab just for a moment (very helpful mistake! haha) you were already connected to the EVM network on E2E Test Dapp, so this is the reason why EVM networks were included in the Solana Dapp request. I was able to reproduce the same behaviour on main

PatrykLucka self-assigned this Oct 15, 2025

PatrykLucka added the team-mobile-ux Mobile UX team label Oct 15, 2025

github-actions bot added the size-M label Oct 15, 2025

fix: multichain support on dapp connected site popover

1255491

PatrykLucka force-pushed the fix-permissions-network-on-solana-dapp branch from 3abb653 to 1255491 Compare October 15, 2025 13:10

test: fix tests

3f10837

test: fix routes unit tests

98c125e

PatrykLucka marked this pull request as ready for review October 15, 2025 14:38

PatrykLucka requested a review from a team as a code owner October 15, 2025 14:38

PatrykLucka changed the title ~~fix: multichain support on dapp connected site popover~~ fix: multichain support on dapp connected site popover cp-13.5.0 Oct 15, 2025

vinnyhoward approved these changes Oct 15, 2025

View reviewed changes

shane-t approved these changes Oct 16, 2025

View reviewed changes

PatrykLucka added this pull request to the merge queue Oct 16, 2025

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 16, 2025

PatrykLucka added this pull request to the merge queue Oct 16, 2025

Merged via the queue into main with commit 2be8ec5 Oct 16, 2025
180 checks passed

PatrykLucka deleted the fix-permissions-network-on-solana-dapp branch October 16, 2025 14:53

github-actions bot locked and limited conversation to collaborators Oct 16, 2025

metamaskbot added the release-13.6.0 Issue or pull request that will be included in release 13.6.0 label Oct 16, 2025

gauthierpetetin added release-13.5.0 Issue or pull request that will be included in release 13.5.0 and removed release-13.6.0 Issue or pull request that will be included in release 13.6.0 labels Oct 16, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: multichain support on dapp connected site popover cp-13.5.0 #36881

fix: multichain support on dapp connected site popover cp-13.5.0 #36881

PatrykLucka commented Oct 15, 2025 •

edited by cursor bot

Loading

Uh oh!

github-actions bot commented Oct 15, 2025

Uh oh!

metamaskbot commented Oct 15, 2025 •

edited

Loading

Uh oh!

metamaskbot commented Oct 15, 2025

Uh oh!

metamaskbot commented Oct 15, 2025

Uh oh!

metamaskbot commented Oct 15, 2025

Uh oh!

metamaskbot commented Oct 15, 2025

Uh oh!

metamaskbot commented Oct 15, 2025

Uh oh!

metamaskbot commented Oct 15, 2025

Uh oh!

adonesky1 commented Oct 15, 2025

Uh oh!

PatrykLucka commented Oct 16, 2025

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

fix: multichain support on dapp connected site popover cp-13.5.0 #36881

fix: multichain support on dapp connected site popover cp-13.5.0 #36881

Conversation

PatrykLucka commented Oct 15, 2025 • edited by cursor bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Changelog

Related issues

Manual testing steps

Screenshots/Recordings

Before

After

Pre-merge author checklist

Pre-merge reviewer checklist

Uh oh!

github-actions bot commented Oct 15, 2025

Uh oh!

metamaskbot commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✨ Files requiring CODEOWNER review ✨

Uh oh!

metamaskbot commented Oct 15, 2025

📊 Page Load Benchmark Results

📄 Localhost MetaMask Test Dapp

Summary

Uh oh!

metamaskbot commented Oct 15, 2025

Uh oh!

metamaskbot commented Oct 15, 2025

📊 Page Load Benchmark Results

📄 Localhost MetaMask Test Dapp

Summary

Uh oh!

metamaskbot commented Oct 15, 2025

Uh oh!

metamaskbot commented Oct 15, 2025

📊 Page Load Benchmark Results

📄 Localhost MetaMask Test Dapp

Summary

Uh oh!

metamaskbot commented Oct 15, 2025

Uh oh!

adonesky1 commented Oct 15, 2025

Uh oh!

PatrykLucka commented Oct 16, 2025

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

PatrykLucka commented Oct 15, 2025 •

edited by cursor bot

Loading

metamaskbot commented Oct 15, 2025 •

edited

Loading