Skip to content

fix(mfa): ask for a new code after too many wrong ones - #47647

Merged
mathieuartu merged 3 commits into
mainfrom
fix/mfa-too-many-attempts-message
Nov 5, 2026
Merged

mathieuartu merged 3 commits into
mainfrom
fix/mfa-too-many-attempts-message

Conversation

@mathieuartu

@mathieuartu mathieuartu commented Nov 5, 2026 •

Copy link
Copy Markdown
Contributor

Description

Changelog

CHANGELOG entry: null

Related issues

Fixes:

Manual testing steps

  1. Verify email MFA
  2. Type wrong code multiple times in a row
  3. Verify you get the cooldown error

Screenshots/Recordings

Before

After

Pre-merge author checklist

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

Medium Risk
Changes email MFA error recovery and analytics in the auth flow, though scope is narrow and covered by new tests.

Overview
After too many wrong email OTP codes, the flow no longer auto-sends a replacement when recovery runs. Users stay on the OTP step with the too many attempts error and must tap Get new code once the existing resend cooldown ends, avoiding silent sends that the server may reject.

The OTP step UI now shows a Get new code in Xs countdown during that cooldown (new mfaOtpGetNewCodeIn copy) and refreshes the too many attempts message. MFA Code Resent analytics are skipped when the flow has already ended (including mid-send), and tests cover the new behavior end-to-end.

Reviewed by Cursor Bugbot for commit 9617f6e. Bugbot is set up for automated code reviews on this repo. Configure here.

@mathieuartu mathieuartu self-assigned this Nov 5, 2026
@mathieuartu mathieuartu added the team-accounts-framework Accounts team label Nov 5, 2026
@mathieuartu
mathieuartu requested a review from a team as a code owner November 5, 2026 13:28
@github-actions

github-actions Bot commented Nov 5, 2026

Copy link
Copy Markdown
Contributor

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.

@github-actions github-actions Bot added the size-M label Nov 5, 2026
@metamask-ci

metamask-ci Bot commented Nov 5, 2026 •

Copy link
Copy Markdown
Contributor

✨ Files requiring CODEOWNER review ✨

🔑 @MetaMask/accounts-engineers (4 files, +59 -2)
  • 📁 ui/
    • 📁 hooks/
      • 📁 identity/
        • 📁 mfa/
          • 📁 engine/
            • 📄 flow.test.ts +27 -0
            • 📄 flow.ts +3 -1
    • 📁 pages/
      • 📁 mfa/
        • 📁 steps/
          • 📄 code-step.tsx +6 -1
          • 📄 steps.test.tsx +23 -0

@metamask-ci

metamask-ci Bot commented Nov 5, 2026

Copy link
Copy Markdown
Contributor
Builds ready [9617f6e]
⚡ Performance Benchmarks (Total: 🟢 8 pass · 🟡 3 warn · 🔴 2 fail)

Baseline (latest main): f693520 | Date: 11/3/2026 | Pipeline: 42036070019 | Baseline logs

Metricschrome-webpackfirefox-webpack
loadNewAccount
[Sentry log · main/release]
🔴 load_new_account(p95) [CI log]🔴 load_new_account(p95) [CI log]

Regressions (🔴 2 failures)

Interaction Benchmarks · Samples: 5 🔴 2
Benchmarkchrome-webpackfirefox-webpack
loadNewAccount
[Sentry log · main/release]
🔴 [CI log]
🔴 load_new_account
🔴 [CI log]
🔴 load_new_account
confirmTx
[Sentry log · main/release]
🟡 [CI log]🟢 [CI log]
bridgeUserActions
[Sentry log · main/release]
🟡 [CI log]🟢 [CI log]

