fix: recipient modal stays visible when switching from EVM to non-evm cp-13.5.0 #36829

micaelae · 2025-10-13T23:01:55Z

Description

Problem: The Recipient modal's open/close state is determined using the previous and currently selected network states within the useDestinationAccount hook, which could get out of sync with the UI's selected networks.

Solution

If the selected account group has a matching dest account, use it and don't show the recipient modal
Otherwise open the modal

Changelog

CHANGELOG entry: fix: hide recipient modal if there is a matching account in the selected bridge destination network

Related issues

Fixes: #36759

Manual testing steps

Load swap page
Select Solana as destination network
Recipient modal should not be open
Load swap page
Select SOL as src
Select eth:MUSD as src
Recipient modal should not be open

Screenshots/Recordings

Before

See linked bug ticket

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

Use default destination account when available and close the recipient picker; otherwise open it, removing EVM/non‑EVM transition logic.

Bridge UI (ui/pages/bridge/hooks/useDestinationAccount.ts):
- Selection/Modal Logic: If defaultInternalDestinationAccount exists, set it (with displayName) and close the picker; otherwise clear selection and open the picker.
- Cleanup: Remove EVM/non‑EVM chain transition checks, useRef with previous chain ID, and related imports; simplify useEffect dependencies.

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

…n-EVM network

metamaskbot · 2025-10-13T23:04:17Z

✨ Files requiring CODEOWNER review ✨

🔄 @MetaMask/swaps-engineers (1 files, +13 -47)

📁 ui/
- 📁 pages/
  - 📁 bridge/
    - 📁 hooks/
      - 📄 useDestinationAccount.ts +13 -47

metamaskbot · 2025-10-13T23:28:29Z

📊 Page Load Benchmark Results

Current Commit: 5820fff | Date: 10/13/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: 730ms (±68ms) 🟢 | historical mean value: 739ms ⬇️ (historical data)
firstContentfulPaint-> current mean value: 76ms (±11ms) 🟢 | historical mean value: 77ms ⬇️ (historical data)

📈 Detailed Results

Metric	Mean	Std Dev	Min	Max	P95	P99
pageLoadTime	1.04s	70ms	1.00s	1.32s	1.27s	1.32s
domContentLoaded	730ms	68ms	693ms	1000ms	939ms	1000ms
firstPaint	76ms	11ms	60ms	168ms	84ms	168ms
firstContentfulPaint	76ms	11ms	60ms	168ms	84ms	168ms
largestContentfulPaint	0ms	0ms	0ms	0ms	0ms	0ms

Results generated automatically by MetaMask CI

metamaskbot · 2025-10-13T23:28:40Z

