anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

reject button working

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-23 02:01:54 -03:00
commit b6280348e5
6 changed files with 99 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/models/core/PublicKeyRing.js
View file

@ -274,6 +274,8 @@ PublicKeyRing.prototype._mergePubkeys = function(inPKR) {
var self = this;
var hasChanged = false;
var l= self.copayersBIP32.length;
if (self.isComplete())
return;
inPKR.copayersBIP32.forEach( function(b) {
var haveIt = false;
@ -286,7 +288,6 @@ PublicKeyRing.prototype._mergePubkeys = function(inPKR) {
}
if (!haveIt) {
if (self.isComplete()) {
//console.log('[PublicKeyRing.js.318] REPEATED KEY', epk); //TODO
throw new Error('trying to add more pubkeys, when PKR isComplete at merge');
}
self.copayersBIP32.push(new BIP32(epk));