fix: show account balances for selected XChain swap destination address #31684

micaelae · 2025-04-07T22:09:34Z

Description

Related issues

Fixes: https://consensyssoftware.atlassian.net/browse/MMS-2154

Manual testing steps

Go to the Bridge page
Select an EVM to Solana quote
Note balances shown in the dest asset picker
Change the dest account address
Verify that the dest balances are updated to match the dest account's holdings
Select a Solana to EVM quote
Note token balances shown in the dest asset picker
Change the dest account address
Verify that the dest balances are updated to match the dest account's holdings

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.

metamaskbot · 2025-04-07T22:11:36Z

✨ Files requiring CODEOWNER review ✨

🔄 @MetaMask/swaps-engineers

ui/hooks/bridge/useTokensWithFiltering.ts
ui/pages/bridge/prepare/prepare-bridge-page.tsx

metamaskbot · 2025-04-07T22:46:47Z

Builds ready [3e45914]

builds: 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 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, 13
- content-script: 0
- offscreen: 0

UI Startup Metrics (1232 ± 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	1232	1098	1382	57	1277	1333
			load	1074	946	1194	55	1144	997
			domContentLoaded	1067	941	1189	55	1147	994
			domInteractive	16	13	65	6	16	29
			firstPaint	776	79	1194	417	222	79
			backgroundConnect	10	6	50	5	9	10
			firstReactRender	22	15	150	15	21	37
			getState	15	5	80	11	7	80
			initialActions	0	0	1	0	0	1
			loadScripts	816	684	919	54	858	899
			setupStore	8	4	28	4	7	8
	Webpack	Home	uiStartup	2177	1680	2581	180	2305	2388
			load	1699	1299	2041	157	1776	1986
			domContentLoaded	1693	1294	2034	155	1771	1967
			domInteractive	17	12	63	10	14	46
			firstPaint	157	64	357	58	258	93
			backgroundConnect	35	12	263	34	35	60
			firstReactRender	190	54	441	117	58	93
			getState	15	4	383	38	8	9
			initialActions	3	1	7	2	4	7
			loadScripts	1684	1280	2010	153	1764	1945
			setupStore	20	6	267	27	34	8
Firefox	Browserify	Home	uiStartup	1347	1181	2025	149	1402	1704
			load	1205	1031	1879	144	1264	1523
			domContentLoaded	1205	1031	1879	144	1264	1522
			domInteractive	95	36	194	25	89	98
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	26	17	64	9	28	50
			firstReactRender	22	19	40	3	22	27
			getState	8	4	67	8	7	9
			initialActions	0	0	1	0	0	1
			loadScripts	1182	1008	1816	141	1242	1477
			setupStore	6	4	20	2	6	7
	Webpack	Home	uiStartup	1541	1338	2219	168	1584	1966
			load	1335	1143	1996	162	1375	1721
			domContentLoaded	1334	1143	1995	162	1374	1721
			domInteractive	101	56	208	23	89	96
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	24	18	50	5	25	35
			firstReactRender	35	28	52	5	37	46
			getState	9	4	36	6	7	9
			initialActions	1	0	2	1	1	1
			loadScripts	1312	1125	1971	161	1353	1694
			setupStore	8	5	28	4	8	9

Bundle size diffs

background: 0 Bytes (0%)
ui: 109 Bytes (0%)
common: 0 Bytes (0%)

Copilot

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

Comments suppressed due to low confidence (1)

ui/hooks/bridge/useTokensWithFiltering.ts:68

The previous destructuring of assetsWithBalance was removed. If multichainTokensWithBalance is used later in this hook, please update the call to destructure the returned value from useMultichainBalances.

useMultichainBalances(accountId);

metamaskbot · 2025-04-08T16:13:00Z

Builds ready [5f0818d]

builds: 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 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, 13
- content-script: 0
- offscreen: 0

UI Startup Metrics (1230 ± 64 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1230	1118	1533	64	1269	1331
			load	1071	918	1301	65	1140	988
			domContentLoaded	1065	912	1296	64	1136	986
			domInteractive	17	13	61	8	16	31
			firstPaint	742	130	1307	423	233	960
			backgroundConnect	9	7	16	2	9	10
			firstReactRender	22	15	140	14	21	38
			getState	12	5	34	7	7	9
			initialActions	0	0	1	0	0	1
			loadScripts	813	667	1035	62	852	899
			setupStore	8	4	23	4	7	9
	Webpack	Home	uiStartup	2174	1705	2496	166	2288	2386
			load	1697	1273	2140	161	1773	1995
			domContentLoaded	1692	1268	2136	160	1768	1985
			domInteractive	16	12	54	10	14	48
			firstPaint	158	68	351	57	246	82
			backgroundConnect	33	12	268	34	34	51
			firstReactRender	194	53	373	117	57	91
			getState	14	4	221	26	7	9
			initialActions	3	1	8	1	4	6
			loadScripts	1680	1261	2090	153	1757	1947
			setupStore	29	6	398	57	42	9
Firefox	Browserify	Home	uiStartup	1351	1184	1758	116	1417	1587
			load	1210	1056	1638	115	1263	1455
			domContentLoaded	1210	1056	1638	115	1263	1455
			domInteractive	96	38	190	26	88	97
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	25	17	60	8	27	41
			firstReactRender	21	19	35	2	22	26
			getState	7	4	39	4	7	9
			initialActions	0	0	1	0	0	1
			loadScripts	1187	1037	1615	115	1241	1434
			setupStore	8	4	235	23	6	7
	Webpack	Home	uiStartup	1473	1315	1842	113	1512	1703
			load	1268	1104	1634	103	1309	1500
			domContentLoaded	1267	1104	1633	103	1309	1500
			domInteractive	95	41	160	22	92	99
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	23	17	44	5	25	30
			firstReactRender	34	29	54	5	36	43
			getState	9	5	30	6	8	9
			initialActions	0	0	2	1	1	1
			loadScripts	1246	1083	1608	104	1287	1480
			setupStore	10	5	286	28	7	9

metamaskbot · 2025-04-09T12:28:40Z

Builds ready [95c632d]

builds: 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 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 (1210 ± 59 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	1115	1478	59	1242	1322
			load	1058	933	1236	56	1134	991
			domContentLoaded	1052	922	1227	56	1167	990
			domInteractive	17	13	68	7	16	29
			firstPaint	NaN	NaN	NaN	NaN	216	995
			backgroundConnect	9	6	30	3	9	10
			firstReactRender	20	15	149	14	19	35
			getState	13	5	36	8	7	9
			initialActions	0	0	6	1	0	0
			loadScripts	803	679	957	55	834	901
			setupStore	8	5	26	3	7	8
	Webpack	Home	uiStartup	2117	1707	2561	196	2249	2357
			load	1664	1318	2071	172	1744	2020
			domContentLoaded	1658	1315	2067	171	1740	2012
			domInteractive	17	12	60	11	14	51
			firstPaint	175	65	1529	154	229	78
			backgroundConnect	31	11	407	40	33	55
			firstReactRender	156	53	356	105	60	96
			getState	10	4	34	5	8	9
			initialActions	3	1	7	1	3	6
			loadScripts	1646	1311	2063	168	1732	1989
			setupStore	21	6	289	32	50	9
Firefox	Browserify	Home	uiStartup	1359	1179	1809	121	1417	1634
			load	1220	1054	1678	124	1284	1495
			domContentLoaded	1220	1054	1677	123	1284	1494
			domInteractive	100	38	213	32	89	97
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	25	16	104	11	23	43
			firstReactRender	22	18	28	2	22	26
			getState	7	4	38	4	7	9
			initialActions	0	0	1	0	0	1
			loadScripts	1196	1038	1648	123	1259	1461
			setupStore	6	4	11	2	6	8
	Webpack	Home	uiStartup	1581	1408	2052	126	1672	1801
			load	1362	1209	1815	116	1427	1573
			domContentLoaded	1362	1209	1815	116	1426	1572
			domInteractive	96	41	171	22	89	96
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	26	18	53	7	28	44
			firstReactRender	35	29	50	5	37	45
			getState	8	4	39	5	8	9
			initialActions	0	0	1	0	1	1
			loadScripts	1339	1184	1795	115	1401	1551
			setupStore	11	4	275	27	7	9

micaelae added 2 commits April 7, 2025 15:08

chore: add accountId param to useMultichainBalances

313ec80

fix: pass dest accountId to useMultichainBalances

2f31aca

metamaskbot added the team-swaps-and-bridge For issues with Swaps or Bridging label Apr 7, 2025

Merge branch 'main' into mms2154-dest-account-balances

3e45914

micaelae marked this pull request as ready for review April 7, 2025 22:10

micaelae requested a review from a team as a code owner April 7, 2025 22:10

micaelae changed the title ~~fix: dest account balances~~ fix: show account balances for selected XChain swap destination address Apr 7, 2025

ghgoodreau previously approved these changes Apr 7, 2025

View reviewed changes

micaelae requested a review from Copilot April 7, 2025 23:00

Copilot AI reviewed Apr 7, 2025

View reviewed changes

GustavoRSSilva previously approved these changes Apr 8, 2025

View reviewed changes

micaelae added this pull request to the merge queue Apr 8, 2025

github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Apr 8, 2025

Merge branch 'main' into mms2154-dest-account-balances

5f0818d

micaelae dismissed stale reviews from GustavoRSSilva and ghgoodreau via 5f0818d April 8, 2025 15:35

micaelae enabled auto-merge April 8, 2025 15:36

ghgoodreau approved these changes Apr 8, 2025

View reviewed changes

Merge branch 'main' into mms2154-dest-account-balances

e9c3fc4

GustavoRSSilva approved these changes Apr 8, 2025

View reviewed changes

micaelae added 3 commits April 8, 2025 10:44

Merge branch 'main' into mms2154-dest-account-balances

dfeeba6

Merge branch 'main' into mms2154-dest-account-balances

d6cc6bf

Merge branch 'main' into mms2154-dest-account-balances

95c632d

micaelae added this pull request to the merge queue Apr 9, 2025

Merged via the queue into main with commit 34e885b Apr 9, 2025
165 of 166 checks passed

micaelae deleted the mms2154-dest-account-balances branch April 9, 2025 12:58

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

metamaskbot added the release-12.17.0 Issue or pull request that will be included in release 12.17.0 label Apr 9, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: show account balances for selected XChain swap destination address #31684

fix: show account balances for selected XChain swap destination address #31684

micaelae commented Apr 7, 2025 •

edited

Loading

metamaskbot commented Apr 7, 2025

metamaskbot commented Apr 7, 2025

Copilot AI left a comment

metamaskbot commented Apr 8, 2025

metamaskbot commented Apr 9, 2025

fix: show account balances for selected XChain swap destination address #31684

fix: show account balances for selected XChain swap destination address #31684

Conversation

micaelae commented Apr 7, 2025 • edited Loading

Description

Related issues

Manual testing steps

Screenshots/Recordings

Before

After

Pre-merge author checklist

Pre-merge reviewer checklist

metamaskbot commented Apr 7, 2025

✨ Files requiring CODEOWNER review ✨

metamaskbot commented Apr 7, 2025

Copilot AI left a comment

Choose a reason for hiding this comment

metamaskbot commented Apr 8, 2025

metamaskbot commented Apr 9, 2025

micaelae commented Apr 7, 2025 •

edited

Loading