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

amount on custom amount screen

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-07-19 15:21:27 +02:00
commit 8ddfffd56b
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
3 changed files with 69 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,6 +64,14 @@ angular.module('copayApp.controllers').controller('customAmountController', func
var currency = parsedAmount.currency;
$scope.amountUnitStr = parsedAmount.amountUnitStr;
configService.whenAvailable(function (config) {
$scope.selectedPriceDisplay = config.wallet.settings.priceDisplay;
$timeout(function () {
$scope.$apply();
});
});
if (currency != 'BTC' && currency != 'BCH') {
// Convert to BTC or BCH
var config = configService.getSync().wallet.settings;
@ -71,7 +79,7 @@ angular.module('copayApp.controllers').controller('customAmountController', func
var btcParsedAmount = txFormatService.parseAmount($scope.wallet.coin, amountUnit, $scope.wallet.coin);
$scope.amountBtc = btcParsedAmount.amount;
$scope.altAmountStr = btcParsedAmount.amountUnitStr;
$scope.altAmountStr = btcParsedAmount.amountUnitStr.toUpperCase();
} else {
$scope.amountBtc = amount; // BTC or BCH
$scope.altAmountStr = txFormatService.formatAlternativeStr($scope.wallet.coin, parsedAmount.amountSat);