fix: swap src token balance on multichain network #30622

micaelae · 2025-02-27T22:23:07Z

Description

Changes include

Follow up changes to 30313 for addressing comments by @darkwing
Pass a srcChainId to AssetPicker when swapping so that the selected asset's balance is included in data

Related issues

Fixes: N/A

Manual testing steps

Open in Flask
Go to Solana
Select a token
balance 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.

…hain-follow-up' into mms-fix-sol-swap-balance

micaelae · 2025-02-27T22:23:57Z

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

-        }
+        networkProps={{
+          network: fromChain,
+          networks: isSwap ? undefined : fromChains,


Main change here is to pass undefined networks bc user shouldn't be able to select from a list anyway

micaelae · 2025-02-27T22:24:23Z

ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx

    allNetworks[currentChainId as keyof typeof allNetworks];
-  const currentNetwork = useMultichainSelector(getMultichainCurrentNetwork);
-  const selectedNetwork = networkProps?.network ?? currentNetwork_;
+  const currentNetworkProviderConfig = useMultichainSelector(


Renaming variables here

metamaskbot · 2025-02-27T22:56:14Z

Builds ready [5681b23]

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 (1706 ± 145 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	250	2075	1461	485	233
		domContentLoaded	1445	2729	1678	302	145
		load	1455	2734	1706	301	145
		domInteractive	15	127	39	27	13
		backgroundConnect	10	66	35	21	10
		firstReactRender	14	74	29	19	9
		getState	4	64	15	18	9
		initialActions	0	1	0	0	0
		loadScripts	1016	2112	1229	252	121
		setupStore	7	68	17	17	8
		uiStartup	1617	3067	1956	345	166

Bundle size diffs

background: 0 Bytes (0.00%)
ui: 12 Bytes (0.00%)
common: 0 Bytes (0.00%)

metamaskbot · 2025-02-27T23:28:56Z

Builds ready [cde531e]

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 (1518 ± 37 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	303	1659	1455	275	132
		domContentLoaded	1372	1646	1502	75	36
		load	1380	1659	1518	77	37
		domInteractive	23	82	40	18	9
		backgroundConnect	9	48	21	14	7
		firstReactRender	14	72	28	22	10
		getState	4	48	10	12	6
		initialActions	0	1	0	0	0
		loadScripts	1000	1240	1109	67	32
		setupStore	7	59	15	16	8
		uiStartup	1587	1910	1727	86	41

Bundle size diffs

background: 0 Bytes (0.00%)
ui: 12 Bytes (0.00%)
common: 0 Bytes (0.00%)

metamaskbot · 2025-02-28T00:09:54Z

Builds ready [2233b98]

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 (1651 ± 52 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	354	1847	1593	303	146
		domContentLoaded	1414	1800	1624	97	47
		load	1449	1845	1651	108	52
		domInteractive	25	98	41	19	9
		backgroundConnect	7	81	28	21	10
		firstReactRender	14	70	41	25	12
		getState	5	49	11	12	6
		initialActions	0	1	0	0	0
		loadScripts	1030	1381	1201	93	44
		setupStore	7	54	11	10	5
		uiStartup	1632	2317	1881	154	74

Bundle size diffs

background: 0 Bytes (0.00%)
ui: 12 Bytes (0.00%)
common: 0 Bytes (0.00%)

micaelae added 4 commits February 26, 2025 19:16

refactor: address PR comments

bc67ee1

fix: check networks list to hide network picker

a204689

Merge remote-tracking branch 'origin/mms1867-asset-picker-caip-multic…

088d54b

…hain-follow-up' into mms-fix-sol-swap-balance

fix: hide network picker when swapping in solana

5681b23

metamaskbot added the team-swaps-and-bridge Team swaps and bridge label Feb 27, 2025

micaelae commented Feb 27, 2025

View reviewed changes

micaelae changed the title ~~Mms fix sol swap balance~~ fix: swap src token balance on multichain network Feb 27, 2025

micaelae marked this pull request as ready for review February 27, 2025 22:30

micaelae requested review from a team as code owners February 27, 2025 22:30

ghgoodreau approved these changes Feb 27, 2025

View reviewed changes

micaelae enabled auto-merge February 27, 2025 22:37

ghgoodreau previously approved these changes Feb 27, 2025

View reviewed changes

ejwessel previously approved these changes Feb 27, 2025

View reviewed changes

GustavoRSSilva previously approved these changes Feb 27, 2025

View reviewed changes

darkwing previously approved these changes Feb 27, 2025

View reviewed changes

Merge branch 'main' into mms-fix-sol-swap-balance

cde531e

Merge branch 'main' into mms-fix-sol-swap-balance

2233b98

micaelae dismissed stale reviews from ghgoodreau, darkwing, ejwessel, and GustavoRSSilva via 2233b98 February 27, 2025 23:35

darkwing approved these changes Feb 27, 2025

View reviewed changes

ghgoodreau approved these changes Feb 27, 2025

View reviewed changes

GustavoRSSilva approved these changes Feb 27, 2025

View reviewed changes

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

Merged via the queue into main with commit 7c69fed Feb 28, 2025
79 checks passed

micaelae deleted the mms-fix-sol-swap-balance branch February 28, 2025 00:41

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

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: swap src token balance on multichain network #30622

fix: swap src token balance on multichain network #30622

micaelae commented Feb 27, 2025 •

edited

Loading

micaelae Feb 27, 2025

micaelae Feb 27, 2025

metamaskbot commented Feb 27, 2025

metamaskbot commented Feb 27, 2025

metamaskbot commented Feb 28, 2025

fix: swap src token balance on multichain network #30622

fix: swap src token balance on multichain network #30622

Conversation

micaelae commented Feb 27, 2025 • edited Loading

Description

Related issues

Manual testing steps

Screenshots/Recordings

Before

After

Pre-merge author checklist

Pre-merge reviewer checklist

micaelae Feb 27, 2025

Choose a reason for hiding this comment

micaelae Feb 27, 2025

Choose a reason for hiding this comment

metamaskbot commented Feb 27, 2025

metamaskbot commented Feb 27, 2025

metamaskbot commented Feb 28, 2025

micaelae commented Feb 27, 2025 •

edited

Loading