mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #2412 from cmgustavo/bug/pending-tx-01
Display unsent transactions on HomeWallet
This commit is contained in:
commit
f94598dde8
|
@ -1487,7 +1487,7 @@ Wallet.prototype.getPendingTxProposals = function() {
|
|||
var satToUnit = 1 / this.settings.unitToSatoshi;
|
||||
|
||||
_.each(txps, function(inTxp, ntxid) {
|
||||
if (!inTxp.isPending(maxRejectCount))
|
||||
if (!inTxp.isPending(maxRejectCount) || (inTxp.sentTs && inTxp.isFullySigned()))
|
||||
return;
|
||||
|
||||
var txp = _.clone(inTxp);
|
||||
|
|
|
@ -52,7 +52,8 @@
|
|||
<div class="large-12 columns">
|
||||
<div class="panel oh">
|
||||
<h2 class="line-b" translate>Spend proposals</h2>
|
||||
<div class="last-transactions pr" ng-repeat="tx in $root.wallet.pendingTxProposals | orderBy:'-createdTs'" ng-include="'views/includes/transaction.html'" ng-if="$root.wallet.pendingTxProposals[0]">
|
||||
<div class="last-transactions pr" ng-repeat="tx in $root.wallet.pendingTxProposals | orderBy:'-createdTs'"
|
||||
ng-include="'views/includes/transaction.html'" ng-if="$root.wallet.pendingTxProposals[0]">
|
||||
</div>
|
||||
|
||||
<div class="text-right size-12 line-t p10t" ng-show="$root.wallet.balanceInfo.lockedBalance && !$root.wallet.balanceInfo.updatingBalance">
|
||||
|
@ -61,9 +62,21 @@
|
|||
<span class="text-gray"> {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}} </span>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="pr" ng-if="!$root.wallet.pendingTxProposals[0]">
|
||||
<p> No pending spend proposals at the moment.
|
||||
<p> No pending spend proposals at the moment.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-if="!$root.wallet.requiresMultipleSignatures() && $root.wallet.pendingTxProposals[0]">
|
||||
<div class="row">
|
||||
<div class="large-12 columns">
|
||||
<div class="panel oh">
|
||||
<h2 class="line-b" translate>Unsent transactions</h2>
|
||||
<div class="last-transactions pr" ng-repeat="tx in $root.wallet.pendingTxProposals | orderBy:'-createdTs'"
|
||||
ng-include="'views/includes/transaction.html'">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue