Merged
Conversation
Contributor
✨ Files requiring CODEOWNER review ✨🔐 @MetaMask/web3auth (2 files, +65 -30)
|
Contributor
i think we need a different modal header if cancel is not allowed.
|
ui/pages/settings/transaction-shield-tab/components/cancel-membership-modal.tsx
Show resolved
Hide resolved
Contributor
Builds ready [256d082]
UI Startup Metrics (1299 ± 104 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
ui/pages/settings/transaction-shield-tab/components/cancel-membership-modal.tsx
Show resolved
Hide resolved
Contributor
Builds ready [74723af]
UI Startup Metrics (1312 ± 143 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
lwin-kyaw
reviewed
Jan 29, 2026
| const { cancelType } = subscription; | ||
|
|
||
| // Do nothing if cancellation is not allowed | ||
| if (getIsSubscriptionCancelNotAllowed(cancelType)) { |
Contributor
There was a problem hiding this comment.
Do we want to show any info to user that cancellation is not allowed?
Member
Author
There was a problem hiding this comment.
Yes, we show different content in cancel modal if cancel not allowed
https://github.com/MetaMask/metamask-extension/pull/39625/changes#diff-4dcd596c76b6787a586780a50aa7cc9273ad6dce5cedcb543fd6bb512c9cafe7R40
lwin-kyaw
previously approved these changes
Jan 30, 2026
Contributor
Builds ready [b5d9a38]
UI Startup Metrics (1376 ± 97 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Contributor
Builds ready [3b3f228]
UI Startup Metrics (1367 ± 95 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Contributor
Builds ready [a681cd2]
UI Startup Metrics (1457 ± 121 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
chaitanyapotti
approved these changes
Feb 9, 2026
lwin-kyaw
approved these changes
Feb 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
@metamask/subscription-controllerfrom^5.3.1to^5.4.1to support the newcancelTypepropertygetIsSubscriptionCancelNotAllowed()inshared/modules/shield/shield.tsCancelMembershipModalto display appropriate content based oncancelTypeuseCancelSubscriptionhook to:cancelAtPeriodEndparams based on cancelTypeChangelog
CHANGELOG entry: Updated Shield subscription cancellation modal to display appropriate messaging based on cancellation type and prevent cancellation when not allowed.
Related issues
Fixes:
Manual testing steps
cancelType:allowed_at_period_end: Should show the cancellation dateallowed_immediate: Should show "If you cancel, your wallet and transactions will not be covered."not_allowed: Should show "Your subscription cannot be cancelled at the moment." with no cancel buttonnot_allowed_pending_verification: Should show "Your subscription cannot be cancelled due to pending verification." with no cancel buttonScreenshots/Recordings
Before
After
Pre-merge author checklist
Pre-merge reviewer checklist
Note
Medium Risk
Changes Shield subscription cancellation behavior by conditionally blocking cancellation and passing
cancelAtPeriodEndto the background, which could impact real subscription termination timing. Risk is limited in scope to the Shield subscription UI/hooks and action wiring.Overview
Updates the Shield subscription cancel flow to respect the new
cancelTypefrom@metamask/subscription-controller.The cancel modal now shows cancel-type-specific messaging (immediate vs end-of-period vs not allowed) and hides the confirm button when cancellation is unavailable, using new i18n strings. The
useCancelSubscriptionhook now no-ops when cancellation isn’t allowed and passescancelAtPeriodEndthroughcancelSubscriptionto align background cancellation behavior with the subscription’s cancel policy.Written by Cursor Bugbot for commit a681cd2. This will update automatically on new commits. Configure here.