From 4d6aeb4f910f105544f189955ac2b68e45a49a90 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Tue, 18 Sep 2018 15:26:30 -0700
Subject: [PATCH] Renamed directive and replaced old variable references with
 new ones.

---
 ...rective.js => wallet-balance.directive.js} | 27 +++++++++++++------
 www/views/tab-send.html                       |  5 ++--
 2 files changed, 21 insertions(+), 11 deletions(-)
 rename src/js/directives/{walletBalanceDirective.js => wallet-balance.directive.js} (81%)

diff --git a/src/js/directives/walletBalanceDirective.js b/src/js/directives/wallet-balance.directive.js
similarity index 81%
rename from src/js/directives/walletBalanceDirective.js
rename to src/js/directives/wallet-balance.directive.js
index 1fea59203..4d8ca2875 100644
--- a/src/js/directives/walletBalanceDirective.js
+++ b/src/js/directives/wallet-balance.directive.js
@@ -12,6 +12,7 @@
         totalBalanceSat: '@',
         // The Wallet object is sometimes not stringify()-able, so not interpolatable,
         // so can't be passed to a directive.
+        walletCoin: '@',
         walletStatus: '@',
         walletCachedBalance: '@',
         walletCachedBalanceUpdatedOn: '@',
@@ -31,7 +32,6 @@
     });
 
     function displayCryptoBalance(walletStatus, walletCachedBalance, walletCachedBalanceUpdatedOn, walletCachedStatus) {
-      console.log('displayCryptoBalance()');
 
       if (walletStatus && walletStatus.isValid && walletStatus.totalBalanceStr) {
         setDisplay(walletStatus.totalBalanceStr, '');
@@ -52,7 +52,7 @@
       setDisplay('', '');
     }
 
-    function displayFiatBalance(walletStatus, walletCachedStatus) {
+    function displayFiatBalance(walletStatus, walletCachedStatus, walletCoin) {
       var displayAmount = '';
       if (walletStatus && walletStatus.isValid && walletStatus.alternativeBalanceAvailable) {
         displayAmount = walletStatus.totalBalanceAlternative + ' ' + walletStatus.alternativeIsoCode;
@@ -66,7 +66,7 @@
         return;
       }
 
-      getFiatBalance(wallet);
+      getFiatBalance(walletStatus, walletCachedStatus, walletCoin);
     }
 
     function formatBalance() {
@@ -94,19 +94,30 @@
       }
 
       if (displayAsFiat) {
-        displayFiatBalance(walletStatusObj, walletCachedStatusObj);
+        displayFiatBalance(walletStatusObj, walletCachedStatusObj, $scope.walletCoin);
       }
     }
 
-    function getFiatBalance(wallet) {
-      if (!(wallet.status && wallet.status.isValid)) {
-        $log.warn('Abandoning call to get fiat balance, because no valid wallet status.');
+    function getFiatBalance(walletStatus, walletCachedStatus, walletCoin) {
+      var totalBalanceSat = null;
+
+      if (walletStatus && walletStatus.isValid) {
+        totalBalanceSat = walletStatus.totalBalanceSat
+      } else if (walletCachedStatus && walletCachedStatus.isValid) {
+        totalBalanceSat = walletCachedStatus.totalBalanceSat
+      }
+
+      // 0 is valid
+      if (totalBalanceSat === null) {
+        $log.warn('Abandoning call to get fiat balance, because no valid wallet status (cached or otherwise).');
         return;
       }
 
-      txFormatService.formatAlternativeStr(wallet.coin, wallet.status.totalBalanceSat, function onFormatAlernativeStr(formatted) {
+      txFormatService.formatAlternativeStr(walletCoin, totalBalanceSat, function onFormatAlernativeStr(formatted) {
         if (formatted) {
           setDisplay(formatted, '');
+        } else {
+          $log.error('Failed to format fiat balance of wallet.');
         }
       });
     }
diff --git a/www/views/tab-send.html b/www/views/tab-send.html
index 0b62fe0a5..b8c2b7884 100644
--- a/www/views/tab-send.html
+++ b/www/views/tab-send.html
@@ -17,14 +17,13 @@
                 </i>
                 <h2>{{fromWallet.name}}</h2>
                 <wallet-balance
-                 display-as-fiat="{{displayBalanceAsFiat}}" 
+                 display-as-fiat="{{displayBalanceAsFiat}}"
+                 wallet-coin="{{fromWallet.coin}}"
                  wallet-status="{{fromWallet.status}}"
                  wallet-cached-balance="{{fromWallet.cachedBalance}}"
                  wallet-cached-balance-updated-on="{{fromWallet.cachedBalanceUpdatedOn}}"
                  wallet-cached-status="{{fromWallet.cachedStatus}}"
                  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>
             </div>
           </div>