Total is the total amount of bitcoin stored in this wallet. It is the sum of Available, Confirming, and Locked balances.
-
+
Total
-
+
{{status.totalBalanceStr}}
@@ -27,7 +33,7 @@
-
Available is the immediatley spendable amount of bitcoin stored in this wallet. It is the Total less Confirming and Locked balances. If you have enabled Use Unconfirmed Funds setting then the Available amount is the Total less Locked balance.
+
Total is the total amount of bitcoin stored in this wallet. It is the sum of Available, Confirming, and Locked amounts.
-
Confirming is the amount of bitcoin stored in this wallet with fewer than 3 block chain confirmations.
+
Available is the immediatley spendable amount of bitcoin stored in this wallet. It is the Total less Confirming and Locked amounts. If you have enabled Use Unconfirmed Funds setting then the Available amount is the Total less Locked amount.
-
+
Confirming
-
+
{{status.pendingBalanceStr}}
@@ -61,13 +67,13 @@
-
Locked is the amount of bitcoin stored in this wallet that is allocated as inputs to pending transaction proposals. This amount is determined using unspent transaction outputs associated with the wallet and may be more than the actual amounts associated with your pending transaction proposals.
+
Confirming is the amount of bitcoin stored in this wallet with fewer than 6 block chain confirmations.
-
+
Locked
-
+
{{status.lockedBalanceStr}}
@@ -78,6 +84,7 @@
+
Locked is the amount of bitcoin stored in this wallet that is allocated as inputs to pending transaction proposals. This amount is determined using unspent transaction outputs associated with the wallet and may be more than the actual amounts associated with your pending transaction proposals.
diff --git a/www/views/tab-home.html b/www/views/tab-home.html
index e7dc6d0bc..e648d02e7 100644
--- a/www/views/tab-home.html
+++ b/www/views/tab-home.html
@@ -80,8 +80,9 @@
Incomplete
- {{wallet.status.totalBalanceStr}}
-
+ {{wallet.status.totalBalanceStr}}
+
+
[Balance Hidden]
{{wallet.m}}-of-{{wallet.n}}
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html
index 3400baf78..59c265045 100644
--- a/www/views/walletDetails.html
+++ b/www/views/walletDetails.html
@@ -27,11 +27,12 @@
-
This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.
+
This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.
Recreate
@@ -45,8 +46,7 @@
ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !wallet.balanceHidden"
on-hold="hideToggle()"
ng-style="{'transform': amountScale}"
- class="amount__balance"
- ng-class="{'amount__top': status.totalBalanceSat == status.spendableAmount}">
+ class="amount__balance">
{{status.totalBalanceStr}}
+
-
@@ -110,12 +113,12 @@
-
{{updateStatusError}}
+
{{updateStatusError}}
Tap to retry
-
This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.
+
This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.
Recreate