Ensure that editing a tx from a transfer to a simple send resets data and updates type #15248
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. |
danjm
commented
Jul 18, 2022
| }; | ||
|
|
||
| // only update what is defined | ||
| editableParams.txParams = pickBy(editableParams.txParams); |
Contributor
Author
There was a problem hiding this comment.
This allows us to set txParams to empty strings
Collaborator
brad-decker
suggested changes
Jul 18, 2022
ui/ducks/send/send.js
Outdated
| // transaction from being a token transfer to a simple send. | ||
| if ( | ||
| unapprovedTx?.type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM || | ||
| unapprovedTx?.type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER |
Contributor
There was a problem hiding this comment.
I know this is nitty, but when I read this comment I thought unapprovedTx was like...any unapproved tx. Can we change this comment to be something along the lines of if the original type of this transaction was a token method then we need to null out he usetInputHeadData (words are not important just specifying original and ensuring that the unapprovedTx is clearly marked as the original tx in an edit flow)
Contributor
Author
There was a problem hiding this comment.
Comment improved in 91d8a85d2
Contributor
There was a problem hiding this comment.
Should we include TOKEN_METHOD_SAFE_TRANSFER_FROM here. I don't believe it's possible for it to be a problem at the moment because it's a method on ERC721's and we don't enable the edit button on ERC721 sends at the moment, but we may want to soon?
ui/ducks/send/send.js
Outdated
Comment on lines
2145
to
2164
| // If, after edit, we are sending the native asset, | ||
| // and if the send duck hex data was reset on this edit, | ||
| // and if the hex data from the tx's background state matches | ||
| // one of the special token methods that we handle, | ||
| // then we conclude that the user does not want to send hex data, | ||
| // and ensure it gets reset in the background state as well. | ||
| const sendingNativeAsset = | ||
| draftTransaction.asset.type === ASSET_TYPES.NATIVE; | ||
| const userInputHexDataHasBeenReset = | ||
| draftTransaction.userInputHexData === ''; | ||
| const priorHexDataMatchesSpecialTokenTxSignatures = | ||
| parseStandardTokenTransactionData(editingTx.txParams.data) !== | ||
| undefined; | ||
| if ( | ||
| sendingNativeAsset && | ||
| userInputHexDataHasBeenReset && | ||
| priorHexDataMatchesSpecialTokenTxSignatures | ||
| ) { | ||
| editingTx.txParams.data = ''; | ||
| } |
Contributor
There was a problem hiding this comment.
I"m confused why we can't just rely upon the value of userInputHexData to override this? It should be set to an empty string n 1920, therefor the call to generateTransactionParams on line 2115 should return an appropriate txParams object. with data null. Can you help me understand why this contract breaks down under these special conditions?
Contributor
Author
There was a problem hiding this comment.
yes removed in ee260f475
| throw error; | ||
| } | ||
|
|
||
| await forceUpdateMetamaskState(dispatch); |
Contributor
There was a problem hiding this comment.
[q] why is this necessary?
Contributor
Author
There was a problem hiding this comment.
To ensure that transaction state is properly updated before hitting the confirm screen routing logic after clicking the "Next" button
danjm
force-pushed
the
modify-tx-type-send-edit
branch
from
ee260f4 to
97745fa
Compare
adonesky1
reviewed
Jul 20, 2022
ui/ducks/send/send.js
Outdated
Comment on lines
941
to
946
| // If an asset update occurs that changes the type from 'NATIVE' to | ||
| // 'NATIVE' then this is likely the initial asset set of an edit | ||
| // transaction. We don't need to set the amount to zero in this case. | ||
| // The only times where an update would occur of this nature that we | ||
| // would want to set the amount to zero is on a network or account change | ||
| // but that update is handled elsewhere. |
Contributor
There was a problem hiding this comment.
why was this comment added back?
Contributor
There was a problem hiding this comment.
rebase issue more than likely.
Contributor
There was a problem hiding this comment.
I will reapprove after this is removed
brad-decker
approved these changes
Jul 20, 2022
brad-decker
suggested changes
Jul 20, 2022
ui/ducks/send/send.js
Outdated
Comment on lines
941
to
946
| // If an asset update occurs that changes the type from 'NATIVE' to | ||
| // 'NATIVE' then this is likely the initial asset set of an edit | ||
| // transaction. We don't need to set the amount to zero in this case. | ||
| // The only times where an update would occur of this nature that we | ||
| // would want to set the amount to zero is on a network or account change | ||
| // but that update is handled elsewhere. |
Contributor
There was a problem hiding this comment.
I will reapprove after this is removed
…from tx to native send
Collaborator
Builds ready [1eed22c]
Page Load Metrics (1690 ± 36 ms)
highlights:storybook
|
brad-decker
approved these changes
Jul 20, 2022
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.
Fixes #15184
Preceding v10.18.0 there was a problem whereby changing from a token transfer to a simple send on the send edit screen would not change the transaction data. This would incorrectly leave the rendered type as transfer and incorrectly leave hex data on the transaction.
With v10.18.0, this could cause an unhandled error when trying to edit a transaction in this state of faulty data, because we would attempt to parse the recipient address of a simple send as if it were a token address.
The solution requires two parts: