fix: shield handle evm account only from account group (multichain) cp-13.11.0

[tuna1207]

Description

This PR updates the Shield subscription feature to properly handle multichain account scenarios where the currently selected account may be a non-EVM account (e.g., Bitcoin, Solana). Previously, Shield subscription features would fail or throw errors when a non-EVM account was selected, as Shield is only supported for EVM accounts.

1. Multichain account support: Added OTHER account type to ShieldUserAccountTypeEnum to handle cases where the selected account is non-EVM (Bitcoin, Solana, etc.)

2. EVM account selection: Updated Shield subscription hooks and metrics to explicitly select EVM accounts (using eip155:1 CAIP-2 identifier) instead of relying on the currently selected account, which may be non-EVM

Changelog

CHANGELOG entry: Fixed Shield subscription feature to properly handle multichain scenarios where non-EVM accounts (Bitcoin, Solana) are selected

Related issues

Fixes: #38131

Manual testing steps

1. Set up a wallet with both EVM and non-EVM accounts (e.g., Bitcoin or Solana account)
2. Select a non-EVM account as the active account
3. Navigate to Shield subscription features (e.g., Shield plan page, subscription settings)
4. Verify that Shield subscription features work correctly and use the EVM account for balance calculations and metrics
5. Verify that metrics tracking properly categorizes the account as OTHER when a non-EVM account is selected
6. Test Shield subscription eligibility checks with non-EVM account selected
7. Test Shield subscription pricing and payment token selection with non-EVM account selected

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

^{Cursor Bugbot is generating a summary for commit a3579a5. Configure here.}

[metamaskbot]

✨ Files requiring CODEOWNER review ✨

🔐 @MetaMask/web3auth (2 files, +23 -6)

• 📁 ui/
  • 📁 hooks/
    • 📁 subscription/
      • 📄 useSubscription.ts +5 -3
      • 📄 useSubscriptionPricing.ts +18 -3

[metamaskbot]

Builds ready [a3579a5]

• builds: chrome, firefox
• builds (beta): chrome, firefox
• builds (flask): chrome, firefox
• builds (test): chrome, firefox
• builds (test-flask): chrome, firefox
• 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, 9
  • common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
  • ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
  • content-script: 0
  • offscreen: 0

