Merge branch 'master' into NewUI-flat

5 files changed, 19 insertions, 7 deletions

diff --git a/ui/app/components/tooltip.js b/ui/app/components/tooltip.js
index edbc074bb..efab2c497 100644
--- a/ui/app/components/tooltip.js
+++ b/ui/app/components/tooltip.js
@@ -17,6 +17,6 @@ Tooltip.prototype.render = function () {
   return h(ReactTooltip, {
     position: position || 'left',
     title,
-    fixed: false,
+    fixed: true,
   }, children)
 }
diff --git a/ui/app/components/transaction-list-item-icon.js b/ui/app/components/transaction-list-item-icon.js
index 431054340..f442b05af 100644
--- a/ui/app/components/transaction-list-item-icon.js
+++ b/ui/app/components/transaction-list-item-icon.js
@@ -35,7 +35,7 @@ TransactionIcon.prototype.render = function () {
     case 'submitted':
       return h(Tooltip, {
         title: 'Pending',
-        position: 'bottom',
+        position: 'right',
       }, [
         h('i.fa.fa-ellipsis-h', {
           style: {
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index 880a288af..a40066dc7 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -65,7 +65,7 @@ TransactionListItem.prototype.render = function () {
 
       h(Tooltip, {
         title: 'Transaction Number',
-        position: 'bottom',
+        position: 'right',
       }, [
         h('span', {
           style: {
diff --git a/ui/app/send.js b/ui/app/send.js
index b14c48e56..bfc569b7d 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -385,10 +385,15 @@ SendTransactionScreen.prototype.onSubmit = function (event) {
   //   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))
-  // }
+  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))
+  }
 
   if (txData && !isHex(stripHexPrefix(txData))) {
     message = 'Transaction data must be hex string.'
diff --git a/ui/app/util.js b/ui/app/util.js
index be26e15a5..7aace1b3c 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -54,6 +54,7 @@ module.exports = {
   shortenBalance,
   getContractAtAddress,
   exportAsFile: exportAsFile,
+  isInvalidChecksumAddress,
 }
 
 function valuesFor (obj) {
@@ -83,6 +84,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 !isAllOneCase(prefixed) && !ethUtil.isValidChecksumAddress(prefixed) && ethUtil.isValidAddress(prefixed)
+}
+
 function isAllOneCase (address) {
   if (!address) return true
   var lower = address.toLowerCase()