3 files changed, 19 insertions, 2 deletions
diff --git a/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js b/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js
index a3ec82863..1e2270432 100644
--- a/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js
+++ b/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js
@@ -29,7 +29,7 @@ const casedContractMap = Object.keys(contractMap).reduce((acc, base) => {
 
 const mapStateToProps = (state, props) => {
   const { toAddress: propsToAddress } = props
-  const { confirmTransaction, metamask } = state
+  const { confirmTransaction, metamask, gas } = state
   const {
     ethTransactionAmount,
     ethTransactionFee,
@@ -60,6 +60,12 @@ const mapStateToProps = (state, props) => {
     unapprovedTxs,
   } = metamask
   const assetImage = assetImages[txParamsToAddress]
+
+  const {
+    customGasLimit,
+    customGasPrice,
+  } = gas
+
   const { balance } = accounts[selectedAddress]
   const { name: fromName } = identities[selectedAddress]
   const toAddress = propsToAddress || txParamsToAddress
@@ -106,6 +112,10 @@ const mapStateToProps = (state, props) => {
     unapprovedTxs,
     unapprovedTxCount,
     currentNetworkUnapprovedTxs,
+    customGas: {
+      gasLimit: customGasLimit || txData.gasPrice,
+      gasPrice: customGasPrice || txData.gasLimit,
+    },
   }
 }
 
@@ -192,7 +202,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
     ...ownProps,
     showCustomizeGasModal: () => dispatchShowCustomizeGasModal({
       txData,
-      onSubmit: txData => dispatchUpdateGasAndCalculate(txData),
+      onSubmit: customGas => dispatchUpdateGasAndCalculate(customGas),
       validate: validateEditGas,
     }),
     cancelAllTransactions: () => dispatchCancelAllTransactions(valuesFor(unapprovedTxs)),
diff --git a/ui/app/components/pages/confirm-transaction/confirm-transaction.component.js b/ui/app/components/pages/confirm-transaction/confirm-transaction.component.js
index 3ac656d73..614b3e584 100644
--- a/ui/app/components/pages/confirm-transaction/confirm-transaction.component.js
+++ b/ui/app/components/pages/confirm-transaction/confirm-transaction.component.js
@@ -32,6 +32,7 @@ export default class ConfirmTransaction extends Component {
     setTransactionToConfirm: PropTypes.func,
     confirmTransaction: PropTypes.object,
     clearConfirmTransaction: PropTypes.func,
+    fetchGasEstimates: PropTypes.func,
   }
 
   getParamsTransactionId () {
@@ -45,6 +46,7 @@ export default class ConfirmTransaction extends Component {
       send = {},
       history,
       confirmTransaction: { txData: { id: transactionId } = {} },
+      fetchGasEstimates,
     } = this.props
 
     if (!totalUnapprovedCount && !send.to) {
@@ -53,6 +55,7 @@ export default class ConfirmTransaction extends Component {
     }
 
     if (!transactionId) {
+      fetchGasEstimates()
       this.setTransactionToConfirm()
     }
   }
diff --git a/ui/app/components/pages/confirm-transaction/confirm-transaction.container.js b/ui/app/components/pages/confirm-transaction/confirm-transaction.container.js
index 1bc2f1efb..cb1a737f9 100644
--- a/ui/app/components/pages/confirm-transaction/confirm-transaction.container.js
+++ b/ui/app/components/pages/confirm-transaction/confirm-transaction.container.js
@@ -5,6 +5,9 @@ import {
   setTransactionToConfirm,
   clearConfirmTransaction,
 } from '../../../ducks/confirm-transaction.duck'
+import {
+  fetchGasEstimates,
+} from '../../../ducks/gas.duck'
 import ConfirmTransaction from './confirm-transaction.component'
 import { getTotalUnapprovedCount } from '../../../selectors'
 import { unconfirmedTransactionsListSelector } from '../../../selectors/confirm-transaction'
@@ -24,6 +27,7 @@ const mapDispatchToProps = dispatch => {
   return {
     setTransactionToConfirm: transactionId => dispatch(setTransactionToConfirm(transactionId)),
     clearConfirmTransaction: () => dispatch(clearConfirmTransaction()),
+    fetchGasEstimates: () => dispatch(fetchGasEstimates()),
   }
 }