From 3691bd5ee03a4457c9bc489de05634ea7fa17c70 Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Wed, 3 Sep 2014 15:55:02 -0300
Subject: [PATCH] settings: fix balance bug

---
 index.html                         |  6 +++---
 js/services/controllerUtils.js     |  1 -
 views/includes/sidebar-mobile.html | 31 ++++++++++++++++++++++++++++++
 views/includes/sidebar.html        |  4 ++--
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index e6f34fd00..40b22b4da 100644
--- a/index.html
+++ b/index.html
@@ -17,8 +17,8 @@
           <i class="fi-loop icon-rotate m15r"></i>
           <span translate> Network Error. Attempting to reconnect...</span>
         </span>
-        <nav class="tab-bar" ng-class="{'hide-tab-bar' : !$root.wallet ||
-          !$root.wallet.isReady() || $root.wallet.isLocked}">
+        <nav class="tab-bar" ng-if="$root.wallet &&
+          $root.wallet.isReady() && !$root.wallet.isLocked">
           <section class="left-small">
             <a class="left-off-canvas-toggle menu-icon" ><span></span></a>
           </section>
@@ -28,7 +28,7 @@
 
           <section class="middle tab-bar-section">
             <h1 class="right">
-              {{totalBalance || 0 |noFractionNumber}} {{$root.unitName}}
+              {{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}
             </h1>
             <h1 class="title ellipsis">
               {{$root.wallet.getName()}}
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index a11e19238..ba3b6da98 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -50,7 +50,6 @@ angular.module('copayApp.services')
         $scope.loading = false;
       });
 
-
       w.on('corrupt', function(peerId) {
         notification.error('Error', 'Received corrupt message from ' + peerId);
       });
diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html
index cfd792528..acb540d3c 100644
--- a/views/includes/sidebar-mobile.html
+++ b/views/includes/sidebar-mobile.html
@@ -6,6 +6,37 @@
       </a>
       <div ng-include="'views/includes/version.html'"></div>
     </div>
+
+    <div class="line-sidebar-b"></div>
+    <div class="founds size-12 text-center box-founds p10t">
+      <div class="m10b">
+        Balance
+        <span ng-if="$root.updatingBalance">
+          <i class="fi-bitcoin-circle icon-rotate spinner"></i>
+        </span>
+        <span ng-if="$root.wallet && !$root.updatingBalance"
+          data-options="disable_for_touch:true"
+          tooltip="{{totalBalanceBTC |noFractionNumber:8}} BTC"
+          tooltip-trigger="mouseenter"
+          tooltip-placement="bottom">{{totalBalance || 0
+          |noFractionNumber}} {{$root.unitName}} 
+        </span>
+      </div> 
+      <div>
+        Locked 
+        <span ng-if="$root.updatingBalance">
+          <i class="fi-bitcoin-circle icon-rotate spinner"></i>
+        </span>
+        <span ng-if="$root.wallet && !$root.updatingBalance"
+          data-options="disable_for_touch:true"
+          tooltip="{{lockedBalanceBTC |noFractionNumber:8}} BTC"
+          tooltip-trigger="mouseenter"
+          tooltip-placement="bottom">{{lockedBalance || 0|noFractionNumber}} {{$root.unitName}}
+        </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>
+
   </header>
   <div class="line-sidebar-b"></div>
   <div class="founds size-12 box-founds p15" ng-disabled="$root.loading" ng-click="refresh()">
diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html
index 9f68392e3..86c6f7a96 100644
--- a/views/includes/sidebar.html
+++ b/views/includes/sidebar.html
@@ -20,7 +20,7 @@
       <span ng-if="$root.updatingBalance">
         <i class="fi-bitcoin-circle icon-rotate spinner"></i>
       </span>
-      <span ng-if="!$root.updatingBalance"
+      <span ng-if="$root.wallet && !$root.updatingBalance"
         class="has-tip"
         data-options="disable_for_touch:true"
         tooltip-popup-delay='500'
@@ -33,7 +33,7 @@
       <span ng-if="$root.updatingBalance">
         <i class="fi-bitcoin-circle icon-rotate spinner"></i>
       </span>
-      <span ng-show="!$root.updatingBalance"
+      <span ng-if="$root.wallet && !$root.updatingBalance"
         class="has-tip"
         data-options="disable_for_touch:true"
         tooltip-popup-delay='500'