📈 Results compared to the previous 5 runs on main

  • ↑ loadNewAccount/load_new_account: +184%
  • ↑ loadNewAccount/total: +184%
  • ↓ loadNewAccount/inp: -18%
  • ↑ loadNewAccount/fcp: +12%
  • ↑ loadNewAccount/lcp: +1004%
  • ↑ loadNewAccount/cls: +556%
  • ↑ confirmTx/longTaskTotalDuration: +43%
  • ↑ confirmTx/longTaskMaxDuration: +56%
  • ↑ confirmTx/tbt: +73%
  • ↓ confirmTx/inp: -21%
  • ↑ confirmTx/fcp: +14%
  • ↑ confirmTx/lcp: +1045%
  • ↓ confirmTx/cls: -10%
  • ↑ bridgeUserActions/bridge_load_page: +131%
  • ↑ bridgeUserActions/bridge_load_asset_picker: +104%
  • ↑ bridgeUserActions/longTaskCount: +82%
  • ↑ bridgeUserActions/longTaskTotalDuration: +115%
  • ↑ bridgeUserActions/longTaskMaxDuration: +38%
  • ↑ bridgeUserActions/tbt: +169%
  • ↑ bridgeUserActions/total: +31%
  • ↑ bridgeUserActions/inp: +10%
  • ↑ bridgeUserActions/fcp: +12%
  • ↑ bridgeUserActions/lcp: +1005%
  • ↑ bridgeUserActions/cls: +594%
  • ↑ loadNewAccount/load_new_account: +181%
  • ↑ loadNewAccount/total: +181%
  • ↑ loadNewAccount/inp: +101%
  • ↓ loadNewAccount/fcp: -70%
  • ↑ loadNewAccount/lcp: +929%
  • ↓ confirmTx/longTaskCount: -100%
  • ↓ confirmTx/longTaskTotalDuration: -100%
  • ↓ confirmTx/longTaskMaxDuration: -100%
  • ↓ confirmTx/tbt: -100%
  • ↓ confirmTx/inp: -21%
  • ↓ confirmTx/fcp: -69%
  • ↑ confirmTx/lcp: +1344%
  • ↑ bridgeUserActions/bridge_load_page: +111%
  • ↑ bridgeUserActions/bridge_load_asset_picker: +54%
  • ↓ bridgeUserActions/bridge_search_token: -11%
  • ↓ bridgeUserActions/longTaskCount: -100%
  • ↓ bridgeUserActions/longTaskTotalDuration: -100%
  • ↓ bridgeUserActions/longTaskMaxDuration: -100%
  • ↓ bridgeUserActions/tbt: -100%
  • ↑ bridgeUserActions/inp: +69%
  • ↓ bridgeUserActions/fcp: -69%
  • ↑ bridgeUserActions/lcp: +862%

🌐 Core Web Vitals — 🟢 good · 🟡 needs improvement · 🔴 poor (web.dev thresholds)

  • 🟡 loadNewAccount/FCP: p75 1.9s
  • 🟡 confirmTx/FCP: p75 2.0s
  • 🟡 bridgeUserActions/FCP: p75 1.9s
  • 🟡 loadNewAccount/INP: p75 216ms
Startup Benchmarks · Samples: 100
Benchmarkchrome-webpackfirefox-webpack
startupStandardHome
[Sentry log · main/release]
🟢 [CI log]🟢 [CI log]

📈 Results compared to the previous 5 runs on main

  • ↑ startupStandardHome/uiStartup: +88%
  • ↑ startupStandardHome/load: +122%
  • ↑ startupStandardHome/domContentLoaded: +123%
  • ↑ startupStandardHome/domInteractive: +33%
  • ↓ startupStandardHome/firstPaint: -50%
  • ↓ startupStandardHome/firstReactRender: -98%
  • ↓ startupStandardHome/initialActions: -29%
  • ↑ startupStandardHome/loadScripts: +121%
  • ↑ startupStandardHome/setupStore: +140%
  • ↑ startupStandardHome/numNetworkReqs: +11%
  • ↑ startupStandardHome/longTaskCount: +43%
  • ↑ startupStandardHome/longTaskTotalDuration: +119%
  • ↑ startupStandardHome/longTaskMaxDuration: +129%
  • ↑ startupStandardHome/tbt: +143%
  • ↓ startupStandardHome/fcp: -47%
  • ↑ startupStandardHome/lcp: +136%
  • ↓ startupStandardHome/cls: -72%
  • ↓ startupStandardHome/uiStartup: -36%
  • ↓ startupStandardHome/load: -31%
  • ↓ startupStandardHome/domContentLoaded: -33%
  • ↓ startupStandardHome/domInteractive: -36%
  • ↓ startupStandardHome/backgroundConnect: -22%
  • ↓ startupStandardHome/firstReactRender: -99%
  • ↓ startupStandardHome/initialActions: -50%
  • ↓ startupStandardHome/loadScripts: -31%
  • ↓ startupStandardHome/setupStore: -30%
  • ↓ startupStandardHome/fcp: -28%
  • ↓ startupStandardHome/lcp: -29%
