BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix txp modals for single outputs

This commit is contained in:
Gustavo Maximiliano Cortez 2015-08-14 16:56:13 -03:00
parent e54e78c78d
commit a4731e7f06
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/views/modals/txp-details.html
View File

@ -14,15 +14,15 @@
<div class="modal-content fix-modals-touch" ng-init="updateCopayerList()">
<h4 class="title m0" translate>Details</h4>
<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-include="'views/includes/output.html'">
</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-include="'views/includes/output.html'">
</div>
<div ng-if="tx.showSingle"
<div ng-if="tx.showSingle || !tx.outputs"
ng-repeat="output in [ tx ]"
ng-include="'views/includes/output.html'">
</div>
@ -131,7 +131,7 @@
ng-show="tx.status=='broadcasted'" translate>
Payment sent!
</div>
<div class="text-center text-warning"
<div class="text-center text-warning m10t"
ng-show="tx.status=='rejected'" translate>
Payment finally rejected
</div>

3
src/js/controllers/walletHome.js
View File

@ -204,6 +204,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var action = lodash.find(tx.actions, {
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;
if (!action && tx.status == 'pending')
$scope.tx.pendingForUs = true;