Fix merge conflicts

1 files changed, 14 insertions, 13 deletions

diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 9a323e6c2..fbccfd6c5 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -45,6 +45,7 @@ function mapStateToProps (state) {
     unapprovedMsgCount,
     unapprovedPersonalMsgCount,
     send: state.metamask.send,
+    selectedAddressTxList: state.metamask.selectedAddressTxList,
   }
 }
 
@@ -53,19 +54,19 @@ function ConfirmTxScreen () {
   Component.call(this)
 }
 
-ConfirmTxScreen.prototype.componentWillMount = function () {
-  const { unapprovedTxs = {}, send } = this.props
-  const { to } = send
-  if (Object.keys(unapprovedTxs).length === 0 && !to) {
-    this.props.history.push(DEFAULT_ROUTE)
-  }
-}
-
-ConfirmTxScreen.prototype.componentWillReceiveProps = function (nextProps) {
-  const { send } = this.props
-  const { to } = send
-  const { unapprovedTxs = {} } = nextProps
-  if (Object.keys(unapprovedTxs).length === 0 && !to) {
+ConfirmTxScreen.prototype.componentDidUpdate = function (prevProps) {
+  const {
+    unapprovedTxs,
+    network,
+    selectedAddressTxList,
+  } = this.props
+  const { index: prevIndex, unapprovedTxs: prevUnapprovedTxs } = prevProps
+  const prevUnconfTxList = txHelper(prevUnapprovedTxs, {}, {}, {}, network)
+  const prevTxData = prevUnconfTxList[prevIndex] || {}
+  const prevTx = selectedAddressTxList.find(({ id }) => id === prevTxData.id) || {}
+  const unconfTxList = txHelper(unapprovedTxs, {}, {}, {}, network)
+
+  if (prevTx.status === 'dropped' && unconfTxList.length === 0) {
     this.props.history.push(DEFAULT_ROUTE)
   }
 }