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

fix pending notification

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-11-25 15:09:51 -03:00
commit 4e54fe6cf7
5 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/models/Wallet.js
View file

@ -1897,9 +1897,11 @@ Wallet.prototype.onPayProPaymentAck = function(ntxid, rawData) {
var ack = paypro.makePaymentACK(data);
var memo = ack.get('memo');
log.debug('Payment Acknowledged!: %s', memo);
var txp = this.txProposals.get(ntxid);
txp.paymentAckMemo = memo;
self.sendTxProposal(ntxid);
self.emitAndKeepAlive('paymentACK', memo);
this.sendTxProposal(ntxid);
this.emitAndKeepAlive('paymentACK', memo);
};
@ -2571,6 +2573,8 @@ Wallet.prototype.getTransactionHistory = function(opts, cb) {
var proposals = self.getTxProposals();
var satToUnit = 1 / self.settings.unitToSatoshi;
function extractInsOuts(tx) {
// Inputs
var inputs = _.map(tx.vin, function(item) {