wallet balance directive displaying fiat balance from wallet status.

src/js/directives/walletBalanceDirective.js

@@ -28,37 +28,41 @@
 
     function displayCryptoBalance(wallet) {
       console.log('displayCryptoBalance()');
-      if (wallet.status) {
-        if (wallet.status.totalBalanceStr) {
-          $scope.displayAmount = wallet.status.totalBalanceStr;
-          $scope.cachedBalanceUpdatedOn = '';
-          console.log('Displaying wallet.status.totalBalanceStr');
 
-        } else if (wallet.status.cachedBalance) {
+      if (wallet.status && wallet.status.totalBalanceStr) {
-          $scope.displayAmount = wallet.status.cachedBalance;
+        setDisplay(wallet.status.totalBalanceStr, '');
-          $scope.cachedBalanceUpdatedOn = wallet.status.cachedBalanceUpdatedOn;
+        cryptoBalanceHasBeenDisplayed = true;
-          console.log('Displaying wallet.status.cachedBalance');
+        return;
-
-        } else {
-          $scope.displayAmount = '';
-          $scope.cachedBalanceUpdatedOn = '';
-          console.log('Displaying "" from status');
-        }
-      } else if (wallet.cachedBalance) {
-        $scope.displayAmount = cachedBalance;
-        $scope.cachedBalanceUpdatedOn = '';
-        console.log('Displaying cachedBalance');
-
-      } else {
-        $scope.displayAmount = '';
-        $scope.cachedBalanceUpdatedOn = '';
-        console.log('Displaying "" without status');
       }
-      cryptoBalanceHasBeenDisplayed = true;
+       
+      if (wallet.cachedBalance) {
+        setDisplay(wallet.cachedBalance, wallet.cachedBalanceUpdatedOn);
+        return;
+      }
+
+      if (wallet.cachedStatus && wallet.cachedStatus.totalBalanceStr) {
+        setDisplay(wallet.cachedStatus.totalBalanceStr, '');
+        return;  
+      }
+         
+      setDisplay('', '');
     }
 
     function displayFiatBalance(wallet) {
-    
+      var displayAmount = '';
+      if (wallet.status && wallet.status.alternativeBalanceAvailable) {
+        displayAmount = wallet.status.totalBalanceAlternative + ' ' + wallet.status.alternativeIsoCode;
+        setDisplay(displayAmount, '');
+        return;
+      }
+
+      if (wallet.cachedStatus && wallet.cachedStatus.alternativeBalanceAvailable) {
+        displayAmount = wallet.cachedStatus.totalBalanceAlternative + ' ' + wallet.cachedStatus.alternativeIsoCode;
+        setDisplay(displayAmount, '');
+        return;
+      }
+
+      getFiatBalance(wallet);
     }
 
     function formatBalance() {
@@ -80,8 +84,14 @@
       if ($scope.displayAsFiat) {
         displayFiatBalance(wallet);
       }
+    }
 
+    function getFiatBalance(wallet) {
+    }
 
+    function setDisplay(amount, cachedBalanceUpdatedOn) {
+      $scope.displayAmount = amount;
+      $scope.cachedBalanceUpdatedOn = cachedBalanceUpdatedOn;
     }
   }
 })();

www/views/includes/wallet-balance.html

@@ -1,3 +1,3 @@
-<div class="wallet-balance">
+<div class="wallet-balance-directive">
   <span>{{displayAmount}}</span><span ng-if="age">{{&middot; (cachedBalanceUpdatedOn  * 1000 | amTimeAgo)}}</span>
 </div>