chore: Add error handling for `setCorrectChain` #28740

gambinish · 2024-11-26T18:40:29Z

Description

Adds error handling to setCurrentNetwork and additional check to make sure that the user is never redirected to an incorrect network that is incompatible with the token they are trying to send/swap.

This is an edge case, and should be revisited post-launch for a more elegant/user friendly approach. We are now checking to make sure that the network and token chainIds match before redirecting. Very rarely, this will result in the user needing to click the send/swap button twice before they get redirected to the send/swap flow.

In our opinion, this was preferable to potentially redirecting the user to an incorrect network, where they could transact with a token incompatible with the network they are on.

Related issues

Fixes:

Manual testing steps

Screenshots/Recordings

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 · 2024-11-26T18:40:41Z

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.

…/metamask-extension into chore/portfolio-view-swap-check

metamaskbot · 2024-11-26T20:32:20Z

Builds ready [e829c99]

builds: chrome, firefox
builds (beta): chrome
builds (flask): chrome, firefox
builds (MMI): chrome, firefox
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
mv3: Background Module Init Stats
mv3: UI Init Stats
mv3: Module Load Stats
mv3: Bundle Size Stats
mv2: E2e Actions Stats
code coverage: Report
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7
- common: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9
- content-script: 0
- offscreen: 0
- ui: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1727 ± 75 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	1517	2100	1733	162	78
		domContentLoaded	1479	2003	1699	152	73
		load	1516	2100	1727	156	75
		domInteractive	24	96	42	23	11
		backgroundConnect	9	72	30	19	9
		firstReactRender	16	74	32	21	10
		getState	5	62	19	19	9
		initialActions	0	0	0	0	0
		loadScripts	1080	1552	1253	139	67
		setupStore	6	59	22	21	10
		uiStartup	1732	2406	1924	180	86

Bundle size diffs

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

ui/pages/asset/components/token-buttons.tsx

…n/network mismatch

…ssets-page

ui/pages/asset/components/token-buttons.tsx

metamaskbot · 2024-11-27T18:42:39Z

Builds ready [da5872e]

builds: chrome, firefox
builds (beta): chrome
builds (flask): chrome, firefox
builds (MMI): chrome, firefox
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
mv3: Background Module Init Stats
mv3: UI Init Stats
mv3: Module Load Stats
mv3: Bundle Size Stats
mv2: E2e Actions Stats
code coverage: Report
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7
- common: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9
- content-script: 0
- offscreen: 0
- ui: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1678 ± 42 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	419	1855	1614	288	138
		domContentLoaded	1508	1842	1653	88	42
		load	1523	1857	1678	88	42
		domInteractive	20	68	34	15	7
		backgroundConnect	9	72	26	17	8
		firstReactRender	16	103	46	27	13
		getState	5	56	15	16	8
		initialActions	0	1	0	0	0
		loadScripts	1113	1394	1220	81	39
		setupStore	6	62	12	15	7
		uiStartup	1722	2497	1888	160	77

Bundle size diffs

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

metamaskbot · 2024-11-27T20:33:12Z

Builds ready [8d8272d]

builds: chrome, firefox
builds (beta): chrome
builds (flask): chrome, firefox
builds (MMI): chrome, firefox
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
mv3: Background Module Init Stats
mv3: UI Init Stats
mv3: Module Load Stats
mv3: Bundle Size Stats
mv2: E2e Actions Stats
code coverage: Report
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7
- common: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9
- content-script: 0
- offscreen: 0
- ui: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1711 ± 44 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	1533	1846	1712	91	44
		domContentLoaded	1515	1835	1682	91	44
		load	1531	1841	1711	92	44
		domInteractive	23	94	43	21	10
		backgroundConnect	9	109	29	24	12
		firstReactRender	16	75	39	24	12
		getState	5	21	8	4	2
		initialActions	0	1	0	0	0
		loadScripts	1101	1394	1248	84	40
		setupStore	6	58	19	20	10
		uiStartup	1751	2128	1936	117	56

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

background: 0 Bytes (0.00%)
ui: 286 Bytes (0.00%)
common: 309 Bytes (0.00%)

metamaskbot · 2024-11-27T21:24:52Z

Builds ready [954652b]

builds: chrome, firefox
builds (beta): chrome
builds (flask): chrome, firefox
builds (MMI): chrome, firefox
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
mv3: Background Module Init Stats
mv3: UI Init Stats
mv3: Module Load Stats
mv3: Bundle Size Stats
mv2: E2e Actions Stats
code coverage: Report
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7
- common: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9
- content-script: 0
- offscreen: 0
- ui: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1923 ± 55 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	1742	2239	1925	119	57
		domContentLoaded	1731	2170	1892	110	53
		load	1741	2184	1923	115	55
		domInteractive	25	76	39	16	8
		backgroundConnect	10	104	35	28	13
		firstReactRender	15	57	26	13	6
		getState	46	122	83	21	10
		initialActions	0	1	0	0	0
		loadScripts	1322	1745	1480	101	48
		setupStore	6	10	8	1	1
		uiStartup	1962	2531	2191	156	75

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

background: 0 Bytes (0.00%)
ui: 286 Bytes (0.00%)
common: 309 Bytes (0.00%)

metamaskbot · 2024-11-27T22:58:14Z

Builds ready [8a8f65c]

