fix: balance and token icons are unavailable when the bridge page is reopened #31343

micaelae · 2025-03-27T05:12:12Z

Description

Related issues

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

Manual testing steps

Request a Bridge quote with src=native token
Close extension popup
Open popup again
Balance should be repopulated and token icons should be visible

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.

Copilot

Pull Request Overview

This PR addresses an issue where balance and token icons were unavailable when the bridge page was reopened by updating both the balance fetching logic and the token icon assignment.

Adjusts the balance lookup in useLatestBalance to correctly select a CAIP asset type based on native status.
Revises token icon assignment logic in the prepare-bridge-page to prioritize available icon URLs.
Updates token type definitions to include an optional iconUrl field.

Reviewed Changes

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

File	Description
ui/hooks/bridge/useLatestBalance.ts	Updates balance lookup logic using a CAIP asset type based on native address detection.
ui/pages/bridge/prepare/prepare-bridge-page.tsx	Modifies token icon assignment for both toToken and fromToken, mixing icon and iconUrl sources.
shared/types/bridge.ts	Adds iconUrl to the BridgeAsset type for enhanced token image support.

Comments suppressed due to low confidence (2)

ui/pages/bridge/prepare/prepare-bridge-page.tsx:257

The toToken image property now uses srcAsset.icon as the primary source instead of destAsset.icon; please verify that this change is intentional to match the expected behavior of the bridge page.

image: srcAsset.icon ?? destAsset.iconUrl ?? '',

ui/pages/bridge/prepare/prepare-bridge-page.tsx:265

Switching from the nullish coalescing operator (??) to the logical OR (||) on this line means falsy values like an empty string are treated differently; please confirm if this behavior is desired.

image: srcAsset.icon || srcAsset.iconUrl || '',

metamaskbot · 2025-03-27T05:48:36Z

Builds ready [b779fab]

builds: chrome, firefox
builds (flask): chrome, firefox
builds (MMI): chrome
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
mv3: Bundle Size Stats
mv2: E2e 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
- content-script: 0
- offscreen: 0

