mirror of https://github.com/BTCPrivate/copay.git
Fix txp modals for single outputs
This commit is contained in:
parent
e54e78c78d
commit
a4731e7f06
|
@ -14,15 +14,15 @@
|
||||||
<div class="modal-content fix-modals-touch" ng-init="updateCopayerList()">
|
<div class="modal-content fix-modals-touch" ng-init="updateCopayerList()">
|
||||||
<h4 class="title m0" translate>Details</h4>
|
<h4 class="title m0" translate>Details</h4>
|
||||||
<ul class="no-bullet size-14 m0">
|
<ul class="no-bullet size-14 m0">
|
||||||
<div ng-if="!tx.showSingle"
|
<div ng-if="!tx.showSingle && tx.outputs"
|
||||||
ng-repeat="output in [ tx.outputs.summary ]"
|
ng-repeat="output in [ tx.outputs.summary ]"
|
||||||
ng-include="'views/includes/output.html'">
|
ng-include="'views/includes/output.html'">
|
||||||
</div>
|
</div>
|
||||||
<div ng-if="!tx.showSingle && tx.outputs.summary.showDetails"
|
<div ng-if="!tx.showSingle && tx.outputs && tx.outputs.summary.showDetails"
|
||||||
ng-repeat="output in tx.outputs.details"
|
ng-repeat="output in tx.outputs.details"
|
||||||
ng-include="'views/includes/output.html'">
|
ng-include="'views/includes/output.html'">
|
||||||
</div>
|
</div>
|
||||||
<div ng-if="tx.showSingle"
|
<div ng-if="tx.showSingle || !tx.outputs"
|
||||||
ng-repeat="output in [ tx ]"
|
ng-repeat="output in [ tx ]"
|
||||||
ng-include="'views/includes/output.html'">
|
ng-include="'views/includes/output.html'">
|
||||||
</div>
|
</div>
|
||||||
|
@ -131,7 +131,7 @@
|
||||||
ng-show="tx.status=='broadcasted'" translate>
|
ng-show="tx.status=='broadcasted'" translate>
|
||||||
Payment sent!
|
Payment sent!
|
||||||
</div>
|
</div>
|
||||||
<div class="text-center text-warning"
|
<div class="text-center text-warning m10t"
|
||||||
ng-show="tx.status=='rejected'" translate>
|
ng-show="tx.status=='rejected'" translate>
|
||||||
Payment finally rejected
|
Payment finally rejected
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -204,6 +204,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
var action = lodash.find(tx.actions, {
|
var action = lodash.find(tx.actions, {
|
||||||
copayerId: fc.credentials.copayerId
|
copayerId: fc.credentials.copayerId
|
||||||
});
|
});
|
||||||
|
tx.amountStr = profileService.formatAmount(tx.amount) + ' ' + config.unitName;
|
||||||
|
tx.alternativeAmount = rateService.toFiat(tx.amount, config.alternativeIsoCode) ? rateService.toFiat(tx.amount, config.alternativeIsoCode).toFixed(2) : 'N/A';
|
||||||
|
tx.alternativeAmountStr = tx.alternativeAmount + " " + config.alternativeIsoCode;
|
||||||
$scope.tx = tx;
|
$scope.tx = tx;
|
||||||
if (!action && tx.status == 'pending')
|
if (!action && tx.status == 'pending')
|
||||||
$scope.tx.pendingForUs = true;
|
$scope.tx.pendingForUs = true;
|
||||||
|
|
Loading…
Reference in New Issue