diff options
author | Dan J Miller <danjm.com@gmail.com> | 2018-01-13 03:48:18 +0800 |
---|---|---|
committer | Alexander Tseung <alextsg@users.noreply.github.com> | 2018-01-13 03:48:18 +0800 |
commit | 5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f (patch) | |
tree | f354a007d35321ad7bc54564d2ae40e8f152176f /ui/app/components/shift-list-item.js | |
parent | b72610fb534580e607c6934e938c50d58ba05350 (diff) | |
download | tangerine-wallet-browser-5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f.tar tangerine-wallet-browser-5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f.tar.gz tangerine-wallet-browser-5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f.tar.bz2 tangerine-wallet-browser-5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f.tar.lz tangerine-wallet-browser-5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f.tar.xz tangerine-wallet-browser-5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f.tar.zst tangerine-wallet-browser-5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f.zip |
[NewUI-flat] New deposit ether modal UI. (#2642)
* New deposit ether modal.
* New deposit modal full screen on mobile, and other style fixes.
* Hide shapeshift option from deposit modal for now.
* Add shapeshift form to new deposit modal.
* Store recipient address for shapeshift tx in background.
* Use Simpledropdown to achieve desired styling in coin selector.
* Lint fix
* Fix typos and remove dead code.
* Remove storage of shapeshift receiving address from background.
* Fix typos
Diffstat (limited to 'ui/app/components/shift-list-item.js')
-rw-r--r-- | ui/app/components/shift-list-item.js | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js index 43973de63..111a77df4 100644 --- a/ui/app/components/shift-list-item.js +++ b/ui/app/components/shift-list-item.js @@ -16,6 +16,7 @@ module.exports = connect(mapStateToProps)(ShiftListItem) function mapStateToProps (state) { return { + selectedAddress: state.metamask.selectedAddress, conversionRate: state.metamask.conversionRate, currentCurrency: state.metamask.currentCurrency, } @@ -28,36 +29,39 @@ function ShiftListItem () { } ShiftListItem.prototype.render = function () { + const { selectedAddress, receivingAddress } = this.props return ( - h('div.tx-list-item.tx-list-clickable', { - style: { - paddingTop: '20px', - paddingBottom: '20px', - justifyContent: 'space-around', - alignItems: 'center', - }, - }, [ - h('div', { + selectedAddress === receivingAddress + ? h('div.tx-list-item.tx-list-clickable', { style: { - width: '0px', - position: 'relative', - bottom: '19px', + paddingTop: '20px', + paddingBottom: '20px', + justifyContent: 'space-around', + alignItems: 'center', }, }, [ - h('img', { - src: 'https://info.shapeshift.io/sites/default/files/logo.png', + h('div', { style: { - height: '35px', - width: '132px', - position: 'absolute', - clip: 'rect(0px,23px,34px,0px)', + width: '0px', + position: 'relative', + bottom: '19px', }, - }), - ]), + }, [ + h('img', { + src: 'https://info.shapeshift.io/sites/default/files/logo.png', + style: { + height: '35px', + width: '132px', + position: 'absolute', + clip: 'rect(0px,23px,34px,0px)', + }, + }), + ]), - this.renderInfo(), - this.renderUtilComponents(), - ]) + this.renderInfo(), + this.renderUtilComponents(), + ]) + : null ) } |