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

Merge pull request #1856 from isocolsky/ref/update_txs

Browse source 
Various small fixes
This commit is contained in:
Matias Alejo Garcia 2014-11-21 11:05:23 -03:00
commit 6e099a7aa2
3 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

44
js/models/Wallet.js
View file

@ -1363,30 +1363,28 @@ Wallet.prototype.getPendingTxProposals = function() {
var txps = this.getTxProposals(); var txps = this.getTxProposals();
var satToUnit = 1 / this.settings.unitToSatoshi; var satToUnit = 1 / this.settings.unitToSatoshi;
_.find(txps, function(txp) { _.each(_.where(txps, 'isPending'), function(txp) {
if (txp.isPending) { pendingForUs++;
pendingForUs++; var addresses = {};
var addresses = {}; var outs = JSON.parse(txp.builder.vanilla.outs);
var outs = JSON.parse(txp.builder.vanilla.outs); outs.forEach(function(o) {
outs.forEach(function(o) { if (!self.publicKeyRing.addressToPath[o.Straddress]) {
if (!self.publicKeyRing.addressToPath[o.Straddress]) { if (!addresses[o.address]) addresses[o.address] = 0;
if (!addresses[o.address]) addresses[o.address] = 0; addresses[o.address] += (o.amountSatStr || Math.round(o.amount * bitcore.util.COIN));
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) { // extra fields
txp.outs.push({ txp.fee = txp.builder.feeSat * satToUnit;
address: address, txp.missingSignatures = txp.builder.build().countInputMissingSignatures(0);
value: value * satToUnit 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; ret.pendingForUs = pendingForUs;

6
js/services/controllerUtils.js
View file

@ -65,7 +65,7 @@ angular.module('copayApp.services')
root.updateTxsAndBalance = function(w) { root.updateTxsAndBalance = function(w) {
root.updateTxs(); root.updateTxs(w);
root.updateBalance(w, function() { root.updateBalance(w, function() {
$rootScope.$digest(); $rootScope.$digest();
}); });
@ -356,8 +356,8 @@ angular.module('copayApp.services')
}); });
}; };
root.updateTxs = function() { root.updateTxs = function(w) {
var w = $rootScope.wallet; w = w || $rootScope.wallet;
if (!w) return root.onErrorDigest(); if (!w) return root.onErrorDigest();
var res = w.getPendingTxProposals(); var res = w.getPendingTxProposals();
_.each(res.txs, function(tx) { _.each(res.txs, function(tx) {

1
views/history.html
View file

@ -120,5 +120,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>