diff --git a/index.html b/index.html
index a8105b78c..7065e3c27 100644
--- a/index.html
+++ b/index.html
@@ -57,16 +57,30 @@
-
-
- Note: Your wallet is not complete yet.
-
- {{$root.wallet.publicKeyRing.totalCopayers - $root.wallet.publicKeyRing.registeredCopayers() }} keys are
-
-
- One key is
-
- missing. Share this secret with your other copayers for them to join your wallet:
{{$root.wallet.getMyPeerId()}}
+
+
+
+
+
+
+
+
+ Note: Your wallet is not complete yet.
+
+ {{$root.wallet.publicKeyRing.totalCopayers - $root.wallet.publicKeyRing.registeredCopayers() }} keys are
+
+
+ One key is
+
+ missing.
+
+
+
+ Share this secret with your other copayers for them to join your wallet
+
+
+ {{$root.wallet.getMyCopayerId()}}
+
diff --git a/js/models/core/PrivateKey.js b/js/models/core/PrivateKey.js
index 0e2d87631..589dfaae0 100644
--- a/js/models/core/PrivateKey.js
+++ b/js/models/core/PrivateKey.js
@@ -27,7 +27,6 @@ PrivateKey.prototype.getId = function(prefix) {
return hash.substring(0, hash.length/2);
};
-
PrivateKey.fromObj = function(obj) {
return new PrivateKey(obj);
};
diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index b90b71040..13a7e6e94 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -122,10 +122,10 @@ Wallet.prototype._handleData = function(senderId, data, isInbound) {
}
};
-Wallet.prototype._handleNetworkChange = function(newPeerId) {
+Wallet.prototype._handleNetworkChange = function(newCopayerId) {
if (newPeerId) {
- this.log('#### Setting new PEER:', newPeerId);
- this.sendWalletId(newPeerId);
+ this.log('#### Setting new PEER:', newCopayerId);
+ this.sendWalletId(newCopayerId);
}
this.emit('refresh');
};
@@ -143,13 +143,13 @@ Wallet.prototype._optsToObj = function () {
};
-Wallet.prototype.getPeerId = function(index) {
+Wallet.prototype.getCopayerId = function(index) {
return this.publicKeyRing.getCopayerId(index || 0);
};
-Wallet.prototype.getMyPeerId = function() {
- return this.getPeerId(0);
+Wallet.prototype.getMyCopayerId = function() {
+ return this.getCopayerId(0);
};
Wallet.prototype.netStart = function() {
@@ -167,19 +167,21 @@ Wallet.prototype.netStart = function() {
self.emit('close');
});
- var myPeerId = self.getMyPeerId();
+ var myId = self.getMyCopayerId();
var startOpts = {
- peerId: myPeerId
+ copayerId: myId
};
net.start(function() {
self.emit('created');
for (var i=0; i