Merge pull request #1918 from MetaMask/token-hotfix

Token hotfix
feature/default_network_editable
Kevin Serrano 7 years ago committed by GitHub
commit f2ee32ba33
  1. 1
      CHANGELOG.md
  2. 35
      ui/app/account-detail.js

@ -2,6 +2,7 @@
## Current Master ## Current Master
- hotfix - disable token list
- Added a deprecation warning for web3 https://github.com/ethereum/mist/releases/tag/v0.9.0 - Added a deprecation warning for web3 https://github.com/ethereum/mist/releases/tag/v0.9.0
## 3.9.6 2017-8-09 ## 3.9.6 2017-8-09

@ -12,7 +12,7 @@ const ExportAccountView = require('./components/account-export')
const ethUtil = require('ethereumjs-util') const ethUtil = require('ethereumjs-util')
const EditableLabel = require('./components/editable-label') const EditableLabel = require('./components/editable-label')
const TabBar = require('./components/tab-bar') 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 const AccountDropdowns = require('./components/account-dropdowns').AccountDropdowns
module.exports = connect(mapStateToProps)(AccountDetailScreen) module.exports = connect(mapStateToProps)(AccountDetailScreen)
@ -255,17 +255,34 @@ AccountDetailScreen.prototype.tabSections = function () {
AccountDetailScreen.prototype.tabSwitchView = function () { AccountDetailScreen.prototype.tabSwitchView = function () {
const props = this.props const props = this.props
const { address, network } = props const { address/*, network */} = props
const { currentAccountTab, tokens } = this.props const { currentAccountTab/*, tokens*/ } = this.props
switch (currentAccountTab) { switch (currentAccountTab) {
case 'tokens': case 'tokens':
return h(TokenList, { // return h(TokenList, {
userAddress: address, // userAddress: address,
network, // network,
tokens, // tokens,
addToken: () => this.props.dispatch(actions.showAddTokenPage()), // 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: default:
return this.transactionList() return this.transactionList()
} }

Loading…
Cancel
Save