mirror of https://github.com/BTCPrivate/copay.git
Adds Fee to TXP modal
This commit is contained in:
parent
67ba30a20e
commit
d1c55e0876
|
@ -24,6 +24,10 @@
|
||||||
<span class="label gray radius">{{alternativeAmountStr}}</span>
|
<span class="label gray radius">{{alternativeAmountStr}}</span>
|
||||||
</span>
|
</span>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="line-b p10">
|
||||||
|
<span class="text-gray" translate>Fee</span>:
|
||||||
|
<span class="right">{{feeStr}}</span>
|
||||||
|
</li>
|
||||||
<li class="line-b p10">
|
<li class="line-b p10">
|
||||||
<span class="text-gray" translate>Time</span>:
|
<span class="text-gray" translate>Time</span>:
|
||||||
<span class="right">
|
<span class="right">
|
||||||
|
|
|
@ -349,6 +349,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
||||||
lodash.each(txps, function(tx) {
|
lodash.each(txps, function(tx) {
|
||||||
var amount = tx.amount * self.satToUnit;
|
var amount = tx.amount * self.satToUnit;
|
||||||
tx.amountStr = profileService.formatAmount(tx.amount) + ' ' + config.unitName;
|
tx.amountStr = profileService.formatAmount(tx.amount) + ' ' + config.unitName;
|
||||||
|
tx.feeStr = profileService.formatAmount(tx.fee) + ' ' + config.unitName;
|
||||||
tx.alternativeAmount = rateService.toFiat(tx.amount, config.alternativeIsoCode) ? rateService.toFiat(tx.amount, config.alternativeIsoCode).toFixed(2) : 'N/A';
|
tx.alternativeAmount = rateService.toFiat(tx.amount, config.alternativeIsoCode) ? rateService.toFiat(tx.amount, config.alternativeIsoCode).toFixed(2) : 'N/A';
|
||||||
tx.alternativeAmountStr = tx.alternativeAmount + " " + config.alternativeIsoCode;
|
tx.alternativeAmountStr = tx.alternativeAmount + " " + config.alternativeIsoCode;
|
||||||
tx.alternativeIsoCode = config.alternativeIsoCode;
|
tx.alternativeIsoCode = config.alternativeIsoCode;
|
||||||
|
|
|
@ -132,6 +132,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
$scope.error = null;
|
$scope.error = null;
|
||||||
$scope.tx = tx;
|
$scope.tx = tx;
|
||||||
$scope.amountStr = tx.amountStr;
|
$scope.amountStr = tx.amountStr;
|
||||||
|
$scope.feeStr = tx.feeStr;
|
||||||
$scope.alternativeAmountStr = tx.alternativeAmountStr;
|
$scope.alternativeAmountStr = tx.alternativeAmountStr;
|
||||||
$scope.copayers = copayers
|
$scope.copayers = copayers
|
||||||
$scope.copayerId = fc.credentials.copayerId;
|
$scope.copayerId = fc.credentials.copayerId;
|
||||||
|
|
Loading…
Reference in New Issue