aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-08-16 03:42:54 +0800
committerGitHub <noreply@github.com>2017-08-16 03:42:54 +0800
commitf2ee32ba33792ac7ac5090506e3e71a5a9c75482 (patch)
tree32d09881f27511f711cc40689dedabe21a33a4bf
parent68c6b2d666719476bff78cbc107a56be3b86dbe1 (diff)
parent9c7abacf64c3c83790330c04baf456a1f642ed36 (diff)
downloadtangerine-wallet-browser-f2ee32ba33792ac7ac5090506e3e71a5a9c75482.tar
tangerine-wallet-browser-f2ee32ba33792ac7ac5090506e3e71a5a9c75482.tar.gz
tangerine-wallet-browser-f2ee32ba33792ac7ac5090506e3e71a5a9c75482.tar.bz2
tangerine-wallet-browser-f2ee32ba33792ac7ac5090506e3e71a5a9c75482.tar.lz
tangerine-wallet-browser-f2ee32ba33792ac7ac5090506e3e71a5a9c75482.tar.xz
tangerine-wallet-browser-f2ee32ba33792ac7ac5090506e3e71a5a9c75482.tar.zst
tangerine-wallet-browser-f2ee32ba33792ac7ac5090506e3e71a5a9c75482.zip
Merge pull request #1918 from MetaMask/token-hotfix
Token hotfix
-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()
}