User Journey Benchmarks · Samples: 5 · mock API
Benchmarkchrome-webpackfirefox-webpack
onboardingImportWallet
[Sentry log · main/release]
🟢 [CI log]🟡 [CI log]
🟡 total
onboardingNewWallet
[Sentry log · main/release]
🟢 [CI log]🟢 [CI log]

📈 Results compared to the previous 5 runs on main

  • ↑ onboardingImportWallet/srpButtonToSrpForm: +14%
  • ↑ onboardingImportWallet/confirmSrpToPwForm: +22%
  • ↑ onboardingImportWallet/pwFormToMetricsScreen: +31%
  • ↑ onboardingImportWallet/metricsToWalletReadyScreen: +17%
  • ↓ onboardingImportWallet/doneButtonToHomeScreen: -91%
  • ↓ onboardingImportWallet/openAccountMenuToAccountListLoaded: -74%
  • ↓ onboardingImportWallet/longTaskCount: -82%
  • ↓ onboardingImportWallet/longTaskTotalDuration: -94%
  • ↓ onboardingImportWallet/longTaskMaxDuration: -90%
  • ↓ onboardingImportWallet/tbt: -100%
  • ↓ onboardingImportWallet/total: -85%
  • ↓ onboardingNewWallet/createWalletToSocialScreen: -13%
  • ↓ onboardingNewWallet/srpButtonToPwForm: -34%
  • ↓ onboardingNewWallet/createPwToRecoveryScreen: -21%
  • ↓ onboardingNewWallet/skipBackupToMetricsScreen: -15%
  • ↓ onboardingNewWallet/agreeButtonToOnboardingSuccess: -50%
  • ↓ onboardingNewWallet/doneButtonToAssetList: -75%
  • ↓ onboardingNewWallet/longTaskCount: -100%
  • ↓ onboardingNewWallet/longTaskTotalDuration: -100%
  • ↓ onboardingNewWallet/longTaskMaxDuration: -100%
  • ↓ onboardingNewWallet/tbt: -100%
  • ↓ onboardingNewWallet/total: -72%
Dapp Page Load Benchmarks · Samples: 100
Benchmarkchrome-webpack
dappPageLoad
[Sentry log · main/release]
🟢 [CI log]

📈 Results compared to the previous 5 runs on main

  • ↓ dappPageLoad/pageLoadTime: -60%
  • ↓ dappPageLoad/domContentLoaded: -17%
  • ↓ dappPageLoad/firstPaint: -42%
  • ↓ dappPageLoad/firstContentfulPaint: -42%
Bundle Size Diffs [🚨 Warning! Bundle size has increased!]
Status Bundle Total Diff Change
🚨 background 15.25 MiB +4.91 KiB +0.03%
🚨 ui 19.38 MiB +38.39 KiB +0.19%
✅ common 0 Bytes 0 Bytes 0.00%
✅ other 4.44 MiB +116 Bytes 0.00%
✅ content scripts 3.23 MiB +232 Bytes +0.01%
🚨 unzipped 79.7 MiB +44.63 KiB +0.05%
🚨 zip 23.82 MiB +8.08 KiB +0.03%

@metamask-ci

metamask-ci Bot commented Nov 5, 2026

Copy link
Copy Markdown
Contributor
Builds ready [dc3b04b]
⚡ Performance Benchmarks (Total: 🟢 7 pass · 🟡 2 warn · 🔴 4 fail)

Baseline (latest main): f693520 | Date: 11/3/2026 | Pipeline: 42049359276 | Baseline logs

Metricschrome-webpackfirefox-webpack
loadNewAccount
[Sentry log · main/release]
🔴 load_new_account(p95) [CI log]🔴 load_new_account(p95) [CI log]
onboardingImportWallet
[Sentry log · main/release]
🟢 [CI log]🔴 [CI log]
onboardingNewWallet
[Sentry log · main/release]
🟢 [CI log]🔴 [CI log]

Regressions (🔴 4 failures)

Interaction Benchmarks · Samples: 5 🔴 2
Benchmarkchrome-webpackfirefox-webpack
loadNewAccount
[Sentry log · main/release]
🔴 [CI log]
🔴 load_new_account
🔴 [CI log]
🔴 load_new_account
confirmTx
[Sentry log · main/release]
🟡 [CI log]🟢 [CI log]
bridgeUserActions
[Sentry log · main/release]
🟡 [CI log]🟢 [CI log]

