Fixed socke-emit-on

Merge branch 'master' into feature/socket-io-support

Fix conflicts:
	js/controllers/home.js

index.html

@@ -178,7 +178,7 @@
 
         <div class="row">
           <div class="large-6 columns">
-            <a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">{{addr}} <span class="right"> &gt;</span></a>
+            <a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">{{addr}} <span class="right">({{addrBalance[addr]}} BTC) &gt;</span></a>
           </div>
           <div class="large-3 columns line-dashed-v text-center">
             <qrcode size="160" data="{{selectedAddr}}"></qrcode>

js/controllers/header.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copay.header').controller('HeaderController',
-  function($scope, $rootScope, $location, walletFactory, Socket) {
+  function($scope, $rootScope, $location, walletFactory) {
     $scope.menu = [{
       'title': 'Home',
       'icon': 'fi-home',
@@ -40,8 +40,6 @@ angular.module('copay.header').controller('HeaderController',
       if (w) {
         w.disconnect();
         delete $rootScope['wallet'];
-        var socket = Socket($scope);
-        socket.removeAllListeners();
         $location.path('signin');
       }
     };

js/controllers/home.js

@@ -5,20 +5,32 @@ angular.module('copay.home').controller('HomeController',
     $scope.title = 'Home';
 
     $scope.oneAtATime = true;
+    $scope.addrBalance = {};
+
+    var _getBalance = function() {
+      $scope.addrs.forEach(function(addr) {
+        $rootScope.wallet.blockchain.listUnspent([addr], function(unspent) {
+          var balance = $rootScope.wallet.blockchain.getBalance(unspent);
+          $scope.addrBalance[addr] = balance;
+          $scope.$digest();
+        });
+      });
+    };
 
     if (!$rootScope.wallet || !$rootScope.wallet.id) {
       $location.path('signin');
-    }
+    } else {
-    else {
       $scope.addrs = $rootScope.wallet.getAddressesStr();
       $scope.selectedAddr = $scope.addrs[0];
+
+      _getBalance();
     }
 
     $scope.newAddr = function() {
-console.log('[home.js.17:newAddr:]'); //TODO
+      var a = $rootScope.wallet.generateAddress().toString();
-      var a = $rootScope.wallet.generateAddress();
+      $scope.addrs.push(a);
-console.log('[home.js.19]',a); //TODO
+
-      $scope.addrs.push(a.toString());
+      _getBalance();
     };
 
     $scope.selectAddr = function(addr) {

js/controllers/peer.js

@@ -7,9 +7,9 @@ angular.module('copay.peer').controller('PeerController',
       //Network.connect($rootScope.masterId);
     };
 
-    var addrs = $rootScope.wallet.getAddressesStr();
     var socket = Socket($scope);
     socket.on('connect', function() {
+      var addrs = $rootScope.wallet.getAddressesStr();
       socket.emit('subscribe', 'inv');
       for(var i=0;i<addrs.length;i++) {
         socket.emit('subscribe', addrs[i]);