Fix small issues on the multisig code.

darkwallet · Oct 23, 2014 · 7da14b4 · 7da14b4
1 parent 476745d
commit 7da14b4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/js/dwutil/multisig.js b/js/dwutil/multisig.js
@@ -2,8 +2,6 @@
 
 define(['darkwallet', 'bitcoinjs-lib', 'crypto-js'], function(DarkWallet, Bitcoin, CryptoJS) {
 
-var convert = Bitcoin.convert;
-
 /**
  * Class for dark wallet multisig funds
  */
@@ -34,7 +32,7 @@ MultisigFund.prototype.detectParticipant = function(pubKeyBytes, i) {
 
     var participant = { pubKey: pubKeyBytes };
 
-    var walletAddress = identity.wallet.getWalletAddress(myAddress);
+    var walletAddress = identity.wallet.getWalletAddress(myAddress.toString());
     if (walletAddress) {
         // Current identity
         participant.type = 'me';
@@ -133,7 +131,7 @@ MultisigFund.prototype.findFundTask = function(task) {
 MultisigFund.prototype.organizeSignatures = function(hexSigs) {
     var signatures = [];
     var multisig = this.multisig;
-    multisig.participants.forEach(function(participant, i) {
+    multisig.pubKeys.forEach(function(participant, i) {
         if (hexSigs.hasOwnProperty(i)) {
             signatures.push(hexSigs[i]);
         } else {