From 812ed5f1cd772c6b03191d16c819f9dd814bc265 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Fri, 10 Aug 2018 17:13:24 +1200
Subject: [PATCH] wallet-balance workaround for wallet not being
 stringify-able, and hence not being interpolatable, and hence not being able
 to pass it to the directive.

---
 src/js/directives/walletBalanceDirective.js | 55 ++++++++++++---------
 www/views/tab-send.html                     |  8 ++-
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/js/directives/walletBalanceDirective.js b/src/js/directives/walletBalanceDirective.js
index 4c42a42f9..1fea59203 100644
--- a/src/js/directives/walletBalanceDirective.js
+++ b/src/js/directives/walletBalanceDirective.js
@@ -10,7 +10,12 @@
       scope: {
         displayAsFiat: '@',
         totalBalanceSat: '@',
-        wallet: '@'
+        // The Wallet object is sometimes not stringify()-able, so not interpolatable,
+        // so can't be passed to a directive.
+        walletStatus: '@',
+        walletCachedBalance: '@',
+        walletCachedBalanceUpdatedOn: '@',
+        walletCachedStatus: '@'
       },
       templateUrl: 'views/includes/wallet-balance.html',
       controller: walletBalanceController
@@ -25,38 +30,38 @@
       formatBalance();
     });
 
-    function displayCryptoBalance(wallet) {
+    function displayCryptoBalance(walletStatus, walletCachedBalance, walletCachedBalanceUpdatedOn, walletCachedStatus) {
       console.log('displayCryptoBalance()');
 
-      if (wallet.status && wallet.status.isValid && wallet.status.totalBalanceStr) {
-        setDisplay(wallet.status.totalBalanceStr, '');
+      if (walletStatus && walletStatus.isValid && walletStatus.totalBalanceStr) {
+        setDisplay(walletStatus.totalBalanceStr, '');
         cryptoBalanceHasBeenDisplayed = true;
         return;
       }
        
-      if (wallet.cachedBalance) {
-        setDisplay(wallet.cachedBalance, wallet.cachedBalanceUpdatedOn);
+      if (walletCachedBalance) {
+        setDisplay(walletCachedBalance, walletCachedBalanceUpdatedOn);
         return;
       }
 
-      if (wallet.cachedStatus && wallet.status.isValid && wallet.cachedStatus.totalBalanceStr) {
-        setDisplay(wallet.cachedStatus.totalBalanceStr, '');
+      if (walletCachedStatus && walletCachedStatus.isValid && walletCachedStatus.totalBalanceStr) {
+        setDisplay(walletCachedStatus.totalBalanceStr, '');
         return;  
       }
          
       setDisplay('', '');
     }
 
-    function displayFiatBalance(wallet) {
+    function displayFiatBalance(walletStatus, walletCachedStatus) {
       var displayAmount = '';
-      if (wallet.status && wallet.status.isValid && wallet.status.alternativeBalanceAvailable) {
-        displayAmount = wallet.status.totalBalanceAlternative + ' ' + wallet.status.alternativeIsoCode;
+      if (walletStatus && walletStatus.isValid && walletStatus.alternativeBalanceAvailable) {
+        displayAmount = walletStatus.totalBalanceAlternative + ' ' + walletStatus.alternativeIsoCode;
         setDisplay(displayAmount, '');
         return;
       }
 
-      if (wallet.cachedStatus && wallet.cachedStatus.isValid && wallet.cachedStatus.alternativeBalanceAvailable) {
-        displayAmount = wallet.cachedStatus.totalBalanceAlternative + ' ' + wallet.cachedStatus.alternativeIsoCode;
+      if (walletCachedStatus && walletCachedStatus.isValid && walletCachedStatus.alternativeBalanceAvailable) {
+        displayAmount = walletCachedStatus.totalBalanceAlternative + ' ' + walletCachedStatus.alternativeIsoCode;
         setDisplay(displayAmount, '');
         return;
       }
@@ -66,26 +71,30 @@
 
     function formatBalance() {
       var displayAsFiat = $scope.displayAsFiat === 'true';
-      if (!$scope.wallet) {
-        setDisplay('', '');
-        return;
+
+      var walletStatusObj = null;
+      var walletCachedBalance = null;
+      var walletCachedBalanceUpdatedOn = null;
+      var walletCachedStatusObj = null;
+
+      try {
+        walletStatusObj = JSON.parse($scope.walletStatus);
+      } catch (e) {
+        $log.warn('Failed to parse walletStatus.', e);
       }
 
-      var wallet = null;
       try {
-        wallet = JSON.parse($scope.wallet);
+        walletCachedStatusObj = JSON.parse($scope.walletCachedStatus);
       } catch (e) {
-        $log.error('Error parsing wallet to display balance.', e);
-        setDisplay('', '');
-        return;
+        $log.warn('Failed to parse walletCachedStatus.', e);
       }
 
       if (!displayAsFiat || displayAsFiat && !cryptoBalanceHasBeenDisplayed) {
-        displayCryptoBalance(wallet);
+        displayCryptoBalance(walletStatusObj, walletCachedBalance, walletCachedBalanceUpdatedOn, walletCachedStatusObj);
       }
 
       if (displayAsFiat) {
-        displayFiatBalance(wallet);
+        displayFiatBalance(walletStatusObj, walletCachedStatusObj);
       }
     }
 
diff --git a/www/views/tab-send.html b/www/views/tab-send.html
index 43918cac8..339ac3556 100644
--- a/www/views/tab-send.html
+++ b/www/views/tab-send.html
@@ -16,7 +16,13 @@
                     ></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-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>