builds: chrome, firefox
builds (beta): chrome
builds (flask): chrome, firefox
builds (MMI): chrome, firefox
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
mv3: Background Module Init Stats
mv3: UI Init Stats
mv3: Module Load Stats
mv3: Bundle Size Stats
mv2: E2e Actions Stats
code coverage: Report
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7
- common: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9
- content-script: 0
- offscreen: 0
- ui: 0, 1, 10, 11, 12, 2, 3, 4, 5, 6, 7, 8, 9

Page Load Metrics (1752 ± 48 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	1582	2040	1750	100	48
		domContentLoaded	1571	2014	1731	96	46
		load	1584	2042	1752	100	48
		domInteractive	24	64	34	12	6
		backgroundConnect	7	54	22	14	7
		firstReactRender	14	51	19	8	4
		getState	42	106	79	20	9
		initialActions	0	1	0	0	0
		loadScripts	1160	1585	1311	94	45
		setupStore	6	43	10	8	4
		uiStartup	1782	2347	1973	142	68

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

background: 0 Bytes (0.00%)
ui: 286 Bytes (0.00%)
common: 309 Bytes (0.00%)

chore: Add error handling and unit test for setCorrectChain

63cd7bf

metamaskbot added the team-assets label Nov 26, 2024

gambinish added the portfolio-view Used for PRs and issues related to Q4 2024 portfolio view label Nov 26, 2024

gambinish requested a review from jonybur November 26, 2024 18:45

gambinish added 4 commits November 26, 2024 10:54

fix: Mock react router correctly in token-buttons-test

bd04656

fix: Expand test suite to include swap button click

1995a8d

fix: Lint and update snapshots

fd633a4

fix: Lint file import order

76de6cc

gambinish marked this pull request as ready for review November 26, 2024 19:37

gambinish requested a review from a team as a code owner November 26, 2024 19:37

gambinish and others added 4 commits November 26, 2024 11:37

Merge branch 'develop' into chore/portfolio-view-swap-check

d920599

chore: incorporate dapp network switching into setCorrectChain

cf02585

Merge branch 'chore/portfolio-view-swap-check' of github.com:MetaMask…

d9a858e

…/metamask-extension into chore/portfolio-view-swap-check

fix: Tweak asset-page-test state mock

e829c99

gambinish mentioned this pull request Nov 26, 2024

Multichain: Change Chain from Asset Details for Send and Swap #27732

Closed

7 tasks

salimtb previously approved these changes Nov 27, 2024

View reviewed changes

sahar-fehri reviewed Nov 27, 2024

View reviewed changes

ui/pages/asset/components/token-buttons.tsx Show resolved Hide resolved

fix: Add if condition to ensure that navigation doesnt happen on chai…

d6a3682

…n/network mismatch

gambinish dismissed salimtb’s stale review via d6a3682 November 27, 2024 17:15

gambinish added 3 commits November 27, 2024 09:16

fix: Active tab no longer needs to be mocked in unit test suite for a…

bc9a520

…ssets-page

fix: Add unit test coverage for coin-buttons

a6e695e

fix: Lint

da5872e

sahar-fehri reviewed Nov 27, 2024

View reviewed changes

ui/pages/asset/components/token-buttons.tsx Outdated Show resolved Hide resolved

gambinish added 4 commits November 27, 2024 11:36

fix: Throw error in setCurrentChain, catch and stop execution on failure

53d1026

fix: Cleanup

f31edb0

fix: Cleanup

1b42ecb

fix: Move the network switch action outside of codefence

ddb158e

gambinish added 2 commits November 27, 2024 12:02

chore: Revert unecessary snapshot update

30b5bb9

chore: Remove mocked error

8d8272d

sahar-fehri approved these changes Nov 27, 2024

View reviewed changes

Merge branch 'develop' into chore/portfolio-view-swap-check

954652b

darkwing approved these changes Nov 27, 2024

View reviewed changes

Merge branch 'develop' into chore/portfolio-view-swap-check

8a8f65c

gambinish changed the title ~~chore: Add error handling and unit test for setCorrectChain~~ chore: Add error handling for setCorrectChain Nov 27, 2024

gambinish added this pull request to the merge queue Nov 27, 2024

Merged via the queue into develop with commit 781267a Nov 27, 2024
78 checks passed

gambinish deleted the chore/portfolio-view-swap-check branch November 27, 2024 23:20

github-actions bot locked and limited conversation to collaborators Nov 27, 2024

metamaskbot added the release-12.9.0 Issue or pull request that will be included in release 12.9.0 label Nov 27, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Add error handling for `setCorrectChain` #28740

chore: Add error handling for `setCorrectChain` #28740

gambinish commented Nov 26, 2024 •

edited

Loading

github-actions bot commented Nov 26, 2024

metamaskbot commented Nov 26, 2024

metamaskbot commented Nov 27, 2024

metamaskbot commented Nov 27, 2024

metamaskbot commented Nov 27, 2024

metamaskbot commented Nov 27, 2024

chore: Add error handling for setCorrectChain #28740

chore: Add error handling for setCorrectChain #28740

Conversation

gambinish commented Nov 26, 2024 • edited Loading

Description

Related issues

Manual testing steps

Screenshots/Recordings

Pre-merge author checklist

Pre-merge reviewer checklist

github-actions bot commented Nov 26, 2024

metamaskbot commented Nov 26, 2024

metamaskbot commented Nov 27, 2024

metamaskbot commented Nov 27, 2024

metamaskbot commented Nov 27, 2024

metamaskbot commented Nov 27, 2024

chore: Add error handling for `setCorrectChain` #28740

chore: Add error handling for `setCorrectChain` #28740

gambinish commented Nov 26, 2024 •

edited

Loading