Merge branch 'develop' into remove-accounts-accountTracker-cachedBala…

…nces

app/scripts/controllers/transactions/index.js

@@ -793,4 +793,5 @@ export default class TransactionController extends EventEmitter {
     const currentNetworkTxList = this.txStateManager.getTxList(MAX_MEMSTORE_TX_LIST_SIZE)
     this.memStore.updateState({ unapprovedTxs, currentNetworkTxList })
   }
+
 }

app/scripts/controllers/transactions/tx-state-manager.js

@@ -508,4 +508,14 @@ export default class TransactionStateManager extends EventEmitter {
     const transactionList = this.getFullTxList()
     this._saveTxList(transactionList.filter((txMeta) => txMeta.id !== txId))
   }
+
+  /**
+   * Filters out the unapproved transactions
+   */
+
+  clearUnapprovedTxs () {
+    const transactions = this.getFullTxList()
+    const nonUnapprovedTxs = transactions.filter((tx) => tx.status !== 'unapproved')
+    this._saveTxList(nonUnapprovedTxs)
+  }
 }

app/scripts/metamask-controller.js

@@ -637,6 +637,9 @@ export default class MetamaskController extends EventEmitter {
       // clear cachedBalances
       this.cachedBalancesController.clearCachedBalances()
 
+      // clear unapproved transactions
+      this.txController.txStateManager.clearUnapprovedTxs()
+
       // create new vault
       const vault = await keyringController.createNewVaultAndRestore(password, seed)
 

test/unit/app/controllers/transactions/tx-state-manager-test.js

@@ -598,4 +598,23 @@ describe('TransactionStateManager', function () {
       assert.equal(txStateManager.getFullTxList()[0].id, 2, 'txList should have a id of 2')
     })
   })
+
+  describe('#clearUnapprovedTxs', function () {
+    it('removes unapproved transactions', function () {
+      const txMetas = [
+        { id: 0, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
+        { id: 1, status: 'unapproved', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: currentNetworkId },
+        { id: 2, status: 'confirmed', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: otherNetworkId },
+        { id: 3, status: 'confirmed', txParams: { from: '0xaa', to: '0xbb' }, metamaskNetworkId: otherNetworkId },
+      ]
+
+      txMetas.forEach((txMeta) => txStateManager.addTx(txMeta, noop))
+
+      txStateManager.clearUnapprovedTxs()
+
+      const unapprovedTxList = txStateManager.getFullTxList().filter((tx) => tx.status === 'unapproved')
+
+      assert.equal(unapprovedTxList.length, 0)
+    })
+  })
 })

ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js

@@ -1,5 +1,6 @@
 import { connect } from 'react-redux'
 import GasModalPageContainer from './gas-modal-page-container.component'
+import { captureException } from '@sentry/browser'
 import {
   hideModal,
   setGasLimit,
@@ -124,6 +125,12 @@ const mapStateToProps = (state, ownProps) => {
     conversionRate,
   })
 
+  let currentTimeEstimate = ''
+  try {
+    currentTimeEstimate = getRenderableTimeEstimate(customGasPrice, gasPrices, estimatedTimes)
+  } catch (error) {
+    captureException(error)
+  }
 
   return {
     hideBasic,
@@ -134,7 +141,7 @@ const mapStateToProps = (state, ownProps) => {
     customGasLimit: calcCustomGasLimit(customModalGasLimitInHex),
     customGasTotal,
     newTotalFiat,
-    currentTimeEstimate: getRenderableTimeEstimate(customGasPrice, gasPrices, estimatedTimes),
+    currentTimeEstimate,
     blockTime: getBasicGasEstimateBlockTime(state),
     customPriceIsSafe: isCustomPriceSafe(state),
     maxModeOn,

ui/app/hooks/useTransactionTimeRemaining.js

@@ -3,10 +3,10 @@ import { hexWEIToDecGWEI } from '../helpers/utils/conversions.util'
 import { useSelector } from 'react-redux'
 import { useRef, useEffect, useState, useMemo } from 'react'
 import { isEqual } from 'lodash'
+import { captureException } from '@sentry/browser'
 import { getRawTimeEstimateData } from '../helpers/utils/gas-time-estimates.util'
 import { getCurrentLocale } from '../ducks/metamask/metamask'
 
-
 /**
  * Calculate the number of minutes remaining until the transaction completes.
  * @param {number} initialTimeEstimate - timestamp for the projected completion time
@@ -55,10 +55,15 @@ export function useTransactionTimeRemaining (
   // Memoize this value so it can be used as a dependency in the effect below
   const initialTimeEstimate = useMemo(() => {
     const customGasPrice = Number(hexWEIToDecGWEI(currentGasPrice))
-    const {
-      newTimeEstimate,
-    } = getRawTimeEstimateData(customGasPrice, gasPrices, estimatedTimes)
-    return newTimeEstimate
+    try {
+      const {
+        newTimeEstimate,
+      } = getRawTimeEstimateData(customGasPrice, gasPrices, estimatedTimes)
+      return newTimeEstimate
+    } catch (error) {
+      captureException(error)
+      return NaN
+    }
   }, [ currentGasPrice, gasPrices, estimatedTimes ])
 
   useEffect(() => {