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

fix addresses to string. fix layout of receive

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-05 17:33:00 -03:00
commit 2122ccff43
3 changed files with 65 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/models/Wallet.js
View file

@ -2823,7 +2823,7 @@ Wallet.prototype.getTransactionHistory = function(cb) {
return {
type: 'out',
address: addr ? addr : itemAddr,
address: addr ? addr.addressStr : itemAddr,
isMine: !_.isUndefined(addr),
isChange: addr ? !!addr.isChange : false,
label: self.addressBook[itemAddr] ? self.addressBook[itemAddr].label : undefined,
@ -2880,6 +2880,7 @@ Wallet.prototype.getTransactionHistory = function(cb) {
});
tx.comment = proposal ? proposal.comment : undefined;
tx.labelTo = firstOut ? firstOut.label : undefined;
tx.addressTo = firstOut ? firstOut.address : undefined;
tx.amountSat = Math.abs(amount);
tx.amount = tx.amountSat * satToUnit;
tx.sentTs = proposal ? proposal.sentTs : undefined;