m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fixing ENS input entry in send flow (#10923)

Browse Source 
* Fixing ENS input entry in send flow

Fixes MetaMask/metamask-extension#10691

* removed unnecessary apostrophe
This commit is contained in:
ryanml 2021-04-26 07:31:20 -07:00 committed by GitHub
parent 9fa6fc9d05
commit f080c10cbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/app/helpers/utils/util.js
View File

@ -83,6 +83,9 @@ export function isValidAddress(address) {
return false; return false;
} }
const prefixed = addHexPrefix(address); const prefixed = addHexPrefix(address);
if (!isHex(prefixed)) {
return false;
}
return ( return (
(isAllOneCase(prefixed.slice(2)) && ethUtil.isValidAddress(prefixed)) || (isAllOneCase(prefixed.slice(2)) && ethUtil.isValidAddress(prefixed)) ||
ethUtil.isValidChecksumAddress(prefixed) ethUtil.isValidChecksumAddress(prefixed)

2
ui/app/pages/send/send-content/add-recipient/add-recipient.js
View File

@ -22,7 +22,7 @@ export function getToErrorObject(to, sendTokenAddress, chainId) {
let toError = null; let toError = null;
if (!to) { if (!to) {
toError = REQUIRED_ERROR; toError = REQUIRED_ERROR;
} else if (!isValidAddress(to)) { } else if (!isValidAddress(to) && !isValidDomainName(to)) {
toError = isDefaultMetaMaskChain(chainId) toError = isDefaultMetaMaskChain(chainId)
? INVALID_RECIPIENT_ADDRESS_ERROR ? INVALID_RECIPIENT_ADDRESS_ERROR
: INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR; : INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR;

2
ui/app/pages/send/send-content/add-recipient/ens-input.component.js
View File

@ -314,7 +314,7 @@ export default class EnsInput extends Component {
} }
if (ensFailure) { if (ensFailure) {
return <i className="fa fa-warning fa-lg warning'" />; return <i className="fa fa-warning fa-lg warning" />;
} }
if (ensResolution && ensResolution !== ZERO_ADDRESS) { if (ensResolution && ensResolution !== ZERO_ADDRESS) {