fix: cp-12.17.3 support permit2 approvals in batch simulation #32733

matthewwalsh0 · 2025-05-09T09:14:19Z

Description

Include Permit2 approvals in batch simulation changes.

In addition:

Fix incorrect Unlimited label.
Show loader in Edit Spending Cap Modal to prevent temporary token ID display.

Related issues

Fixes: #4847 #4846

Manual testing steps

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.

sentry-io · 2025-05-09T09:14:44Z

🔍 Existing Issues For Review

Your pull request is modifying functions with the following pre-existing issues:

📄 File: ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx

Function	Unhandled Issue
`handleSubmit`	Error: Invalid data /notification.html `Event Count:` 3 `Affected Users:` 0

_{Did you find this useful? React with a 👍 or 👎}

metamaskbot · 2025-05-09T09:16:20Z

✨ Files requiring CODEOWNER review ✨

✅ @MetaMask/confirmations

ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/__snapshots__/edit-spending-cap-modal.test.tsx.snap
ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.test.tsx
ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx
ui/pages/confirmations/components/confirm/info/approve/hooks/use-approve-token-simulation.test.ts
ui/pages/confirmations/components/confirm/info/approve/hooks/use-approve-token-simulation.ts
ui/pages/confirmations/components/confirm/info/batch/batch-simulation-details/batch-simulation-details.test.tsx
ui/pages/confirmations/components/confirm/info/hooks/useBatchApproveBalanceChanges.test.ts
ui/pages/confirmations/components/confirm/info/hooks/useBatchApproveBalanceChanges.ts

metamaskbot · 2025-05-09T09:46:21Z

Builds ready [0001c3f]