📈 Results compared to the previous 5 runs on main

  • ↑ loadNewAccount/load_new_account: +183%
  • ↑ loadNewAccount/total: +183%
  • ↓ loadNewAccount/inp: -10%
  • ↑ loadNewAccount/lcp: +956%
  • ↑ loadNewAccount/cls: +532%
  • ↑ confirmTx/longTaskTotalDuration: +38%
  • ↑ confirmTx/longTaskMaxDuration: +55%
  • ↑ confirmTx/tbt: +65%
  • ↓ confirmTx/inp: -21%
  • ↑ confirmTx/lcp: +966%
  • ↑ bridgeUserActions/bridge_load_page: +97%
  • ↑ bridgeUserActions/bridge_load_asset_picker: +29%
  • ↑ bridgeUserActions/longTaskCount: +36%
  • ↑ bridgeUserActions/longTaskTotalDuration: +81%
  • ↑ bridgeUserActions/longTaskMaxDuration: +39%
  • ↑ bridgeUserActions/tbt: +154%
  • ↑ bridgeUserActions/total: +16%
  • ↑ bridgeUserActions/lcp: +979%
  • ↑ bridgeUserActions/cls: +594%
  • ↑ loadNewAccount/load_new_account: +182%
  • ↑ loadNewAccount/total: +182%
  • ↑ loadNewAccount/inp: +146%
  • ↓ loadNewAccount/fcp: -60%
  • ↑ loadNewAccount/lcp: +1043%
  • ↓ confirmTx/longTaskCount: -100%
  • ↓ confirmTx/longTaskTotalDuration: -100%
  • ↓ confirmTx/longTaskMaxDuration: -100%
  • ↓ confirmTx/tbt: -100%
  • ↓ confirmTx/inp: -29%
  • ↓ confirmTx/fcp: -49%
  • ↑ confirmTx/lcp: +1077%
  • ↑ bridgeUserActions/bridge_load_page: +139%
  • ↑ bridgeUserActions/bridge_load_asset_picker: +122%
  • ↓ bridgeUserActions/longTaskCount: -100%
  • ↓ bridgeUserActions/longTaskTotalDuration: -100%
  • ↓ bridgeUserActions/longTaskMaxDuration: -100%
  • ↓ bridgeUserActions/tbt: -100%
  • ↑ bridgeUserActions/total: +25%
  • ↑ bridgeUserActions/inp: +25%
  • ↓ bridgeUserActions/fcp: -64%
  • ↑ bridgeUserActions/lcp: +1243%

🌐 Core Web Vitals — 🟢 good · 🟡 needs improvement · 🔴 poor (web.dev thresholds)

  • 🟡 loadNewAccount/FCP: p75 1.9s
  • 🟡 confirmTx/FCP: p75 1.8s
  • 🟡 bridgeUserActions/FCP: p75 1.9s
  • 🟡 loadNewAccount/INP: p75 264ms
Startup Benchmarks · Samples: 100
Benchmarkchrome-webpackfirefox-webpack
startupStandardHome
[Sentry log · main/release]
🟢 [CI log]🟢 [CI log]

📈 Results compared to the previous 5 runs on main

  • ↑ startupStandardHome/uiStartup: +31%
  • ↑ startupStandardHome/load: +52%
  • ↑ startupStandardHome/domContentLoaded: +52%
  • ↓ startupStandardHome/firstPaint: -40%
  • ↓ startupStandardHome/backgroundConnect: -21%
  • ↓ startupStandardHome/firstReactRender: -98%
  • ↓ startupStandardHome/initialActions: -64%
  • ↑ startupStandardHome/loadScripts: +51%
  • ↑ startupStandardHome/setupStore: +17%
  • ↑ startupStandardHome/longTaskTotalDuration: +47%
  • ↑ startupStandardHome/longTaskMaxDuration: +65%
  • ↑ startupStandardHome/tbt: +57%
  • ↓ startupStandardHome/inp: -18%
  • ↑ startupStandardHome/fcp: +40%
  • ↑ startupStandardHome/lcp: +528%
  • ↓ startupStandardHome/cls: -72%
  • ↓ startupStandardHome/uiStartup: -21%
  • ↓ startupStandardHome/load: -15%
  • ↓ startupStandardHome/domContentLoaded: -18%
  • ↓ startupStandardHome/domInteractive: -38%
  • ↓ startupStandardHome/firstReactRender: -99%
  • ↓ startupStandardHome/initialActions: -50%
  • ↓ startupStandardHome/loadScripts: -16%
  • ↓ startupStandardHome/setupStore: -19%
  • ↓ startupStandardHome/fcp: -33%
  • ↓ startupStandardHome/lcp: -13%
