fix copayers

js/controllers/copayers.js

@@ -1,18 +1,33 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('CopayersController',
-  function($scope, $rootScope, $location) {
+  function($scope, $rootScope, $timeout, go) {
+
+    console.log('[copayers.js.5]'); //TODO
 
     $scope.init = function() {
+      var w = $rootScope.wallet;
       $rootScope.title = 'Waiting copayers for ' + $rootScope.wallet.getName();
       $scope.loading = false;
       $scope.secret = $rootScope.wallet.getSecret();
+
+      w.on('publicKeyRingUpdated', $scope.updateList);
+      w.on('ready', $scope.updateList);
+      $scope.updateList();
     };
 
-    $scope.copayersList = function() {
+    $scope.updateList = function() {
-      if ($rootScope.wallet) {
+      var w = $rootScope.wallet;
-        $scope.copayers = $rootScope.wallet.getRegisteredPeerIds();
+
+      $scope.copayers = $rootScope.wallet.getRegisteredPeerIds();
+      if (w.isComplete()) {
+
+        w.removeListener('publicKeyRingUpdated', $scope.updateList);
+        w.removeListener('ready', $scope.updateList);
+        go.walletHome();
       }
-      return $scope.copayers;
+      $timeout(function() {
-    }
+        $rootScope.$digest();
+      }, 1);
+    };
   });

js/controllers/homeWallet.js

@@ -1,15 +1,17 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $location, rateService, notification, identityService) {
-  $scope.init = function() {
+  $scope.initHome = function() {
+    var w = $rootScope.wallet;
+
     $rootScope.title = 'Home';
-
-
     $scope.rateService = rateService;
     $scope.isRateAvailable = false;
 
-    var w = $rootScope.wallet;
+    if (w.isShared())
-    w.on('txProposalEvent', _updateTxs);
+      $scope.copayers = w.getRegisteredPeerIds();
+
+     w.on('txProposalEvent', _updateTxs);
     _updateTxs();
 
     rateService.whenAvailable(function() {
@@ -18,7 +20,9 @@ angular.module('copayApp.controllers').controller('HomeWalletController', functi
     });
   };
 
-  // This is necesarry, since wallet can change in homeWallet, without running init() again.
+  // This is necessary, since wallet can change in homeWallet, 
+  // without running init() again.
+  
   var removeWatch;
   removeWatch = $rootScope.$watch('wallet.id', function(newWallet, oldWallet) {
     if ($rootScope.wallet && $rootScope.wallet.isComplete() && newWallet !== oldWallet) {

js/controllers/receive.js

@@ -21,10 +21,8 @@ angular.module('copayApp.controllers').controller('ReceiveController',
       var lastAddr = _.first(w.getAddressesOrderer()); 
       var balance = w.balanceInfo.balanceByAddr;
 
-      if (balance[lastAddr]>0)
-        $scope.loading = true;
-
       while (balance && balance[lastAddr] > 0) {
+        $scope.loading = true;
         $scope.newAddr();
         lastAddr = w.generateAddress(null);
       };

js/models/Identity.js

@@ -509,6 +509,9 @@ Identity.prototype.bindWallet = function(w) {
   w.on('publicKeyRingUpdated', function() {
     Identity.storeWalletDebounced(self, w);
   });
+  w.on('ready', function() {
+    Identity.storeWalletDebounced(self, w);
+  });
 
   this.emitAndKeepAlive('newWallet', w.getId());
 };

js/routes.js

@@ -22,11 +22,11 @@ angular
         template: " ", // just fire controller
         controller: 'EmailConfirmationController',
       })
-      // Payment intents come here.
+    // Payment intents come here.
-      .when('/uri-payment/:data', {
+    .when('/uri-payment/:data', {
-        template: " ", // just fire controller
+      template: " ", // just fire controller
-        controller: 'paymentUriController',
+      controller: 'paymentUriController',
-      })
+    })
       .when('/selectWalletForPayment', {
         template: " ", // just fire controller
         controller: 'walletForPaymentController',
@@ -127,6 +127,7 @@ angular
     }
 
     $rootScope.$on('$routeChangeStart', function(event, next, current) {
+
       if (!ls || ls.length < 1) {
         $location.path('unsupported');
       } else {
@@ -134,7 +135,8 @@ angular
           $idle.unwatch();
           $location.path('/');
         }
-        if ($rootScope.wallet && !$rootScope.wallet.isComplete() && next.walletShouldBeComplete) {
+        if ($rootScope.wallet && !$rootScope.wallet.isComplete() 
+            && next.walletShouldBeComplete) {
           $location.path('/copayers');
         }
       }

js/services/go.js

@@ -57,24 +57,23 @@ angular.module('copayApp.services').factory('go', function($window, $rootScope,
   };
 
   root.walletHome = function() {
-console.log('[go.js.25:walletHome:]'); //TODO
     var w = $rootScope.wallet;
     preconditions.checkState(w);
     $rootScope.starting = false;
+
     if (!w.isComplete()) {
       root.path('copayers');
     } else {
       if ($rootScope.pendingPayment) {
         root.path('selectWalletForPayment');
       } else {
-
-console.log('[go.js.36]'); //TODO
         root.path('homeWallet');
       }
     }
   };
 
   root.home = function() {
+console.log('[go.js.48:home:]'); //TODO
     if ($rootScope.iden)
       root.walletHome();
     else
@@ -83,6 +82,8 @@ console.log('[go.js.36]'); //TODO
 
 
   root.send = function() {
+
+console.log('[go.js.58]'); //TODO
     $location.path('send');
   };
 

test/mocks/FakeBlockchainSocket.js

@@ -26,7 +26,7 @@ var inherits = function(ctor, superCtor) {
 
 inherits(FakeSocket, EventEmitter);
 
-FakeSocket.prototype.removeEventListener = function() {
+FakeSocket.prototype.removeListener = function() {
   return;
 }
 

views/copayers.html

@@ -1,4 +1,4 @@
-<div ng-controller="CopayersController">
+<div ng-controller="CopayersController" ng-init="init()">
   <div class="row hide-for-large-up">
     <div class="medium-12 small-12 columns">
       <h1 translate>
@@ -12,6 +12,13 @@
         <div class="panel oh">
           <h2 class="line-b">
             Share this secret with your other copayers 
+            <div class="right size-10">
+              <span ng-if="!$root.wallet.isShared()">Personal Wallet</span>
+              <span ng-if="$root.wallet.isShared()">
+                Multisignature wallet [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]
+              </span>
+              <span ng-if="$root.wallet.isTestnet()"> in TESTNET</span>
+            </div>
           </h2>
           <div class="text-center">
             <qrcode size="250" data="{{secret}}"></qrcode>
@@ -22,7 +29,7 @@
         </div>
       </div>
       <div class="panel oh">
-        <div ng-include="'views/includes/copayer.html'"></div> 
+        <div ng-include="'views/includes/copayers.html'"></div> 
         <div class="copay-box" ng-if="!$root.wallet.isComplete()">
           <span ng-include="'views/includes/photo.html'"></span>
           <p class="size-12 text-white text-light m0">

views/homeWallet.html

@@ -1,4 +1,4 @@
-<div class="home-wallet" ng-controller="HomeWalletController" ng-init="init()">
+<div class="home-wallet" ng-controller="HomeWalletController" ng-init="initHome()">
   <div class="row hide-for-large-up">
     <div class="medium-12 small-12 columns">
       <h1 translate>Home</h1>
@@ -63,7 +63,7 @@
     <div class="large-12 columns">
       <div class="panel oh">
         <h2 class="line-b" translate>Copayers</h2>
-        <div ng-include="'views/includes/copayer.html'"></div>
+        <div ng-include="'views/includes/copayers.html'"></div>
       </div>
     </div>
   </div>

views/includes/copayers.html

@@ -1,5 +1,5 @@
-<div ng-controller="CopayersController">
+<div>
-  <div class="copay-box" ng-repeat="copayer in copayersList()">
+  <div class="copay-box" ng-repeat="copayer in copayers">
     <div class="photo-container">
       <img gravatar-src="'{{copayer.nick}}'" gravatar-size="35">
     </div>

views/includes/head.html

@@ -2,7 +2,7 @@
   <h1>
     {{$root.title}} 
     <small ng-if="$root.wallet">
-      <a class="text-gray" ng-click="refresh()" ng-if="!$root.updatingBalance">
+      <a class="text-gray" ng-click="refresh()" ng-if="$root.wallet.isComplete() && !$root.updatingBalance">
         <i class="fi-refresh"></i>
       </a>
       <span ng-if="$root.updatingBalance">