fix: shield plan token approval amount incorrect when plan change #37585
+87
−71
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
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
Collaborator
Builds ready [50a1e6e]
UI Startup Metrics (1205 ± 90 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 [f31aec5]
UI Startup Metrics (1206 ± 119 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 [4ab428c]
UI Startup Metrics (1249 ± 99 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
Nov 10, 2025
|
|
||
| // reset selected token if selected plan changes | ||
| useEffect(() => { | ||
| setSelectedToken(undefined); |
Contributor
There was a problem hiding this comment.
Should this set to be default instead of undefined?
Like what we do in the above useEffects.
If I'm not mistaken, we don't need new side effects hook for this (we already have the (useEffect) hook which does the similar thing)?
Member
Author
There was a problem hiding this comment.
ah no that wouldn't work, since the above effect is only set if there is no selected token set yet to set the default token, if there is already token set, it won't trigger again, so that it won't run everytime token balance change
lwin-kyaw
approved these changes
Nov 10, 2025
chaitanyapotti
approved these changes
Nov 10, 2025
metamaskbot
added
the
release-13.10.0
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
Previously in shield plan screen, when user change plan, the selected token approval amount didn't get updated hence user will see outdated approval amount in the confirmation screen
This PR reset the selected token when plan change to get correct latest approval amount
Changelog
CHANGELOG entry: fix incorrect token approval amount when change shield plan
Related issues
Fixes:
Manual testing steps
Screenshots/Recordings
Before
After
Pre-merge author checklist
Pre-merge reviewer checklist
Note
Prevents stale approval amounts by resetting the selected token when the plan changes and refactors
useAvailableTokenBalancesto return{availableTokenBalances, pending, error}viauseAsyncResult.useAvailableTokenBalances:{ availableTokenBalances, pending, error }instead of an array; leveragesuseAsyncResult(removes localuseState/useEffect).priceor chain map; logs when token payment info missing.ui/pages/shield-plan/shield-plan.tsx):pendingto defer token selection until data ready.selectedTokenwhenselectedPlanchanges; only restores last-used token if it matches current plan.Written by Cursor Bugbot for commit 4ab428c. This will update automatically on new commits. Configure here.