diff options
Diffstat (limited to 'ui/app/accounts/index.js')
-rw-r--r-- | ui/app/accounts/index.js | 101 |
1 files changed, 49 insertions, 52 deletions
diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js index 8215a559a..775df400b 100644 --- a/ui/app/accounts/index.js +++ b/ui/app/accounts/index.js @@ -2,7 +2,6 @@ const inherits = require('util').inherits const Component = require('react').Component const h = require('react-hyperscript') const connect = require('react-redux').connect -const extend = require('xtend') const actions = require('../actions') const valuesFor = require('../util').valuesFor const findDOMNode = require('react-dom').findDOMNode @@ -10,8 +9,7 @@ const AccountPanel = require('./account-panel') module.exports = connect(mapStateToProps)(AccountsScreen) - -function mapStateToProps(state) { +function mapStateToProps (state) { const pendingTxs = valuesFor(state.metamask.unconfTxs) const pendingMsgs = valuesFor(state.metamask.unconfMsgs) const pending = pendingTxs.concat(pendingMsgs) @@ -28,12 +26,11 @@ function mapStateToProps(state) { } inherits(AccountsScreen, Component) -function AccountsScreen() { +function AccountsScreen () { Component.call(this) } - -AccountsScreen.prototype.render = function() { +AccountsScreen.prototype.render = function () { var state = this.props var identityList = valuesFor(state.identities) var unconfTxList = valuesFor(state.unconfTxs) @@ -63,48 +60,48 @@ AccountsScreen.prototype.render = function() { height: '418px', overflowY: 'auto', overflowX: 'hidden', - } + }, }, - [ - identityList.map((identity) => { - const pending = this.props.pending.filter((txOrMsg) => { - if ('txParams' in txOrMsg) { - return txOrMsg.txParams.from === identity.address - } else if ('msgParams' in txOrMsg) { - return txOrMsg.msgParams.from === identity.address - } else { - return false - } - }) - - return h(AccountPanel, { - key: `acct-panel-${identity.address}`, - identity, - selectedAddress: this.props.selectedAddress, - accounts: this.props.accounts, - onShowDetail: this.onShowDetail.bind(this), - pending, - }) - }), - - h('hr.horizontal-line', {key: 'horizontal-line1'}), - h('div.footer.hover-white.pointer', { - key: 'reveal-account-bar', - onClick:() => { - actions.revealAccount() - }, - style: { - display: 'flex', - flex: '1 0 auto', - height: '40px', - paddint: '10px', - justifyContent: 'center', - alignItems: 'center', - } - }, [ - h('i.fa.fa-plus.fa-lg', {key: ''}), + [ + identityList.map((identity) => { + const pending = this.props.pending.filter((txOrMsg) => { + if ('txParams' in txOrMsg) { + return txOrMsg.txParams.from === identity.address + } else if ('msgParams' in txOrMsg) { + return txOrMsg.msgParams.from === identity.address + } else { + return false + } + }) + + return h(AccountPanel, { + key: `acct-panel-${identity.address}`, + identity, + selectedAddress: this.props.selectedAddress, + accounts: this.props.accounts, + onShowDetail: this.onShowDetail.bind(this), + pending, + }) + }), + + h('hr.horizontal-line', {key: 'horizontal-line1'}), + h('div.footer.hover-white.pointer', { + key: 'reveal-account-bar', + onClick: () => { + actions.revealAccount() + }, + style: { + display: 'flex', + flex: '1 0 auto', + height: '40px', + paddint: '10px', + justifyContent: 'center', + alignItems: 'center', + }, + }, [ + h('i.fa.fa-plus.fa-lg', {key: ''}), + ]), ]), - ]), unconfTxList.length ? ( @@ -123,7 +120,7 @@ AccountsScreen.prototype.render = function() { } // If a new account was revealed, scroll to the bottom -AccountsScreen.prototype.componentDidUpdate = function(){ +AccountsScreen.prototype.componentDidUpdate = function () { const scrollToBottom = this.props.scrollToBottom if (scrollToBottom) { @@ -133,27 +130,27 @@ AccountsScreen.prototype.componentDidUpdate = function(){ } } -AccountsScreen.prototype.navigateToConfTx = function(){ +AccountsScreen.prototype.navigateToConfTx = function () { event.stopPropagation() this.props.dispatch(actions.showConfTxPage()) } -AccountsScreen.prototype.onSelect = function(address, event){ +AccountsScreen.prototype.onSelect = function (address, event) { event.stopPropagation() // if already selected, deselect if (this.props.selectedAddress === address) address = null this.props.dispatch(actions.setSelectedAddress(address)) } -AccountsScreen.prototype.onShowDetail = function(address, event){ +AccountsScreen.prototype.onShowDetail = function (address, event) { event.stopPropagation() this.props.dispatch(actions.showAccountDetail(address)) } -AccountsScreen.prototype.onRevealAccount = function() { +AccountsScreen.prototype.onRevealAccount = function () { this.props.dispatch(actions.revealAccount()) } -AccountsScreen.prototype.goHome = function() { +AccountsScreen.prototype.goHome = function () { this.props.dispatch(actions.goHome()) } |