Skip to content

Conversation

@lwin-kyaw
Copy link
Contributor

@lwin-kyaw lwin-kyaw commented Dec 5, 2025

Description

Open in GitHub Codespaces

Changelog

CHANGELOG entry: handle rewards-link errors and allow retry (re-link)

Related issues

Fixes:

Manual testing steps

  1. Go to this page...

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

Adds a "Link Rewards" button in Transaction Shield settings to manually link claimed points to the subscription and logs linking failures; updates locales.

  • UI (Transaction Shield settings ui/pages/settings/transaction-shield-tab/transaction-shield.tsx):
    • Add conditional "Link Rewards" button to link claimed points to the current Shield subscription (linkRewardToShieldSubscription) when opted into rewards and no rewardAccountId is present.
    • Type tweak for displayedShieldSubscription to include optional rewardAccountId.
    • Log warnings on reward-link failures.
  • Rewards Hook (ui/hooks/rewards/useOptIn.ts):
    • Log warnings if linkRewardToShieldSubscription fails during opt-in (previously silent).
  • Locales (app/_locales/en/messages.json, app/_locales/en_GB/messages.json):
    • Add shieldTxDetails3DescriptionLinkReward message ("Link Rewards").

Written by Cursor Bugbot for commit 5ac21dc. This will update automatically on new commits. Configure here.

lwin-kyaw and others added 28 commits December 2, 2025 17:30
@lwin-kyaw lwin-kyaw requested a review from a team as a code owner December 5, 2025 06:48
@github-actions
Copy link
Contributor

github-actions bot commented Dec 5, 2025

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.

@metamaskbot
Copy link
Collaborator

✨ Files requiring CODEOWNER review ✨

🔐 @MetaMask/web3auth (1 files, +40 -2)
  • 📁 ui/
    • 📁 pages/
      • 📁 settings/
        • 📁 transaction-shield-tab/
          • 📄 transaction-shield.tsx +40 -2

@metamaskbot
Copy link
Collaborator

Builds ready [5ac21dc]
UI Startup Metrics (1251 ± 113 ms)
PlatformBuildTypePageMetricMean (ms)Min (ms)Max (ms)Std Dev (ms)P 75 (ms)P 95 (ms)
ChromeBrowserifyStandard HomeuiStartup12511050162011313231458
load103685513549010771209
domContentLoaded103085013489010731203
domInteractive2816116222390
firstPaint4628512493789631099
backgroundConnect21920027513225247
firstReactRender282094102945
getState3516121173884
initialActions105113
loadScripts817649111785863992
setupStore1162131118
numNetworkReqs271897211885
BrowserifyPower User HomeuiStartup20481703275020521572448
load1026880178514610231386
domContentLoaded1012873176514510011377
domInteractive35181842932108
firstPaint5079617964019591307
backgroundConnect257201782112234558
firstReactRender5539100125887
getState19513669275202243
initialActions106112
loadScripts80467515451437961171
setupStore21872112345
numNetworkReqs1496736459204268
WebpackStandard HomeuiStartup836705126685884982
load646566111881666787
domContentLoaded642562111081662782
domInteractive261699192284
firstPaint21393848141212650
backgroundConnect1052851226
firstReactRender27204363141
getState261349103544
initialActions104111
loadScripts639560110780660778
setupStore1172841322
numNetworkReqs261890191884
WebpackPower User HomeuiStartup16621299221822819002068
load677578108889688899
domContentLoaded667573108289676894
domInteractive35181902933112
firstPaint25988840176242663
backgroundConnect109866320323605
firstReactRender60468796776
getState17812767054184217
initialActions102012
loadScripts664572107488674885
setupStore211054112348
numNetworkReqs1646337066220273
FirefoxBrowserifyStandard HomeuiStartup13571119169313514511666
load1116931151610211751311
domContentLoaded1116931151610211751311
domInteractive70331903690156
firstPaint------
backgroundConnect48211803256115
firstReactRender25186892447
getState126138151025
initialActions102112
loadScripts108991514649611481278
setupStore1163571032
numNetworkReqs281886192679
BrowserifyPower User HomeuiStartup27222027463163827084422
load1243951278640611952610
domContentLoaded1243949278540611952610
domInteractive1123252496110352
firstPaint------
backgroundConnect172251246247129947
firstReactRender58352002459100
getState28464911230352793
initialActions208123
loadScripts1181934260032511402362
setupStore15081065199148618
numNetworkReqs82611702581151
WebpackStandard HomeuiStartup14811233206313315601682
load1220105914398712781384
domContentLoaded1220105914398712781383
domInteractive57272303277111
firstPaint------
backgroundConnect46181612844107
firstReactRender271972102765
getState147187231225
initialActions102012
loadScripts1193104313988112441341
setupStore156111191384
numNetworkReqs281886202081
WebpackPower User HomeuiStartup29632087529675529354809
load14671181302441915032759
domContentLoaded14661181302341915032759
domInteractive114301220140100333
firstPaint------
backgroundConnect178221191218169663
firstReactRender63401822662131
getState27866773197407692
initialActions30761026
loadScripts13921149285835014082523
setupStore1537758211118685
numNetworkReqs82591702580151
📊 Page Load Benchmark Results

Current Commit: 5ac21dc | Date: 12/5/2025

📄 Localhost MetaMask Test Dapp

Samples: 100

Summary

  • pageLoadTime-> current mean value: 1.04s (±37ms) 🟡 | historical mean value: 1.04s ⬆️ (historical data)
  • domContentLoaded-> current mean value: 726ms (±35ms) 🟢 | historical mean value: 724ms ⬆️ (historical data)
  • firstContentfulPaint-> current mean value: 77ms (±10ms) 🟢 | historical mean value: 78ms ⬇️ (historical data)

📈 Detailed Results

Metric Mean Std Dev Min Max P95 P99
pageLoadTime 1.04s 37ms 1.00s 1.30s 1.07s 1.30s
domContentLoaded 726ms 35ms 693ms 978ms 742ms 978ms
firstPaint 77ms 10ms 64ms 164ms 84ms 164ms
firstContentfulPaint 77ms 10ms 64ms 164ms 84ms 164ms
largestContentfulPaint 0ms 0ms 0ms 0ms 0ms 0ms
Bundle size diffs [🚨 Warning! Bundle size has increased!]
  • background: 58 Bytes (0%)
  • ui: 971 Bytes (0.01%)
  • common: 83 Bytes (0%)

@lwin-kyaw lwin-kyaw changed the title fix: handle rewards linking failure fix: handle rewards linking failure cp-13.13.0 Dec 5, 2025
@lwin-kyaw lwin-kyaw added this pull request to the merge queue Dec 5, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 5, 2025
@lwin-kyaw lwin-kyaw added this pull request to the merge queue Dec 5, 2025
Merged via the queue into main with commit b9b406a Dec 5, 2025
183 of 188 checks passed
@lwin-kyaw lwin-kyaw deleted the feat/rewards-linking-status branch December 5, 2025 10:33
@github-actions github-actions bot locked and limited conversation to collaborators Dec 5, 2025
@metamaskbot metamaskbot added the release-13.14.0 Issue or pull request that will be included in release 13.14.0 label Dec 5, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-shield release-13.14.0 Issue or pull request that will be included in release 13.14.0 size-S team-shield Shield team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants