1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

Merge pull request #1918 from MetaMask/token-hotfix

Token hotfix
This commit is contained in:
Kevin Serrano 2017-08-15 12:42:54 -07:00 committed by GitHub
commit f2ee32ba33
2 changed files with 27 additions and 9 deletions

View File

@ -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

View File

@ -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()
}