chore: convert setTimeouts to waitForNextUpdate cp-13.25.0 by Jwhiles · Pull Request #41308 · MetaMask/metamask-extension

Jwhiles · 2026-03-27T13:56:52Z

Description

Updates a test to use waitForNextUpdate rather than setTimeout, as setTimeout seemed to be causing some inconsistent results.

Changelog

CHANGELOG entry: null

Related issues

Fixes:

Manual testing steps

Go to this page...

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.

Note

Low Risk
Test-only changes that update async waiting semantics; low product risk, with minor risk of altering test reliability if the new waitFor assertions are too permissive or timing-sensitive.

Overview
Refactors useMerklRewards.test.ts to remove setTimeout/act-based async flushing and instead wait on specific state transitions via renderHook’s waitFor.

Cleans up teardown logic (dropping the extra microtask flush) and makes the geoblocked case explicitly synchronous since the query is disabled.

^{Written by Cursor Bugbot for commit 014f0f8. This will update automatically on new commits. Configure here.}

github-actions · 2026-03-27T13:57:01Z

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.

metamaskbotv2 · 2026-03-27T13:57:40Z

✨ Files requiring CODEOWNER review ✨

👨‍🔧 @MetaMask/metamask-earn (1 files, +50 -67)

📁 ui/
- 📁 components/
  - 📁 app/
    - 📁 musd/
      - 📁 hooks/
        
        📄 useMerklRewards.test.ts +50 -67

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.}

metamaskbotv2 · 2026-03-27T14:55:23Z

Builds ready [6b12a13]

builds: chrome, firefox
builds (beta): chrome, firefox
builds (flask): chrome, firefox
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
webpack builds: chrome, firefox
webpack builds (beta): chrome, firefox
webpack builds (flask): chrome, firefox
webpack builds (test): chrome, firefox
webpack builds (test-flask): chrome, firefox
bundle size: Bundle Size Stats
interaction-benchmark: Interaction Stats
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
- common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21
- content-script: 0
- offscreen: 0

⚡ Performance Benchmarks

👆 Interaction Benchmarks
Benchmark Metric Mean (ms) Min (ms) Max (ms) Std Dev (ms) P75 (ms) P95 (ms)
Load New Account load_new_account 286 281 292 4 288 292
total 286 281 292 4 288 292
Confirm Tx confirm_tx 6119 6110 6133 8 6122 6133
total 6119 6110 6133 8 6122 6133
Bridge User Actions bridge_load_page 246 196 303 37 266 303
bridge_load_asset_picker 273 255 286 12 281 286
bridge_search_token 805 744 888 51 834 888
total 1299 1260 1335 36 1335 1335

🔌 Startup Benchmarks
Benchmark Metric Mean (ms) Min (ms) Max (ms) Std Dev (ms) P75 (ms) P95 (ms)
Chrome Browserify Startup Standard Home uiStartup 1503 1305 1806 104 1559 1689
load 1237 1045 1450 93 1295 1409
domContentLoaded 1229 1040 1442 92 1287 1393
domInteractive 31 18 113 23 27 97
firstPaint 190 72 1278 143 248 370
backgroundConnect 215 190 414 25 219 254
firstReactRender 22 13 51 6 23 35
initialActions 1 0 5 1 1 3
loadScripts 1030 843 1218 88 1083 1192
setupStore 13 6 36 6 16 23
numNetworkReqs 39 31 85 16 37 80
Chrome Browserify Startup Power User Home uiStartup 4808 2132 14974 2098 5702 7706
load 1326 1122 1927 146 1370 1649
domContentLoaded 1301 1107 1880 132 1335 1545
domInteractive 42 21 249 32 42 100
firstPaint 244 86 613 105 311 399
backgroundConnect 1717 280 11836 1862 2819 3564
firstReactRender 27 18 62 6 29 38
initialActions 1 0 16 2 1 4
loadScripts 1091 910 1620 121 1132 1332
setupStore 16 6 50 8 18 31
numNetworkReqs 292 133 524 71 329 394

