Skip to content

Commit f2ee32b

Browse files
authored
Merge pull request #1918 from MetaMask/token-hotfix
Token hotfix
2 parents 68c6b2d + 9c7abac commit f2ee32b

File tree

2 files changed

+27
-9
lines changed

2 files changed

+27
-9
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Current Master
44

5+
- hotfix - disable token list
56
- Added a deprecation warning for web3 https://github.com/ethereum/mist/releases/tag/v0.9.0
67

78
## 3.9.6 2017-8-09

ui/app/account-detail.js

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const ExportAccountView = require('./components/account-export')
1212
const ethUtil = require('ethereumjs-util')
1313
const EditableLabel = require('./components/editable-label')
1414
const TabBar = require('./components/tab-bar')
15-
const TokenList = require('./components/token-list')
15+
// const TokenList = require('./components/token-list')
1616
const AccountDropdowns = require('./components/account-dropdowns').AccountDropdowns
1717

1818
module.exports = connect(mapStateToProps)(AccountDetailScreen)
@@ -255,17 +255,34 @@ AccountDetailScreen.prototype.tabSections = function () {
255255

256256
AccountDetailScreen.prototype.tabSwitchView = function () {
257257
const props = this.props
258-
const { address, network } = props
259-
const { currentAccountTab, tokens } = this.props
258+
const { address/*, network */} = props
259+
const { currentAccountTab/*, tokens*/ } = this.props
260260

261261
switch (currentAccountTab) {
262262
case 'tokens':
263-
return h(TokenList, {
264-
userAddress: address,
265-
network,
266-
tokens,
267-
addToken: () => this.props.dispatch(actions.showAddTokenPage()),
268-
})
263+
// return h(TokenList, {
264+
// userAddress: address,
265+
// network,
266+
// tokens,
267+
// addToken: () => this.props.dispatch(actions.showAddTokenPage()),
268+
// })
269+
return h('.hotFix', {
270+
style: {
271+
padding: '80px',
272+
},
273+
}, [
274+
'Token lists are temporarily down. You can check you your token balances ',
275+
h('span.hotFix', {
276+
style: {
277+
color: 'rgba(247, 134, 28, 1)',
278+
cursor: 'pointer',
279+
},
280+
onClick: () => {
281+
global.platform.openWindow({
282+
url: `https://ethplorer.io/address/${address}`,
283+
})
284+
},
285+
}, 'here')])
269286
default:
270287
return this.transactionList()
271288
}

0 commit comments

Comments
 (0)