diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-07-06 06:48:40 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-07-06 06:49:51 +0800 |
| commit | ed8a71d35074c5ee0a6c4c03ae366f59ab6bc519 (patch) | |
| tree | 14485e7cbdf3a24299775801c27c50595f92e938 /ui | |
| parent | b72861fc9848a474badac076951d5286a996d2e8 (diff) | |
| parent | 8aab5d965b2095683baaf35bf1de6450de981800 (diff) | |
| download | tangerine-wallet-browser-ed8a71d35074c5ee0a6c4c03ae366f59ab6bc519.tar tangerine-wallet-browser-ed8a71d35074c5ee0a6c4c03ae366f59ab6bc519.tar.gz tangerine-wallet-browser-ed8a71d35074c5ee0a6c4c03ae366f59ab6bc519.tar.bz2 tangerine-wallet-browser-ed8a71d35074c5ee0a6c4c03ae366f59ab6bc519.tar.lz tangerine-wallet-browser-ed8a71d35074c5ee0a6c4c03ae366f59ab6bc519.tar.xz tangerine-wallet-browser-ed8a71d35074c5ee0a6c4c03ae366f59ab6bc519.tar.zst tangerine-wallet-browser-ed8a71d35074c5ee0a6c4c03ae366f59ab6bc519.zip | |
Merge branch 'master' into NewUI
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/classic/app/components/token-list.js | 2 | ||||
| -rw-r--r-- | ui/responsive/app/components/token-list.js | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/ui/classic/app/components/token-list.js b/ui/classic/app/components/token-list.js index fed7e9f7a..20cfa897e 100644 --- a/ui/classic/app/components/token-list.js +++ b/ui/classic/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 diff --git a/ui/responsive/app/components/token-list.js b/ui/responsive/app/components/token-list.js index fed7e9f7a..20cfa897e 100644 --- a/ui/responsive/app/components/token-list.js +++ b/ui/responsive/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 |