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

assign addressTo and labelTo on outgoing txs only

Browse source
This commit is contained in:
Ivan Socolsky 2014-11-12 17:06:35 -03:00
commit 9fdf06c28c
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
js/models/Wallet.js
View file

@ -1323,7 +1323,10 @@ Wallet.prototype.getPendingTxProposals = function() {
});
txp.outs = [];
_.each(addresses, function(value, address) {
txp.outs.push({address: address, value: value * satToUnit});
txp.outs.push({
address: address,
value: value * satToUnit
});
});
// extra fields
txp.fee = txp.builder.feeSat * satToUnit;
@ -2931,12 +2934,16 @@ Wallet.prototype.getTransactionHistory = function(opts, cb) {
tx.action = amount > 0 ? 'sent' : 'received';
}
var firstOut = _.findWhere(items, {
type: 'out'
});
if (tx.action == 'sent' || tx.action == 'moved') {
var firstOut = _.findWhere(items, {
type: 'out'
});
if (firstOut) {
tx.labelTo = firstOut.label;
tx.addressTo = firstOut.address;
}
};
tx.labelTo = firstOut ? firstOut.label : undefined;
tx.addressTo = firstOut ? firstOut.address : undefined;
tx.amountSat = Math.abs(amount);
tx.amount = tx.amountSat * satToUnit;
tx.minedTs = !_.isNaN(tx.time) ? tx.time * 1000 : undefined;