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

Set min max allowed valued

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2017-07-18 12:36:32 -03:00
commit 3cac9a30bc
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/js/controllers/modals/feeLevels.js
View file

@ -2,7 +2,9 @@
angular.module('copayApp.controllers').controller('feeLevelsController', function($scope, $timeout, $log, lodash, gettextCatalog, configService, feeService, ongoingProcess, popupService) { angular.module('copayApp.controllers').controller('feeLevelsController', function($scope, $timeout, $log, lodash, gettextCatalog, configService, feeService, ongoingProcess, popupService) {
var MAX_RECOMMENDED_FEE = 1000; var FEE_MULTIPLIER = 10;
var FEE_MIN = 0;
var FEE_MAX = 1000000;
var showErrorAndClose = function(title, msg) { var showErrorAndClose = function(title, msg) {
title = title || gettextCatalog.getString('Error'); title = title || gettextCatalog.getString('Error');
@ -21,7 +23,10 @@ angular.module('copayApp.controllers').controller('feeLevelsController', functio
}; };
var getMaxRecommended = function() { var getMaxRecommended = function() {
return MAX_RECOMMENDED_FEE; var value = lodash.find($scope.feeLevels[$scope.network], {
level: 'urgent'
});
return parseInt((value.feePerKB / 1000).toFixed());
}; };
$scope.ok = function() { $scope.ok = function() {
@ -30,18 +35,22 @@ angular.module('copayApp.controllers').controller('feeLevelsController', functio
}; };
$scope.setFeesRecommended = function() { $scope.setFeesRecommended = function() {
$scope.maxFeeRecommended = getMaxRecommended(); $scope.minFeeAllowed = FEE_MIN;
$scope.maxFeeAllowed = FEE_MAX;
$scope.maxFeeRecommended = getMaxRecommended() * FEE_MULTIPLIER;
$scope.minFeeRecommended = getMinRecommended(); $scope.minFeeRecommended = getMinRecommended();
}; };
$scope.checkFees = function(feePerSatByte) { $scope.checkFees = function(feePerSatByte) {
if (Number(feePerSatByte) == 0) $scope.showError = true; var fee = Number(feePerSatByte);
if (fee <= $scope.minFeeAllowed) $scope.showError = true;
else $scope.showError = false; else $scope.showError = false;
if (Number(feePerSatByte) < $scope.minFeeRecommended) $scope.showMinWarning = true; if (fee > $scope.minFeeAllowed && fee < $scope.minFeeRecommended) $scope.showMinWarning = true;
else $scope.showMinWarning = false; else $scope.showMinWarning = false;
if (Number(feePerSatByte) > $scope.maxFeeRecommended) $scope.showMaxWarning = true; if (fee < $scope.maxFeeAllowed && fee > $scope.maxFeeRecommended) $scope.showMaxWarning = true;
else $scope.showMaxWarning = false; else $scope.showMaxWarning = false;
}; };

8
www/views/modals/chooseFeeLevel.html
View file

@ -39,8 +39,8 @@
<input <input
type="number" type="number"
placeholder="{{'Enter custom fee'|translate}}" placeholder="{{'Enter custom fee'|translate}}"
ng-min="0" ng-min="minFeeAllowed"
ng-max="maxFeeRecommended + 10000" ng-max="maxFeeAllowed"
min="minFeeRecommended" min="minFeeRecommended"
max="maxFeeRecommended" max="maxFeeRecommended"
ng-change="checkFees(customSatPerByte.value)" ng-change="checkFees(customSatPerByte.value)"
@ -52,7 +52,7 @@
<div class="error-fee" ng-if="showError"> <div class="error-fee" ng-if="showError">
<i class="icon ion-close-circled"></i> <i class="icon ion-close-circled"></i>
<span translate> <span translate>
Zero value for fee are not allowed. Transactions without fee are not supported.
</span> </span>
</div> </div>
<div class="warning-fee" ng-if="showMinWarning || showMaxWarning"> <div class="warning-fee" ng-if="showMinWarning || showMaxWarning">
@ -61,7 +61,7 @@
Your fee is lower than recommended. Your fee is lower than recommended.
</span> </span>
<span ng-if="showMaxWarning" translate> <span ng-if="showMaxWarning" translate>
You should not set a fee higher than 1000 satoshis/byte. You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte.
</span> </span>
</div> </div>
</div> </div>