mirror of https://github.com/BTCPrivate/copay.git
Improve tx counter notification: not show if you sign, reject or if it is your tx proposal.
This commit is contained in:
parent
eedfdcfaa1
commit
19573dc327
|
@ -128,6 +128,8 @@ angular.module('copay.controllerUtils')
|
||||||
var w = $rootScope.wallet;
|
var w = $rootScope.wallet;
|
||||||
if (!w) return;
|
if (!w) return;
|
||||||
|
|
||||||
|
var myCopayerId = w.getMyCopayerId();
|
||||||
|
var pending = 0;
|
||||||
var inT = w.getTxProposals();
|
var inT = w.getTxProposals();
|
||||||
var txs = [];
|
var txs = [];
|
||||||
|
|
||||||
|
@ -149,13 +151,16 @@ angular.module('copay.controllerUtils')
|
||||||
i.fee = i.builder.feeSat/bitcore.util.COIN;
|
i.fee = i.builder.feeSat/bitcore.util.COIN;
|
||||||
i.missingSignatures = tx.countInputMissingSignatures(0);
|
i.missingSignatures = tx.countInputMissingSignatures(0);
|
||||||
txs.push(i);
|
txs.push(i);
|
||||||
});
|
|
||||||
$rootScope.txs = txs;
|
if (myCopayerId != i.creator && !i.finallyRejected && !i.sentTs && !i.rejectedByUs && !i.signedByUs) {
|
||||||
var pending = 0;
|
|
||||||
for(var i=0; i<txs.length;i++) {
|
|
||||||
if (!txs[i].finallyRejected && !txs[i].sentTs) {
|
|
||||||
pending++;
|
pending++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
$rootScope.txs = txs;
|
||||||
|
if ($rootScope.pendingTxCount < pending) {
|
||||||
|
$rootScope.showTxAlert = pending;
|
||||||
}
|
}
|
||||||
$rootScope.pendingTxCount = pending;
|
$rootScope.pendingTxCount = pending;
|
||||||
w.removeListener('txProposalsUpdated',root.updateTxs)
|
w.removeListener('txProposalsUpdated',root.updateTxs)
|
||||||
|
|
Loading…
Reference in New Issue