fix: hides fromtoken from the totokenpicker #33857

ghgoodreau · 2025-06-23T23:02:00Z

Description

Fixes a bug where you can select the same fromToken and toToken on Solana during swapping.

Related issues

Fixes: #32668

Manual testing steps

Go to Solana swap page
Try to select the same from and toTokens
Should be impossible with native (SOL) and non-native (USDC) tokens

Screenshots/Recordings

Before

With SOL as source token:

After

With SOL as source token:

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.

github-actions · 2025-06-23T23:02:07Z

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-06-23T23:04:10Z

✨ Files requiring CODEOWNER review ✨

🔄 @MetaMask/swaps-engineers (1 files, +30 -12)

📁 ui/
- 📁 hooks/
  - 📁 bridge/
    - 📄 useTokensWithFiltering.ts +30 -12

metamaskbot · 2025-06-23T23:25:27Z

Builds ready [59ffda2]

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, 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 (1310 ± 83 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1310	1177	1527	83	1367	1457
			load	1123	977	1347	84	1183	1294
			domContentLoaded	1116	970	1336	83	1174	1287
			domInteractive	19	15	43	6	18	33
			firstPaint	716	87	1343	465	1144	1271
			backgroundConnect	8	4	26	3	8	14
			firstReactRender	24	17	165	16	23	39
			getState	16	6	48	8	21	32
			initialActions	0	0	1	0	0	1
			loadScripts	855	720	1078	82	909	1005
			setupStore	10	6	36	5	9	26
	Webpack	Home	uiStartup	2179	1763	2676	207	2263	2640
			load	1655	1275	2105	175	1754	1987
			domContentLoaded	1649	1269	2099	174	1746	1973
			domInteractive	17	12	79	14	13	56
			firstPaint	165	61	413	73	185	308
			backgroundConnect	22	9	271	26	21	39
			firstReactRender	252	90	544	120	383	406
			getState	11	4	30	5	13	20
			initialActions	3	1	6	1	3	4
			loadScripts	1646	1265	2090	172	1743	1962
			setupStore	15	7	41	6	18	25
Firefox	Browserify	Home	uiStartup	1335	1195	1677	99	1372	1567
			load	1172	1051	1388	70	1216	1302
			domContentLoaded	1172	1051	1388	70	1216	1302
			domInteractive	114	35	501	71	119	280
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	19	13	67	6	20	29
			firstReactRender	23	20	50	4	23	30
			getState	10	5	109	12	9	28
			initialActions	0	0	1	0	0	1
			loadScripts	1155	1034	1374	69	1195	1283
			setupStore	10	4	69	13	9	46
	Webpack	Home	uiStartup	1697	1469	2259	170	1807	2071
			load	1461	1229	1933	146	1597	1693
			domContentLoaded	1461	1228	1933	146	1596	1693
			domInteractive	98	33	340	58	96	310
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	23	17	46	5	25	32
			firstReactRender	46	37	65	4	48	53
			getState	14	8	105	11	14	35
			initialActions	1	0	2	1	1	1
			loadScripts	1440	1212	1905	146	1574	1673
			setupStore	10	5	42	6	10	23

cc: @HowardBraham
Benchmark value 1311 exceeds gate value 1234 for chrome browserify home mean uiStartup
Benchmark value 1123 exceeds gate value 1070 for chrome browserify home mean load
Benchmark value 1116 exceeds gate value 1061 for chrome browserify home mean domContentLoaded
Benchmark value 25 exceeds gate value 23 for chrome browserify home mean firstReactRender
Benchmark value 16 exceeds gate value 15 for chrome browserify home mean getState
Benchmark value 855 exceeds gate value 830 for chrome browserify home mean loadScripts
Benchmark value 1457 exceeds gate value 1365 for chrome browserify home p95 uiStartup
Benchmark value 1294 exceeds gate value 1190 for chrome browserify home p95 load
Benchmark value 1287 exceeds gate value 1180 for chrome browserify home p95 domContentLoaded
Benchmark value 1271 exceeds gate value 1180 for chrome browserify home p95 firstPaint
Benchmark value 1005 exceeds gate value 940 for chrome browserify home p95 loadScripts
Benchmark value 26 exceeds gate value 17 for chrome browserify home p95 setupStore
Benchmark value 253 exceeds gate value 235 for chrome webpack home mean firstReactRender
Benchmark value 2640 exceeds gate value 2454 for chrome webpack home p95 uiStartup
Benchmark value 406 exceeds gate value 370 for chrome webpack home p95 firstReactRender
Benchmark value 114 exceeds gate value 110 for firefox browserify home mean domInteractive
Benchmark value 10 exceeds gate value 9 for firefox browserify home mean setupStore
Benchmark value 280 exceeds gate value 195 for firefox browserify home p95 domInteractive
Benchmark value 28 exceeds gate value 24 for firefox browserify home p95 getState
Benchmark value 46 exceeds gate value 27 for firefox browserify home p95 setupStore
Benchmark value 1698 exceeds gate value 1615 for firefox webpack home mean uiStartup
Benchmark value 1462 exceeds gate value 1380 for firefox webpack home mean load
Benchmark value 1461 exceeds gate value 1380 for firefox webpack home mean domContentLoaded
Benchmark value 47 exceeds gate value 38 for firefox webpack home mean firstReactRender
Benchmark value 1441 exceeds gate value 1360 for firefox webpack home mean loadScripts
Benchmark value 2071 exceeds gate value 1935 for firefox webpack home p95 uiStartup
Benchmark value 1693 exceeds gate value 1660 for firefox webpack home p95 load
Benchmark value 1693 exceeds gate value 1660 for firefox webpack home p95 domContentLoaded
Benchmark value 310 exceeds gate value 156 for firefox webpack home p95 domInteractive
Benchmark value 53 exceeds gate value 50 for firefox webpack home p95 firstReactRender
Benchmark value 35 exceeds gate value 32 for firefox webpack home p95 getState
Benchmark value 1673 exceeds gate value 1630 for firefox webpack home p95 loadScripts
Sum of mean exceeds: 572ms | Sum of p95 exceeds: 1203ms
Sum of all benchmark exceeds: 1775ms

Bundle size diffs

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

metamaskbot · 2025-06-25T17:58:46Z

Builds ready [67e0b81]

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

UI Startup Metrics (1195 ± 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	1195	1081	1369	71	1241	1339
			load	1030	909	1222	73	1080	1155
			domContentLoaded	1024	903	1216	72	1073	1148
			domInteractive	17	13	38	5	17	31
			firstPaint	652	74	1220	416	1038	1131
			backgroundConnect	7	4	21	3	7	11
			firstReactRender	22	16	44	5	23	38
			getState	13	6	38	7	17	26
			initialActions	0	0	1	0	0	1
			loadScripts	821	703	1012	72	867	943
			setupStore	8	5	24	3	9	17
	Webpack	Home	uiStartup	2171	1747	2671	207	2275	2602
			load	1663	1289	2058	179	1756	1951
			domContentLoaded	1657	1285	2052	178	1753	1948
			domInteractive	17	11	71	14	13	61
			firstPaint	168	64	420	66	209	288
			backgroundConnect	28	13	282	45	22	42
			firstReactRender	216	89	416	119	367	400
			getState	13	4	310	30	11	26
			initialActions	2	1	5	1	3	4
			loadScripts	1654	1284	2043	176	1751	1946
			setupStore	21	7	303	46	17	25
Firefox	Browserify	Home	uiStartup	1412	1265	1688	97	1458	1635
			load	1237	1109	1423	75	1290	1379
			domContentLoaded	1237	1109	1423	75	1290	1378
			domInteractive	112	36	299	36	126	179
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	28	14	188	26	26	101
			firstReactRender	25	22	51	4	25	30
			getState	11	5	93	13	9	20
			initialActions	0	0	1	0	0	1
			loadScripts	1213	1093	1399	75	1264	1363
			setupStore	9	4	97	14	7	26
	Webpack	Home	uiStartup	1589	1361	2246	179	1678	1968
			load	1383	1172	1949	152	1484	1674
			domContentLoaded	1382	1172	1949	152	1483	1674
			domInteractive	100	31	473	69	93	286
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	21	15	43	5	22	35
			firstReactRender	40	31	49	3	42	47
			getState	12	7	37	6	11	30
			initialActions	0	0	2	1	1	1
			loadScripts	1364	1155	1919	151	1464	1656
			setupStore	8	5	34	5	8	18

Benchmark value 944 exceeds gate value 940 for chrome browserify home p95 loadScripts
Benchmark value 2602 exceeds gate value 2454 for chrome webpack home p95 uiStartup
Benchmark value 62 exceeds gate value 57 for chrome webpack home p95 domInteractive
Benchmark value 400 exceeds gate value 370 for chrome webpack home p95 firstReactRender
Benchmark value 1413 exceeds gate value 1405 for firefox browserify home mean uiStartup
Benchmark value 112 exceeds gate value 110 for firefox browserify home mean domInteractive
Benchmark value 29 exceeds gate value 25 for firefox browserify home mean backgroundConnect
Benchmark value 26 exceeds gate value 25 for firefox browserify home mean firstReactRender
Benchmark value 10 exceeds gate value 9 for firefox browserify home mean setupStore
Benchmark value 101 exceeds gate value 70 for firefox browserify home p95 backgroundConnect
Benchmark value 1383 exceeds gate value 1380 for firefox webpack home mean load
Benchmark value 1383 exceeds gate value 1380 for firefox webpack home mean domContentLoaded
Benchmark value 41 exceeds gate value 38 for firefox webpack home mean firstReactRender
Benchmark value 1365 exceeds gate value 1360 for firefox webpack home mean loadScripts
Benchmark value 1968 exceeds gate value 1935 for firefox webpack home p95 uiStartup
Benchmark value 1674 exceeds gate value 1660 for firefox webpack home p95 load
Benchmark value 1674 exceeds gate value 1660 for firefox webpack home p95 domContentLoaded
Benchmark value 286 exceeds gate value 156 for firefox webpack home p95 domInteractive
Benchmark value 1656 exceeds gate value 1630 for firefox webpack home p95 loadScripts
Sum of mean exceeds: 30ms | Sum of p95 exceeds: 435ms
Sum of all benchmark exceeds: 465ms

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

background: 159.97 KiB (2.99%)
ui: 7.1 KiB (0.1%)
common: 21.1 KiB (0.25%)

fix: hides fromtoken from the dotokenpicker

59ffda2

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

ghgoodreau changed the title ~~fix: hides fromtoken from the dotokenpicker~~ fix: hides fromtoken from the totokenpicker Jun 24, 2025

fix: better docs

67e0b81

micaelae approved these changes Jun 25, 2025

View reviewed changes

SteP-n-s approved these changes Jun 25, 2025

View reviewed changes

ghgoodreau marked this pull request as ready for review June 25, 2025 19:06

ghgoodreau requested a review from a team as a code owner June 25, 2025 19:06

ghgoodreau added this pull request to the merge queue Jun 25, 2025

Merged via the queue into main with commit ee356a2 Jun 25, 2025
155 checks passed

ghgoodreau deleted the MMS-2643-from-and-to-addrs-fix branch June 25, 2025 19:57

github-actions bot locked and limited conversation to collaborators Jun 25, 2025

metamaskbot added the release-12.23.0 Issue or pull request that will be included in release 12.23.0 label Jun 25, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: hides fromtoken from the totokenpicker #33857

fix: hides fromtoken from the totokenpicker #33857

ghgoodreau commented Jun 23, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Jun 23, 2025

Uh oh!

metamaskbot commented Jun 23, 2025 •

edited

Loading

Uh oh!

metamaskbot commented Jun 23, 2025

Uh oh!

metamaskbot commented Jun 25, 2025

Uh oh!

Uh oh!

Uh oh!

fix: hides fromtoken from the totokenpicker #33857

fix: hides fromtoken from the totokenpicker #33857

Conversation

ghgoodreau commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related issues

Manual testing steps

Screenshots/Recordings

Before

After

Pre-merge author checklist

Pre-merge reviewer checklist

Uh oh!

github-actions bot commented Jun 23, 2025

Uh oh!

metamaskbot commented Jun 23, 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 Jun 23, 2025

Uh oh!

metamaskbot commented Jun 25, 2025

Uh oh!

Uh oh!

Uh oh!

ghgoodreau commented Jun 23, 2025 •

edited

Loading

metamaskbot commented Jun 23, 2025 •

edited

Loading