🧭 User Journey Benchmarks
Benchmark Metric Mean (ms) Min (ms) Max (ms) Std Dev (ms) P75 (ms) P95 (ms)
Onboarding Import Wallet importWalletToSocialScreen 220 218 223 2 221 223
srpButtonToSrpForm 98 96 99 1 98 99
confirmSrpToPwForm 23 23 24 1 24 24
pwFormToMetricsScreen 16 16 17 0 17 17
metricsToWalletReadyScreen 17 17 17 0 17 17
doneButtonToHomeScreen 597 535 679 56 645 679
openAccountMenuToAccountListLoaded 2937 2926 2945 8 2942 2945
total 3910 3859 3992 51 3949 3992
Onboarding New Wallet createWalletToSocialScreen 218 218 218 0 218 218
srpButtonToPwForm 119 110 128 7 125 128
createPwToRecoveryScreen 8 8 8 0 8 8
skipBackupToMetricsScreen 40 37 43 2 40 43
agreeButtonToOnboardingSuccess 16 16 17 0 17 17
doneButtonToAssetList 518 515 521 3 521 521
total 914 912 915 2 915 915
Asset Details assetClickToPriceChart 92 64 124 25 118 124
total 92 64 124 25 118 124
Solana Asset Details assetClickToPriceChart 84 57 126 26 101 126
total 84 57 126 26 101 126
Import Srp Home loginToHomeScreen 2337 2269 2484 87 2313 2484
openAccountMenuAfterLogin 55 48 61 5 58 61
homeAfterImportWithNewWallet 1533 388 2319 901 2273 2319
total 4048 2756 5328 996 4612 5328
Send Transactions openSendPageFromHome 30 25 34 3 30 34
selectTokenToSendFormLoaded 27 21 33 4 29 33
reviewTransactionToConfirmationPage 1159 964 1324 137 1290 1324
total 1239 1063 1423 143 1382 1423
Swap openSwapPageFromHome 115 66 192 47 147 192
fetchAndDisplaySwapQuotes 2692 2686 2699 5 2694 2699
total 2814 2765 2920 58 2834 2920

🌐 Dapp Page Load Benchmarks

Current Commit: 6b12a13 | Date: 3/27/2026

📄 Localhost MetaMask Test Dapp

Samples: 100

Summary

pageLoadTime-> current mean value: 1.02s (±38ms) 🟡 | historical mean value: 1.03s ⬇️ (historical data)
domContentLoaded-> current mean value: 717ms (±35ms) 🟢 | historical mean value: 728ms ⬇️ (historical data)
firstContentfulPaint-> current mean value: 84ms (±11ms) 🟢 | historical mean value: 85ms ⬇️ (historical data)

📈 Detailed Results

Metric	Mean	Std Dev	Min	Max	P95	P99
pageLoadTime	1.02s	38ms	995ms	1.31s	1.05s	1.31s
domContentLoaded	717ms	35ms	694ms	985ms	733ms	985ms
firstPaint	84ms	11ms	72ms	172ms	92ms	172ms
firstContentfulPaint	84ms	11ms	72ms	172ms	92ms	172ms
largestContentfulPaint	0ms	0ms	0ms	0ms	0ms	0ms

Bundle size diffs

background: 58 Bytes (0%)
ui: 5 Bytes (0%)
common: 20 Bytes (0%)

sonarqubecloud · 2026-03-27T15:11:19Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

metamaskbotv2 · 2026-03-27T15:32:30Z

Builds ready [014f0f8]

builds: chrome, firefox
builds (beta): chrome, firefox
builds (flask): chrome, firefox
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
webpack builds: chrome, firefox
webpack builds (beta): chrome, firefox
webpack builds (flask): chrome, firefox
webpack builds (test): chrome, firefox
webpack builds (test-flask): chrome, firefox
bundle size: Bundle Size Stats
interaction-benchmark: Interaction Stats
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
- common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21
- content-script: 0
- offscreen: 0

⚡ Performance Benchmarks

👆 Interaction Benchmarks
Benchmark Metric Mean (ms) Min (ms) Max (ms) Std Dev (ms) P75 (ms) P95 (ms)
Load New Account load_new_account 316 292 333 15 322 333
total 316 292 333 15 322 333
Confirm Tx confirm_tx 6065 6034 6089 23 6086 6089
total 6065 6034 6089 23 6086 6089
Bridge User Actions bridge_load_page 244 229 257 11 257 257
bridge_load_asset_picker 213 130 266 49 256 266
bridge_search_token 785 753 835 31 806 835
total 1271 1136 1416 96 1329 1416

