Merge pull request #986 from yemel/feature/ui-locked-balance

Change available balance to locked

js/services/controllerUtils.js

@@ -212,6 +212,10 @@ angular.module('copayApp.services')
         $rootScope.totalBalanceBTC = (balanceSat / COIN);
         $rootScope.availableBalance = safeBalanceSat * satToUnit;
         $rootScope.availableBalanceBTC = (safeBalanceSat / COIN);
+
+        $rootScope.lockedBalance = (balanceSat - safeBalanceSat) * satToUnit;
+        $rootScope.lockedBalanceBTC = (balanceSat - safeBalanceSat) / COIN;
+
         var balanceByAddr = {};
         for (var ii in balanceByAddrSat) {
           balanceByAddr[ii] = balanceByAddrSat[ii] * satToUnit;

test/unit/services/servicesSpec.js

@@ -93,8 +93,12 @@ describe("Unit: controllerUtils", function() {
     controllerUtils.updateBalance(function() {
       expect($rootScope.totalBalanceBTC).to.be.equal(1.00000001);
       expect($rootScope.availableBalanceBTC).to.be.equal(0.90000002);
+      expect($rootScope.lockedBalanceBTC).to.be.equal(0.09999999);
+
       expect($rootScope.totalBalance).to.be.equal(1000000.01);
       expect($rootScope.availableBalance).to.be.equal(900000.02);
+      expect($rootScope.lockedBalance).to.be.equal(99999.99);
+
       expect($rootScope.addrInfos).not.to.equal(null);
       expect($rootScope.addrInfos[0].address).to.equal(Waddr);
     });

views/includes/sidebar-mobile.html

@@ -24,16 +24,16 @@
         </span>
       </div> 
       <div>
-        Available
+        Locked 
         <span ng-if="$root.updatingBalance">
           <i class="fi-bitcoin-circle icon-rotate spinner"></i>
         </span>
         <span ng-show="!$root.updatingBalance"
           data-options="disable_for_touch:true"
-          tooltip="{{availableBalanceBTC || 0 |noFractionNumber:8}} BTC"
+          tooltip="{{lockedBalanceBTC || 0 |noFractionNumber:8}} BTC"
           tooltip-trigger="mouseenter"
-          tooltip-placement="bottom">{{availableBalance || 0|noFractionNumber}} {{$root.unitName}}
+          tooltip-placement="bottom">{{lockedBalance || 0|noFractionNumber}} {{$root.unitName}}
-        </span>
+        </span> &nbsp;<i class="fi-info medium" tooltip="Balance locked in pending transaction proposals" tooltip-placement="bottom"></i>
       </div>
       <div class="line-sidebar-b"></div>
     </div>

views/includes/sidebar.html

@@ -32,16 +32,16 @@
         |noFractionNumber}} {{$root.unitName}} 
       </span>
       <br>
-      Available
+      Locked &nbsp;
       <span ng-if="$root.updatingBalance">
         <i class="fi-bitcoin-circle icon-rotate spinner"></i>
       </span>
       <span ng-show="!$root.updatingBalance"
         data-options="disable_for_touch:true"
-        tooltip="{{availableBalanceBTC || 0 |noFractionNumber:8}} BTC"
+        tooltip="{{lockedBalanceBTC || 0 |noFractionNumber:8}} BTC"
         tooltip-trigger="mouseenter"
-        tooltip-placement="bottom">{{availableBalance || 0|noFractionNumber}} {{$root.unitName}}
+        tooltip-placement="bottom">{{lockedBalance || 0|noFractionNumber}} {{$root.unitName}}
-      </span>
+      </span> &nbsp;<i class="fi-info medium" tooltip="Balance locked in pending transaction proposals" tooltip-placement="bottom"></i>
     </div>
     <div class="line-sidebar"></div>
   </header>