Merge pull request #1711 from MetaMask/NoPopularTOkens

Stop loading popular tokens by default

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8bdfa183..9943a8e15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Current Master
 
+- Temporarily disabled loading popular tokens by default to improve performance.
 - Remove SEND token button until a better token sending form can be built, due to some precision issues.
 - Fix precision bug in token balances.
 - Cache token symbol and precisions to reduce network load.
diff --git a/ui/app/components/token-list.js b/ui/app/components/token-list.js
index bf352dc11..fed7e9f7a 100644
--- a/ui/app/components/token-list.js
+++ b/ui/app/components/token-list.js
@@ -3,10 +3,11 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const TokenTracker = require('eth-token-tracker')
 const TokenCell = require('./token-cell.js')
-const contracts = require('eth-contract-metadata')
 const normalizeAddress = require('eth-sig-util').normalize
 
 const defaultTokens = []
+/*
+const contracts = require('eth-contract-metadata')
 for (const address in contracts) {
   const contract = contracts[address]
   if (contract.erc20) {
@@ -14,6 +15,7 @@ for (const address in contracts) {
     defaultTokens.push(contract)
   }
 }
+*/
 
 module.exports = TokenList