From 2346c9b6b9322458b350d5afd19501372272f0ec Mon Sep 17 00:00:00 2001 From: sdtsui Date: Thu, 10 Aug 2017 17:49:12 -0700 Subject: Add overflow support for all account names in account details --- ui/app/account-detail.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'ui/app/account-detail.js') diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 22a883096..f6041e856 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -107,14 +107,23 @@ AccountDetailScreen.prototype.render = function () { }, [ h( - 'h2.font-medium.color-forest', + 'div.font-medium.color-forest', { name: 'edit', style: { }, }, [ - identity && identity.name, + h('h2', { + style: { + maxWidth: '180px', + overflowX: 'hidden', + textOverflow: 'ellipsis', + padding: '5px 0px', + }, + }, [ + identity && identity.name, + ]), ] ), h( -- cgit From 6168efc9cc16d6dc623cb981a6d7f28fedf54477 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Tue, 15 Aug 2017 17:13:11 +0200 Subject: Fix overflow issue on QubesOS, flagged by @kumavis --- ui/app/account-detail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/app/account-detail.js') diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index f6041e856..02089ecd0 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -117,7 +117,7 @@ AccountDetailScreen.prototype.render = function () { h('h2', { style: { maxWidth: '180px', - overflowX: 'hidden', + overflow: 'hidden', textOverflow: 'ellipsis', padding: '5px 0px', }, -- cgit From 176dd6d214489e447460d20b4223596d84048f8d Mon Sep 17 00:00:00 2001 From: frankiebee Date: Tue, 15 Aug 2017 12:12:57 -0700 Subject: Disable token list --- ui/app/account-detail.js | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) (limited to 'ui/app/account-detail.js') diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index f6041e856..9921d3067 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 List is temporally + you can check your token balnce + `, h('span.hotFix', { + style: { + color: 'rgba(247, 134, 28, 1)', + }, + onClick: () => { + global.platform.openWindow({ + url: `https://ethplorer.io/address/${address}`, + }) + }, + }, 'here')]) default: return this.transactionList() } -- cgit From a8d6e1fe98416db4d7c9e8615f79a8c77dbb62fc Mon Sep 17 00:00:00 2001 From: frankiebee Date: Tue, 15 Aug 2017 12:16:41 -0700 Subject: fix spelling --- ui/app/account-detail.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ui/app/account-detail.js') diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 9921d3067..95e2c1cf9 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -270,10 +270,9 @@ AccountDetailScreen.prototype.tabSwitchView = function () { style: { padding: '80px', }, - }, [` - Token List is temporally - you can check your token balnce - `, h('span.hotFix', { + }, [ + 'Token lists are temporarily down. You can check you your token balances ', + h('span.hotFix', { style: { color: 'rgba(247, 134, 28, 1)', }, -- cgit From 9c7abacf64c3c83790330c04baf456a1f642ed36 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Tue, 15 Aug 2017 12:26:11 -0700 Subject: Change cursor type to indicate link. --- ui/app/account-detail.js | 1 + 1 file changed, 1 insertion(+) (limited to 'ui/app/account-detail.js') diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 95e2c1cf9..4046b5875 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -275,6 +275,7 @@ AccountDetailScreen.prototype.tabSwitchView = function () { h('span.hotFix', { style: { color: 'rgba(247, 134, 28, 1)', + cursor: 'pointer', }, onClick: () => { global.platform.openWindow({ -- cgit From b69f5533d902a1aba121b7d3752475c11084885b Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Wed, 16 Aug 2017 09:49:18 -0700 Subject: ReEnable Token List --- ui/app/account-detail.js | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) (limited to 'ui/app/account-detail.js') diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 7af53a694..02089ecd0 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,34 +255,17 @@ 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('.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')]) + return h(TokenList, { + userAddress: address, + network, + tokens, + addToken: () => this.props.dispatch(actions.showAddTokenPage()), + }) default: return this.transactionList() } -- cgit