Builds ready [5820fff]

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 (1210 ± 78 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1210	1075	1508	78	1246	1366
			load	1043	950	1297	68	1077	1190
			domContentLoaded	1037	939	1292	68	1072	1184
			domInteractive	17	13	44	6	16	34
			firstPaint	672	153	1300	417	1060	1158
			backgroundConnect	248	235	270	7	252	261
			firstReactRender	26	19	52	7	27	40
			getState	12	5	71	9	14	28
			initialActions	4	0	43	5	5	12
			loadScripts	795	693	1041	66	830	937
			setupStore	9	5	32	4	10	17
	Webpack	Home	uiStartup	822	702	1105	70	838	975
			load	631	576	920	69	635	815
			domContentLoaded	624	570	907	69	624	807
			domInteractive	15	11	68	9	13	36
			firstPaint	197	52	899	194	197	599
			backgroundConnect	21	11	45	6	25	31
			firstReactRender	28	17	65	10	32	47
			getState	8	4	28	4	10	13
			initialActions	2	0	21	3	3	7
			loadScripts	621	568	895	66	623	796
			setupStore	8	4	24	3	9	11
Firefox	Browserify	Home	uiStartup	1400	1220	1947	122	1437	1679
			load	1195	1061	1360	77	1243	1335
			domContentLoaded	1195	1061	1360	78	1243	1335
			domInteractive	101	33	326	54	102	226
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	29	19	118	14	30	50
			firstReactRender	29	25	37	3	31	35
			getState	7	3	137	14	5	20
			initialActions	3	0	39	6	2	23
			loadScripts	1172	1043	1342	77	1224	1316
			setupStore	8	4	78	11	7	28
	Webpack	Home	uiStartup	1546	1357	2197	126	1593	1764
			load	1337	1211	1722	86	1376	1507
			domContentLoaded	1337	1211	1721	86	1375	1507
			domInteractive	95	31	405	62	95	176
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	32	17	156	19	35	65
			firstReactRender	36	26	81	13	36	75
			getState	11	2	139	22	5	53
			initialActions	5	0	130	17	2	14
			loadScripts	1312	1193	1682	84	1350	1489
			setupStore	9	4	49	10	7	34

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

background: 58 Bytes (0%)
ui: -209 Bytes (0%)
common: 10 Bytes (0%)

metamaskbot · 2025-10-14T00:05:02Z

📊 Page Load Benchmark Results

Current Commit: d4f93d8 | Date: 10/13/2025

📄 Localhost MetaMask Test Dapp

Samples: 100

Summary

pageLoadTime-> current mean value: 1.07s (±71ms) 🟡 | historical mean value: 1.05s ⬆️ (historical data)
domContentLoaded-> current mean value: 750ms (±69ms) 🟢 | historical mean value: 739ms ⬆️ (historical data)
firstContentfulPaint-> current mean value: 79ms (±10ms) 🟢 | historical mean value: 77ms ⬆️ (historical data)

📈 Detailed Results

Metric	Mean	Std Dev	Min	Max	P95	P99
pageLoadTime	1.07s	71ms	1.02s	1.36s	1.29s	1.36s
domContentLoaded	750ms	69ms	711ms	1.03s	954ms	1.03s
firstPaint	79ms	10ms	64ms	164ms	88ms	164ms
firstContentfulPaint	79ms	10ms	64ms	164ms	88ms	164ms
largestContentfulPaint	0ms	0ms	0ms	0ms	0ms	0ms

Results generated automatically by MetaMask CI

metamaskbot · 2025-10-14T00:05:11Z

Builds ready [d4f93d8]

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 (1352 ± 82 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1352	1210	1680	82	1388	1511
			load	1155	1013	1412	74	1198	1315
			domContentLoaded	1144	1001	1401	76	1188	1306
			domInteractive	21	16	58	9	20	48
			firstPaint	788	83	1355	471	1183	1301
			backgroundConnect	281	259	408	23	285	311
			firstReactRender	35	19	182	26	36	90
			getState	14	5	55	10	16	35
			initialActions	5	0	26	5	7	17
			loadScripts	874	726	1122	75	919	1022
			setupStore	11	6	45	6	12	23
	Webpack	Home	uiStartup	823	703	1143	83	837	1050
			load	647	583	967	85	657	860
			domContentLoaded	639	578	959	85	644	852
			domInteractive	15	11	58	8	13	35
			firstPaint	188	59	883	172	199	590
			backgroundConnect	20	11	44	7	25	32
			firstReactRender	25	16	64	8	31	34
			getState	8	4	22	3	10	15
			initialActions	2	0	16	3	3	9
			loadScripts	636	576	948	83	642	842
			setupStore	7	4	13	2	9	11
Firefox	Browserify	Home	uiStartup	1398	1214	1954	142	1477	1663
			load	1190	1056	1439	91	1273	1348
			domContentLoaded	1190	1056	1439	91	1273	1348
			domInteractive	101	35	337	56	103	248
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	29	18	231	21	32	40
			firstReactRender	30	25	126	10	30	35
			getState	6	3	43	6	6	16
			initialActions	4	0	199	20	2	9
			loadScripts	1168	1040	1420	89	1247	1321
			setupStore	10	4	86	14	7	53
	Webpack	Home	uiStartup	1538	1367	2407	137	1573	1795
			load	1339	1199	1657	86	1386	1500
			domContentLoaded	1338	1199	1656	86	1386	1499
			domInteractive	91	31	381	46	97	170
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	31	18	118	16	33	70
			firstReactRender	36	26	82	12	36	75
			getState	9	3	203	22	5	16
			initialActions	4	0	78	9	2	16
			loadScripts	1315	1181	1613	82	1358	1472
			setupStore	9	4	67	10	7	28

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

background: 58 Bytes (0%)
ui: -257 Bytes (0%)
common: 10 Bytes (0%)

metamaskbot · 2025-10-14T19:50:42Z

📊 Page Load Benchmark Results

Current Commit: 2d5f99f | Date: 10/14/2025

📄 Localhost MetaMask Test Dapp

Samples: 100

Summary

pageLoadTime-> current mean value: 1.03s (±73ms) 🟡 | historical mean value: 1.05s ⬇️ (historical data)
domContentLoaded-> current mean value: 725ms (±70ms) 🟢 | historical mean value: 738ms ⬇️ (historical data)
firstContentfulPaint-> current mean value: 74ms (±12ms) 🟢 | historical mean value: 77ms ⬇️ (historical data)

📈 Detailed Results

Metric	Mean	Std Dev	Min	Max	P95	P99
pageLoadTime	1.03s	73ms	997ms	1.32s	1.29s	1.32s
domContentLoaded	725ms	70ms	690ms	989ms	976ms	989ms
firstPaint	74ms	12ms	56ms	176ms	84ms	176ms
firstContentfulPaint	74ms	12ms	56ms	176ms	84ms	176ms
largestContentfulPaint	0ms	0ms	0ms	0ms	0ms	0ms

Results generated automatically by MetaMask CI

metamaskbot · 2025-10-14T19:50:49Z

Builds ready [2d5f99f]

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 (1294 ± 71 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1294	1156	1529	71	1323	1476
			load	1116	967	1338	67	1149	1267
			domContentLoaded	1108	961	1334	68	1143	1240
			domInteractive	19	14	56	7	17	36
			firstPaint	701	76	1317	452	1130	1223
			backgroundConnect	273	260	387	14	276	288
			firstReactRender	28	18	53	8	30	48
			getState	13	5	90	11	14	33
			initialActions	5	0	34	6	5	21
			loadScripts	842	699	1074	68	877	968
			setupStore	11	5	62	7	12	24
	Webpack	Home	uiStartup	818	692	1076	76	834	1013
			load	637	573	924	83	637	876
			domContentLoaded	629	566	917	82	625	870
			domInteractive	15	11	44	7	13	33
			firstPaint	188	55	870	169	190	591
			backgroundConnect	21	10	54	8	25	36
			firstReactRender	26	17	95	10	31	35
			getState	8	3	18	3	10	12
			initialActions	2	0	6	2	3	5
			loadScripts	627	564	906	81	623	865
			setupStore	8	4	14	2	9	11
Firefox	Browserify	Home	uiStartup	1360	1203	1764	95	1404	1506
			load	1169	1050	1380	68	1212	1278
			domContentLoaded	1168	1049	1379	68	1212	1278
			domInteractive	93	34	267	35	101	168
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	28	20	90	12	30	34
			firstReactRender	28	23	75	6	29	36
			getState	5	2	12	2	5	10
			initialActions	2	0	30	3	2	5
			loadScripts	1148	1032	1304	65	1190	1261
			setupStore	8	4	180	18	6	10
	Webpack	Home	uiStartup	1542	1385	2044	119	1593	1799
			load	1337	1209	1602	90	1408	1499
			domContentLoaded	1337	1208	1602	90	1408	1499
			domInteractive	95	31	363	59	92	249
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	33	18	116	17	37	56
			firstReactRender	38	26	78	15	37	77
			getState	5	2	29	3	5	12
			initialActions	4	0	129	14	2	22
			loadScripts	1311	1190	1570	86	1380	1470
			setupStore	11	4	159	19	7	45

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

background: 58 Bytes (0%)
ui: -257 Bytes (0%)
common: 10 Bytes (0%)

fix: recipient modal does not disappear when switching from EVM to no…

5820fff

…n-EVM network

metamaskbot added the team-swaps-and-bridge Swaps and Bridge team label Oct 13, 2025

github-actions bot added the size-S label Oct 13, 2025

micaelae changed the title ~~fix: recipient modal stays visible when switching from EVM to non-evm~~ fix: recipient modal stays visible when switching from EVM to non-evm cp-13.5.0 Oct 13, 2025

micaelae marked this pull request as ready for review October 13, 2025 23:28

micaelae requested a review from a team as a code owner October 13, 2025 23:28

This comment was marked as outdated.

Sign in to view

fix: only read default destination account

d4f93d8

micaelae enabled auto-merge October 14, 2025 00:12

ghgoodreau approved these changes Oct 14, 2025

View reviewed changes

SteP-n-s approved these changes Oct 14, 2025

View reviewed changes

micaelae added this pull request to the merge queue Oct 14, 2025