treat unconfirmed as available

byteball · Sep 25, 2019 · f334628 · f334628
1 parent 8ac921e
commit f334628
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
@@ -340,7 +340,7 @@ <h4 class="title m0">
                 </span>
                 <select class="m10t" ng-model="assetIndexSelectorValue" ng-disabled="home.blockUx || home.lockAsset" ng-change="home.switchForms()">
                 	<option ng-repeat="balance in index.arrBalances"
-                      ng-value="index.arrBalances.indexOf(balance)">{{(balance.asset === 'base' ? 'Bytes' : (balance.asset == index.BLACKBYTES_ASSET ? 'Blackbytes' : (balance.name || balance.asset))) + ' (' + (balance.stableStr ? balance.stableStr : (balance.stable.toLocaleString())) + (balance.pending ? ' ' + ('confirmed' | translate) : ' ' + ('available' | translate) ) + ')'}}</option>
+                      ng-value="index.arrBalances.indexOf(balance)">{{(balance.asset === 'base' ? 'Bytes' : (balance.asset == index.BLACKBYTES_ASSET ? 'Blackbytes' : (balance.name || balance.asset))) + ' (' + (balance.totalStr ? balance.totalStr : (balance.total.toLocaleString())) + (balance.pending && 0 ? ' ' + ('confirmed' | translate) : ' ' + ('available' | translate) ) + ')'}}</option>
                 	<option ng-value="-1" translate>Data into datafeed</option>
                 	<option ng-value="-2" translate>Attestation</option>
                 	<option ng-value="-3" translate>Profile</option>

diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
@@ -1729,7 +1729,7 @@ angular.module('copayApp.controllers')
 				form.amount.$render();
 			}
 			else {
-				var full_amount = assetInfo.stable;
+				var full_amount = assetInfo.total;
 				if (assetInfo.asset === constants.BLACKBYTES_ASSET)
 					full_amount /= this.bbUnitValue;
 				else if (assetInfo.decimals)