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

Fix - 244 - Clear the amount after switching, limit by 8 after comma

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-05-09 17:01:05 +09:00
commit 3fae07d5fa
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
var satToBtc; var satToBtc;
var SMALL_FONT_SIZE_LIMIT = 10; var SMALL_FONT_SIZE_LIMIT = 10;
var LENGTH_EXPRESSION_LIMIT = 19; var LENGTH_EXPRESSION_LIMIT = 19;
var LENGTH_COMMA_EXPRESSION_LIMIT = 8;
var isNW = platformInfo.isNW; var isNW = platformInfo.isNW;
var unitIndex = 0; var unitIndex = 0;
@ -255,9 +256,6 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.changeUnit = function() { $scope.changeUnit = function() {
$scope.amountModel.amount = '0'; $scope.amountModel.amount = '0';
if ($scope.alternativeAmount && $scope.alternativeAmount > 0) {
$scope.amountModel.amount = $scope.alternativeAmount;
}
if (fixedUnit) return; if (fixedUnit) return;
@ -301,6 +299,11 @@ angular.module('copayApp.controllers').controller('amountController', function($
}; };
$scope.pushDigit = function(digit) { $scope.pushDigit = function(digit) {
if ($scope.amountModel.amount) {
var amountSplitByComma = $scope.amountModel.amount.split('.');
if (amountSplitByComma.length > 1 && amountSplitByComma[1].length >= LENGTH_COMMA_EXPRESSION_LIMIT) return;
}
if ($scope.amountModel.amount && $scope.amountModel.amount.length >= LENGTH_EXPRESSION_LIMIT) return; if ($scope.amountModel.amount && $scope.amountModel.amount.length >= LENGTH_EXPRESSION_LIMIT) return;
if (($scope.amountModel.amount.indexOf('.') > -1 || $scope.amountModel.amount == '') && digit == '.') return; if (($scope.amountModel.amount.indexOf('.') > -1 || $scope.amountModel.amount == '') && digit == '.') return;
if ($scope.amountModel.amount == '0' && digit == '0') return; if ($scope.amountModel.amount == '0' && digit == '0') return;

2
src/sass/views/amount.scss
View file

@ -337,7 +337,7 @@
right: 0; right: 0;
top: 50%; top: 50%;
transform: translate(0, -50%); transform: translate(0, -50%);
padding: 5px; padding: 15px;
img { img {
width: 18px; width: 18px;