From d8ab9cc002c10757b7382a174dafff7a0247e307 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@users.noreply.github.com>
Date: Sun, 9 Dec 2018 12:48:06 -0800
Subject: Group transactions by nonce (#5886)

---
 .../cancel-transaction/cancel-transaction.container.js   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'ui/app/components/modals/cancel-transaction/cancel-transaction.container.js')

diff --git a/ui/app/components/modals/cancel-transaction/cancel-transaction.container.js b/ui/app/components/modals/cancel-transaction/cancel-transaction.container.js
index eede8b1ee..10931a001 100644
--- a/ui/app/components/modals/cancel-transaction/cancel-transaction.container.js
+++ b/ui/app/components/modals/cancel-transaction/cancel-transaction.container.js
@@ -28,31 +28,29 @@ const mapStateToProps = (state, ownProps) => {
     transactionId,
     transactionStatus,
     originalGasPrice,
+    defaultNewGasPrice,
     newGasFee,
   }
 }
 
 const mapDispatchToProps = dispatch => {
   return {
-    createCancelTransaction: txId => dispatch(createCancelTransaction(txId)),
+    createCancelTransaction: (txId, customGasPrice) => {
+      return dispatch(createCancelTransaction(txId, customGasPrice))
+    },
     showTransactionConfirmedModal: () => dispatch(showModal({ name: 'TRANSACTION_CONFIRMED' })),
   }
 }
 
 const mergeProps = (stateProps, dispatchProps, ownProps) => {
-  const { transactionId, ...restStateProps } = stateProps
-  const {
-    createCancelTransaction: dispatchCreateCancelTransaction,
-    ...restDispatchProps
-  } = dispatchProps
+  const { transactionId, defaultNewGasPrice, ...restStateProps } = stateProps
+  const { createCancelTransaction, ...restDispatchProps } = dispatchProps
 
   return {
     ...restStateProps,
     ...restDispatchProps,
     ...ownProps,
-    createCancelTransaction: newGasPrice => {
-      return dispatchCreateCancelTransaction(transactionId, newGasPrice)
-    },
+    createCancelTransaction: () => createCancelTransaction(transactionId, defaultNewGasPrice),
   }
 }
 
-- 
cgit