🔌 Startup Benchmarks
Benchmark Metric Mean (ms) Min (ms) Max (ms) Std Dev (ms) P75 (ms) P95 (ms)
Chrome Browserify Startup Standard Home uiStartup 1487 1230 1791 106 1536 1697
load 1227 1019 1463 89 1268 1387
domContentLoaded 1217 1006 1457 88 1259 1379
domInteractive 30 16 124 21 26 85
firstPaint 246 71 1302 240 248 471
backgroundConnect 211 187 262 14 218 234
firstReactRender 21 14 50 5 22 29
initialActions 1 0 5 1 1 3
loadScripts 1022 829 1257 86 1061 1184
setupStore 13 6 34 6 16 24
numNetworkReqs 39 31 90 15 38 80
Chrome Browserify Startup Power User Home uiStartup 4895 2242 13244 2173 5771 9043
load 1356 1148 2074 146 1400 1668
domContentLoaded 1330 1124 2011 140 1369 1648
domInteractive 47 22 306 46 40 137
firstPaint 250 87 1283 149 307 403
backgroundConnect 1818 300 10120 1888 2829 4998
firstReactRender 29 18 75 8 31 45
initialActions 1 0 8 1 1 4
loadScripts 1114 917 1726 132 1141 1378
setupStore 17 6 40 8 21 33
numNetworkReqs 247 83 425 71 292 353

🧭 User Journey Benchmarks
Benchmark Metric Mean (ms) Min (ms) Max (ms) Std Dev (ms) P75 (ms) P95 (ms)
Onboarding Import Wallet importWalletToSocialScreen 218 218 219 0 219 219
srpButtonToSrpForm 94 93 95 1 95 95
confirmSrpToPwForm 22 21 22 0 22 22
pwFormToMetricsScreen 16 15 16 1 16 16
metricsToWalletReadyScreen 16 15 17 1 16 17
doneButtonToHomeScreen 537 526 549 10 542 549
openAccountMenuToAccountListLoaded 3132 2927 3519 217 3182 3519
total 4023 3819 4339 192 4116 4339
Onboarding New Wallet createWalletToSocialScreen 220 218 223 2 221 223
srpButtonToPwForm 116 109 128 8 124 128
createPwToRecoveryScreen 8 8 9 0 8 9
skipBackupToMetricsScreen 41 40 41 0 41 41
agreeButtonToOnboardingSuccess 16 16 16 0 16 16
doneButtonToAssetList 515 488 548 23 522 548
total 909 903 916 5 916 916
Asset Details assetClickToPriceChart 97 88 105 6 103 105
total 97 88 105 6 103 105
Solana Asset Details assetClickToPriceChart 91 72 106 12 101 106
total 91 72 106 12 101 106
Import Srp Home loginToHomeScreen 2380 2311 2462 55 2425 2462
openAccountMenuAfterLogin 53 46 59 6 58 59
homeAfterImportWithNewWallet 1130 296 2339 973 2301 2339
total 3570 2720 4822 973 4699 4822
Send Transactions openSendPageFromHome 49 22 77 20 62 77
selectTokenToSendFormLoaded 34 28 40 4 36 40
reviewTransactionToConfirmationPage 999 783 1214 183 1212 1214
total 1083 852 1318 201 1314 1318
Swap openSwapPageFromHome 115 79 161 29 124 161
fetchAndDisplaySwapQuotes 2684 2681 2688 2 2685 2688
total 2787 2760 2809 22 2808 2809

🌐 Dapp Page Load Benchmarks

Current Commit: 014f0f8 | Date: 3/27/2026

📄 Localhost MetaMask Test Dapp

Samples: 100

Summary

pageLoadTime-> current mean value: 1.05s (±40ms) 🟡 | historical mean value: 1.03s ⬆️ (historical data)
domContentLoaded-> current mean value: 740ms (±37ms) 🟢 | historical mean value: 726ms ⬆️ (historical data)
firstContentfulPaint-> current mean value: 87ms (±14ms) 🟢 | historical mean value: 85ms ⬆️ (historical data)

📈 Detailed Results

Metric	Mean	Std Dev	Min	Max	P95	P99
pageLoadTime	1.05s	40ms	1.02s	1.33s	1.09s	1.33s
domContentLoaded	740ms	37ms	714ms	1.00s	770ms	1.00s
firstPaint	87ms	14ms	68ms	204ms	104ms	204ms
firstContentfulPaint	87ms	14ms	68ms	204ms	104ms	204ms
largestContentfulPaint	0ms	0ms	0ms	0ms	0ms	0ms

Bundle size diffs

background: 99 Bytes (0%)
ui: 104 Bytes (0%)
common: 426 Bytes (0%)

Jwhiles temporarily deployed to pr-comment March 27, 2026 13:56 — with GitHub Actions Inactive

metamaskbot added the team-earn label Mar 27, 2026

github-actions Bot added the size-S label Mar 27, 2026

