aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-08-17 00:49:18 +0800
committerDan Finlay <dan@danfinlay.com>2017-08-17 00:49:18 +0800
commitb69f5533d902a1aba121b7d3752475c11084885b (patch)
treec49af1f9409d89db4f7dccece2d07712338b69e1 /ui/app
parent60fdbd67af8b8b931c068d35ce81d11e21da2cef (diff)
downloadtangerine-wallet-browser-b69f5533d902a1aba121b7d3752475c11084885b.tar.gz
tangerine-wallet-browser-b69f5533d902a1aba121b7d3752475c11084885b.tar.zst
tangerine-wallet-browser-b69f5533d902a1aba121b7d3752475c11084885b.zip
ReEnable Token List
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/account-detail.js35
1 files changed, 9 insertions, 26 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 7af53a694..02089ecd0 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -12,7 +12,7 @@ const ExportAccountView = require('./components/account-export')
const ethUtil = require('ethereumjs-util')
const EditableLabel = require('./components/editable-label')
const TabBar = require('./components/tab-bar')
-// const TokenList = require('./components/token-list')
+const TokenList = require('./components/token-list')
const AccountDropdowns = require('./components/account-dropdowns').AccountDropdowns
module.exports = connect(mapStateToProps)(AccountDetailScreen)
@@ -255,34 +255,17 @@ AccountDetailScreen.prototype.tabSections = function () {
AccountDetailScreen.prototype.tabSwitchView = function () {
const props = this.props
- const { address/*, network */} = props
- const { currentAccountTab/*, tokens*/ } = this.props
+ const { address, network } = props
+ const { currentAccountTab, tokens } = this.props
switch (currentAccountTab) {
case 'tokens':
- // return h(TokenList, {
- // userAddress: address,
- // network,
- // tokens,
- // addToken: () => this.props.dispatch(actions.showAddTokenPage()),
- // })
- return h('.hotFix', {
- style: {
- padding: '80px',
- },
- }, [
- 'Token lists are temporarily down. You can check you your token balances ',
- h('span.hotFix', {
- style: {
- color: 'rgba(247, 134, 28, 1)',
- cursor: 'pointer',
- },
- onClick: () => {
- global.platform.openWindow({
- url: `https://ethplorer.io/address/${address}`,
- })
- },
- }, 'here')])
+ return h(TokenList, {
+ userAddress: address,
+ network,
+ tokens,
+ addToken: () => this.props.dispatch(actions.showAddTokenPage()),
+ })
default:
return this.transactionList()
}