From ad4ebfdc3c22e3900e4475fab8d5d96c0068e1cc Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 28 Aug 2014 16:37:34 -0300 Subject: [PATCH] add resync to refresh button --- js/controllers/sidebar.js | 2 +- js/models/core/Wallet.js | 16 +--------------- js/models/network/Async.js | 5 ++++- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index e93bf27e2..db34c12be 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -36,7 +36,7 @@ angular.module('copayApp.controllers').controller('SidebarController', function( $scope.refresh = function() { var w = $rootScope.wallet; - w.connectToAll(); + w.sendWalletReady(); if ($rootScope.addrInfos.length > 0) { controllerUtils.updateBalance(function() { $rootScope.$digest(); diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index f214625a6..86ac1f3ae 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -86,19 +86,6 @@ Wallet.prototype.seedCopayer = function(pubKey) { this.seededCopayerId = pubKey; }; -// not being used now -Wallet.prototype.connectToAll = function() { - // not being used now - return; - - var all = this.publicKeyRing.getAllCopayerIds(); - this.network.connectToCopayers(all); - if (this.seededCopayerId) { - this.sendWalletReady(this.seededCopayerId); - this.seededCopayerId = null; - } -}; - Wallet.prototype._onIndexes = function(senderId, data) { this.log('RECV INDEXES:', data); var inIndexes = HDParams.fromList(data.indexes); @@ -647,8 +634,7 @@ Wallet.prototype.sendReject = function(ntxid) { Wallet.prototype.sendWalletReady = function(recipients) { - preconditions.checkArgument(recipients); - this.log('### SENDING WalletReady TO:', recipients); + this.log('### SENDING WalletReady TO:', recipients || 'All'); this.send(recipients, { type: 'walletReady', diff --git a/js/models/network/Async.js b/js/models/network/Async.js index cb7d078ee..e3075496c 100644 --- a/js/models/network/Async.js +++ b/js/models/network/Async.js @@ -345,13 +345,16 @@ Network.prototype.send = function(dest, payload, cb) { dest = this.getCopayerIds(); payload.isBroadcast = 1; } + console.log('SEND to: ' + to, payload); + if (typeof dest === 'string') dest = [dest]; var l = dest.length; var i = 0; - //console.log('sending ' + JSON.stringify(payload)); dest.forEach(function(to) { + + //console.log('\t to ' + to); var message = self.encode(to, payload);