From 2c6ad1268ebe092b1d36eb2aa2c3a2f88b4e0d76 Mon Sep 17 00:00:00 2001
From: Gustavo Cortez <cmgustavo83@gmail.com>
Date: Tue, 13 May 2014 11:27:31 -0300
Subject: [PATCH] fixes recommended by Matias

---
 css/main.css                   | 5 +++++
 index.html                     | 2 +-
 js/services/controllerUtils.js | 9 +++------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/css/main.css b/css/main.css
index c898be077..8c1b25984 100644
--- a/css/main.css
+++ b/css/main.css
@@ -88,6 +88,11 @@ html, body {height: 100%;}
   width: 25%;
 }
 
+.top-bar-section .label.alert {
+  vertical-align: super;
+  margin-left: 5px;
+}
+
 .header {
   margin-bottom: 30px;
 }
diff --git a/index.html b/index.html
index 486514def..4bd608f03 100644
--- a/index.html
+++ b/index.html
@@ -56,7 +56,7 @@
             <ul>
               <li data-ng-repeat="item in menu" ui-route="/{{item.link}}" class="text-center" data-ng-class="{active: isActive(item)}">
                 <a href="{{item.link}}"> <i class="{{item.icon}}"></i> {{item.title}} 
-                  <span class="label alert round" ng-if="item.title=='Transactions' && $root.txslength > 0">{{$root.txslength}}</span>
+                  <span class="label alert round" ng-if="item.link=='#/transactions' && $root.pendingTxCount > 0">{{$root.pendingTxCount}}</span>
                 </a>
               </li>
             </ul>
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index e3ad7e0a5..299d021dd 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -83,7 +83,6 @@ angular.module('copay.controllerUtils')
         $rootScope.$digest();
       });
       w.on('txProposalsUpdated', function() {
-        console.log('[ txProposalsUpdated ]'); //TODO
         root.updateTxs();
         root.updateBalance();
       });
@@ -109,7 +108,6 @@ angular.module('copay.controllerUtils')
       if ($rootScope.addrInfos.length === 0) return;
       $rootScope.loading = true;
       w.getBalance(false, function(balance, balanceByAddr) {
-        console.log('New total balance:', balance);
         $rootScope.totalBalance = balance;
         $rootScope.balanceByAddr = balanceByAddr;
         $rootScope.selectedAddr = $rootScope.addrInfos[0].address.toString();
@@ -118,7 +116,6 @@ angular.module('copay.controllerUtils')
         if (cb) cb();
       });
       w.getBalance(true, function(balance) {
-        console.log('New available balance:', balance);
         $rootScope.availableBalance = balance;
         $rootScope.loading = false;
         $rootScope.$digest();
@@ -154,13 +151,13 @@ angular.module('copay.controllerUtils')
         txs.push(i);
       });
       $rootScope.txs = txs;
-      var txps = 0;
+      var pending = 0;
       for(var i=0; i<txs.length;i++) {
         if (!txs[i].finallyRejected && !txs[i].sentTs) {
-          txps++;
+          pending++;
         }
       }
-      $rootScope.txslength = txps;
+      $rootScope.pendingTxCount = pending;
       w.removeListener('txProposalsUpdated',root.updateTxs)
       w.once('txProposalsUpdated',root.updateTxs);
       $rootScope.loading = false;