From 90ef40d5238e7161598b86539015679728937054 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Mon, 21 May 2018 12:31:59 +0900 Subject: [PATCH] Fix - 344 - Add comma like first character --- src/js/controllers/amount.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index 2d0a5aa28..ce09a4137 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -307,12 +307,18 @@ angular.module('copayApp.controllers').controller('amountController', function($ } 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 && digit == '.') return; if ($scope.amountModel.amount == '0' && digit == '0') return; if (availableUnits[unitIndex].isFiat && $scope.amountModel.amount.indexOf('.') > -1 && $scope.amountModel.amount[$scope.amountModel.amount.indexOf('.') + 2]) return; - if ($scope.amountModel.amount == '0' && digit != '.') { $scope.amountModel.amount = ''} - + if ($scope.amountModel.amount == '0' && digit != '.') { + $scope.amountModel.amount = ''; + } + + if ($scope.amountModel.amount == '' && digit == '.') { + $scope.amountModel.amount = '0'; + } + $scope.amountModel.amount = ($scope.amountModel.amount + digit).replace('..', '.'); checkFontSize(); $scope.processAmount();