3 files changed, 47 insertions, 15 deletions

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 263e48441..489392473 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -13,6 +13,7 @@ const Identicon = require('./components/identicon')
 const EtherBalance = require('./components/eth-balance')
 const transactionList = require('./components/transaction-list')
 const ExportAccountView = require('./components/account-export')
+const ethUtil = require('ethereumjs-util')
 
 module.exports = connect(mapStateToProps)(AccountDetailScreen)
 
@@ -110,7 +111,7 @@ AccountDetailScreen.prototype.render = function() {
           }),
 
           h('i.fa.fa-clipboard.fa-md.cursor-pointer.color-orange', {
-            onClick: () => copyToClipboard(selected),
+            onClick: () => copyToClipboard(ethUtil.toChecksumAddress(selected)),
           }),
 
         ]),
@@ -133,7 +134,7 @@ AccountDetailScreen.prototype.render = function() {
           }, 'SEND ETH'),
 
         ]),
-      
+
       ]),
 
       // subview (tx history, pk export confirm)
diff --git a/ui/app/send.js b/ui/app/send.js
index 52e56132c..ba4e5bfff 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -206,20 +206,21 @@ SendTransactionScreen.prototype.back = function() {
   this.props.dispatch(actions.backToAccountDetail(address))
 }
 
-SendTransactionScreen.prototype.onSubmit = function(event) {
-  var recipient = document.querySelector('input[name="address"]').value
+SendTransactionScreen.prototype.onSubmit = function() {
 
-  var inputAmount = parseFloat(document.querySelector('input[name="amount"]').value)
-  var value = util.normalizeNumberToWei(inputAmount, 'ether')
-
-  var balance = this.props.balance
+  const recipient = document.querySelector('input[name="address"]').value
+  const input = document.querySelector('input[name="amount"]').value
+  const value = util.normalizeEthStringToWei(input)
+  const txData = document.querySelector('input[name="txData"]').value
+  const balance = this.props.balance
 
   if (value.gt(balance)) {
     var message = 'Insufficient funds.'
     return this.props.dispatch(actions.displayWarning(message))
   }
-  if (recipient.length !== 42) {
-    var message = 'Recipient address is the incorrect length.'
+
+  if ((!util.isValidAddress(recipient) && !txData) || (!recipient && !txData)) {
+    var message = 'Recipient address is invalid.'
     return this.props.dispatch(actions.displayWarning(message))
   }
 
@@ -227,12 +228,11 @@ SendTransactionScreen.prototype.onSubmit = function(event) {
   this.props.dispatch(actions.showLoadingIndication())
 
   var txParams = {
-    to: recipient,
     from: this.props.address,
     value: '0x' + value.toString(16),
   }
 
-  var txData = document.querySelector('input[name="txData"]').value
+  if (recipient) txParams.to = ethUtil.addHexPrefix(recipient)
   if (txData) txParams.data = txData
 
   this.props.dispatch(actions.signTx(txParams))
diff --git a/ui/app/util.js b/ui/app/util.js
index 0f3f191aa..81a029350 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -21,6 +21,8 @@ for (var currency in valueTable) {
 module.exports = {
   valuesFor: valuesFor,
   addressSummary: addressSummary,
+  isAllOneCase: isAllOneCase,
+  isValidAddress: isValidAddress,
   numericBalance: numericBalance,
   parseBalance: parseBalance,
   formatBalance: formatBalance,
@@ -29,6 +31,7 @@ module.exports = {
   ethToWei: ethToWei,
   weiToEth: weiToEth,
   normalizeToWei: normalizeToWei,
+  normalizeEthStringToWei: normalizeEthStringToWei,
   normalizeNumberToWei: normalizeNumberToWei,
   valueTable: valueTable,
   bnTable: bnTable,
@@ -42,7 +45,21 @@ function valuesFor(obj) {
 }
 
 function addressSummary(address) {
-  return address ? address.slice(0,2+8)+'...'+address.slice(-4) : '...'
+  if (!address) return ''
+  var checked = ethUtil.toChecksumAddress(address)
+  return checked ? checked.slice(0,2+8)+'...'+checked.slice(-4) : '...'
+}
+
+function isValidAddress(address) {
+  var prefixed = ethUtil.addHexPrefix(address)
+  return isAllOneCase(prefixed) && ethUtil.isValidAddress(prefixed) || ethUtil.isValidChecksumAddress(prefixed)
+}
+
+function isAllOneCase(address) {
+  if (!address) return true
+  var lower = address.toLowerCase()
+  var upper = address.toUpperCase()
+  return address === lower || address === upper
 }
 
 // Takes wei Hex, returns wei BN, even if input is null
@@ -106,9 +123,23 @@ function normalizeToWei(amount, currency) {
   return amount
 }
 
-var multiple = new ethUtil.BN('1000', 10)
+function normalizeEthStringToWei(str) {
+  const parts = str.split('.')
+  let eth = new ethUtil.BN(parts[0], 10).mul(bnTable.wei)
+  if (parts[1]) {
+    var decimal = parts[1]
+    while(decimal.length < 18) {
+      decimal += '0'
+    }
+    const decimalBN = new ethUtil.BN(decimal, 10)
+    eth = eth.add(decimalBN)
+  }
+  return eth
+}
+
+var multiple = new ethUtil.BN('10000', 10)
 function normalizeNumberToWei(n, currency) {
-  var enlarged = n * 1000
+  var enlarged = n * 10000
   var amount = new ethUtil.BN(String(enlarged), 10)
   return normalizeToWei(amount, currency).div(multiple)
 }