diff options
author | Frankie <frankie.diamond@gmail.com> | 2016-09-13 01:34:06 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-13 01:34:06 +0800 |
commit | c37c050c8a119e4c2de1edea474c3c3d5ad1cf99 (patch) | |
tree | 9a4f288759d608b2300dc0245ea898f01d6d9a1b /ui/app/accounts | |
parent | fcc9ca812e557fd5ecc547f5eb597069788d6c00 (diff) | |
download | tangerine-wallet-browser-c37c050c8a119e4c2de1edea474c3c3d5ad1cf99.tar tangerine-wallet-browser-c37c050c8a119e4c2de1edea474c3c3d5ad1cf99.tar.gz tangerine-wallet-browser-c37c050c8a119e4c2de1edea474c3c3d5ad1cf99.tar.bz2 tangerine-wallet-browser-c37c050c8a119e4c2de1edea474c3c3d5ad1cf99.tar.lz tangerine-wallet-browser-c37c050c8a119e4c2de1edea474c3c3d5ad1cf99.tar.xz tangerine-wallet-browser-c37c050c8a119e4c2de1edea474c3c3d5ad1cf99.tar.zst tangerine-wallet-browser-c37c050c8a119e4c2de1edea474c3c3d5ad1cf99.zip |
Revert "Add new eth-lightwallet salting to vault."
Diffstat (limited to 'ui/app/accounts')
-rw-r--r-- | ui/app/accounts/account-list-item.js | 13 | ||||
-rw-r--r-- | ui/app/accounts/index.js | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/ui/app/accounts/account-list-item.js b/ui/app/accounts/account-list-item.js index 4e0d69ed7..0b4acdfec 100644 --- a/ui/app/accounts/account-list-item.js +++ b/ui/app/accounts/account-list-item.js @@ -7,14 +7,14 @@ const EthBalance = require('../components/eth-balance') const CopyButton = require('../components/copyButton') const Identicon = require('../components/identicon') -module.exports = AccountListItem +module.exports = NewComponent -inherits(AccountListItem, Component) -function AccountListItem () { +inherits(NewComponent, Component) +function NewComponent () { Component.call(this) } -AccountListItem.prototype.render = function () { +NewComponent.prototype.render = function () { const identity = this.props.identity var isSelected = this.props.selectedAddress === identity.address var account = this.props.accounts[identity.address] @@ -23,6 +23,9 @@ AccountListItem.prototype.render = function () { return ( h(`.accounts-list-option.flex-row.flex-space-between.pointer.hover-white${selectedClass}`, { key: `account-panel-${identity.address}`, + style: { + flex: '1 0 auto', + }, onClick: (event) => this.props.onShowDetail(identity.address, event), }, [ @@ -70,7 +73,7 @@ AccountListItem.prototype.render = function () { ) } -AccountListItem.prototype.pendingOrNot = function () { +NewComponent.prototype.pendingOrNot = function () { const pending = this.props.pending if (pending.length === 0) return null return h('.pending-dot', pending.length) diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js index d3c84d387..c20900c1e 100644 --- a/ui/app/accounts/index.js +++ b/ui/app/accounts/index.js @@ -84,7 +84,7 @@ AccountsScreen.prototype.render = function () { }) }), - h('hr.horizontal-line'), + h('hr.horizontal-line', {key: 'horizontal-line1'}), h('div.footer.hover-white.pointer', { key: 'reveal-account-bar', onClick: () => { @@ -92,6 +92,7 @@ AccountsScreen.prototype.render = function () { }, style: { display: 'flex', + flex: '1 0 auto', height: '40px', paddint: '10px', justifyContent: 'center', @@ -100,7 +101,6 @@ AccountsScreen.prototype.render = function () { }, [ h('i.fa.fa-plus.fa-lg', {key: ''}), ]), - h('hr.horizontal-line'), ]), unconfTxList.length ? ( |