diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 65b644ebb..a2dea86dc 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -220,8 +220,9 @@ 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 === null? 0 : cache.pendingAmount)) + ' ' + cache.unitName; - if (cache.pendingAmount) { + if (cache.pendingAmount !== null && cache.pendingAmount !== 0) { cache.pendingAmountStr = txFormatService.formatAmount(cache.pendingAmount) + ' ' + cache.unitName; } else { cache.pendingAmountStr = null; 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 - {{wallet.status.availableBalanceStr}} + {{wallet.status.pendingBalanceStr}} [Balance Hidden] {{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 @@
- {{status.totalBalanceStr}} -
{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
-
- Pending Confirmation: {{status.pendingAmountStr}} + {{status.totalBalanceStr}} +
{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
+
+
Available: {{status.totalBalanceStr}}
+
Confirming: {{status.pendingAmountStr}}