From dcb561a2b046f3d1c8a3cd615d06bed75ff4e1a0 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Fri, 14 Nov 2014 14:10:07 -0300 Subject: [PATCH] fixed small bug in getPendingTxProposals --- js/models/Wallet.js | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/js/models/Wallet.js b/js/models/Wallet.js index 2edadc079..fdc60b08d 100644 --- a/js/models/Wallet.js +++ b/js/models/Wallet.js @@ -1363,30 +1363,28 @@ Wallet.prototype.getPendingTxProposals = function() { var txps = this.getTxProposals(); var satToUnit = 1 / this.settings.unitToSatoshi; - _.find(txps, function(txp) { - if (txp.isPending) { - pendingForUs++; - var addresses = {}; - var outs = JSON.parse(txp.builder.vanilla.outs); - outs.forEach(function(o) { - if (!self.publicKeyRing.addressToPath[o.Straddress]) { - if (!addresses[o.address]) addresses[o.address] = 0; - addresses[o.address] += (o.amountSatStr || Math.round(o.amount * bitcore.util.COIN)); - }; + _.each(_.where(txps, 'isPending'), function(txp) { + pendingForUs++; + var addresses = {}; + var outs = JSON.parse(txp.builder.vanilla.outs); + outs.forEach(function(o) { + if (!self.publicKeyRing.addressToPath[o.Straddress]) { + if (!addresses[o.address]) addresses[o.address] = 0; + addresses[o.address] += (o.amountSatStr || Math.round(o.amount * bitcore.util.COIN)); + }; + }); + txp.outs = []; + _.each(addresses, function(value, address) { + txp.outs.push({ + address: address, + value: value * satToUnit }); - txp.outs = []; - _.each(addresses, function(value, address) { - txp.outs.push({ - address: address, - value: value * satToUnit - }); - }); - // extra fields - txp.fee = txp.builder.feeSat * satToUnit; - txp.missingSignatures = txp.builder.build().countInputMissingSignatures(0); - txp.actionList = self._getActionList(txp.peerActions); - ret.txs.push(txp); - } + }); + // extra fields + txp.fee = txp.builder.feeSat * satToUnit; + txp.missingSignatures = txp.builder.build().countInputMissingSignatures(0); + txp.actionList = self._getActionList(txp.peerActions); + ret.txs.push(txp); }); ret.pendingForUs = pendingForUs;