From 7810880f0c96ff8628cfd87bf7e6cb8145bb147a Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Tue, 12 Sep 2017 12:23:21 -0700
Subject: Add specific error message for failed address checksum.

---
 ui/app/send.js | 5 +++++
 ui/app/util.js | 7 +++++++
 2 files changed, 12 insertions(+)

(limited to 'ui/app')

diff --git a/ui/app/send.js b/ui/app/send.js
index a21a219eb..e59c1130e 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -262,6 +262,11 @@ SendTransactionScreen.prototype.onSubmit = function () {
     return this.props.dispatch(actions.displayWarning(message))
   }
 
+  if ((util.isInvalidChecksumAddress(recipient))) {
+    message = 'Recipient address checksum is invalid.'
+    return this.props.dispatch(actions.displayWarning(message))
+  }
+
   if ((!util.isValidAddress(recipient) && !txData) || (!recipient && !txData)) {
     message = 'Recipient address is invalid.'
     return this.props.dispatch(actions.displayWarning(message))
diff --git a/ui/app/util.js b/ui/app/util.js
index 1368ebf11..860a17224 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -37,6 +37,7 @@ module.exports = {
   bnTable: bnTable,
   isHex: isHex,
   exportAsFile: exportAsFile,
+  isInvalidChecksumAddress,
 }
 
 function valuesFor (obj) {
@@ -66,6 +67,12 @@ function isValidAddress (address) {
   return (isAllOneCase(prefixed) && ethUtil.isValidAddress(prefixed)) || ethUtil.isValidChecksumAddress(prefixed)
 }
 
+function isInvalidChecksumAddress (address) {
+  var prefixed = ethUtil.addHexPrefix(address)
+  if (address === '0x0000000000000000000000000000000000000000') return false
+  return ethUtil.isValidAddress(prefixed) && !ethUtil.isValidChecksumAddress(prefixed)
+}
+
 function isAllOneCase (address) {
   if (!address) return true
   var lower = address.toLowerCase()
-- 
cgit 


From ef6967325e43de26edc0d99ac5853804648024ae Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Tue, 12 Sep 2017 12:52:13 -0700
Subject: Check if all lower or upper before doing checksum.

---
 ui/app/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app')

diff --git a/ui/app/util.js b/ui/app/util.js
index 860a17224..3f8b4dcc3 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -70,7 +70,7 @@ function isValidAddress (address) {
 function isInvalidChecksumAddress (address) {
   var prefixed = ethUtil.addHexPrefix(address)
   if (address === '0x0000000000000000000000000000000000000000') return false
-  return ethUtil.isValidAddress(prefixed) && !ethUtil.isValidChecksumAddress(prefixed)
+  return !isAllOneCase(prefixed) && !ethUtil.isValidChecksumAddress(prefixed) && ethUtil.isValidAddress(prefixed)
 }
 
 function isAllOneCase (address) {
-- 
cgit