3 files changed, 14 insertions, 4 deletions
diff --git a/ui/app/add-token.js b/ui/app/add-token.js
index 90edc8de1..e313babf3 100644
--- a/ui/app/add-token.js
+++ b/ui/app/add-token.js
@@ -7,7 +7,9 @@ const Fuse = require('fuse.js')
 const contractMap = require('eth-contract-metadata')
 const TokenBalance = require('./components/token-balance')
 const Identicon = require('./components/identicon')
-const contractList = Object.entries(contractMap).map(([ _, tokenData]) => tokenData)
+const contractList = Object.entries(contractMap)
+  .map(([ _, tokenData]) => tokenData)
+  .filter(tokenData => Boolean(tokenData.erc20))
 const fuse = new Fuse(contractList, {
     shouldSort: true,
     threshold: 0.45,
@@ -105,6 +107,7 @@ AddTokenScreen.prototype.tokenAddressDidChange = function (e) {
 }
 
 AddTokenScreen.prototype.checkExistingAddresses = function (address) {
+  if (!address) return false
   const tokensList = this.props.tokens
   const matchesAddress = existingToken => {
     return existingToken.address.toLowerCase() === address.toLowerCase()
diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js
index 42b676954..6fb4ddf70 100644
--- a/ui/app/components/pending-tx/confirm-send-token.js
+++ b/ui/app/components/pending-tx/confirm-send-token.js
@@ -36,6 +36,7 @@ function mapStateToProps (state, ownProps) {
   const {
     conversionRate,
     identities,
+    currentCurrency,
   } = state.metamask
   const accounts = state.metamask.accounts
   const selectedAddress = getSelectedAddress(state)
@@ -47,6 +48,7 @@ function mapStateToProps (state, ownProps) {
     selectedAddress,
     tokenExchangeRate,
     tokenData: tokenData || {},
+    currentCurrency: currentCurrency.toUpperCase(),
   }
 }
 
@@ -101,7 +103,7 @@ ConfirmSendToken.prototype.getGasFee = function () {
     multiplierBase: 16,
   })
 
-  const FIAT = conversionUtil(txFeeBn, {
+  const FIAT = conversionUtil(gasTotal, {
     fromNumericBase: 'BN',
     toNumericBase: 'dec',
     fromDenomination: 'WEI',
@@ -223,7 +225,7 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () {
 
         h('div.confirm-screen-section-column', [
           h('div.confirm-screen-row-info', `${fiatAmount + fiatGas} ${currentCurrency}`),
-          h('div.confirm-screen-row-detail', `${tokenAmount + tokenGas} ${symbol}`),
+          h('div.confirm-screen-row-detail', `${tokenTotal} ${symbol}`),
         ]),
       ])
     )
diff --git a/ui/app/reducers.js b/ui/app/reducers.js
index 6a2f44534..1cded7ca7 100644
--- a/ui/app/reducers.js
+++ b/ui/app/reducers.js
@@ -43,7 +43,12 @@ function rootReducer (state, action) {
 
 window.logState = function () {
   let state = window.METAMASK_CACHED_LOG_STATE
-  const version = global.platform.getVersion()
+  let version
+  try {
+    version = global.platform.getVersion()
+  } catch (e) {
+    version = 'unable to load version.'
+  }
   state.version = version
   let stateString = JSON.stringify(state, removeSeedWords, 2)
   return stateString