Merge pull request #6280 from MetaMask/network-checksum-disable

No longer check network when validating checksum addresses
6 years ago · c44f7857a8
parent 5abcce2be7 ef7ac90bca
commit c44f7857a8
1 changed files with 1 additions and 2 deletions
--- a/ui/app/util.js
+++ b/ui/app/util.js
@ -95,7 +95,6 @@ function miniAddressSummary (address) {
 function isValidAddress (address, network) {
  var prefixed = ethUtil.addHexPrefix(address)
  if (address === '0x0000000000000000000000000000000000000000') return false
-  if (!isEthNetwork(network)) return (ethUtil.isValidAddress(prefixed) && address === address.toLowerCase())
  return (isAllOneCase(prefixed) && ethUtil.isValidAddress(prefixed)) || ethUtil.isValidChecksumAddress(prefixed)
 }

@ -315,7 +314,7 @@ function getTokenAddressFromTokenObject (token) {
 */
 function checksumAddress (address, network) {
  const checksummed = address ? ethUtil.toChecksumAddress(address) : ''
-  return checksummed && network && !isEthNetwork(network) ? checksummed.toLowerCase() : checksummed
+  return checksummed
 }

 function addressSlicer (address = '') {