fix: Display alerts on add network request if there are pending confirmations #30634

jpuri · 2025-02-28T12:03:15Z

Description

Add confirmation reject warning when user adds a new network. As user confirms the warning pending confirmations are deleted.

Related issues

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/4292

Manual testing steps

Enable EVM multichain locally using env variable EVM_MULTICHAIN_ENABLED
Submit a confirmation
Add new network - ensure a warning appears and pending confirmations are deleted as user confirms the warning

Screenshots/Recordings

Uploading Screen Recording 2025-02-28 at 4.30.58 PM.mov…

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-02-28T12:03:29Z

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.

…nsion into add_network_alert

metamaskbot · 2025-02-28T16:19:12Z

Builds ready [1730a64]

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 (1750 ± 73 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	305	2131	1610	458	220
		domContentLoaded	1506	2105	1726	148	71
		load	1532	2134	1750	152	73
		domInteractive	25	96	38	16	8
		backgroundConnect	10	67	28	17	8
		firstReactRender	14	77	26	18	9
		getState	5	66	17	19	9
		initialActions	0	1	0	0	0
		loadScripts	1067	1526	1288	116	56
		setupStore	8	64	24	22	11
		uiStartup	1736	2362	2000	161	77

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

background: 840 Bytes (0.01%)
ui: 3.55 KiB (0.05%)
common: 227 Bytes (0.00%)

…d_network_alert

metamaskbot · 2025-03-03T11:43:27Z

Builds ready [bb8e799]

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 (1838 ± 86 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	271	2307	1769	387	186
		domContentLoaded	1536	2255	1807	172	83
		load	1545	2311	1838	179	86
		domInteractive	23	114	41	25	12
		backgroundConnect	10	110	32	25	12
		firstReactRender	16	81	39	23	11
		getState	5	60	25	21	10
		initialActions	0	1	0	0	0
		loadScripts	1126	1670	1363	136	66
		setupStore	8	69	16	17	8
		uiStartup	1804	2592	2102	187	90

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

background: 840 Bytes (0.01%)
ui: 3.79 KiB (0.05%)
common: 227 Bytes (0.00%)

app/scripts/lib/rpc-method-middleware/handlers/ethereum-chain-utils.js

builds.yml

ui/components/app/alert-system/multiple-alert-modal/multiple-alert-modal.tsx

ui/components/app/alert-system/multiple-alert-modal/multiple-alert-modal.test.tsx

ui/pages/confirmations/confirmation/alerts/useAddEthereumChainAlerts.test.ts

ui/pages/confirmations/confirmation/alerts/useAddEthereumChainAlerts.ts

ui/pages/confirmations/confirmation/alerts/useAlertsActions.tsx

ui/pages/confirmations/confirmation/confirmation.js

…nsion into add_network_alert

metamaskbot · 2025-03-05T14:09:09Z

Builds ready [6bd09fb]

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 (1721 ± 72 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	304	1998	1629	323	155
		domContentLoaded	1506	2155	1703	150	72
		load	1550	2169	1721	151	72
		domInteractive	14	117	42	24	12
		backgroundConnect	11	52	24	15	7
		firstReactRender	15	74	43	26	12
		getState	5	50	11	13	6
		initialActions	0	0	0	0	0
		loadScripts	1104	1660	1267	134	64
		setupStore	7	57	14	14	7
		uiStartup	1765	2470	1964	164	79

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

background: 846 Bytes (0.01%)
ui: 3.8 KiB (0.05%)
common: 362 Bytes (0.00%)

matthewwalsh0 · 2025-03-06T23:56:04Z

ui/selectors/selectors.js

+ * @param origin - Origin to ger approvals from.
+ * @returns array of approvals from an origin
+ */
+export const getApprovalsByOrigin = (state, origin) => {


Minor, but we try and name selectors using selectX to make it explicit they are selectors and not utils.

Also, should we avoid adding to the legacy selectors.js and maybe use ui/selectors/approvals.ts?

I will update this in following PR

matthewwalsh0 · 2025-03-06T23:58:41Z

app/scripts/metamask-controller.js

@@ -6035,7 +6035,7 @@ export default class MetamaskController extends EventEmitter {
    engine.push(createSelectedNetworkMiddleware(this.controllerMessenger));

    // Add a middleware that will switch chain on each request (as needed)
-    if (!process.env.EVM_MULTICHAIN_ENABLED) {
+    if (process.env.EVM_MULTICHAIN_ENABLED !== true) {


Minor, does this mean we can also remove the ENV for each build type?

I remember it created trouble with build. Let me experiment in next PR.

I just tried it in next pr @matthewwalsh0 and it caused CI to break:

ui/pages/confirmations/confirmation/alerts/useAddEthereumChainAlerts.ts

Display alerts on add network request if there are pending confirmations

bfcf801

jpuri added the team-confirmations Push issues to confirmations team label Feb 28, 2025

Adding test coverage

e667097

jpuri marked this pull request as ready for review February 28, 2025 13:29

jpuri requested a review from a team as a code owner February 28, 2025 13:29

jpuri added 6 commits February 28, 2025 19:07

Adding test coverage

b1a8557

Adding test coverage

8a138dd

Adding test coverage

2c9fbc3

Merge branch 'main' into add_network_alert

46fe299

Adding test coverage

f106e55

Merge branch 'add_network_alert' of github.com:MetaMask/metamask-exte…

1730a64

…nsion into add_network_alert

jpuri added 4 commits March 3, 2025 12:47

Merge branch 'main' of github.com:MetaMask/metamask-extension into ad…

769dac7

…d_network_alert

update

e103603

update

82f0cc9

update

bb8e799

matthewwalsh0 requested changes Mar 5, 2025

View reviewed changes

jpuri added 4 commits March 5, 2025 18:36

update

efe24ac

Merge branch 'main' into add_network_alert

460442e

update

798344a

Merge branch 'add_network_alert' of github.com:MetaMask/metamask-exte…

6bd09fb

…nsion into add_network_alert

jpuri requested a review from matthewwalsh0 March 5, 2025 13:51

matthewwalsh0 approved these changes Mar 7, 2025

View reviewed changes

OGPoyraz approved these changes Mar 7, 2025

View reviewed changes

jpuri added this pull request to the merge queue Mar 7, 2025

Merged via the queue into main with commit 135d0d2 Mar 7, 2025
74 checks passed

jpuri deleted the add_network_alert branch March 7, 2025 13:30

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

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Display alerts on add network request if there are pending confirmations #30634

fix: Display alerts on add network request if there are pending confirmations #30634

jpuri commented Feb 28, 2025 •

edited by github-actions bot

Loading

github-actions bot commented Feb 28, 2025

metamaskbot commented Feb 28, 2025

metamaskbot commented Mar 3, 2025

metamaskbot commented Mar 5, 2025

matthewwalsh0 Mar 6, 2025

jpuri Mar 7, 2025

matthewwalsh0 Mar 6, 2025

jpuri Mar 7, 2025

jpuri Mar 7, 2025

fix: Display alerts on add network request if there are pending confirmations #30634

fix: Display alerts on add network request if there are pending confirmations #30634

Conversation

jpuri commented Feb 28, 2025 • edited by github-actions bot Loading

Description

Related issues

Manual testing steps

Screenshots/Recordings

Pre-merge author checklist

Pre-merge reviewer checklist

github-actions bot commented Feb 28, 2025

metamaskbot commented Feb 28, 2025

metamaskbot commented Mar 3, 2025

metamaskbot commented Mar 5, 2025

matthewwalsh0 Mar 6, 2025

Choose a reason for hiding this comment

jpuri Mar 7, 2025

Choose a reason for hiding this comment

matthewwalsh0 Mar 6, 2025

Choose a reason for hiding this comment

jpuri Mar 7, 2025

Choose a reason for hiding this comment

jpuri Mar 7, 2025

Choose a reason for hiding this comment

jpuri commented Feb 28, 2025 •

edited by github-actions bot

Loading