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

show label and comment in view

Browse source
This commit is contained in:
Ivan Socolsky 2014-10-23 12:33:55 -03:00 • committed by Matias Alejo Garcia
commit ccb138f605
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/models/Wallet.js
View file

@ -3000,9 +3000,8 @@ Wallet.prototype.getTransactionHistory = function(cb) {
});
var proposal = _.findWhere(proposals, {
ntxid: tx.txid
sentTxid: tx.txid
});
tx.comment = proposal ? proposal.comment : undefined;
tx.labelTo = firstOut ? firstOut.label : undefined;
tx.amountSat = Math.abs(amount);
@ -3010,7 +3009,8 @@ Wallet.prototype.getTransactionHistory = function(cb) {
};
if (addresses.length > 0) {
self.blockchain.getTransactions(addresses, function(err, txs) {
var addressesStr = _.pluck(addresses, 'addressStr');
self.blockchain.getTransactions(addressesStr, function(err, txs) {
if (err) return cb(err);
var history = _.map(txs, function(tx) {