fix conflicts

js/controllers/backup.js

@@ -1,11 +1,14 @@
 'use strict';
 
 angular.module('copay.backup').controller('BackupController',
-  function($scope, $rootScope, $location, $window, $timeout) {
-
-    if (!$rootScope.wallet.id) {
+  function($scope, $rootScope, $location, $window, $timeout, Socket, controllerUtils) {
+    if (!$rootScope.wallet || !$rootScope.wallet.id) {
       $location.path('signin');
     }
+    else {
+      var socket = Socket($scope);
+      socket.on('connect', controllerUtils.handleTransactionByAddress($scope));
+    }
 
     $scope.title = 'Backup';
 

js/controllers/header.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copay.header').controller('HeaderController',
-  function($scope, $rootScope, $location, walletFactory) {
+  function($scope, $rootScope, $location, walletFactory, controllerUtils) {
     $scope.menu = [{
       'title': 'Home',
       'icon': 'fi-home',
@@ -24,7 +24,7 @@ angular.module('copay.header').controller('HeaderController',
       'link': '#/backup'
     }];
 
-    if (!$rootScope.peerId) {
+   if (!$rootScope.wallet || !$rootScope.wallet.id) {
       $location.path('signin');
     }
 
@@ -39,12 +39,12 @@ angular.module('copay.header').controller('HeaderController',
       var w = $rootScope.wallet;
       if (w) {
         w.disconnect();
-        delete $rootScope['wallet'];
-        $location.path('signin');
+        controllerUtils.logout();
       }
     };
 
     $scope.clearFlashMessage = function() {
       $rootScope.flashMessage = {};
     };
+
   });

js/controllers/home.js

@@ -1,16 +1,15 @@
 'use strict';
 
 angular.module('copay.home').controller('HomeController',
-  function($scope, $rootScope, $location) {
+  function($scope, $rootScope, $location, Socket, controllerUtils) {
     $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);
+        $rootScope.wallet.getBalance([addr], function(balance) {
           $scope.addrBalance[addr] = balance;
           $scope.$digest();
         });
@@ -24,13 +23,17 @@ angular.module('copay.home').controller('HomeController',
       $scope.selectedAddr = $scope.addrs[0];
 
       _getBalance();
+
+      var socket = Socket($scope);
+      socket.on('connect', controllerUtils.handleTransactionByAddress($scope));
     }
 
     $scope.newAddr = function() {
       var a = $rootScope.wallet.generateAddress().toString();
       $scope.addrs.push(a);
-
       _getBalance();
+      var socket = Socket($scope);
+      socket.on('connect', controllerUtils.handleTransactionByAddress($scope));
     };
 
     $scope.selectAddr = function(addr) {

js/controllers/peer.js

@@ -1,10 +1,18 @@
 'use strict';
 
 angular.module('copay.peer').controller('PeerController',
-  function($scope, $rootScope, $location, $routeParams) {
+  function($scope, $rootScope, $location, $routeParams, Socket, controllerUtils) {
     
     $scope.init = function() {
       //Network.connect($rootScope.masterId);
     };
+
+    if (!$rootScope.wallet || !$rootScope.wallet.id) {
+      $location.path('signin');
+    }
+    else {
+      var socket = Socket($scope);
+      socket.on('connect', controllerUtils.handleTransactionByAddress($scope));
+    }
   });
 

js/controllers/send.js

@@ -1,13 +1,17 @@
 'use strict';
 
 angular.module('copay.send').controller('SendController',
-  function($scope, $rootScope, $location) {
+  function($scope, $rootScope, $location, Socket, controllerUtils) {
     $scope.title = 'Send';
 
-    if (!$rootScope.wallet.id) {
+    if (!$rootScope.wallet || !$rootScope.wallet.id) {
       $location.path('signin');
     }
-
+    else {
+      var socket = Socket($scope);
+      socket.on('connect', controllerUtils.handleTransactionByAddress($scope));
+   
+    }
 
     $scope.sendTest = function() {
       var w    = $rootScope.wallet;

js/controllers/setup.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copay.setup').controller('SetupController',
-  function($scope, $rootScope, $location, walletFactory) {
+  function($scope, $rootScope, $location, walletFactory, controllerUtils) {
 
     $scope.loading = false;
 
@@ -32,16 +32,7 @@ angular.module('copay.setup').controller('SetupController',
         totalCopayers: totalCopayers
       };
       var w = walletFactory.create(opts);
-      w.on('created', function(){
-        $location.path('peer');
-        $rootScope.wallet = w;
-        $rootScope.$digest();
-      });
-      w.on('openError', function(){
-        $scope.loading = false;
-        $rootScope.flashMessage = {type:'error', message: 'Wallet not found'};
-        $location.path('signin');
-      });
+      controllerUtils.setupUxHandlers(w);
       w.netStart();
     };
 

js/controllers/signin.js

@@ -1,36 +1,17 @@
 'use strict';
 
+
+
 angular.module('copay.signin').controller('SigninController',
-  function($scope, $rootScope, $location, walletFactory) {
+  function($scope, $rootScope, $location, walletFactory, controllerUtils) {
 
 //    var peerData = Storage.get($rootScope.walletId, 'peerData');
 //    $rootScope.peerId = peerData ? peerData.peerId : null;
     $scope.loading = false;
 
-    $scope.selectedWalletId = false;
+    $scope.walletIds = walletFactory.getWalletIds();
 
-    $scope.listWalletIds = function() {
-      return walletFactory.getWalletIds();
-    };
-
-    var _setupUxHandlers =  function(w) {
-      w.on('created', function() {
-        $location.path('peer');
-        $rootScope.wallet = w;
-        $rootScope.$digest();
-      });
-      w.on('refresh', function() {
-
-console.log('[signin.js.23] RECEIVED REFRESH'); //TODO
-        $rootScope.$digest();
-      });
- 
-      w.on('openError', function(){
-        $scope.loading = false;
-        $rootScope.flashMessage = {type:'error', message: 'Wallet not found'};
-        $location.path('signin');
-      });
-    };
+    $scope.selectedWalletId = $scope.walletIds.length ? $scope.walletIds[0]:null;
 
     $scope.create = function() {
       $location.path('setup');
@@ -40,16 +21,18 @@ console.log('[signin.js.23] RECEIVED REFRESH'); //TODO
       $scope.loading = true;
 
       var w = walletFactory.open(walletId);
-      _setupUxHandlers(w);
+      controllerUtils.setupUxHandlers(w);
       w.netStart();
     };
 
     $scope.join = function(cid) {
-console.log('[signin.js.42:join:]'); //TODO
       $scope.loading = true;
+      walletFactory.network.on('openError', function() {
+        controllerUtils.onError($scope); 
+        $rootScope.$digest();
+      });
       walletFactory.connectTo(cid, function(w) {
-console.log('[signin.js.50]'); //TODO
-        _setupUxHandlers(w);
+        controllerUtils.setupUxHandlers(w);
         w.netStart();
       });
     };

js/controllers/transactions.js

@@ -1,29 +1,33 @@
 'use strict';
 
 angular.module('copay.transactions').controller('TransactionsController',
-  function($scope, $rootScope, $location) {
+  function($scope, $rootScope, $location, Socket, controllerUtils) {
     $scope.title = 'Transactions';
 
     $scope.oneAtATime = true;
 
-    if (!$rootScope.wallet.id) {
+    if (!$rootScope.wallet || !$rootScope.wallet.id) {
       $location.path('signin');
     }
+    else {
+      $scope.txsinput = [
+      {
+        fromAddr: "n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb",
+        toAddr: "msvv2mDfE298s7boXwALq4Dqv77K3TWRZ1",
+        amount: 23.9982
+      },
+      {
+        fromAddr: "my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J",
+        toAddr: "monCusNiDuptf68rtr58hEjKpJt6cW6zwS",
+        amount: 2.22
+      }
+      ];
 
-    $scope.txsinput = [
-    {
-      fromAddr: "n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb",
-      toAddr: "msvv2mDfE298s7boXwALq4Dqv77K3TWRZ1",
-      amount: 23.9982
-    },
-    {
-      fromAddr: "my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J",
-      toAddr: "monCusNiDuptf68rtr58hEjKpJt6cW6zwS",
-      amount: 2.22
+      $scope.txsoutput = $rootScope.wallet.getTxProposals();
+
+      var socket = Socket($scope);
+      socket.on('connect', controllerUtils.handleTransactionByAddress($scope));
     }
-    ];
-
-    $scope.txsoutput = $rootScope.wallet.getTxProposals();
 
     $scope.sign = function (ntxid) {
       var w = $rootScope.wallet;