Merge branch 'master' into AddTokenList

4 files changed, 36 insertions, 45 deletions

diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js
index 4f27b35c0..d061d0ad1 100644
--- a/ui/lib/account-link.js
+++ b/ui/lib/account-link.js
@@ -11,6 +11,9 @@ module.exports = function (address, network) {
     case 3: // ropsten test net
       link = `http://ropsten.etherscan.io/address/${address}`
       break
+    case 4: // rinkeby test net
+      link = `http://rinkeby.etherscan.io/address/${address}`
+      break
     case 42: // kovan test net
       link = `http://kovan.etherscan.io/address/${address}`
       break
diff --git a/ui/lib/contract-namer.js b/ui/lib/contract-namer.js
index a94c62b62..f05e770cc 100644
--- a/ui/lib/contract-namer.js
+++ b/ui/lib/contract-namer.js
@@ -5,14 +5,18 @@
  * otherwise returns null.
  */
 
-// Nickname keys must be stored in lower case.
-const nicknames = {}
+const contractMap = require('eth-contract-metadata')
+const ethUtil = require('ethereumjs-util')
 
 module.exports = function (addr, identities = {}) {
+  const checksummed = ethUtil.toChecksumAddress(addr)
+  if (contractMap[checksummed] && contractMap[checksummed].name) {
+    return contractMap[checksummed].name
+  }
+
   const address = addr.toLowerCase()
   const ids = hashFromIdentities(identities)
-
-  return addrFromHash(address, ids) || addrFromHash(address, nicknames)
+  return addrFromHash(address, ids)
 }
 
 function hashFromIdentities (identities) {
diff --git a/ui/lib/explorer-link.js b/ui/lib/explorer-link.js
index ca89f8b25..e11249551 100644
--- a/ui/lib/explorer-link.js
+++ b/ui/lib/explorer-link.js
@@ -8,6 +8,9 @@ module.exports = function (hash, network) {
     case 3: // ropsten test net
       prefix = 'ropsten.'
       break
+    case 4: // rinkeby test net
+      prefix = 'rinkeby.'
+      break
     case 42: // kovan test net
       prefix = 'kovan.'
       break
diff --git a/ui/lib/icon-factory.js b/ui/lib/icon-factory.js
index ac703ae40..4ee6b600b 100644
--- a/ui/lib/icon-factory.js
+++ b/ui/lib/icon-factory.js
@@ -1,4 +1,7 @@
 var iconFactory
+const isValidAddress = require('ethereumjs-util').isValidAddress
+const toChecksumAddress = require('ethereumjs-util').toChecksumAddress
+const contractMap = require('eth-contract-metadata')
 
 module.exports = function (jazzicon) {
   if (!iconFactory) {
@@ -10,48 +13,15 @@ module.exports = function (jazzicon) {
 function IconFactory (jazzicon) {
   this.jazzicon = jazzicon
   this.cache = {}
-
-  this.presets = {
-    '1':{ // Main network:
-      '0x48c80f1f4d53d5951e5d5438b54cba84f29f32a5': 'https://etherscan.io/token/images/augur.png',
-      '0xc66ea802717bfb9833400264dd12c2bceaa34a6d': 'https://etherscan.io/token/images/mkr-etherscan-35.png',
-      '0xa74476443119a942de498590fe1f2454d7d4ac0d': 'https://etherscan.io/token/images/golem.png',
-      '0xaec2e87e0a235266d9c5adc9deb4b2e29b54d009': 'https://etherscan.io/token/images/sngls.png',
-
-    }
-  }
 }
 
-IconFactory.prototype.iconForAddress = function (address, diameter, imageify, network) {
-
-  try {
-    const presetUri = this.presets[network][address.toLowerCase()]
-    if (presetUri) {
-      var img = document.createElement('img')
-      img.src = presetUri
-      img.style.width = `${diameter}px`
-      img.style.height = `${diameter}px`
-      img.style.borderRadius = `${diameter/2}px`
-      return img
-    }
-  } catch (e) {}
-
-
-  if (imageify) {
-    return this.generateIdenticonImg(address, diameter)
-  } else {
-    return this.generateIdenticonSvg(address, diameter)
+IconFactory.prototype.iconForAddress = function (address, diameter) {
+  const addr = toChecksumAddress(address)
+  if (iconExistsFor(addr)) {
+    return imageElFor(addr)
   }
-}
 
-// returns img dom element
-IconFactory.prototype.generateIdenticonImg = function (address, diameter) {
-  var identicon = this.generateIdenticonSvg(address, diameter)
-  var identiconSrc = identicon.innerHTML
-  var dataUri = toDataUri(identiconSrc)
-  var img = document.createElement('img')
-  img.src = dataUri
-  return img
+  return this.generateIdenticonSvg(address, diameter)
 }
 
 // returns svg dom element
@@ -73,12 +43,23 @@ IconFactory.prototype.generateNewIdenticon = function (address, diameter) {
 
 // util
 
+function iconExistsFor (address) {
+  return (contractMap.address) && isValidAddress(address) && (contractMap[address].logo)
+}
+
+function imageElFor (address) {
+  const contract = contractMap[address]
+  const fileName = contract.logo
+  const path = `images/contract/${fileName}`
+  const img = document.createElement('img')
+  img.src = path
+  img.style.width = '100%'
+  return img
+}
+
 function jsNumberForAddress (address) {
   var addr = address.slice(2, 10)
   var seed = parseInt(addr, 16)
   return seed
 }
 
-function toDataUri (identiconSrc) {
-  return 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(identiconSrc)
-}