feat: link rewards to shield subscription #38489
Open
+951
−107
Conversation
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
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. |
lwin-kyaw
added
area-shield
team-shield
lwin-kyaw
commented
Dec 2, 2025
| this.subscriptionService.updateSubscriptionCardPaymentMethod.bind( | ||
| this.subscriptionService, | ||
| ), | ||
| startSubscriptionWithCrypto: |
Contributor
Author
There was a problem hiding this comment.
Removing since, this API is not being used by JSON RPC Engine.
lwin-kyaw
commented
Dec 2, 2025
| }; | ||
| } | ||
|
|
||
| export function startSubscriptionWithCrypto(params: { |
Contributor
Author
There was a problem hiding this comment.
Removing since, this action is not being used by frontend.
Collaborator
Builds ready [c67beb1]
UI Startup Metrics (1323 ± 121 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Collaborator
Builds ready [0ee67f0]
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
lwin-kyaw
commented
Dec 3, 2025
| * | ||
| * @param transactionMeta - The transaction metadata. | ||
| */ | ||
| async _onShieldSubscriptionApprovalTransaction(transactionMeta) { |
Contributor
Author
There was a problem hiding this comment.
Refactored this to SubscriptionService handleShieldSubscriptionApprovalTransaction
Contributor
Author
|
@metamaskbot update-policies |
Collaborator
Builds ready [1e7fcf1]
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Collaborator
|
Policies updated. 🧠 Learn how: https://lavamoat.github.io/guides/policy-diff/#what-to-look-for-when-reviewing-a-policy-diff |
Collaborator
✨ Files requiring CODEOWNER review ✨🕵️ @MetaMask/extension-privacy-reviewers (1 files, +1 -0)
📜 @MetaMask/policy-reviewers (5 files, +385 -5)
Tip Follow the policy review process outlined in the LavaMoat Policy Review Process doc before expecting an approval from Policy Reviewers. |
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
Collaborator
Builds ready [45fd45e]
UI Startup Metrics (1250 ± 130 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
lwin-kyaw
commented
Dec 3, 2025
| "raw.githubusercontent.com", | ||
| "registry.npmjs.org", | ||
| "responsive-rpc.test", | ||
| "rewards.uat-api.cx.metamask.io", |
Contributor
Author
There was a problem hiding this comment.
With rewards being integrated to shield, we call rewards api to fetch rewards details (such as subscription_id, season status, etc) during the shield subscription e2e tests.
cc: @MetaMask/extension-privacy-reviewers @MetaMask/rewards
lwin-kyaw
commented
Dec 3, 2025
| "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-middleware": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/polling-controller to do the subscription status polling.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/polling-controller to do the subscription status polling.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-middleware": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/polling-controller to do the subscription status polling.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/polling-controller to do the subscription status polling.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/polling-controller to do the subscription status polling.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-middleware": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/polling-controller to do the subscription status polling.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/polling-controller to do the subscription status polling.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/polling-controller to do the subscription status polling.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-middleware": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/polling-controller to do the subscription status polling.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/polling-controller to do the subscription status polling.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/polling-controller to do the subscription status polling.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/polling-controller to do the subscription status polling.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/transaction-controller>@metamask/gas-fee-controller": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/transaction-controller to reference/import the type-definitions required for the crypto subscriptions.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "@metamask/controller-utils": true, | ||
| "@metamask/subscription-controller>@metamask/polling-controller": true, | ||
| "@metamask/transaction-controller": true, | ||
| "@metamask/subscription-controller>@metamask/transaction-controller": true, |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/transaction-controller to reference/import the type-definitions required for the crypto subscriptions.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/transaction-controller": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/transaction-controller to reference/import the type-definitions required for the crypto subscriptions.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/transaction-controller>@metamask/gas-fee-controller": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/transaction-controller to reference/import the type-definitions required for the crypto subscriptions.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/transaction-controller": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/transaction-controller to reference/import the type-definitions required for the crypto subscriptions.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/transaction-controller>@metamask/gas-fee-controller": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/transaction-controller to reference/import the type-definitions required for the crypto subscriptions.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "@metamask/controller-utils": true, | ||
| "@metamask/subscription-controller>@metamask/polling-controller": true, | ||
| "@metamask/transaction-controller": true, | ||
| "@metamask/subscription-controller>@metamask/transaction-controller": true, |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/transaction-controller to reference/import the type-definitions required for the crypto subscriptions.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/transaction-controller": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/transaction-controller to reference/import the type-definitions required for the crypto subscriptions.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "uuid": true | ||
| } | ||
| }, | ||
| "@metamask/subscription-controller>@metamask/transaction-controller": { |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/transaction-controller to reference/import the type-definitions required for the crypto subscriptions.
cc: @MetaMask/policy-reviewers
lwin-kyaw
commented
Dec 3, 2025
| "@metamask/controller-utils": true, | ||
| "@metamask/subscription-controller>@metamask/polling-controller": true, | ||
| "@metamask/transaction-controller": true, | ||
| "@metamask/subscription-controller>@metamask/transaction-controller": true, |
Contributor
Author
There was a problem hiding this comment.
@metamask/subscription-controller uses @metamask/transaction-controller to reference/import the type-definitions required for the crypto subscriptions.
cc: @MetaMask/policy-reviewers
Collaborator
Builds ready [b174e08]
UI Startup Metrics (1259 ± 108 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Collaborator
Builds ready [c88a95d]
UI Startup Metrics (1253 ± 110 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
This PR allows rewards opted in users to claim points from shield subscription.
Changelog
CHANGELOG entry: link/claims rewards points from shield subscription
Related issues
Fixes: #38038
Manual testing steps
Screenshots/Recordings
Before
After
Pre-merge author checklist
Pre-merge reviewer checklist
Note
Integrates rewards with Shield subscriptions (including linking and approval flows), moves post-transaction handling into
SubscriptionService, adds cohort tracking, and updates deps/policies.handlePostTransactionwith post-tx cohort assignment and metrics; moves Shield approval handling into#handleShieldSubscriptionApproveTransaction.#getRewardSubscriptionId,#getPrimaryCaipAccountId, andlinkRewardToExistingSubscription; passesrewardSubscriptionIdtostartShieldSubscriptionWithCardand crypto approval submit.RewardsController:getSeasonMetadata,RewardsController:getActualSubscriptionId) andAppStateController:setPendingShieldCohort.AppStateController: exposes/registerssetPendingShieldCohortaction.MetaMaskController: removes_onShieldSubscriptionApprovalTransaction; delegates post-tx handling tosubscriptionService.handlePostTransaction; removesCOHORT_NAMESimport and crypto start wiring.submitShieldSubscriptionCryptoApproval,linkRewards).startSubscriptionWithCryptoaction.linkRewardToShieldSubscriptionthunk.subscription-service.test.tsto cover reward ID inclusion, season checks, and linking behavior.@metamask/subscription-controllerand bumps@metamask/transaction-controller; updates LavaMoat policies accordingly.rewards.uat-api.cx.metamask.iotoprivacy-snapshot.json.Written by Cursor Bugbot for commit c88a95d. This will update automatically on new commits. Configure here.