aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md1
-rw-r--r--ui/app/account-detail.js35
2 files changed, 27 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 516e8f9e8..4c4d3e3dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
## Current Master
+- hotfix - disable token list
- Added a deprecation warning for web3 https://github.com/ethereum/mist/releases/tag/v0.9.0
## 3.9.6 2017-8-09
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index f6041e856..4046b5875 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,17 +255,34 @@ 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(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')])
default:
return this.transactionList()
}