diff options
author | Dan <danjm.com@gmail.com> | 2018-06-05 20:26:36 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-06-05 20:26:36 +0800 |
commit | 49f0df31742ed09d74ab9cc55d74f23152c19f20 (patch) | |
tree | b853d92a33b6e551cd79c64b3ad362a9f80b9fc3 /ui/app/components/tx-view.js | |
parent | 8f0a3b83111a9ccf5d515cebbd33cabe9ab16ba7 (diff) | |
parent | 3b6e96bac918925c4edc674e26dba8cc5feb1324 (diff) | |
download | tangerine-wallet-browser-49f0df31742ed09d74ab9cc55d74f23152c19f20.tar.gz tangerine-wallet-browser-49f0df31742ed09d74ab9cc55d74f23152c19f20.tar.zst tangerine-wallet-browser-49f0df31742ed09d74ab9cc55d74f23152c19f20.zip |
Merge branch 'develop' into handle-import-account-failure-in-ui
Diffstat (limited to 'ui/app/components/tx-view.js')
-rw-r--r-- | ui/app/components/tx-view.js | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/ui/app/components/tx-view.js b/ui/app/components/tx-view.js index 263f992c0..014497fcd 100644 --- a/ui/app/components/tx-view.js +++ b/ui/app/components/tx-view.js @@ -12,7 +12,7 @@ const { checksumAddress: toChecksumAddress } = require('../util') const BalanceComponent = require('./balance-component') const TxList = require('./tx-list') -const Identicon = require('./identicon') +const SelectedAccount = require('./selected-account') module.exports = compose( withRouter, @@ -103,7 +103,7 @@ TxView.prototype.renderButtons = function () { } TxView.prototype.render = function () { - const { selectedAddress, identity, network, isMascara } = this.props + const { isMascara } = this.props return h('div.tx-view.flex-column', { style: {}, @@ -111,10 +111,12 @@ TxView.prototype.render = function () { h('div.flex-row.phone-visible', { style: { - justifyContent: 'space-between', + justifyContent: 'center', alignItems: 'center', flex: '0 0 auto', - margin: '10px', + marginBottom: '16px', + padding: '5px', + borderBottom: '1px solid #e5e5e5', }, }, [ @@ -127,23 +129,7 @@ TxView.prototype.render = function () { onClick: () => this.props.sidebarOpen ? this.props.hideSidebar() : this.props.showSidebar(), }), - h('.identicon-wrapper.select-none', { - style: { - marginLeft: '0.9em', - }, - }, [ - h(Identicon, { - diameter: 24, - address: selectedAddress, - network, - }), - ]), - - h('span.account-name', { - style: {}, - }, [ - identity.name, - ]), + h(SelectedAccount), !isMascara && h('div.open-in-browser', { onClick: () => global.platform.openExtensionInBrowser(), |