Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton

3 files changed, 21 insertions, 4 deletions

diff --git a/ui/app/actions.js b/ui/app/actions.js
index 6ff28f32f..d99291e46 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -645,7 +645,9 @@ function addToken (address, symbol, decimals) {
       if (err) {
         return dispatch(actions.displayWarning(err.message))
       }
-      dispatch(actions.goHome())
+      setTimeout(() => {
+        dispatch(actions.goHome())
+      }, 250)
     })
   }
 }
diff --git a/ui/app/add-token.js b/ui/app/add-token.js
index 025cfacb5..f21184270 100644
--- a/ui/app/add-token.js
+++ b/ui/app/add-token.js
@@ -31,6 +31,7 @@ function AddTokenScreen () {
 
 AddTokenScreen.prototype.render = function () {
   const state = this.state
+  const props = this.props
   const { warning, symbol, decimals } = state
 
   return (
@@ -40,7 +41,7 @@ AddTokenScreen.prototype.render = function () {
       h('.section-title.flex-row.flex-center', [
         h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', {
           onClick: (event) => {
-            state.dispatch(actions.goHome())
+            props.dispatch(actions.goHome())
           },
         }),
         h('h2.page-subtitle', 'Add Token'),
@@ -141,7 +142,13 @@ AddTokenScreen.prototype.render = function () {
               if (!valid) return
 
               const { address, symbol, decimals } = this.state
-              this.props.dispatch(actions.addToken(address.trim(), symbol.trim(), decimals))
+              this.checkIfToken(address.trim())
+              .then(() => {
+                this.props.dispatch(actions.addToken(address.trim(), symbol.trim(), decimals))
+              })
+              .catch((reason) => {
+                this.setState({ warning: 'Not a valid token address.' })
+              })
             },
           }, 'Add'),
         ]),
@@ -201,6 +208,12 @@ AddTokenScreen.prototype.validateInputs = function () {
   return isValid
 }
 
+AddTokenScreen.prototype.checkIfToken = async function (address) {
+  const contract = this.TokenContract.at(address)
+  const result = await contract.balance(address)
+  return result[0].toString()
+}
+
 AddTokenScreen.prototype.attemptToAutoFillTokenParams = async function (address) {
   const contract = this.TokenContract.at(address)
 
diff --git a/ui/app/components/token-cell.js b/ui/app/components/token-cell.js
index 67558ad87..48f46934a 100644
--- a/ui/app/components/token-cell.js
+++ b/ui/app/components/token-cell.js
@@ -2,6 +2,7 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const Identicon = require('./identicon')
+const prefixForNetwork = require('../../lib/etherscan-prefix-for-network')
 
 module.exports = TokenCell
 
@@ -59,7 +60,8 @@ function navigateTo (url) {
 }
 
 function etherscanLinkFor (tokenAddress, address, network) {
-  return `https://etherscan.io/token/${tokenAddress}?a=${address}`
+  const prefix = prefixForNetwork(network)
+  return `https://${prefix}etherscan.io/token/${tokenAddress}?a=${address}`
 }
 
 function tokenFactoryFor (tokenAddress) {