fix: Solana swap tx submission and activity list items #36321

micaelae · 2025-09-25T00:21:39Z

Description

Changes

Bump bridge controllers to 47.0.0 (fix: read selectedAccount from quote request and submitTx args core#6719) to remove dependency on the selectedAccountId when fetching quotes and submitting a transaction
Add controller permissions for getAccountByAddress action
Add selected account address to submitTx call params
Updates solana activity selectors so all tx submitted by accountGroup are visible

Changelog

CHANGELOG entry: fix: include accountAddress in swap tx submission params and show bridge activity list items for all accounts in accountGroup

Related issues

Fixes: https://consensyssoftware.atlassian.net/browse/MUL-983

Manual testing steps

Submit solana swap tx
Submit solana bridge tx
Submit evm swap tx
Submit evm bridge tx
balances shown in Swap page should be accurate
CTA button should be disabled when account has insufficient balance
submission should succeed if user has enough funds
transactions should be sent from expected accounts
all transactions should be visible in activity log (both EVM and Solana)

Screenshots/Recordings

Before

Nothing happens after attempting to submit a solana transaction. Old solana bridge txs don't appear in activity list

After

Able to submit a solana tx, and can see old and new solana bridge transactions

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-09-25T00:25:09Z

✨ Files requiring CODEOWNER review ✨

🔄 @MetaMask/swaps-engineers (7 files, +102 -49)

📁 ui/
- 📁 ducks/
  - 📁 bridge/
    - 📄 bridge.test.ts +2 -0
  - 📁 bridge-status/
    - 📄 actions.ts +8 -2
    - 📄 selectors.ts +33 -14
- 📁 hooks/
  - 📁 bridge/
    - 📄 useSolanaBridgeTransactionMapping.ts +2 -2
- 📁 pages/
  - 📁 bridge/
    - 📁 hooks/
      - 📁 __snapshots__/
        
        📄 useSubmitBridgeTransaction.test.tsx.snap +2 -0
        
        📄 useSubmitBridgeTransaction.ts +15 -2
    - 📁 prepare/
      - 📄 prepare-bridge-page.tsx +40 -29

## Explanation This change replaces `getSelectedMultichainAccount` calls with `getAccountByAddress(walletAddress)`, which mitigates tx submission issues that happen when the selected account is different from the account for which the quotes were fetched Note that there are breaking changes (see changelogs) in the `submitTx` and `updateBridgeQuoteParams` handlers. Extension integration PR: MetaMask/metamask-extension#36321  ## References Fixes https://consensyssoftware.atlassian.net/browse/MUL-983  ## Checklist - [x] I've updated the test suite for new or updated code as appropriate - [x] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [x] I've communicated my changes to consumers by [updating changelogs for packages I've changed](https://github.com/MetaMask/core/tree/main/docs/contributing.md#updating-changelogs), highlighting breaking changes as necessary - [x] I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes

socket-security · 2025-09-25T22:37:55Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Package	Supply Chain Security	Quality	Maintenance
@metamask/bridge-status-controller@46.0.0 ⏵ 47.0.0	⁺¹	⁺¹
@metamask/bridge-controller@46.0.0 ⏵ 47.0.0	⁺¹	⁺¹
@metamask/utils@11.8.0 ⏵ 11.8.1			⁺²

View full report

metamaskbot · 2025-09-25T23:03:06Z

📊 Page Load Benchmark Results

Current Commit: 6ce5e62 | Date: 9/25/2025

📄 Localhost MetaMask Test Dapp

Samples: 100

Summary

pageLoadTime-> current mean value: 1.10s (±78ms) 🟡 | historical mean value: 1.05s ⬆️ (historical data)
domContentLoaded-> current mean value: 772ms (±75ms) 🟢 | historical mean value: 736ms ⬆️ (historical data)
firstContentfulPaint-> current mean value: 81ms (±11ms) 🟢 | historical mean value: 79ms ⬆️ (historical data)

📈 Detailed Results

Metric	Mean	Std Dev	Min	Max	P95	P99
pageLoadTime	1.10s	78ms	1.05s	1.40s	1.33s	1.40s
domContentLoaded	772ms	75ms	734ms	1.07s	995ms	1.07s
firstPaint	81ms	11ms	64ms	180ms	92ms	180ms
firstContentfulPaint	81ms	11ms	64ms	180ms	92ms	180ms
largestContentfulPaint	0ms	0ms	0ms	0ms	0ms	0ms

Results generated automatically by MetaMask CI

metamaskbot · 2025-09-25T23:03:16Z

Builds ready [6ce5e62]

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

UI Startup Metrics (1252 ± 60 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1252	1140	1396	60	1287	1367
			load	1081	978	1234	53	1113	1174
			domContentLoaded	1074	972	1227	53	1107	1167
			domInteractive	18	13	46	6	17	36
			firstPaint	633	103	1220	439	1086	1168
			backgroundConnect	255	242	301	9	259	269
			firstReactRender	26	17	56	7	28	39
			getState	14	6	42	7	16	28
			initialActions	6	0	69	9	6	19
			loadScripts	825	734	975	52	860	927
			setupStore	9	5	22	3	10	17
	Webpack	Home	uiStartup	1185	949	1442	111	1266	1328
			load	990	774	1252	105	1059	1132
			domContentLoaded	985	770	1248	105	1056	1129
			domInteractive	17	13	58	10	15	47
			firstPaint	148	67	361	53	181	245
			backgroundConnect	16	11	33	6	17	30
			firstReactRender	37	34	50	3	37	43
			getState	7	4	19	3	7	13
			initialActions	6	2	16	4	8	14
			loadScripts	982	768	1246	105	1053	1126
			setupStore	9	6	26	3	9	13
Firefox	Browserify	Home	uiStartup	1409	1229	1797	95	1453	1601
			load	1217	1079	1349	64	1273	1316
			domContentLoaded	1217	1079	1348	64	1273	1315
			domInteractive	102	34	284	51	110	241
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	32	19	147	18	33	57
			firstReactRender	29	24	77	7	29	41
			getState	6	3	43	5	6	12
			initialActions	6	1	182	18	4	12
			loadScripts	1192	1062	1330	63	1254	1296
			setupStore	15	5	201	28	9	53
	Webpack	Home	uiStartup	1567	1350	2276	181	1635	2061
			load	1328	1148	1691	130	1412	1609
			domContentLoaded	1328	1148	1691	130	1412	1608
			domInteractive	108	32	380	69	101	303
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	34	20	207	23	36	79
			firstReactRender	37	30	51	4	39	46
			getState	6	2	78	7	6	9
			initialActions	3	0	22	3	4	8
			loadScripts	1304	1132	1670	127	1393	1557
			setupStore	10	5	69	8	9	18

Benchmark value 1252 exceeds gate value 1234 for chrome browserify home mean uiStartup
Benchmark value 1081 exceeds gate value 1070 for chrome browserify home mean load
Benchmark value 1075 exceeds gate value 1061 for chrome browserify home mean domContentLoaded
Benchmark value 256 exceeds gate value 10 for chrome browserify home mean backgroundConnect
Benchmark value 26 exceeds gate value 23 for chrome browserify home mean firstReactRender
Benchmark value 7 exceeds gate value 1 for chrome browserify home mean initialActions
Benchmark value 1367 exceeds gate value 1365 for chrome browserify home p95 uiStartup
Benchmark value 270 exceeds gate value 18 for chrome browserify home p95 backgroundConnect
Benchmark value 19 exceeds gate value 1.2 for chrome browserify home p95 initialActions
Benchmark value 14 exceeds gate value 7 for chrome webpack home p95 initialActions
Benchmark value 1409 exceeds gate value 1405 for firefox browserify home mean uiStartup
Benchmark value 32 exceeds gate value 25 for firefox browserify home mean backgroundConnect
Benchmark value 29 exceeds gate value 25 for firefox browserify home mean firstReactRender
Benchmark value 6 exceeds gate value 1 for firefox browserify home mean initialActions
Benchmark value 16 exceeds gate value 9 for firefox browserify home mean setupStore
Benchmark value 241 exceeds gate value 195 for firefox browserify home p95 domInteractive
Benchmark value 12 exceeds gate value 2 for firefox browserify home p95 initialActions
Benchmark value 53 exceeds gate value 27 for firefox browserify home p95 setupStore
Benchmark value 108 exceeds gate value 100 for firefox webpack home mean domInteractive
Benchmark value 35 exceeds gate value 26 for firefox webpack home mean backgroundConnect
Benchmark value 4 exceeds gate value 1 for firefox webpack home mean initialActions
Benchmark value 2061 exceeds gate value 1935 for firefox webpack home p95 uiStartup
Benchmark value 303 exceeds gate value 156 for firefox webpack home p95 domInteractive
Benchmark value 79 exceeds gate value 49 for firefox webpack home p95 backgroundConnect
Benchmark value 8 exceeds gate value 2 for firefox webpack home p95 initialActions
Sum of mean exceeds: 345ms | Sum of p95 exceeds: 669.8ms
Sum of all benchmark exceeds: 1014.8ms

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

background: 2.99 KiB (0.07%)
ui: -116 Bytes (0%)
common: 1.96 KiB (0.03%)

metamaskbot · 2025-09-25T23:45:08Z

📊 Page Load Benchmark Results

Current Commit: d8c4d4e | Date: 9/25/2025

📄 Localhost MetaMask Test Dapp

Samples: 100

Summary

pageLoadTime-> current mean value: 1.06s (±71ms) 🟡 | historical mean value: 1.05s ⬆️ (historical data)
domContentLoaded-> current mean value: 741ms (±68ms) 🟢 | historical mean value: 736ms ⬆️ (historical data)
firstContentfulPaint-> current mean value: 78ms (±12ms) 🟢 | historical mean value: 79ms ⬇️ (historical data)

📈 Detailed Results

Metric	Mean	Std Dev	Min	Max	P95	P99
pageLoadTime	1.06s	71ms	1.02s	1.32s	1.28s	1.32s
domContentLoaded	741ms	68ms	706ms	998ms	956ms	998ms
firstPaint	78ms	12ms	60ms	180ms	92ms	180ms
firstContentfulPaint	78ms	12ms	60ms	180ms	92ms	180ms
largestContentfulPaint	0ms	0ms	0ms	0ms	0ms	0ms

Results generated automatically by MetaMask CI

metamaskbot · 2025-09-25T23:45:25Z

Builds ready [d8c4d4e]

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

UI Startup Metrics (1232 ± 58 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	1120	1428	58	1266	1318
			load	1066	969	1192	53	1104	1152
			domContentLoaded	1059	963	1187	53	1098	1145
			domInteractive	19	13	59	10	17	45
			firstPaint	681	73	1200	428	1075	1151
			backgroundConnect	254	243	270	6	258	266
			firstReactRender	25	17	42	6	27	37
			getState	12	5	36	6	15	26
			initialActions	4	1	17	3	5	12
			loadScripts	812	718	935	51	846	896
			setupStore	9	5	18	2	10	13
	Webpack	Home	uiStartup	1165	925	1446	111	1238	1308
			load	978	758	1271	106	1042	1128
			domContentLoaded	974	753	1268	106	1039	1124
			domInteractive	16	12	66	9	14	41
			firstPaint	152	62	315	51	179	243
			backgroundConnect	16	9	30	6	17	28
			firstReactRender	36	33	51	3	36	44
			getState	7	3	26	3	7	12
			initialActions	8	2	86	9	8	15
			loadScripts	971	751	1265	105	1034	1122
			setupStore	8	6	13	2	9	12
Firefox	Browserify	Home	uiStartup	1450	1258	1881	96	1492	1605
			load	1255	1097	1440	70	1301	1373
			domContentLoaded	1255	1096	1440	70	1301	1373
			domInteractive	104	34	314	51	114	249
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	36	22	136	19	37	85
			firstReactRender	29	24	56	5	30	34
			getState	6	2	33	4	7	12
			initialActions	5	1	63	8	4	10
			loadScripts	1228	1078	1413	70	1279	1332
			setupStore	12	5	154	18	9	50
	Webpack	Home	uiStartup	1548	1372	2111	163	1639	1891
			load	1320	1160	1732	151	1412	1621
			domContentLoaded	1320	1160	1731	151	1412	1621
			domInteractive	108	33	333	70	97	294
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	32	21	51	7	38	42
			firstReactRender	37	31	62	4	39	41
			getState	6	3	17	2	6	10
			initialActions	4	0	148	15	4	7
			loadScripts	1296	1131	1713	153	1391	1600
			setupStore	9	5	29	3	10	17

Benchmark value 254 exceeds gate value 10 for chrome browserify home mean backgroundConnect
Benchmark value 25 exceeds gate value 23 for chrome browserify home mean firstReactRender
Benchmark value 5 exceeds gate value 1 for chrome browserify home mean initialActions
Benchmark value 45 exceeds gate value 41 for chrome browserify home p95 domInteractive
Benchmark value 266 exceeds gate value 18 for chrome browserify home p95 backgroundConnect
Benchmark value 12 exceeds gate value 1.2 for chrome browserify home p95 initialActions
Benchmark value 8 exceeds gate value 7 for chrome webpack home mean initialActions
Benchmark value 15 exceeds gate value 7 for chrome webpack home p95 initialActions
Benchmark value 1450 exceeds gate value 1405 for firefox browserify home mean uiStartup
Benchmark value 1256 exceeds gate value 1245 for firefox browserify home mean load
Benchmark value 1255 exceeds gate value 1239 for firefox browserify home mean domContentLoaded
Benchmark value 36 exceeds gate value 25 for firefox browserify home mean backgroundConnect
Benchmark value 29 exceeds gate value 25 for firefox browserify home mean firstReactRender
Benchmark value 5 exceeds gate value 1 for firefox browserify home mean initialActions
Benchmark value 13 exceeds gate value 9 for firefox browserify home mean setupStore
Benchmark value 249 exceeds gate value 195 for firefox browserify home p95 domInteractive
Benchmark value 85 exceeds gate value 70 for firefox browserify home p95 backgroundConnect
Benchmark value 10 exceeds gate value 2 for firefox browserify home p95 initialActions
Benchmark value 50 exceeds gate value 27 for firefox browserify home p95 setupStore
Benchmark value 108 exceeds gate value 100 for firefox webpack home mean domInteractive
Benchmark value 32 exceeds gate value 26 for firefox webpack home mean backgroundConnect
Benchmark value 5 exceeds gate value 1 for firefox webpack home mean initialActions
Benchmark value 294 exceeds gate value 156 for firefox webpack home p95 domInteractive
Benchmark value 7 exceeds gate value 2 for firefox webpack home p95 initialActions
Sum of mean exceeds: 364ms | Sum of p95 exceeds: 513.8ms
Sum of all benchmark exceeds: 877.8ms

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

background: 2.99 KiB (0.07%)
ui: -116 Bytes (0%)
common: 1.96 KiB (0.03%)

ngalee8311 · 2025-09-26T06:46:15Z

mul983-solana-activity
files changed

micaelae added 8 commits September 24, 2025 14:31

fix: use account group to select native balance

bfd38f3

fix: show SOL as a token (not native)

1c61fef

fix: use account group from address to get multichain balances

989532f

fix: selector unit test

d528061

fix: rm only

91bd1d6

fix: show solana swap and bridge transactions

52dc0fa

chore: require walletAddress in bridge quote request

13fc612

chore: require accountAddress when submitting bridge txs

10ce2bd

metamaskbot added the team-swaps-and-bridge Swaps and Bridge team label Sep 25, 2025

micaelae changed the base branch from main to swap3098-sol-balance September 25, 2025 00:22

Merge branch 'swap3098-sol-balance' into mul983-solana-activity

67f1b7c

micaelae mentioned this pull request Sep 25, 2025

fix: read selectedAccount from quote request and submitTx args MetaMask/core#6719

Merged

4 tasks

github-actions bot added the size-M label Sep 25, 2025

Base automatically changed from swap3098-sol-balance to main September 25, 2025 19:04

Merge branch 'main' into mul983-solana-activity

ffc28bf

chore: bump bridge controllers

6ce5e62

fix: unit tests

d8c4d4e

micaelae changed the title ~~fix: Solana bridge tx submission and activity list items~~ fix: Solana swap tx submission and activity list items Sep 25, 2025

micaelae marked this pull request as ready for review September 25, 2025 23:34

micaelae requested a review from a team as a code owner September 25, 2025 23:34

ghgoodreau approved these changes Sep 25, 2025

View reviewed changes

SteP-n-s approved these changes Sep 26, 2025

View reviewed changes

micaelae added this pull request to the merge queue Sep 26, 2025

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

micaelae added this pull request to the merge queue Sep 26, 2025

Merged via the queue into main with commit 31742a1 Sep 26, 2025
158 of 162 checks passed

micaelae deleted the mul983-solana-activity branch September 26, 2025 20:45

github-actions bot locked and limited conversation to collaborators Sep 26, 2025

metamaskbot added the release-13.5.0 Issue or pull request that will be included in release 13.5.0 label Sep 26, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: Solana swap tx submission and activity list items #36321

fix: Solana swap tx submission and activity list items #36321

micaelae commented Sep 25, 2025 •

edited

Loading

Uh oh!

metamaskbot commented Sep 25, 2025 •

edited

Loading

Uh oh!

socket-security bot commented Sep 25, 2025 •

edited

Loading

Uh oh!

metamaskbot commented Sep 25, 2025

Uh oh!

metamaskbot commented Sep 25, 2025

Uh oh!

metamaskbot commented Sep 25, 2025

Uh oh!

metamaskbot commented Sep 25, 2025

Uh oh!

ngalee8311 commented Sep 26, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fix: Solana swap tx submission and activity list items #36321

fix: Solana swap tx submission and activity list items #36321

Conversation

micaelae commented Sep 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Changelog

Related issues

Manual testing steps

Screenshots/Recordings

Before

After

Pre-merge author checklist

Pre-merge reviewer checklist

Uh oh!

metamaskbot commented Sep 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✨ Files requiring CODEOWNER review ✨

Uh oh!

socket-security bot commented Sep 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

metamaskbot commented Sep 25, 2025

📊 Page Load Benchmark Results

📄 Localhost MetaMask Test Dapp

Summary

Uh oh!

metamaskbot commented Sep 25, 2025

Uh oh!

metamaskbot commented Sep 25, 2025

📊 Page Load Benchmark Results

📄 Localhost MetaMask Test Dapp

Summary

Uh oh!

metamaskbot commented Sep 25, 2025

Uh oh!

ngalee8311 commented Sep 26, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

micaelae commented Sep 25, 2025 •

edited

Loading

metamaskbot commented Sep 25, 2025 •

edited

Loading

socket-security bot commented Sep 25, 2025 •

edited

Loading