diff options
author | Thomas <tmashuang@gmail.com> | 2018-04-11 23:35:31 +0800 |
---|---|---|
committer | Thomas <tmashuang@gmail.com> | 2018-04-11 23:35:31 +0800 |
commit | f82c51c2c4782f54fb1d690f2dc1c309fafefe65 (patch) | |
tree | 84e5d2a1b989459f3dbb6f74e1921b4b83f705a0 /ui/app/components/tx-view.js | |
parent | 30474ccd35d5d7f30ffb8dff0acc8fbc77f44731 (diff) | |
parent | 29dab1e9e00c1c1e6ad834026df51b2839d3171d (diff) | |
download | tangerine-wallet-browser-f82c51c2c4782f54fb1d690f2dc1c309fafefe65.tar.gz tangerine-wallet-browser-f82c51c2c4782f54fb1d690f2dc1c309fafefe65.tar.zst tangerine-wallet-browser-f82c51c2c4782f54fb1d690f2dc1c309fafefe65.zip |
Merge branch 'master' into testing
Diffstat (limited to 'ui/app/components/tx-view.js')
-rw-r--r-- | ui/app/components/tx-view.js | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/ui/app/components/tx-view.js b/ui/app/components/tx-view.js index ca24e813f..80aac35c4 100644 --- a/ui/app/components/tx-view.js +++ b/ui/app/components/tx-view.js @@ -4,20 +4,25 @@ const connect = require('react-redux').connect const h = require('react-hyperscript') const ethUtil = require('ethereumjs-util') const inherits = require('util').inherits +const { withRouter } = require('react-router-dom') +const { compose } = require('recompose') const actions = require('../actions') const selectors = require('../selectors') +const { SEND_ROUTE } = require('../routes') const BalanceComponent = require('./balance-component') const TxList = require('./tx-list') const Identicon = require('./identicon') +module.exports = compose( + withRouter, + connect(mapStateToProps, mapDispatchToProps) +)(TxView) + TxView.contextTypes = { t: PropTypes.func, } -module.exports = connect(mapStateToProps, mapDispatchToProps)(TxView) - - function mapStateToProps (state) { const sidebarOpen = state.appState.sidebarOpen const isMascara = state.appState.isMascara @@ -69,7 +74,7 @@ TxView.prototype.renderHeroBalance = function () { } TxView.prototype.renderButtons = function () { - const {selectedToken, showModal, showSendPage, showSendTokenPage } = this.props + const {selectedToken, showModal, history } = this.props return !selectedToken ? ( @@ -84,14 +89,14 @@ TxView.prototype.renderButtons = function () { style: { marginLeft: '0.8em', }, - onClick: showSendPage, + onClick: () => history.push(SEND_ROUTE), }, this.context.t('send')), ]) ) : ( h('div.flex-row.flex-center.hero-balance-buttons', [ h('button.btn-primary.hero-balance-button', { - onClick: showSendTokenPage, + onClick: () => history.push(SEND_ROUTE), }, this.context.t('send')), ]) ) |