Jwhiles requested a review from nickewansmith March 27, 2026 14:01

chore: convert setTimeouts to waitForNextUpdate

b987c68

Jwhiles force-pushed the fix-flaky-tests branch from 1b0702c to b987c68 Compare March 27, 2026 14:09

Jwhiles temporarily deployed to pr-comment March 27, 2026 14:09 — with GitHub Actions Inactive

Jwhiles marked this pull request as ready for review March 27, 2026 14:10

Jwhiles temporarily deployed to pr-comment March 27, 2026 14:10 — with GitHub Actions Inactive

nickewansmith previously approved these changes Mar 27, 2026

View reviewed changes

seaona previously approved these changes Mar 27, 2026

View reviewed changes

DDDDDanica mentioned this pull request Mar 27, 2026

fix: fix failed unit test useMerklRewards.test.ts #41289

Closed

7 tasks

DDDDDanica previously approved these changes Mar 27, 2026

View reviewed changes

chore: waitfor specific assertions

6b12a13

Jwhiles dismissed stale reviews from DDDDDanica, seaona, and nickewansmith via 6b12a13 March 27, 2026 14:19

Jwhiles temporarily deployed to pr-comment March 27, 2026 14:19 — with GitHub Actions Inactive

github-actions Bot added size-M and removed size-S labels Mar 27, 2026

cursor Bot reviewed Mar 27, 2026

View reviewed changes

Comment thread ui/components/app/musd/hooks/useMerklRewards.test.ts

Jwhiles temporarily deployed to pr-comment March 27, 2026 14:49 — with GitHub Actions Inactive

chloeYue changed the title ~~chore: convert setTimeouts to waitForNextUpdate~~ chore: convert setTimeouts to waitForNextUpdate cp-13.25.0 Mar 27, 2026

fix: respond to cursor bot review

014f0f8

Jwhiles temporarily deployed to pr-comment March 27, 2026 14:57 — with GitHub Actions Inactive

nickewansmith requested review from nickewansmith and seaona March 27, 2026 14:59

nickewansmith approved these changes Mar 27, 2026

View reviewed changes

Jwhiles temporarily deployed to pr-comment March 27, 2026 15:27 — with GitHub Actions Inactive

Jwhiles requested a review from DDDDDanica March 27, 2026 15:49

Jwhiles enabled auto-merge March 27, 2026 15:53

seaona approved these changes Mar 27, 2026

View reviewed changes

Jwhiles added this pull request to the merge queue Mar 27, 2026

Merged via the queue into main with commit 667cb0f Mar 27, 2026
96 checks passed

Jwhiles deleted the fix-flaky-tests branch March 27, 2026 16:14

github-actions Bot locked and limited conversation to collaborators Mar 27, 2026

metamaskbot added the release-13.26.0 Issue or pull request that will be included in release 13.26.0 label Mar 27, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: convert setTimeouts to waitForNextUpdate cp-13.25.0#41308

chore: convert setTimeouts to waitForNextUpdate cp-13.25.0#41308
Jwhiles merged 3 commits into
mainfrom
fix-flaky-tests

Jwhiles commented Mar 27, 2026 •

edited by cursor Bot

Loading

Uh oh!

github-actions Bot commented Mar 27, 2026

Uh oh!

metamaskbotv2 Bot commented Mar 27, 2026 •

edited

Loading

Uh oh!

cursor Bot left a comment

Uh oh!

Uh oh!

metamaskbotv2 Bot commented Mar 27, 2026

📄 Localhost MetaMask Test Dapp

Summary

Uh oh!

sonarqubecloud Bot commented Mar 27, 2026

Uh oh!

metamaskbotv2 Bot commented Mar 27, 2026

📄 Localhost MetaMask Test Dapp

Summary

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

Jwhiles commented Mar 27, 2026 • edited by cursor Bot 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!

github-actions Bot commented Mar 27, 2026

Uh oh!

metamaskbotv2 Bot commented Mar 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✨ Files requiring CODEOWNER review ✨

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

metamaskbotv2 Bot commented Mar 27, 2026

📄 Localhost MetaMask Test Dapp

Summary

Uh oh!

sonarqubecloud Bot commented Mar 27, 2026

Quality Gate passed

Uh oh!

metamaskbotv2 Bot commented Mar 27, 2026

📄 Localhost MetaMask Test Dapp

Summary

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Jwhiles commented Mar 27, 2026 •

edited by cursor Bot

Loading

metamaskbotv2 Bot commented Mar 27, 2026 •

edited

Loading