From 652726dbe96aa05024b7b1b00d9f4265692ba9e3 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Mon, 18 Aug 2014 12:46:51 -0400 Subject: [PATCH] some connection in intermediate screen --- js/models/core/Wallet.js | 2 ++ js/models/core/WalletFactory.js | 3 ++- js/models/network/Async.js | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index ffbb245a7..e61b4d699 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -633,7 +633,9 @@ Wallet.prototype.sendReject = function(ntxid) { }); }; + Wallet.prototype.sendWalletReady = function(recipients) { + preconditions.checkArgument(recipients); this.log('### SENDING WalletReady TO:', recipients); this.send(recipients, { diff --git a/js/models/core/WalletFactory.js b/js/models/core/WalletFactory.js index c9e32ed06..86f3c8065 100644 --- a/js/models/core/WalletFactory.js +++ b/js/models/core/WalletFactory.js @@ -268,7 +268,8 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras data.opts.passphrase = passphrase; data.opts.id = data.walletId; var w = self.create(data.opts); - w.seedCopayer(s.pubKey); + w.sendWalletReady(s.pubKey); + //w.seedCopayer(s.pubKey); return cb(null, w); } }); diff --git a/js/models/network/Async.js b/js/models/network/Async.js index 77b751d6c..194eda462 100644 --- a/js/models/network/Async.js +++ b/js/models/network/Async.js @@ -309,7 +309,8 @@ Network.prototype.start = function(opts, openCallback) { this.socket.removeAllListeners(); } - this.socket = io.connect(this.host + ':' + this.port, { + var hostPort = this.host + ':' + this.port; + this.socket = io.connect(hostPort, { reconnection: false, }); this._setupConnectionHandlers(openCallback);