anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

uppercase pipes

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-07-19 15:41:06 +02:00
commit 00ca5cded6
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/customAmount.js
View file

@ -79,7 +79,7 @@ angular.module('copayApp.controllers').controller('customAmountController', func
var btcParsedAmount = txFormatService.parseAmount($scope.wallet.coin, amountUnit, $scope.wallet.coin); var btcParsedAmount = txFormatService.parseAmount($scope.wallet.coin, amountUnit, $scope.wallet.coin);
$scope.amountBtc = btcParsedAmount.amount; $scope.amountBtc = btcParsedAmount.amount;
$scope.altAmountStr = btcParsedAmount.amountUnitStr.toUpperCase(); $scope.altAmountStr = btcParsedAmount.amountUnitStr;
} else { } else {
$scope.amountBtc = amount; // BTC or BCH $scope.amountBtc = amount; // BTC or BCH
$scope.altAmountStr = txFormatService.formatAlternativeStr($scope.wallet.coin, parsedAmount.amountSat); $scope.altAmountStr = txFormatService.formatAlternativeStr($scope.wallet.coin, parsedAmount.amountSat);

6
www/views/customAmount.html
View file

@ -36,11 +36,11 @@
<div ng-show="selectedPriceDisplay=='fiat'"> <div ng-show="selectedPriceDisplay=='fiat'">
<span class="size-36">{{amountUnitStr}}</span> <span class="size-36">{{amountUnitStr}}</span>
<div class="size-14 amount-alternative"> <div class="size-14 amount-alternative">
{{altAmountStr}} {{altAmountStr | uppercase}}
</div> </div>
</div> </div>
<div ng-show="selectedPriceDisplay=='crypto'"> <div ng-show="selectedPriceDisplay=='crypto'">
<span class="size-36">{{altAmountStr}}</span> <span class="size-36">{{altAmountStr | uppercase}}</span>
<div class="size-14 amount-alternative"> <div class="size-14 amount-alternative">
{{amountUnitStr}} {{amountUnitStr}}
</div> </div>
@ -80,7 +80,7 @@
<div class="item single-line"> <div class="item single-line">
<span class="label" translate>Amount</span> <span class="label" translate>Amount</span>
<span class="item-note"> <span class="item-note">
{{amountUnitStr}} - {{altAmountStr}} {{amountUnitStr}} - {{altAmountStr | uppercase}}
</span> </span>
</div> </div>
<div class="item single-line"> <div class="item single-line">