Recipient name passed to confirm-page-container component should be u… #16961
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
…sed if pet name exists for the to address
|
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
force-pushed
the
fix-recipient-name-bug
branch
from
75a37a5 to
6839799
Compare
danjm
force-pushed
the
fix-recipient-name-bug
branch
from
30350ef to
f489403
Compare
…book, token and ens names
danjm
commented
Dec 15, 2022
| const toMetadataName = getMetadataContractName(state, to); | ||
|
|
||
| return { | ||
| isBuyableChain, | ||
| contact, | ||
| toName, | ||
| toMetadataName, | ||
| isOwnedAccount: getAccountsWithLabels(state) |
There was a problem hiding this comment.
this isOwnedAccount was unused
danjm
commented
Dec 15, 2022
| @@ -163,6 +164,7 @@ export function RecipientWithAddress({ | |||
| recipientNickname || | |||
| recipientMetadataName || | |||
| recipientEns || | |||
| shortenAddress(checksummedRecipientAddress) || | |||
There was a problem hiding this comment.
this line ensures that a recipient address is rendered if it exists but does not have an account, addressbook, token or ens name
danjm
commented
Dec 15, 2022
| @@ -19,17 +18,16 @@ function mapStateToProps(state, ownProps) { | |||
| const defaultToken = getSwapsDefaultToken(state); | |||
| const accountBalance = defaultToken.string; | |||
| const identities = getMetaMaskIdentities(state); | |||
| const toName = getAccountName(identities, to); | |||
| const ownedAccountName = getAccountName(identities, to); | |||
| const toName = ownedAccountName || contact?.name; | |||
There was a problem hiding this comment.
this above line ensures that the addressbook name is used if available
danjm
commented
Dec 15, 2022
| @@ -129,7 +129,7 @@ describe('Send ETH non-contract address with data that matches ERC20 transfer da | |||
|
|
|||
There was a problem hiding this comment.
the test changes restore the tests to the state they were in before the previous PR linked in the above description of this PR
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.
…sed if pet name exists for the to address
Fixes #16658
Explanation
In a recent PR, in the ConfirmPageContainer, we stopped defaulting to the addressbook contact name or passed
toNameprop if no owned account name for thetoaddress existed. That causes the send-to-recipient component to default to showing "New Contract" when sending to an address that is not in our address book or account names: https://github.com/MetaMask/metamask-extension/pull/15888/files#diff-214bde98baa3dbda2a9df24d3d2cbb420d51b54bb1404a1b710418213827236fR162-R166.This PR fixes the issue by firstly adding the shortened address as a fallback in the sender-to-recipient component in all cases. To then also ensure that the address book contact name is shown if it exists, it is added as a fallback in the ConfirmPageContainer container if an owned account name doesn't exist. Appropriate tests are also restored.
Furthermore, this PR passes the sender-to-recipient component a new boolean property which indicates whether the recipient is an account owned by the user. This boolean is used to decide whether to show the user edit/add nickname popover, which should be shown when the recipient is clicked unless that recipient as an account owned by the user. This was also needed to get e2e tests to pass.