From 703256d92f5b8657fc38ee5354af7b0b6682f4f8 Mon Sep 17 00:00:00 2001
From: Jason Dreyzehner <jason@dreyzehner.com>
Date: Fri, 28 Oct 2016 11:45:23 -0400
Subject: [PATCH] fix(design): use max balance on home view, display
 available/confirming better in wallet

Fixes #4881
---
 src/js/services/walletService.js | 1 +
 www/views/tab-home.html          | 2 +-
 www/views/walletDetails.html     | 9 +++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index 65b644ebb..e53a3b1d0 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -220,6 +220,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
       cache.totalBalanceStr = txFormatService.formatAmount(cache.totalBalanceSat) + ' ' + cache.unitName;
       cache.lockedBalanceStr = txFormatService.formatAmount(cache.lockedBalanceSat) + ' ' + cache.unitName;
       cache.availableBalanceStr = txFormatService.formatAmount(cache.availableBalanceSat) + ' ' + cache.unitName;
+      cache.pendingBalanceStr = txFormatService.formatAmount(cache.totalBalanceSat + cache.pendingAmount) + ' ' + cache.unitName;
 
       if (cache.pendingAmount) {
         cache.pendingAmountStr = txFormatService.formatAmount(cache.pendingAmount) + ' ' + cache.unitName;
diff --git a/www/views/tab-home.html b/www/views/tab-home.html
index 865afc0bc..1b4c611f1 100644
--- a/www/views/tab-home.html
+++ b/www/views/tab-home.html
@@ -83,7 +83,7 @@
             Incomplete
           </span>
           <span ng-if="wallet.isComplete()">
-            <span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
+            <span ng-if="!wallet.balanceHidden">{{wallet.status.pendingBalanceStr}}</span>
             <span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
             <span class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1">
               {{wallet.m}}-of-{{wallet.n}}
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html
index 1526a0688..d9ee9e4ae 100644
--- a/www/views/walletDetails.html
+++ b/www/views/walletDetails.html
@@ -37,10 +37,11 @@
 
 
           <div ng-click='updateAll(true)' ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !wallet.balanceHidden" on-hold="hideToggle()">
-            <strong class="size-36">{{status.totalBalanceStr}}</strong>
-            <div class="size-14 amount-alternative" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
-            <div class="size-14" ng-if="status.pendingAmount">
-              <span translate>Pending Confirmation</span>: {{status.pendingAmountStr}}
+            <strong ng-if="!status.pendingAmount" class="size-36">{{status.totalBalanceStr}}</strong>
+            <div ng-if="!status.pendingAmount" class="size-14 amount-alternative" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
+            <div class="size-20" ng-if="status.pendingAmount">
+              <div style="margin-bottom:.5rem"><span translate>Available</span>: {{status.totalBalanceStr}}</div>
+              <div><span translate>Confirming</span>: {{status.pendingAmountStr}}</div>
             </div>
           </div>