diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-07-06 01:38:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 01:38:14 +0800 |
| commit | 8aab5d965b2095683baaf35bf1de6450de981800 (patch) | |
| tree | cdc226e5e2e82f609d8c3de7201395fa3ef9c870 | |
| parent | ce3d374d800a7213ac5dcc472d058372f3fe813b (diff) | |
| parent | 52a6b9f103fecfd92f860188daf15e1fa943ab5f (diff) | |
| download | tangerine-wallet-browser-8aab5d965b2095683baaf35bf1de6450de981800.tar tangerine-wallet-browser-8aab5d965b2095683baaf35bf1de6450de981800.tar.gz tangerine-wallet-browser-8aab5d965b2095683baaf35bf1de6450de981800.tar.bz2 tangerine-wallet-browser-8aab5d965b2095683baaf35bf1de6450de981800.tar.lz tangerine-wallet-browser-8aab5d965b2095683baaf35bf1de6450de981800.tar.xz tangerine-wallet-browser-8aab5d965b2095683baaf35bf1de6450de981800.tar.zst tangerine-wallet-browser-8aab5d965b2095683baaf35bf1de6450de981800.zip | |
Merge pull request #1741 from MetaMask/ReEnableTokenList
Reenable Default Token List
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | ui/app/components/token-list.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index bcbd81e30..e7934dc77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Current Master +- Re-enable default token list. +- Add origin header to dapp-bound requests to allow providers to throttle sites. + ## 3.8.2 2017-7-3 - No longer show network loading indication on config screen, to allow selecting custom RPCs. diff --git a/ui/app/components/token-list.js b/ui/app/components/token-list.js index fed7e9f7a..20cfa897e 100644 --- a/ui/app/components/token-list.js +++ b/ui/app/components/token-list.js @@ -6,7 +6,6 @@ const TokenCell = require('./token-cell.js') const normalizeAddress = require('eth-sig-util').normalize const defaultTokens = [] -/* const contracts = require('eth-contract-metadata') for (const address in contracts) { const contract = contracts[address] @@ -15,7 +14,6 @@ for (const address in contracts) { defaultTokens.push(contract) } } -*/ module.exports = TokenList |