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

Improvement - 312 - Wrong flow on camera permissions

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-05-09 16:12:09 +09:00
commit 068c2a769f
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/js/controllers/amount.js
View file

@ -253,12 +253,10 @@ angular.module('copayApp.controllers').controller('amountController', function($
}; };
$scope.changeUnit = function() { $scope.changeUnit = function() {
$scope.amountModel.amount = '0';
if ($scope.alternativeAmount == 0) { $scope.amountModel.amount = '0';
$scope.alternativeAmount = null; if ($scope.alternativeAmount && $scope.alternativeAmount > 0) {
} else { $scope.amountModel.amount = $scope.alternativeAmount;
$scope.amountModel.amount = parseFloat($scope.alternativeAmount.replace(/[^0-9-.]/g, ''));
} }
if (fixedUnit) return; if (fixedUnit) return;
@ -269,7 +267,6 @@ angular.module('copayApp.controllers').controller('amountController', function($
} }
if (availableUnits[unitIndex].isFiat) { if (availableUnits[unitIndex].isFiat) {
$scope.amountModel.amount = parseFloat($scope.amountModel.amount).toFixed(2);
altUnitIndex = altUnitIndex == 0 && availableUnits.length > 2 ? 1 : 0; altUnitIndex = altUnitIndex == 0 && availableUnits.length > 2 ? 1 : 0;
} else { } else {
altUnitIndex = lodash.findIndex(availableUnits, { altUnitIndex = lodash.findIndex(availableUnits, {