From 7b802b7f9af1bb0616b02a294f50d58862b3e7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Mon, 10 Jul 2017 14:07:01 -0300 Subject: [PATCH] avoid negative fee --- src/js/controllers/preferencesFee.js | 3 ++- www/views/modals/chooseFeeLevel.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/preferencesFee.js b/src/js/controllers/preferencesFee.js index 1811f4f32..9339b413e 100644 --- a/src/js/controllers/preferencesFee.js +++ b/src/js/controllers/preferencesFee.js @@ -80,8 +80,9 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', fu var showCustomFeePrompt = function() { $scope.invalidCustomFeeEntered = true; $scope.showMaxWarning = false; + $scope.showMinWarning = false; popupService.showPrompt(gettextCatalog.getString('Custom Fee'), gettextCatalog.getString('Set your own fee in satoshis/byte'), null, function(text) { - if (!text || !parseInt(text)) return; + if (!text || !parseInt(text) || parseInt(text) <= 0) return; $scope.feePerSatByte = parseInt(text); $scope.customFeePerKB = ($scope.feePerSatByte * 1000).toFixed(); setMaxWarning(); diff --git a/www/views/modals/chooseFeeLevel.html b/www/views/modals/chooseFeeLevel.html index 90d59169d..c651b146d 100644 --- a/www/views/modals/chooseFeeLevel.html +++ b/www/views/modals/chooseFeeLevel.html @@ -31,7 +31,7 @@
- Your fee is lower than the minimum recommended ({{getMinimumRecommeded()}} satoshis/byte). Your transaction may never get confirmed. + Your fee is lower than the recommended super economy fee ({{getMinimumRecommeded()}} satoshis/byte). Your transaction may never get confirmed.