From 7f70943fa2020fcc4fb9bdd0a0b22dd8d8c0718a Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@users.noreply.github.com>
Date: Thu, 8 Feb 2018 17:37:22 -0800
Subject: [PATCH] Fix exception thrown in selected token tx list with
 shapeshift txs (#3215)

---
 ui/app/selectors.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/app/selectors.js b/ui/app/selectors.js
index 38a96c48b..5d2635775 100644
--- a/ui/app/selectors.js
+++ b/ui/app/selectors.js
@@ -116,7 +116,7 @@ function transactionsSelector (state) {
   // console.log({txsToRender, selectedTokenAddress})
   return selectedTokenAddress
     ? txsToRender
-      .filter(({ txParams: { to } }) => to === selectedTokenAddress)
+      .filter(({ txParams }) => txParams && txParams.to === selectedTokenAddress)
       .sort((a, b) => b.time - a.time)
     : txsToRender
       .sort((a, b) => b.time - a.time)
@@ -179,11 +179,11 @@ function autoAddToBetaUI (state) {
     (numberOfAccounts > autoAddAccountsThreshold) &&
     (numberOfTokensAdded > autoAddTokensThreshold)
   const userIsNotInBeta = !state.metamask.featureFlags.betaUI
-  
+
   return userIsNotInBeta && userPassesThreshold
 }
 
 function getCurrentViewContext (state) {
   const { currentView = {} } = state.appState
-  return currentView.context 
+  return currentView.context
 }
\ No newline at end of file