From d7285a72e46858c559e38180b118e93590ca07da Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Fri, 10 Aug 2018 13:26:12 +1200
Subject: [PATCH 1/2] wallet-balance directive retrieves alternative amount
 when needed.

---
 src/js/directives/walletBalanceDirective.js | 26 +++++++++++++--------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/js/directives/walletBalanceDirective.js b/src/js/directives/walletBalanceDirective.js
index a13d30a98..d318b370d 100644
--- a/src/js/directives/walletBalanceDirective.js
+++ b/src/js/directives/walletBalanceDirective.js
@@ -17,8 +17,7 @@
     }
   });
     
-  function walletBalanceController($log, $scope, $timeout, uxLanguage) {
-    console.log('walletBalanceController');
+  function walletBalanceController($log, $scope, txFormatService) {
     var cryptoBalanceHasBeenDisplayed = false;
     
     formatBalance();
@@ -29,7 +28,7 @@
     function displayCryptoBalance(wallet) {
       console.log('displayCryptoBalance()');
 
-      if (wallet.status && wallet.status.totalBalanceStr) {
+      if (wallet.status && wallet.status.isValid && wallet.status.totalBalanceStr) {
         setDisplay(wallet.status.totalBalanceStr, '');
         cryptoBalanceHasBeenDisplayed = true;
         return;
@@ -40,7 +39,7 @@
         return;
       }
 
-      if (wallet.cachedStatus && wallet.cachedStatus.totalBalanceStr) {
+      if (wallet.cachedStatus && wallet.status.isValid && wallet.cachedStatus.totalBalanceStr) {
         setDisplay(wallet.cachedStatus.totalBalanceStr, '');
         return;  
       }
@@ -50,13 +49,13 @@
 
     function displayFiatBalance(wallet) {
       var displayAmount = '';
-      if (wallet.status && wallet.status.alternativeBalanceAvailable) {
+      if (wallet.status && wallet.status.isValid && wallet.status.alternativeBalanceAvailable) {
         displayAmount = wallet.status.totalBalanceAlternative + ' ' + wallet.status.alternativeIsoCode;
         setDisplay(displayAmount, '');
         return;
       }
 
-      if (wallet.cachedStatus && wallet.cachedStatus.alternativeBalanceAvailable) {
+      if (wallet.cachedStatus && wallet.cachedStatus.isValid && wallet.cachedStatus.alternativeBalanceAvailable) {
         displayAmount = wallet.cachedStatus.totalBalanceAlternative + ' ' + wallet.cachedStatus.alternativeIsoCode;
         setDisplay(displayAmount, '');
         return;
@@ -66,15 +65,12 @@
     }
 
     function formatBalance() {
-      //console.log('formatBalance() with wallet:', $scope.wallet,);
-      console.log('formatBalance() with displayAsFiat: "' + $scope.displayAsFiat + '"');
       var wallet = null;
       try {
         wallet = JSON.parse($scope.wallet);
       } catch (e) {
         $log.error('Error parsing wallet to display balance.', e);
-        $scope.displayAmount = '';
-        $scope.cachedBalanceUpdatedOn = '';
+        setDisplay('', '');
       }
 
       if (!$scope.displayAsFiat || $scope.displayAsFiat && !cryptoBalanceHasBeenDisplayed) {
@@ -87,6 +83,16 @@
     }
 
     function getFiatBalance(wallet) {
+      if (!(wallet.status && wallet.status.isValid)) {
+        $log.warn('Abandoning call to get fiat balance, because no valid wallet status.');
+        return;
+      }
+
+      txFormatService.formatAlternativeStr(wallet.coin, wallet.status.totalBalanceSat, function onFormatAlernativeStr(formatted) {
+        if (formatted) {
+          setDisplay(formatted, '');
+        }
+      });
     }
 
     function setDisplay(amount, cachedBalanceUpdatedOn) {

From 82c0746ff808555e040f6e5b2a11eb5b7b63c57a Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Fri, 10 Aug 2018 13:48:59 +1200
Subject: [PATCH 2/2] wallet-balance directive uses formatted-amount.

---
 src/js/directives/walletBalanceDirective.js | 6 ++++--
 www/views/includes/wallet-balance.html      | 2 +-
 www/views/tab-send.html                     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/js/directives/walletBalanceDirective.js b/src/js/directives/walletBalanceDirective.js
index d318b370d..5b2a41b6c 100644
--- a/src/js/directives/walletBalanceDirective.js
+++ b/src/js/directives/walletBalanceDirective.js
@@ -65,19 +65,21 @@
     }
 
     function formatBalance() {
+      var displayAsFiat = $scope.displayAsFiat === 'true';
       var wallet = null;
       try {
         wallet = JSON.parse($scope.wallet);
       } catch (e) {
         $log.error('Error parsing wallet to display balance.', e);
         setDisplay('', '');
+        return;
       }
 
-      if (!$scope.displayAsFiat || $scope.displayAsFiat && !cryptoBalanceHasBeenDisplayed) {
+      if (!displayAsFiat || displayAsFiat && !cryptoBalanceHasBeenDisplayed) {
         displayCryptoBalance(wallet);
       }
 
-      if ($scope.displayAsFiat) {
+      if (displayAsFiat) {
         displayFiatBalance(wallet);
       }
     }
diff --git a/www/views/includes/wallet-balance.html b/www/views/includes/wallet-balance.html
index 03baa8cac..0818bf343 100644
--- a/www/views/includes/wallet-balance.html
+++ b/www/views/includes/wallet-balance.html
@@ -1,3 +1,3 @@
 <div class="wallet-balance-directive">
-  <span>{{displayAmount}}</span><span ng-if="age">{{&middot; (cachedBalanceUpdatedOn  * 1000 | amTimeAgo)}}</span>
+  <formatted-amount value="{{displayAmount}}"></formatted-amount><span ng-if="age">{{&middot; (cachedBalanceUpdatedOn  * 1000 | amTimeAgo)}}</span>
 </div>
\ No newline at end of file
diff --git a/www/views/tab-send.html b/www/views/tab-send.html
index 236c3db6f..a4051b8f1 100644
--- a/www/views/tab-send.html
+++ b/www/views/tab-send.html
@@ -16,7 +16,7 @@
                     ></div>
                 </i>
                 <h2>{{fromWallet.name}}</h2>
-                <wallet-balance display-as-fiat="{{displayBalanceAsFiat}}" wallet="{{fromWallet}}" total-balance-sat={{fromWallet.status.totalBalanceSat}}></wallet-balance>
+                <wallet-balance display-as-fiat={{displayBalanceAsFiat}} wallet={{fromWallet}} total-balance-sat={{fromWallet.status.totalBalanceSat}}></wallet-balance>
                 <!--<p ng-show="vm.origin.balanceAmount">{{vm.origin.balanceAmount}} {{vm.origin.balanceCurrency}}</p>-->
                 <!--<formatted-amount value="{{fromWallet.status.totalBalanceStr ? fromWallet.status.totalBalanceStr : ( fromWallet.cachedBalance ? fromWallet.cachedBalance   + (fromWallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( fromWallet.cachedBalanceUpdatedOn  * 1000 | amTimeAgo) : '') : ''  ) }}"></formatted-amount>-->
               </div>