UI Startup Metrics (1231 ± 104 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Standard Home	uiStartup	1231	1047	1550	104	1289	1394
			load	1047	893	1279	92	1113	1217
			domContentLoaded	1041	890	1268	91	1109	1209
			domInteractive	23	14	85	17	19	77
			firstPaint	601	80	1283	426	1064	1198
			backgroundConnect	213	190	270	15	217	244
			firstReactRender	30	19	72	11	36	51
			getState	34	17	76	11	39	55
			initialActions	1	0	6	1	1	2
			loadScripts	835	681	1037	89	902	997
			setupStore	11	6	32	4	12	19
			numNetworkReqs	12	5	77	20	5	72
	Browserify	Power User Home	uiStartup	1872	1551	2754	253	2028	2353
			load	992	883	1631	142	1010	1406
			domContentLoaded	977	875	1620	140	987	1395
			domInteractive	33	17	180	33	29	144
			firstPaint	512	84	1679	384	917	1320
			backgroundConnect	221	200	275	14	227	254
			firstReactRender	86	46	172	21	94	131
			getState	176	130	388	49	191	307
			initialActions	1	0	10	1	1	4
			loadScripts	774	670	1413	140	787	1186
			setupStore	19	10	42	9	26	37
			numNetworkReqs	104	65	270	44	121	204
	Webpack	Standard Home	uiStartup	824	730	1065	74	875	964
			load	615	557	823	61	622	786
			domContentLoaded	610	554	814	60	618	775
			domInteractive	24	14	102	20	20	82
			firstPaint	203	84	807	124	199	599
			backgroundConnect	12	5	39	8	15	28
			firstReactRender	31	20	170	19	33	37
			getState	29	13	56	10	36	44
			initialActions	1	0	4	1	1	2
			loadScripts	607	552	805	58	616	766
			setupStore	12	7	33	4	14	19
			numNetworkReqs	12	5	77	19	5	69
	Webpack	Power User Home	uiStartup	1470	1205	2592	242	1606	1958
			load	681	592	1350	132	689	1025
			domContentLoaded	670	586	1341	131	671	1014
			domInteractive	37	18	201	40	30	156
			firstPaint	276	80	1054	194	301	649
			backgroundConnect	15	8	54	6	18	24
			firstReactRender	85	54	107	12	92	105
			getState	158	122	283	34	164	262
			initialActions	1	0	3	1	1	2
			loadScripts	667	584	1331	129	669	1002
			setupStore	21	9	70	12	27	45
			numNetworkReqs	145	64	298	52	189	265
Firefox	Browserify	Standard Home	uiStartup	1247	1067	1569	109	1290	1476
			load	1049	915	1249	78	1104	1217
			domContentLoaded	1047	911	1249	79	1100	1217
			domInteractive	66	30	234	41	83	155
			firstPaint	-	-	-	-	-	-
			backgroundConnect	35	23	88	13	38	74
			firstReactRender	22	18	36	4	23	34
			getState	14	6	151	21	11	34
			initialActions	1	0	3	1	2	2
			loadScripts	1027	901	1228	76	1082	1186
			setupStore	12	6	81	10	13	26
			numNetworkReqs	11	5	67	15	6	59
	Browserify	Power User Home	uiStartup	2600	1892	3602	336	2803	3233
			load	1159	964	1562	173	1264	1528
			domContentLoaded	1159	955	1561	173	1264	1528
			domInteractive	134	34	614	117	155	423
			firstPaint	-	-	-	-	-	-
			backgroundConnect	180	29	926	207	194	791
			firstReactRender	87	38	134	17	95	115
			getState	255	84	887	253	198	820
			initialActions	2	1	14	2	2	7
			loadScripts	1123	930	1532	166	1211	1489
			setupStore	106	5	831	162	113	539
			numNetworkReqs	90	58	216	40	88	188
	Webpack	Standard Home	uiStartup	1477	1301	1946	130	1542	1761
			load	1255	1096	1530	99	1317	1463
			domContentLoaded	1254	1096	1530	99	1317	1463
			domInteractive	63	29	230	35	82	130
			firstPaint	-	-	-	-	-	-
			backgroundConnect	42	18	143	25	44	106
			firstReactRender	30	21	82	12	30	63
			getState	13	6	153	17	12	41
			initialActions	1	0	3	0	1	2
			loadScripts	1228	1079	1493	90	1293	1397
			setupStore	13	6	71	12	11	40
			numNetworkReqs	12	5	67	17	6	63
	Webpack	Power User Home	uiStartup	2887	2120	3744	334	3072	3512
			load	1404	1108	2002	195	1588	1735
			domContentLoaded	1403	1108	2002	196	1588	1734
			domInteractive	124	28	639	131	138	459
			firstPaint	-	-	-	-	-	-
			backgroundConnect	159	23	724	177	175	610
			firstReactRender	85	43	144	18	93	125
			getState	288	86	949	278	279	868
			initialActions	4	1	54	8	3	8
			loadScripts	1371	1092	1889	188	1561	1711
			setupStore	115	5	813	188	107	720
			numNetworkReqs	90	58	214	44	83	203

📊 Page Load Benchmark Results

Current Commit: a3579a5 | Date: 11/22/2025

📄 Localhost MetaMask Test Dapp

Samples: 100

Summary

• pageLoadTime-> current mean value: 1.04s (±39ms) 🟡 | historical mean value: 1.05s ⬇️ (historical data)
• domContentLoaded-> current mean value: 725ms (±36ms) 🟢 | historical mean value: 731ms ⬇️ (historical data)
• firstContentfulPaint-> current mean value: 77ms (±12ms) 🟢 | historical mean value: 80ms ⬇️ (historical data)

📈 Detailed Results

Metric	Mean	Std Dev	Min	Max	P95	P99
pageLoadTime	1.04s	39ms	1.02s	1.32s	1.08s	1.32s
domContentLoaded	725ms	36ms	706ms	987ms	753ms	987ms
firstPaint	77ms	12ms	60ms	176ms	84ms	176ms
firstContentfulPaint	77ms	12ms	60ms	176ms	84ms	176ms
largestContentfulPaint	0ms	0ms	0ms	0ms	0ms	0ms

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

• background: 53 Bytes (0%)
• ui: 468 Bytes (0.01%)
• common: 126 Bytes (0%)