builds: chrome, firefox
builds (beta): chrome
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 CircleCI 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 (1221 ± 73 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1221	1077	1466	73	1264	1361
			load	1069	941	1297	68	1113	1177
			domContentLoaded	1062	933	1291	68	1109	1170
			domInteractive	16	13	27	3	16	24
			firstPaint	698	74	1302	430	1081	1147
			backgroundConnect	7	4	28	4	7	20
			firstReactRender	20	14	69	7	20	36
			getState	14	6	33	7	19	28
			initialActions	0	0	1	0	0	1
			loadScripts	819	697	989	64	862	923
			setupStore	7	4	15	2	8	12
	Webpack	Home	uiStartup	2170	1758	2528	181	2303	2417
			load	1681	1350	1977	134	1779	1858
			domContentLoaded	1674	1346	1955	133	1771	1854
			domInteractive	16	12	58	10	13	49
			firstPaint	159	63	435	57	175	277
			backgroundConnect	29	10	203	22	36	61
			firstReactRender	178	54	357	111	304	347
			getState	17	4	308	31	16	41
			initialActions	3	1	6	1	3	5
			loadScripts	1669	1344	1931	133	1766	1852
			setupStore	21	6	270	31	21	34
Firefox	Browserify	Home	uiStartup	1364	1202	1732	105	1423	1568
			load	1215	1063	1547	99	1269	1398
			domContentLoaded	1215	1062	1546	99	1269	1398
			domInteractive	99	37	182	28	115	149
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	22	14	147	15	21	41
			firstReactRender	24	20	56	7	23	40
			getState	7	5	13	2	8	11
			initialActions	0	0	1	0	0	1
			loadScripts	1196	1043	1533	98	1250	1381
			setupStore	9	4	205	21	7	33
	Webpack	Home	uiStartup	1526	1358	1851	110	1595	1738
			load	1312	1177	1625	103	1393	1519
			domContentLoaded	1311	1177	1624	103	1393	1519
			domInteractive	80	38	133	19	88	123
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	23	14	104	13	23	43
			firstReactRender	35	29	49	4	36	43
			getState	9	4	66	8	9	30
			initialActions	0	0	1	0	1	1
			loadScripts	1292	1160	1607	103	1376	1500
			setupStore	8	5	23	3	8	14

Benchmark value 1063 exceeds gate value 1061 for chrome browserify home mean domContentLoaded
Benchmark value 20 exceeds gate value 18 for chrome browserify home p95 backgroundConnect
Benchmark value 10 exceeds gate value 9 for firefox browserify home mean setupStore
Benchmark value 33 exceeds gate value 27 for firefox browserify home p95 setupStore
Sum of mean exceeds: 3ms | Sum of p95 exceeds: 8ms
Sum of all benchmark exceeds: 11ms

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

background: 0 Bytes (0%)
ui: 1.33 KiB (0.02%)
common: 308 Bytes (0%)

metamaskbot · 2025-05-09T13:16:44Z

❌ API Spec Test Failed. View the report here.

metamaskbot · 2025-05-09T16:31:58Z

Builds ready [3ce2b50]

builds: chrome, firefox
builds (beta): chrome
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 CircleCI 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 (1264 ± 61 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1264	1138	1474	61	1301	1352
			load	1104	988	1264	63	1152	1211
			domContentLoaded	1098	969	1256	64	1143	1204
			domInteractive	17	14	40	4	17	26
			firstPaint	659	144	1256	456	1126	1188
			backgroundConnect	8	4	42	6	8	25
			firstReactRender	20	15	39	3	22	27
			getState	16	6	86	10	20	29
			initialActions	0	0	1	0	0	1
			loadScripts	850	734	1012	61	899	955
			setupStore	8	5	15	2	8	11
	Webpack	Home	uiStartup	2153	1739	2515	179	2283	2365
			load	1671	1327	2084	144	1765	1907
			domContentLoaded	1663	1323	2069	142	1758	1840
			domInteractive	16	11	74	11	13	47
			firstPaint	173	61	386	62	210	303
			backgroundConnect	31	10	238	30	33	57
			firstReactRender	166	54	376	106	282	348
			getState	18	4	329	36	15	41
			initialActions	3	1	8	1	3	5
			loadScripts	1658	1322	2045	141	1752	1837
			setupStore	18	6	184	18	21	35
Firefox	Browserify	Home	uiStartup	1390	1203	1926	119	1436	1629
			load	1236	1071	1774	110	1289	1431
			domContentLoaded	1236	1071	1773	110	1289	1430
			domInteractive	103	40	292	31	115	146
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	20	13	60	7	21	34
			firstReactRender	24	20	62	6	24	34
			getState	10	4	245	24	8	11
			initialActions	0	0	2	0	0	1
			loadScripts	1218	1057	1760	109	1270	1415
			setupStore	6	4	37	4	6	9
	Webpack	Home	uiStartup	1605	1442	2115	141	1660	1983
			load	1384	1207	1813	126	1460	1659
			domContentLoaded	1384	1207	1812	126	1460	1658
			domInteractive	83	37	270	27	90	127
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	24	16	81	10	25	43
			firstReactRender	35	29	51	4	37	46
			getState	10	5	33	6	10	30
			initialActions	0	0	1	0	1	1
			loadScripts	1363	1192	1797	126	1435	1634
			setupStore	8	5	34	4	8	13

cc: @HowardBraham
Benchmark value 1265 exceeds gate value 1234 for chrome browserify home mean uiStartup
Benchmark value 1105 exceeds gate value 1070 for chrome browserify home mean load
Benchmark value 1098 exceeds gate value 1061 for chrome browserify home mean domContentLoaded
Benchmark value 16 exceeds gate value 15 for chrome browserify home mean getState
Benchmark value 851 exceeds gate value 830 for chrome browserify home mean loadScripts
Benchmark value 1211 exceeds gate value 1190 for chrome browserify home p95 load
Benchmark value 1205 exceeds gate value 1180 for chrome browserify home p95 domContentLoaded
Benchmark value 1189 exceeds gate value 1180 for chrome browserify home p95 firstPaint
Benchmark value 25 exceeds gate value 18 for chrome browserify home p95 backgroundConnect
Benchmark value 956 exceeds gate value 940 for chrome browserify home p95 loadScripts
Benchmark value 1384 exceeds gate value 1380 for firefox webpack home mean load
Benchmark value 1384 exceeds gate value 1380 for firefox webpack home mean domContentLoaded
Benchmark value 1364 exceeds gate value 1360 for firefox webpack home mean loadScripts
Benchmark value 1983 exceeds gate value 1935 for firefox webpack home p95 uiStartup
Benchmark value 1634 exceeds gate value 1630 for firefox webpack home p95 loadScripts
Sum of mean exceeds: 137ms | Sum of p95 exceeds: 130ms
Sum of all benchmark exceeds: 267ms

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

background: 18 Bytes (0%)
ui: 1.59 KiB (0.02%)
common: 1.09 KiB (0.01%)

metamaskbot · 2025-05-09T17:20:12Z

Builds ready [2f6270f]

builds: chrome, firefox
builds (beta): chrome
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 CircleCI 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 (1191 ± 70 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1191	1040	1379	70	1236	1314
			load	1042	911	1211	64	1080	1170
			domContentLoaded	1036	908	1204	65	1074	1163
			domInteractive	16	12	34	4	16	24
			firstPaint	717	98	1210	420	1066	1143
			backgroundConnect	8	4	38	5	8	21
			firstReactRender	18	14	51	5	19	26
			getState	12	5	43	7	17	24
			initialActions	0	0	2	0	0	1
			loadScripts	799	686	950	63	833	914
			setupStore	7	5	15	2	8	11
	Webpack	Home	uiStartup	2168	1770	2677	180	2291	2443
			load	1687	1331	2075	139	1765	1923
			domContentLoaded	1680	1328	2072	137	1757	1911
			domInteractive	16	11	67	11	13	47
			firstPaint	162	64	315	53	189	277
			backgroundConnect	30	9	234	30	33	76
			firstReactRender	177	55	369	109	298	350
			getState	14	4	168	18	15	28
			initialActions	3	1	7	1	3	4
			loadScripts	1675	1326	2070	136	1751	1886
			setupStore	20	7	289	34	20	33
Firefox	Browserify	Home	uiStartup	1357	1189	1796	120	1415	1605
			load	1207	1042	1642	112	1262	1433
			domContentLoaded	1207	1041	1642	112	1262	1433
			domInteractive	103	38	195	30	120	164
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	23	13	194	20	21	48
			firstReactRender	23	20	54	5	22	29
			getState	9	4	165	16	8	24
			initialActions	0	0	4	1	0	1
			loadScripts	1187	1017	1628	110	1237	1379
			setupStore	11	4	348	38	6	15
	Webpack	Home	uiStartup	1614	1414	2074	153	1692	1958
			load	1380	1208	1862	146	1438	1713
			domContentLoaded	1380	1208	1861	146	1437	1713
			domInteractive	80	35	150	19	85	121
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	27	17	333	31	25	40
			firstReactRender	38	30	60	5	40	48
			getState	10	5	40	5	10	29
			initialActions	1	0	2	1	1	1
			loadScripts	1356	1192	1841	143	1414	1689
			setupStore	15	5	303	40	9	27

Benchmark value 21 exceeds gate value 18 for chrome browserify home p95 backgroundConnect
Benchmark value 12 exceeds gate value 9 for firefox browserify home mean setupStore
Benchmark value 1381 exceeds gate value 1380 for firefox webpack home mean load
Benchmark value 27 exceeds gate value 26 for firefox webpack home mean backgroundConnect
Benchmark value 15 exceeds gate value 13 for firefox webpack home mean setupStore
Benchmark value 1958 exceeds gate value 1935 for firefox webpack home p95 uiStartup
Benchmark value 1713 exceeds gate value 1660 for firefox webpack home p95 load
Benchmark value 1713 exceeds gate value 1660 for firefox webpack home p95 domContentLoaded
Benchmark value 1689 exceeds gate value 1630 for firefox webpack home p95 loadScripts
Sum of mean exceeds: 7ms | Sum of p95 exceeds: 191ms
Sum of all benchmark exceeds: 198ms

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

background: 18 Bytes (0%)
ui: 1.66 KiB (0.02%)
common: 1.09 KiB (0.01%)

metamaskbot · 2025-05-09T18:32:56Z

Builds ready [72ece67]

builds: chrome, firefox
builds (beta): chrome
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 CircleCI 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, 14
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
- content-script: 0
- offscreen: 0

UI Startup Metrics (1243 ± 78 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1243	1106	1416	78	1299	1395
			load	1089	959	1272	78	1145	1243
			domContentLoaded	1082	947	1264	79	1140	1234
			domInteractive	17	14	45	4	16	25
			firstPaint	668	135	1273	444	1084	1222
			backgroundConnect	9	4	29	6	9	23
			firstReactRender	20	15	47	6	20	35
			getState	15	5	95	11	19	29
			initialActions	0	0	1	0	0	0
			loadScripts	840	713	1007	77	892	990
			setupStore	8	5	20	2	8	11
	Webpack	Home	uiStartup	2245	1765	2549	158	2354	2459
			load	1731	1357	2180	135	1817	1887
			domContentLoaded	1723	1353	2172	135	1809	1882
			domInteractive	17	12	63	11	14	45
			firstPaint	157	63	586	71	176	292
			backgroundConnect	34	9	385	39	38	59
			firstReactRender	207	55	367	106	311	345
			getState	15	4	85	10	18	27
			initialActions	3	1	7	1	4	6
			loadScripts	1716	1352	2152	132	1804	1880
			setupStore	25	7	232	32	26	40
Firefox	Browserify	Home	uiStartup	1376	1193	2041	126	1426	1631
			load	1224	1070	1737	108	1265	1450
			domContentLoaded	1224	1069	1737	108	1265	1449
			domInteractive	102	36	273	33	116	156
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	24	14	151	19	21	49
			firstReactRender	24	19	58	6	24	30
			getState	9	5	65	7	8	20
			initialActions	0	0	1	0	0	1
			loadScripts	1204	1047	1715	107	1249	1396
			setupStore	9	4	180	19	6	13
	Webpack	Home	uiStartup	1593	1372	2189	146	1641	1857
			load	1370	1179	1897	130	1427	1608
			domContentLoaded	1370	1179	1896	130	1427	1607
			domInteractive	84	60	286	27	90	129
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	21	13	43	5	22	32
			firstReactRender	35	29	63	5	38	44
			getState	13	5	370	36	9	30
			initialActions	0	0	2	1	1	1
			loadScripts	1351	1165	1879	129	1407	1584
			setupStore	8	5	59	6	8	12

cc: @HowardBraham
Benchmark value 1244 exceeds gate value 1234 for chrome browserify home mean uiStartup
Benchmark value 1090 exceeds gate value 1070 for chrome browserify home mean load
Benchmark value 1082 exceeds gate value 1061 for chrome browserify home mean domContentLoaded
Benchmark value 841 exceeds gate value 830 for chrome browserify home mean loadScripts
Benchmark value 1395 exceeds gate value 1365 for chrome browserify home p95 uiStartup
Benchmark value 1244 exceeds gate value 1190 for chrome browserify home p95 load
Benchmark value 1235 exceeds gate value 1180 for chrome browserify home p95 domContentLoaded
Benchmark value 1222 exceeds gate value 1180 for chrome browserify home p95 firstPaint
Benchmark value 24 exceeds gate value 18 for chrome browserify home p95 backgroundConnect
Benchmark value 990 exceeds gate value 940 for chrome browserify home p95 loadScripts
Benchmark value 2245 exceeds gate value 2192 for chrome webpack home mean uiStartup
Benchmark value 1732 exceeds gate value 1711 for chrome webpack home mean load
Benchmark value 1724 exceeds gate value 1704 for chrome webpack home mean domContentLoaded
Benchmark value 1716 exceeds gate value 1699 for chrome webpack home mean loadScripts
Benchmark value 2460 exceeds gate value 2454 for chrome webpack home p95 uiStartup
Sum of mean exceeds: 173ms | Sum of p95 exceeds: 243ms
Sum of all benchmark exceeds: 416ms

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

background: 0 Bytes (0%)
ui: 1.49 KiB (0.02%)
common: 319 Bytes (0%)

metamaskbot added the team-confirmations Push issues to confirmations team label May 9, 2025

matthewwalsh0 marked this pull request as ready for review May 9, 2025 17:50

matthewwalsh0 requested a review from a team as a code owner May 9, 2025 17:50

matthewwalsh0 changed the title ~~fix: support permit2 approvals in batch simulation~~ fix: cp-12.17.3 support permit2 approvals in batch simulation May 9, 2025

matthewwalsh0 added 6 commits May 9, 2025 18:59

Support permit2 approvals in batch simulation

6a60dc1

Add unit tests

b81ac7f

Fix linting

5b1d503

Fix increaseAllowance support

47a224f

Fix incorrect unlimited

54f53cf

Fix linting

72ece67

matthewwalsh0 force-pushed the fix/batch-approvals-permit2 branch from cb7a92b to 72ece67 Compare May 9, 2025 17:59

vinistevam approved these changes May 12, 2025

View reviewed changes

OGPoyraz approved these changes May 12, 2025

View reviewed changes

HowardBraham added this pull request to the merge queue May 12, 2025

Merged via the queue into main with commit 77e2574 May 12, 2025
163 checks passed

HowardBraham deleted the fix/batch-approvals-permit2 branch May 12, 2025 18:21

github-actions bot locked and limited conversation to collaborators May 12, 2025

metamaskbot added the release-12.19.0 label May 12, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: cp-12.17.3 support permit2 approvals in batch simulation #32733

fix: cp-12.17.3 support permit2 approvals in batch simulation #32733

matthewwalsh0 commented May 9, 2025 •

edited

Loading

sentry-io bot commented May 9, 2025

metamaskbot commented May 9, 2025 •

edited

Loading

metamaskbot commented May 9, 2025

metamaskbot commented May 9, 2025

metamaskbot commented May 9, 2025

metamaskbot commented May 9, 2025

metamaskbot commented May 9, 2025

fix: cp-12.17.3 support permit2 approvals in batch simulation #32733

fix: cp-12.17.3 support permit2 approvals in batch simulation #32733

Conversation

matthewwalsh0 commented May 9, 2025 • edited Loading

Description

Related issues

Manual testing steps

Screenshots/Recordings

Before

After

Pre-merge author checklist

Pre-merge reviewer checklist

sentry-io bot commented May 9, 2025

🔍 Existing Issues For Review

metamaskbot commented May 9, 2025 • edited Loading

✨ Files requiring CODEOWNER review ✨

metamaskbot commented May 9, 2025

metamaskbot commented May 9, 2025

metamaskbot commented May 9, 2025

metamaskbot commented May 9, 2025

metamaskbot commented May 9, 2025

matthewwalsh0 commented May 9, 2025 •

edited

Loading

metamaskbot commented May 9, 2025 •

edited

Loading