Skip to content

feat: handle shield change payment method #38165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chaitanyapotti merged 21 commits into from
Dec 3, 2025
Merged

feat: handle shield change payment method #38165

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
39b482c
WIP
tuna1207 Nov 24, 2025
6a2ab08
Merge branch 'main' into feat/shield-change-payment-crypto-crypto
tuna1207 Nov 25, 2025
0556dca
Merge branch 'main' into feat/shield-change-payment-crypto-crypto
tuna1207 Nov 26, 2025
0364dda
feat: handle change payment method crypto to crypto
tuna1207 Nov 27, 2025
b1dd21a
feat: refactor change payment crypto handling
tuna1207 Nov 27, 2025
203ffa7
feat: update change payment button (#38287)
lionellbriones Nov 27, 2025
ef75de6
chore: update subscription controller 5.1.0
tuna1207 Nov 27, 2025
51d7c00
Merge branch 'main' into feat/shield-change-payment-crypto-crypto
tuna1207 Nov 27, 2025
c8a61ea
Update LavaMoat policies
metamaskbot Nov 27, 2025
aeb61c5
Merge branch 'main' into feat/shield-change-payment-crypto-crypto
tuna1207 Nov 28, 2025
e40a7c0
fix: handle error and chain comparison
tuna1207 Nov 28, 2025
e62524a
fix: disable change payment method button if subscription canceled
tuna1207 Nov 28, 2025
55a6a97
Merge branch 'main' into feat/shield-change-payment-crypto-crypto
tuna1207 Nov 28, 2025
b2962f5
Merge branch 'main' into feat/shield-change-payment-crypto-crypto
tuna1207 Nov 28, 2025
d7877f9
Merge branch 'main' into feat/shield-change-payment-crypto-crypto
tuna1207 Nov 30, 2025
8a243ff
Merge branch 'main' into feat/shield-change-payment-crypto-crypto
tuna1207 Dec 2, 2025
38412fd
fix: availableTokenBalancesWithoutCurrentToken logic
tuna1207 Dec 2, 2025
930aeb4
chore: yarn dedupe
tuna1207 Dec 2, 2025
76e23df
fix: don't allow changing if subscription in provisional state
tuna1207 Dec 2, 2025
b7c0302
Merge branch 'main' into feat/shield-change-payment-crypto-crypto
tuna1207 Dec 3, 2025
afbe0e4
fix: refactor executeUpdateSubscriptionCryptoPaymentMethod to accept …
tuna1207 Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 125 additions & 4 deletions lavamoat/browserify/beta/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,18 @@
"@metamask/ppom-validator>json-rpc-random-id": true
}
},
"@metamask/subscription-controller>@metamask/transaction-controller>@metamask/eth-block-tracker": {
Comment thread
tuna1207 marked this conversation as resolved.
Outdated
"globals": {
"clearTimeout": true,
"console.error": true,
"setTimeout": true
},
"packages": {
"@metamask/safe-event-emitter": true,
"@metamask/utils": true,
"@metamask/ppom-validator>json-rpc-random-id": true
}
},
"@metamask/keyring-controller>@metamask/eth-hd-keyring": {
"globals": {
"TextEncoder": true
Expand Down Expand Up @@ -1134,7 +1146,21 @@
"@metamask/rpc-errors": true,
"@metamask/superstruct": true,
"@metamask/utils": true,
"@metamask/eth-json-rpc-middleware>klona": true,
"@metamask/json-rpc-engine>klona": true,
"@metamask/eth-json-rpc-middleware>safe-stable-stringify": true
}
},
"@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-middleware": {
"globals": {
"setTimeout": true
},
"packages": {
"@metamask/eth-sig-util": true,
"@metamask/json-rpc-engine": true,
"@metamask/rpc-errors": true,
"@metamask/superstruct": true,
"@metamask/utils": true,
"@metamask/json-rpc-engine>klona": true,
"@metamask/eth-json-rpc-middleware>safe-stable-stringify": true
}
},
Expand All @@ -1146,6 +1172,12 @@
"uuid": true
}
},
"@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": {
"packages": {
"@metamask/json-rpc-engine": true,
"nanoid": true
}
},
"@metamask/eth-ledger-bridge-keyring": {
"globals": {
"addEventListener": true,
Expand Down Expand Up @@ -1331,6 +1363,20 @@
"uuid": true
}
},
"@metamask/subscription-controller>@metamask/transaction-controller>@metamask/gas-fee-controller": {
"globals": {
"clearInterval": true,
"console.error": true,
"setInterval": true
},
"packages": {
"@metamask/controller-utils": true,
"@metamask/controller-utils>@metamask/eth-query": true,
"@metamask/subscription-controller>@metamask/polling-controller": true,
"bn.js": true,
"uuid": true
}
},
"@metamask/gator-permissions-controller": {
"globals": {
"clearTimeout": true,
Expand Down Expand Up @@ -1358,7 +1404,9 @@
"packages": {
"@metamask/rpc-errors": true,
"@metamask/safe-event-emitter": true,
"@metamask/utils": true
"@metamask/utils": true,
"deep-freeze-strict": true,
"@metamask/json-rpc-engine>klona": true
}
},
"@metamask/json-rpc-middleware-stream": {
Expand Down Expand Up @@ -1584,6 +1632,33 @@
"uuid": true
}
},
"@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller": {
"globals": {
"Intl.NumberFormat": true,
"URL": true,
"setTimeout": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/subscription-controller>@metamask/transaction-controller>@metamask/eth-block-tracker": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
"@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-middleware": true,
"@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
"@metamask/controller-utils>@metamask/eth-query": true,
"@metamask/json-rpc-engine": true,
"@metamask/rpc-errors": true,
"@metamask/network-controller>@metamask/swappable-obj-proxy": true,
"@metamask/utils": true,
"addons-linter>deepmerge": true,
"eslint>fast-deep-equal": true,
"immer": true,
"lodash": true,
"reselect": true,
"uri-js": true,
"uuid": true
}
},
"@metamask/network-enablement-controller": {
"packages": {
"@metamask/base-controller": true,
Expand Down Expand Up @@ -1694,6 +1769,18 @@
"uuid": true
}
},
"@metamask/subscription-controller>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
"console.error": true,
"setTimeout": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"uuid": true
}
},
"@metamask/post-message-stream": {
"globals": {
"MessageEvent.prototype": true,
Expand Down Expand Up @@ -2015,8 +2102,8 @@
},
"packages": {
"@metamask/controller-utils": true,
"@metamask/bridge-controller>@metamask/polling-controller": true,
"@metamask/transaction-controller": true,
"@metamask/subscription-controller>@metamask/polling-controller": true,
"@metamask/subscription-controller>@metamask/transaction-controller": true,
"@metamask/subscription-controller>bignumber.js": true
}
},
Expand Down Expand Up @@ -2071,6 +2158,40 @@
"uuid": true
}
},
"@metamask/subscription-controller>@metamask/transaction-controller": {
"globals": {
"clearTimeout": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@ethereumjs/tx>@ethereumjs/common": true,
"@ethereumjs/tx": true,
"@ethersproject/abi": true,
"@ethersproject/contracts": true,
"@ethersproject/providers": true,
"ethers>@ethersproject/wallet": true,
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/controller-utils>@metamask/eth-query": true,
"@metamask/subscription-controller>@metamask/transaction-controller>@metamask/gas-fee-controller": true,
"@metamask/metamask-eth-abis": true,
"@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller": true,
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
"@metamask/rpc-errors": true,
"@metamask/utils": true,
"@metamask/eth-qr-keyring>async-mutex": true,
"@metamask/subscription-controller>bignumber.js": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
"webpack>events": true,
"fast-json-patch": true,
"lodash": true,
"uuid": true
}
},
"@metamask/user-operation-controller": {
"globals": {
"fetch": true
Expand Down
129 changes: 125 additions & 4 deletions lavamoat/browserify/experimental/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,18 @@
"@metamask/ppom-validator>json-rpc-random-id": true
}
},
"@metamask/subscription-controller>@metamask/transaction-controller>@metamask/eth-block-tracker": {
Comment thread
tuna1207 marked this conversation as resolved.
Outdated
"globals": {
"clearTimeout": true,
"console.error": true,
"setTimeout": true
},
"packages": {
"@metamask/safe-event-emitter": true,
"@metamask/utils": true,
"@metamask/ppom-validator>json-rpc-random-id": true
}
},
"@metamask/keyring-controller>@metamask/eth-hd-keyring": {
"globals": {
"TextEncoder": true
Expand Down Expand Up @@ -1134,7 +1146,21 @@
"@metamask/rpc-errors": true,
"@metamask/superstruct": true,
"@metamask/utils": true,
"@metamask/eth-json-rpc-middleware>klona": true,
"@metamask/json-rpc-engine>klona": true,
"@metamask/eth-json-rpc-middleware>safe-stable-stringify": true
}
},
"@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-middleware": {
"globals": {
"setTimeout": true
},
"packages": {
"@metamask/eth-sig-util": true,
"@metamask/json-rpc-engine": true,
"@metamask/rpc-errors": true,
"@metamask/superstruct": true,
"@metamask/utils": true,
"@metamask/json-rpc-engine>klona": true,
"@metamask/eth-json-rpc-middleware>safe-stable-stringify": true
}
},
Expand All @@ -1146,6 +1172,12 @@
"uuid": true
}
},
"@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": {
"packages": {
"@metamask/json-rpc-engine": true,
"nanoid": true
}
},
"@metamask/eth-ledger-bridge-keyring": {
"globals": {
"addEventListener": true,
Expand Down Expand Up @@ -1331,6 +1363,20 @@
"uuid": true
}
},
"@metamask/subscription-controller>@metamask/transaction-controller>@metamask/gas-fee-controller": {
"globals": {
"clearInterval": true,
"console.error": true,
"setInterval": true
},
"packages": {
"@metamask/controller-utils": true,
"@metamask/controller-utils>@metamask/eth-query": true,
"@metamask/subscription-controller>@metamask/polling-controller": true,
"bn.js": true,
"uuid": true
}
},
"@metamask/gator-permissions-controller": {
"globals": {
"clearTimeout": true,
Expand Down Expand Up @@ -1358,7 +1404,9 @@
"packages": {
"@metamask/rpc-errors": true,
"@metamask/safe-event-emitter": true,
"@metamask/utils": true
"@metamask/utils": true,
"deep-freeze-strict": true,
"@metamask/json-rpc-engine>klona": true
}
},
"@metamask/json-rpc-middleware-stream": {
Expand Down Expand Up @@ -1584,6 +1632,33 @@
"uuid": true
}
},
"@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller": {
"globals": {
"Intl.NumberFormat": true,
"URL": true,
"setTimeout": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/subscription-controller>@metamask/transaction-controller>@metamask/eth-block-tracker": true,
"@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
"@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-middleware": true,
"@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
"@metamask/controller-utils>@metamask/eth-query": true,
"@metamask/json-rpc-engine": true,
"@metamask/rpc-errors": true,
"@metamask/network-controller>@metamask/swappable-obj-proxy": true,
"@metamask/utils": true,
"addons-linter>deepmerge": true,
"eslint>fast-deep-equal": true,
"immer": true,
"lodash": true,
"reselect": true,
"uri-js": true,
"uuid": true
}
},
"@metamask/network-enablement-controller": {
"packages": {
"@metamask/base-controller": true,
Expand Down Expand Up @@ -1694,6 +1769,18 @@
"uuid": true
}
},
"@metamask/subscription-controller>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
"console.error": true,
"setTimeout": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"uuid": true
}
},
"@metamask/post-message-stream": {
"globals": {
"MessageEvent.prototype": true,
Expand Down Expand Up @@ -2015,8 +2102,8 @@
},
"packages": {
"@metamask/controller-utils": true,
"@metamask/bridge-controller>@metamask/polling-controller": true,
"@metamask/transaction-controller": true,
"@metamask/subscription-controller>@metamask/polling-controller": true,
"@metamask/subscription-controller>@metamask/transaction-controller": true,
"@metamask/subscription-controller>bignumber.js": true
}
},
Expand Down Expand Up @@ -2071,6 +2158,40 @@
"uuid": true
}
},
"@metamask/subscription-controller>@metamask/transaction-controller": {
"globals": {
"clearTimeout": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@ethereumjs/tx>@ethereumjs/common": true,
"@ethereumjs/tx": true,
"@ethersproject/abi": true,
"@ethersproject/contracts": true,
"@ethersproject/providers": true,
"ethers>@ethersproject/wallet": true,
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/controller-utils>@metamask/eth-query": true,
"@metamask/subscription-controller>@metamask/transaction-controller>@metamask/gas-fee-controller": true,
"@metamask/metamask-eth-abis": true,
"@metamask/subscription-controller>@metamask/polling-controller>@metamask/network-controller": true,
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
"@metamask/rpc-errors": true,
"@metamask/utils": true,
"@metamask/eth-qr-keyring>async-mutex": true,
"@metamask/subscription-controller>bignumber.js": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
"webpack>events": true,
"fast-json-patch": true,
"lodash": true,
"uuid": true
}
},
"@metamask/user-operation-controller": {
"globals": {
"fetch": true
Expand Down
Loading
Loading