From e928ca2b81a2c9c09923e7c581d866b0e272ec17 Mon Sep 17 00:00:00 2001
From: Mario Colque <colquemario@gmail.com>
Date: Mon, 21 Apr 2014 11:32:51 -0300
Subject: [PATCH] several improvements

---
 js/controllers/addresses.js | 12 ++++++------
 js/controllers/header.js    |  7 ++++++-
 js/routes.js                |  3 ++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/js/controllers/addresses.js b/js/controllers/addresses.js
index bfe216d41..4f644208c 100644
--- a/js/controllers/addresses.js
+++ b/js/controllers/addresses.js
@@ -9,21 +9,21 @@ angular.module('copay.addresses').controller('AddressesController',
     var w = $rootScope.wallet;
 
     var _updateBalance = function () {
+      controllerUtils.setSocketHandlers();
+
       w.getBalance(function (balance, balanceByAddr) {
         if (balanceByAddr  && Object.keys(balanceByAddr).length) {
-          $scope.balanceByAddr = balanceByAddr;
+          $rootScope.balanceByAddr = balanceByAddr;
           $scope.addrs =  Object.keys(balanceByAddr);
           $scope.selectedAddr = $scope.addrs[0];
-          $scope.$digest();
+          $rootScope.$digest();
         }
       });
     };
 
     $scope.newAddr = function() {
-      w.generateAddress().toString();
+      w.generateAddress();
       _updateBalance();
-
-      controllerUtils.setSocketHandlers();
     };
 
     $scope.selectAddr = function(addr) {
@@ -31,5 +31,5 @@ angular.module('copay.addresses').controller('AddressesController',
     };
 
     _updateBalance();
-    w.on('refresh',_updateBalance);
+    w.on('refresh', _updateBalance);
   });
diff --git a/js/controllers/header.js b/js/controllers/header.js
index 2f1bf79eb..ac800178f 100644
--- a/js/controllers/header.js
+++ b/js/controllers/header.js
@@ -26,7 +26,12 @@ angular.module('copay.header').controller('HeaderController',
 
     $rootScope.$watch('wallet', function(wallet) {
       if (wallet) {
-        controllerUtils.setSocketHandlers(); 
+        controllerUtils.setSocketHandlers();
+        $rootScope.wallet.getBalance(function(balance) {
+          $rootScope.$apply(function() {
+            $rootScope.totalBalance = balance;
+          });
+        });
       }
     });
 
diff --git a/js/routes.js b/js/routes.js
index 83b158d1b..3970dd047 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -19,7 +19,8 @@ angular
         validate: false
       })
       .when('/addresses', {
-        templateUrl: 'addresses.html'
+        templateUrl: 'addresses.html',
+        validate: true
       })
       .when('/join/:id', {
         templateUrl: 'join.html',