Page Load Metrics (2903 ± 1366 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	1559	14743	2782	2828	1358
		domContentLoaded	1470	14609	2641	2818	1353
		load	1557	14814	2903	2846	1366
		domInteractive	25	2059	142	440	211
		backgroundConnect	30	1382	265	307	147
		firstReactRender	20	271	75	63	30
		getState	5	747	130	181	87
		initialActions	0	2	0	1	0
		loadScripts	1081	14141	2081	2800	1344
		setupStore	9	370	63	81	39
		uiStartup	1765	15933	4513	3882	1864

Bundle size diffs

background: 0 Bytes (0.00%)
ui: 487 Bytes (0.01%)
common: 0 Bytes (0.00%)

metamaskbot · 2025-03-27T18:33:20Z

Builds ready [d691a93]

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
- 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 (1220 ± 67 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1220	1109	1512	67	1260	1339
			load	1075	977	1302	64	1153	997
			domContentLoaded	1069	972	1295	63	1151	993
			domInteractive	17	13	72	8	16	29
			firstPaint	758	129	1242	420	223	988
			backgroundConnect	10	6	54	7	9	10
			firstReactRender	18	15	37	3	19	25
			getState	11	4	31	7	6	8
			initialActions	0	0	1	0	0	0
			loadScripts	814	703	1034	64	854	908
			setupStore	7	4	19	2	7	9
	Webpack	Home	uiStartup	974	769	1142	57	973	992
			load	833	637	975	62	875	905
			domContentLoaded	827	630	969	62	870	901
			domInteractive	16	12	68	8	14	38
			firstPaint	444	57	917	341	855	917
			backgroundConnect	16	11	34	4	16	26
			firstReactRender	14	12	30	2	14	16
			getState	7	4	13	2	7	9
			initialActions	0	0	1	0	0	1
			loadScripts	825	620	959	62	868	899
			setupStore	8	5	11	1	8	9
Firefox	Browserify	Home	uiStartup	1410	1232	1963	158	1448	1825
			load	1260	1064	1785	148	1306	1662
			domContentLoaded	1260	1064	1785	148	1305	1662
			domInteractive	101	37	214	29	90	98
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	27	17	134	16	27	51
			firstReactRender	24	20	61	5	25	28
			getState	8	3	47	6	7	8
			initialActions	0	0	1	0	0	1
			loadScripts	1235	1043	1762	148	1279	1630
			setupStore	7	4	45	5	6	8
	Webpack	Home	uiStartup	971	832	1463	138	900	980
			load	850	733	1268	123	819	950
			domContentLoaded	849	732	1268	123	818	949
			domInteractive	115	32	218	30	218	97
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	20	13	68	9	21	35
			firstReactRender	19	16	28	3	19	25
			getState	10	4	75	11	7	9
			initialActions	0	0	2	0	0	1
			loadScripts	833	720	1245	119	830	974
			setupStore	8	5	56	6	7	8

Bundle size diffs

background: 0 Bytes (0%)
ui: 362 Bytes (0.01%)
common: 0 Bytes (0%)

metamaskbot · 2025-03-27T21:01:49Z

✨ Files requiring CODEOWNER review ✨

🔄 @MetaMask/swaps-engineers

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

metamaskbot · 2025-03-27T22:39:46Z

Builds ready [a49e380]

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
- 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 (1177 ± 51 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1177	1077	1316	51	1211	1263
			load	1025	936	1163	48	951	987
			domContentLoaded	1019	932	1154	49	948	991
			domInteractive	16	13	32	5	15	29
			firstPaint	693	149	1163	402	256	984
			backgroundConnect	11	6	73	11	9	10
			firstReactRender	19	14	45	6	19	32
			getState	11	4	34	7	6	8
			initialActions	0	0	1	0	0	1
			loadScripts	805	701	942	50	837	897
			setupStore	8	5	22	3	7	8
	Webpack	Home	uiStartup	962	836	1237	76	961	982
			load	822	601	946	56	846	913
			domContentLoaded	815	583	937	56	842	901
			domInteractive	15	12	48	7	14	32
			firstPaint	479	55	932	345	835	900
			backgroundConnect	16	12	55	8	15	40
			firstReactRender	14	12	33	4	13	25
			getState	7	4	11	1	7	8
			initialActions	0	0	1	0	0	0
			loadScripts	813	573	927	56	840	899
			setupStore	8	5	33	4	8	9
Firefox	Browserify	Home	uiStartup	1422	1240	1999	166	1453	1872
			load	1280	1060	1822	161	1320	1707
			domContentLoaded	1280	1060	1821	161	1320	1707
			domInteractive	110	37	186	25	81	98
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	24	16	50	5	27	33
			firstReactRender	23	19	54	6	25	32
			getState	7	4	35	4	7	9
			initialActions	0	0	1	0	0	1
			loadScripts	1258	1041	1790	159	1298	1668
			setupStore	6	4	23	3	6	7
	Webpack	Home	uiStartup	975	826	1534	156	894	970
			load	854	721	1331	138	809	945
			domContentLoaded	854	720	1331	138	809	945
			domInteractive	112	35	180	26	137	90
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	21	13	94	12	24	33
			firstReactRender	18	16	27	2	18	24
			getState	9	3	92	11	8	9
			initialActions	0	0	1	0	0	1
			loadScripts	837	707	1302	135	812	967
			setupStore	7	4	49	5	7	8

Bundle size diffs

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

metamaskbot · 2025-03-28T16:19:39Z

Builds ready [ea01374]

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
- 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 (1172 ± 50 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1172	1084	1400	50	1195	1257
			load	1014	893	1152	48	949	991
			domContentLoaded	1009	884	1144	49	954	998
			domInteractive	16	13	37	5	15	32
			firstPaint	731	135	1159	392	254	985
			backgroundConnect	10	6	54	7	9	10
			firstReactRender	19	14	48	5	19	27
			getState	11	4	37	7	6	9
			initialActions	0	0	1	0	0	0
			loadScripts	798	677	928	49	828	882
			setupStore	8	4	19	2	7	8
	Webpack	Home	uiStartup	964	762	1260	85	969	990
			load	820	613	947	63	851	911
			domContentLoaded	814	596	936	64	846	904
			domInteractive	16	12	46	8	14	37
			firstPaint	511	55	939	350	840	907
			backgroundConnect	16	11	47	8	15	39
			firstReactRender	14	12	33	4	14	25
			getState	7	4	15	2	7	8
			initialActions	0	0	1	0	0	1
			loadScripts	811	586	925	63	844	894
			setupStore	7	5	19	2	7	9
Firefox	Browserify	Home	uiStartup	1417	1236	1955	157	1436	1827
			load	1271	1072	1804	151	1302	1656
			domContentLoaded	1270	1072	1803	151	1301	1656
			domInteractive	105	38	170	29	86	96
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	28	17	131	19	25	35
			firstReactRender	23	19	52	5	25	29
			getState	7	4	38	4	7	9
			initialActions	0	0	1	0	0	1
			loadScripts	1245	1051	1779	147	1276	1630
			setupStore	6	4	12	2	6	7
	Webpack	Home	uiStartup	971	823	1573	168	898	988
			load	851	718	1349	148	812	887
			domContentLoaded	851	718	1349	148	812	887
			domInteractive	115	34	218	28	154	96
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	21	13	101	15	20	33
			firstReactRender	18	16	28	2	19	25
			getState	8	4	68	7	7	9
			initialActions	0	0	1	0	0	1
			loadScripts	835	705	1322	144	804	911
			setupStore	8	5	61	8	7	8

Bundle size diffs

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

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

micaelae requested a review from Copilot March 27, 2025 05:12

Copilot AI reviewed Mar 27, 2025

View reviewed changes

micaelae marked this pull request as ready for review March 27, 2025 06:00

micaelae requested a review from a team as a code owner March 27, 2025 06:00

micaelae added 2 commits March 27, 2025 14:23

fix: show SOL balance on reopen

012b1d7

fix: show token icons when reopening the bridge page

70f3b09

micaelae force-pushed the mms2147-balance-resets-on-reopen branch from fa3e9e5 to 70f3b09 Compare March 27, 2025 21:24

micaelae enabled auto-merge March 27, 2025 21:34

GustavoRSSilva previously approved these changes Mar 27, 2025

View reviewed changes

micaelae added 2 commits March 27, 2025 15:03

fix: Linea and Ethereum balances

adb4fa6

fix: set insufficientBal to undefined when not running an e2e test

a49e380

micaelae dismissed GustavoRSSilva’s stale review via a49e380 March 27, 2025 22:03

ghgoodreau approved these changes Mar 28, 2025

View reviewed changes

Merge branch 'main' into mms2147-balance-resets-on-reopen

12744fa

GustavoRSSilva approved these changes Mar 28, 2025

View reviewed changes

Merge branch 'main' into mms2147-balance-resets-on-reopen

ea01374

micaelae added this pull request to the merge queue Mar 28, 2025

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

micaelae added this pull request to the merge queue Mar 28, 2025

micaelae mentioned this pull request Mar 28, 2025

fix: cp-12.16.0 include solana swap features and bug fixes #31408

Merged

7 tasks

Merged via the queue into main with commit 1e33e5f Mar 28, 2025
147 checks passed

micaelae deleted the mms2147-balance-resets-on-reopen branch March 28, 2025 17:28

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

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: balance and token icons are unavailable when the bridge page is reopened #31343

fix: balance and token icons are unavailable when the bridge page is reopened #31343

micaelae commented Mar 27, 2025 •

edited

Loading

Copilot AI left a comment

metamaskbot commented Mar 27, 2025

metamaskbot commented Mar 27, 2025

metamaskbot commented Mar 27, 2025

metamaskbot commented Mar 27, 2025

metamaskbot commented Mar 28, 2025

fix: balance and token icons are unavailable when the bridge page is reopened #31343

fix: balance and token icons are unavailable when the bridge page is reopened #31343

Conversation

micaelae commented Mar 27, 2025 • edited Loading

Description

Related issues

Manual testing steps

Screenshots/Recordings

Before

After

Pre-merge author checklist

Pre-merge reviewer checklist

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

metamaskbot commented Mar 27, 2025

metamaskbot commented Mar 27, 2025

metamaskbot commented Mar 27, 2025

✨ Files requiring CODEOWNER review ✨

metamaskbot commented Mar 27, 2025

metamaskbot commented Mar 28, 2025

micaelae commented Mar 27, 2025 •

edited

Loading