User Journey Benchmarks · Samples: 5 · mock API 🔴 2
Benchmarkchrome-webpackfirefox-webpack
onboardingImportWallet
[Sentry log · main/release]
🟢 [CI log]🔴 [CI log]
🔴 total
onboardingNewWallet
[Sentry log · main/release]
🟢 [CI log]🔴 [CI log]
🔴 total

📈 Results compared to the previous 5 runs on main

  • ↑ onboardingImportWallet/srpButtonToSrpForm: +22%
  • ↓ onboardingImportWallet/confirmSrpToPwForm: -14%
  • ↓ onboardingImportWallet/metricsToWalletReadyScreen: -29%
  • ↓ onboardingImportWallet/doneButtonToHomeScreen: -92%
  • ↓ onboardingImportWallet/openAccountMenuToAccountListLoaded: -74%
  • ↓ onboardingImportWallet/longTaskCount: -100%
  • ↓ onboardingImportWallet/longTaskTotalDuration: -100%
  • ↓ onboardingImportWallet/longTaskMaxDuration: -100%
  • ↓ onboardingImportWallet/tbt: -100%
  • ↓ onboardingImportWallet/total: -86%
  • ↓ onboardingNewWallet/createWalletToSocialScreen: -11%
  • ↓ onboardingNewWallet/srpButtonToPwForm: -30%
  • ↓ onboardingNewWallet/createPwToRecoveryScreen: -17%
  • ↓ onboardingNewWallet/skipBackupToMetricsScreen: -17%
  • ↓ onboardingNewWallet/agreeButtonToOnboardingSuccess: -50%
  • ↓ onboardingNewWallet/doneButtonToAssetList: -78%
  • ↓ onboardingNewWallet/longTaskCount: -100%
  • ↓ onboardingNewWallet/longTaskTotalDuration: -100%
  • ↓ onboardingNewWallet/longTaskMaxDuration: -100%
  • ↓ onboardingNewWallet/tbt: -100%
  • ↓ onboardingNewWallet/total: -74%
Dapp Page Load Benchmarks · Samples: 100
Benchmarkchrome-webpack
dappPageLoad
[Sentry log · main/release]
🟢 [CI log]

📈 Results compared to the previous 5 runs on main

  • ↓ dappPageLoad/pageLoadTime: -50%
  • ↓ dappPageLoad/firstPaint: -33%
  • ↓ dappPageLoad/firstContentfulPaint: -33%
Bundle Size Diffs
Status Bundle Total Diff Change
✅ background 15.25 MiB +251 Bytes 0.00%
✅ ui 19.39 MiB +302 Bytes 0.00%
✅ common 0 Bytes 0 Bytes 0.00%
✅ other 4.44 MiB 0 Bytes 0.00%
✅ content scripts 3.23 MiB 0 Bytes 0.00%
✅ unzipped 79.72 MiB +836 Bytes 0.00%
✅ zip 23.83 MiB +181 Bytes 0.00%

@sonarqubecloud

sonarqubecloud Bot commented Nov 5, 2026

Copy link
Copy Markdown

@ccharly ccharly left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (not tested)

@mathieuartu
mathieuartu added this pull request to the merge queue Nov 5, 2026
Merged via the queue into main with commit ad77086 Nov 5, 2026
137 checks passed
@mathieuartu
mathieuartu deleted the fix/mfa-too-many-attempts-message branch November 5, 2026 16:56
@github-actions github-actions Bot locked and limited conversation to collaborators Nov 5, 2026
@metamaskbot metamaskbot added the release-13.57.0 Issue or pull request that will be included in release 13.57.0 label Nov 9, 2026
@gauthierpetetin

Copy link
Copy Markdown
Contributor

No release label on PR. Adding release label release-13.57.0 on PR, as PR was added to branch 13.57.0 when release was cut.

This branch was previously deployed

1 inactive deployment
pr-comment — dc3b04b4 Deployed Nov 5, 2026 by mathieuartu via Publish prerelease / Publish prerelease #173033
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

release-13.57.0 Issue or pull request that will be included in release 13.57.0 size-S team-accounts-framework Accounts team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants