Fix conf-tx render

2 files changed, 8 insertions, 2 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index af2b70353..8a21220b1 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -4,7 +4,6 @@ const connect = require('react-redux').connect
 const { Route, Switch, Redirect, withRouter } = require('react-router-dom')
 const { compose } = require('recompose')
 const h = require('react-hyperscript')
-const PropTypes = require('prop-types')
 const actions = require('./actions')
 const classnames = require('classnames')
 
@@ -732,6 +731,10 @@ function mapDispatchToProps (dispatch, ownProps) {
   }
 }
 
+App.contextTypes = {
+  t: PropTypes.func,
+}
+
 module.exports = compose(
   withRouter,
   connect(mapStateToProps, mapDispatchToProps)
diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js
index 0cef64ca6..70643aa36 100644
--- a/ui/app/components/tx-list.js
+++ b/ui/app/components/tx-list.js
@@ -120,7 +120,10 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa
   const isUnapproved = transactionStatus === 'unapproved'
 
   if (isUnapproved) {
-    opts.onClick = () => history.push(CONFIRM_TRANSACTION_ROUTE)
+    opts.onClick = () => {
+      this.props.showConfTxPage({ id: transactionId })
+      history.push(CONFIRM_TRANSACTION_ROUTE)
+    }
     opts.transactionStatus = this.context.t('notStarted')
   } else if (transactionHash) {
     opts.onClick = () => this.view(transactionHash, transactionNetworkId)