Merge pull request #6832 from MetaMask/master-rebased

Master rebased

2 files changed, 63 insertions, 42 deletions

diff --git a/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js b/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js
index fc5e2f90d..5d2ccb083 100644
--- a/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js
+++ b/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js
@@ -1,7 +1,10 @@
 import { connect } from 'react-redux'
+import { compose } from 'recompose'
+import { withRouter } from 'react-router-dom'
 import ConfirmTokenTransactionBase from './confirm-token-transaction-base.component'
 import {
   contractExchangeRateSelector,
+  transactionFeeSelector,
 } from '../../selectors/confirm-transaction'
 import { tokenSelector } from '../../selectors/tokens'
 import {
@@ -14,15 +17,21 @@ import {
 } from '../../helpers/utils/token-util'
 
 
-const mapStateToProps = (state) => {
-  const { confirmTransaction, metamask: { currentCurrency, conversionRate } } = state
+const mapStateToProps = (state, ownProps) => {
+  const { match: { params = {} } } = ownProps
+  const { id: paramsTransactionId } = params
+  const { confirmTransaction, metamask: { currentCurrency, conversionRate, selectedAddressTxList } } = state
+
   const {
-    txData: { txParams: { to: tokenAddress, data } = {} } = {},
-    fiatTransactionTotal,
-    ethTransactionTotal,
+    txData: { id: transactionId, txParams: { to: tokenAddress, data } = {} } = {},
   } = confirmTransaction
 
+  const transaction = selectedAddressTxList.find(({ id }) => id === (Number(paramsTransactionId) || transactionId)) || {}
 
+  const {
+    ethTransactionTotal,
+    fiatTransactionTotal,
+  } = transactionFeeSelector(state, transaction)
   const tokens = tokenSelector(state)
   const currentToken = tokens && tokens.find(({ address }) => tokenAddress === address)
   const { decimals, symbol: tokenSymbol } = currentToken || {}
@@ -46,4 +55,7 @@ const mapStateToProps = (state) => {
   }
 }
 
-export default connect(mapStateToProps)(ConfirmTokenTransactionBase)
+export default compose(
+  withRouter,
+  connect(mapStateToProps)
+)(ConfirmTokenTransactionBase)
diff --git a/ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js b/ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js
index e769d8974..2a1b78a8e 100644
--- a/ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js
+++ b/ui/app/pages/confirm-transaction-base/confirm-transaction-base.container.js
@@ -6,9 +6,9 @@ import contractMap from 'eth-contract-metadata'
 import ConfirmTransactionBase from './confirm-transaction-base.component'
 import {
   clearConfirmTransaction,
-  updateGasAndCalculate,
 } from '../../ducks/confirm-transaction/confirm-transaction.duck'
-import { clearSend, cancelTx, cancelTxs, updateAndApproveTx, showModal, setMetaMetricsSendCount } from '../../store/actions'
+
+import { clearSend, cancelTx, cancelTxs, updateAndApproveTx, showModal, setMetaMetricsSendCount, updateTransaction } from '../../store/actions'
 import {
   INSUFFICIENT_FUNDS_ERROR_KEY,
   GAS_LIMIT_TOO_LOW_ERROR_KEY,
@@ -19,6 +19,7 @@ import { conversionGreaterThan } from '../../helpers/utils/conversion-util'
 import { MIN_GAS_LIMIT_DEC } from '../send/send.constants'
 import { checksumAddress, addressSlicer, valuesFor } from '../../helpers/utils/util'
 import { getMetaMaskAccounts, getAdvancedInlineGasShown, preferencesSelector, getIsMainnet, getKnownMethodData } from '../../selectors/selectors'
+import { transactionFeeSelector } from '../../selectors/confirm-transaction'
 
 const casedContractMap = Object.keys(contractMap).reduce((acc, base) => {
   return {
@@ -32,23 +33,26 @@ const mapStateToProps = (state, ownProps) => {
   const { id: paramsTransactionId } = params
   const { showFiatInTestnets } = preferencesSelector(state)
   const isMainnet = getIsMainnet(state)
-  const { confirmTransaction, metamask, gas } = state
+  const { confirmTransaction, metamask } = state
+  const {
+    conversionRate,
+    identities,
+    currentCurrency,
+    selectedAddress,
+    selectedAddressTxList,
+    assetImages,
+    network,
+    unapprovedTxs,
+    metaMetricsSendCount,
+  } = metamask
   const {
-    ethTransactionAmount,
-    ethTransactionFee,
-    ethTransactionTotal,
-    fiatTransactionAmount,
-    fiatTransactionFee,
-    fiatTransactionTotal,
-    hexTransactionAmount,
-    hexTransactionFee,
-    hexTransactionTotal,
     tokenData,
     txData,
     tokenProps,
     nonce,
   } = confirmTransaction
   const { txParams = {}, lastGasPrice, id: transactionId, transactionCategory } = txData
+  const transaction = R.find(({ id }) => id === (transactionId || Number(paramsTransactionId)))(selectedAddressTxList) || {}
   const {
     from: fromAddress,
     to: txParamsToAddress,
@@ -56,26 +60,10 @@ const mapStateToProps = (state, ownProps) => {
     gas: gasLimit,
     value: amount,
     data,
-  } = txParams
+  } = transaction && transaction.txParams || txParams
   const accounts = getMetaMaskAccounts(state)
-  const {
-    conversionRate,
-    identities,
-    currentCurrency,
-    selectedAddress,
-    selectedAddressTxList,
-    assetImages,
-    network,
-    unapprovedTxs,
-    metaMetricsSendCount,
-  } = metamask
   const assetImage = assetImages[txParamsToAddress]
 
-  const {
-    customGasLimit,
-    customGasPrice,
-  } = gas
-
   const { balance } = accounts[selectedAddress]
   const { name: fromName } = identities[selectedAddress]
   const toAddress = propsToAddress || txParamsToAddress
@@ -88,9 +76,20 @@ const mapStateToProps = (state, ownProps) => {
     )
 
   const isTxReprice = Boolean(lastGasPrice)
-  const transaction = R.find(({ id }) => id === (transactionId || Number(paramsTransactionId)))(selectedAddressTxList)
   const transactionStatus = transaction ? transaction.status : ''
 
+  const {
+    ethTransactionAmount,
+    ethTransactionFee,
+    ethTransactionTotal,
+    fiatTransactionAmount,
+    fiatTransactionFee,
+    fiatTransactionTotal,
+    hexTransactionAmount,
+    hexTransactionFee,
+    hexTransactionTotal,
+  } = transactionFeeSelector(state, transaction)
+
   if (transaction && transaction.simulationFails) {
     txData.simulationFails = transaction.simulationFails
   }
@@ -125,7 +124,7 @@ const mapStateToProps = (state, ownProps) => {
     hexTransactionAmount,
     hexTransactionFee,
     hexTransactionTotal,
-    txData: Object.keys(txData).length ? txData : transaction || {},
+    txData: { ...txData, ...transaction },
     tokenData,
     methodData,
     tokenProps,
@@ -139,8 +138,8 @@ const mapStateToProps = (state, ownProps) => {
     unapprovedTxCount,
     currentNetworkUnapprovedTxs,
     customGas: {
-      gasLimit: customGasLimit || gasLimit,
-      gasPrice: customGasPrice || gasPrice,
+      gasLimit,
+      gasPrice,
     },
     advancedInlineGasShown: getAdvancedInlineGasShown(state),
     insufficientBalance,
@@ -161,8 +160,8 @@ const mapDispatchToProps = dispatch => {
     showCustomizeGasModal: ({ txData, onSubmit, validate }) => {
       return dispatch(showModal({ name: 'CUSTOMIZE_GAS', txData, onSubmit, validate }))
     },
-    updateGasAndCalculate: ({ gasLimit, gasPrice }) => {
-      return dispatch(updateGasAndCalculate({ gasLimit, gasPrice }))
+    updateGasAndCalculate: (updatedTx) => {
+      return dispatch(updateTransaction(updatedTx))
     },
     showRejectTransactionsConfirmationModal: ({ onSubmit, unapprovedTxCount }) => {
       return dispatch(showModal({ name: 'REJECT_TRANSACTIONS', onSubmit, unapprovedTxCount }))
@@ -239,7 +238,17 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
       validate: validateEditGas,
     }),
     cancelAllTransactions: () => dispatchCancelAllTransactions(valuesFor(unapprovedTxs)),
-    updateGasAndCalculate: dispatchUpdateGasAndCalculate,
+    updateGasAndCalculate: ({ gasLimit, gasPrice }) => {
+      const updatedTx = {
+        ...txData,
+        txParams: {
+          ...txData.txParams,
+          gas: gasLimit,
+          gasPrice,
+        },
+      }
+      dispatchUpdateGasAndCalculate(updatedTx)
+    },
   }
 }