From a17c3518c3fd7be6f3039fd7b0e494b5ab4f2ad5 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Fri, 21 Sep 2018 14:38:28 -0700
Subject: [PATCH] Manual merge from Sprint 22 for 575.

---
 src/js/controllers/review.controller.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
index fcaa80455..2311b2cb6 100644
--- a/src/js/controllers/review.controller.js
+++ b/src/js/controllers/review.controller.js
@@ -79,7 +79,7 @@ angular
 
     $scope.$on("$ionicView.beforeEnter", onBeforeEnter);
 
-    
+
     function onBeforeEnter(event, data) {
       console.log('review onBeforeEnter sendflow ', sendFlowService.state);
       // Reset from last time
@@ -100,7 +100,7 @@ angular
       vm.originWallet = profileService.getWallet(originWalletId);
       vm.origin.currency = vm.originWallet.coin.toUpperCase();
       coin = vm.originWallet.coin;
-      
+
       if (sendFlowData.thirdParty) {
         vm.thirdParty = sendFlowData.thirdParty;
         switch (vm.thirdParty.id) {
@@ -398,12 +398,12 @@ angular
       var balanceCryptoAmount = '';
       var balanceCryptoCurrencyCode = '';
       var balanceFiatAmount = '';
-      var balanceFiatCurrency = ''
+      var balanceFiatCurrency = '';
       var displayAmount = '';
       var displayCurrency = '';
 
       var walletStatus = null;
-      if (wallet.status.isValid) {
+      if (wallet.status && wallet.status.isValid) {
         walletStatus = wallet.status;
       } else if (wallet.cachedStatus.isValid) {
         walletStatus = wallet.cachedStatus;