Token allowance screen updated #16157
Merged
Conversation
This file contains 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
|
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. |
filipsekulic
force-pushed
the
token-allowance-screen-update
branch
from
b5287f0 to
da2438d
Compare
|
Verified by QA |
darkwing
reviewed
Oct 11, 2022
Builds ready [7be0fcc]
Page Load Metrics (2576 ± 99 ms)
highlights:storybook
|
filipsekulic
requested review from
jpuri,
darkwing,
brad-decker and
georgewrmarshall
|
@brad-decker @georgewrmarshall |
georgewrmarshall
previously approved these changes
Oct 12, 2022
danjm
reviewed
Oct 19, 2022
| @@ -2938,6 +2938,9 @@ | |||
| "message": "By revoking permission, the following $1 will no longer be able to access your $2", | |||
| "description": "$1 is either key 'account' or 'contract', and $2 is either a string or link of a given token symbol or name" | |||
| }, | |||
| "revokeSpendingCap": { | |||
| "message": "Revoke spending cap for your" | |||
There was a problem hiding this comment.
I realize that the existing translations are like this, but this should have a $1 here where the value that will come after "your" will be placed. Here is a ticket to fix this. We can fix it after this PR is merged: #16234
There was a problem hiding this comment.
looks like PR is here #16347, so your question is addressed
|
I am unable enter a decimal number for the custom approval amount, unless I copy and paste from elsewhere Peek.2022-10-19.12-24.mp4 |
|
@bschorchit should we show a warning if the amount the user sets (or the amount the dapp proposes) is equal to their total balance? |
danjm
reviewed
Oct 19, 2022
| @@ -128,17 +145,36 @@ export default function TokenAllowance({ | |||
| fullTxData.originalApprovalAmount = dappProposedTokenAmount; | |||
| } | |||
|
|
|||
| if (customTokenAmount) { | |||
| txData.customTokenAmount = customTokenAmount; | |||
There was a problem hiding this comment.
Should this be fullTxData instead of txData?
Updating txData here does not seem to have any effect
There was a problem hiding this comment.
Good catch!
Yes, I accidentally used txData instead of fullTxData.
Fixed here: 679cab6
danjm
reviewed
Oct 19, 2022
| @@ -128,17 +145,36 @@ export default function TokenAllowance({ | |||
| fullTxData.originalApprovalAmount = dappProposedTokenAmount; | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
fullTxData.txParams.data is not updated anywhere, so if a user enters a custom amount, the approval will still be submitted with the default amount
There was a problem hiding this comment.
Good catch once again! 🙌
I fixed it here: 679cab6
|
We can improve how state management is done for the custom token data. I created a PR with suggested changes #16236 Its possible my changes break something... maybe there is a case that the code I am replacing was meant to handle. If so, we can discuss and modify. |
danjm
requested changes
Oct 19, 2022
There is a problem with |
You are right. I made this 'mistake' as I thought the input value should be forwarded back to the container and when a user clicks on the |
Builds ready [679cab6]
Page Load Metrics (2447 ± 63 ms)
highlights:storybook
|
Oh good catch. Yes, we should also show the warning in this case. cc: @SayaGT |
danjm
reviewed
Nov 3, 2022
| @@ -58,7 +63,7 @@ export default function TokenAllowance({ | |||
| data, | |||
| isSetApproveForAll, | |||
| isApprovalOrRejection, | |||
| customTxParamsData, | |||
There was a problem hiding this comment.
Is it okay to stop using the customTxParamsData that is being passed into the component?
There was a problem hiding this comment.
Actually yes, because I fixed the issue with the customTxParamsData you had mentioned before (#16157 (review)).
It is now being placed inside the token-allowance container - here.
There was a problem hiding this comment.
right, okay, and I see how the customdata that was being passed in is only used in the ConfirmApproveContent component
|
Edit: I think it is okay to make this change in another PR |
danjm
approved these changes
Nov 3, 2022
|
@georgewrmarshall Can you reapprove when you get a chance? there have not been any UI or CSS changes since you last approved |
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.
Explanation
Updated the
Token allowancescreen.More Information
Screenshots/Screencaps
Before
Before.mov
After
After.mov
Manual Testing Steps
BEFORE TESTING - in your
.metamaskrcfile, setTOKEN_ALLOWANCE_IMPROVEMENTS=1and then start the appSend Tokensclick onCREATE TOKENAPPROVE TOKENSorAPPROVE TOKENS WITHOUT GASin order to see the newly created screenTo see how the screen looks like when the enhanced gas fee is enabled, go to
Settings (Experimental tab)and enable it (Enable enhanced gas fee UItoggle).