Merge pull request #2649 from cmgustavo/bug/ux-animation-05

Clear proposals when changing wallets
This commit is contained in:
Matias Alejo Garcia 2015-04-28 11:54:12 -03:00
commit 643846ad95
1 changed files with 19 additions and 21 deletions

View File

@ -126,29 +126,27 @@
</div> </div>
</div> </div>
<div ng-show="index.requiresMultipleSignatures && index.txps[0]"> <div ng-if="index.txps[0]">
<h4 class="title m0" translate>Spend proposals</h4> <div ng-show="index.requiresMultipleSignatures">
<div class="last-transactions pr" ng-repeat="tx in index.txps" <h4 class="title m0" translate>Spend proposals</h4>
ng-include="'views/includes/transaction.html'"> <div class="last-transactions pr" ng-repeat="tx in index.txps"
ng-include="'views/includes/transaction.html'">
</div>
<div class="text-gray text-center size-12 p10t"
ng-show="index.lockedBalance && !index.updatingStatus">
<span translate>Total Locked Balance</span>:
<b>{{index.lockedBalance}} {{index.unitName}} </b>
<span> {{index.lockedBalanceAlternative}}
{{index.alternativeIsoCode}} </span>
</div>
</div> </div>
<div class="text-gray text-center size-12 p10t" <div ng-show="!index.requiresMultipleSignatures">
ng-show="index.lockedBalance && !index.updatingStatus"> <h4 class="title m0" translate>Unsent transactions</h4>
<span translate>Total Locked Balance</span>: <div class="last-transactions pr" ng-repeat="tx in index.txps"
<b>{{index.lockedBalance}} {{index.unitName}} </b> ng-include="'views/includes/transaction.html'">
<span> {{index.lockedBalanceAlternative}} </div>
{{index.alternativeIsoCode}} </span>
</div>
<div class="pr" ng-if="!index.txps[0]">
<p translate>No pending spend proposals at the moment.</p>
</div>
</div>
<div ng-if="!index.requiresMultipleSignatures && index.txps[0]">
<h4 class="title m0" translate>Unsent transactions</h4>
<div class="last-transactions pr" ng-repeat="tx in index.txps"
ng-include="'views/includes/transaction.html'">
</div> </div>
</div> </div>
</div> </div>