diff --git a/src/js/controllers/preferencesFee.js b/src/js/controllers/preferencesFee.js index 55ffe42a7..94fe0d3ff 100644 --- a/src/js/controllers/preferencesFee.js +++ b/src/js/controllers/preferencesFee.js @@ -53,11 +53,11 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', fu level: $scope.currentFeeLevel }); if (lodash.isEmpty(feeLevelValue)) { - $scope.feePerKBUnit = null; + $scope.feePerSatByte = null; $scope.avgConfirmationTime = null; return; } - $scope.feePerKBUnit = feeLevelValue.feePerKBUnit; + $scope.feePerSatByte = (feeLevelValue.feePerKB / 1000).toFixed(); $scope.avgConfirmationTime = feeLevelValue.nbBlocks * 10; }; }); diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index 0e4deabc7..51fc62207 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -50,12 +50,7 @@ angular.module('copayApp.services').factory('feeService', function($log, $stateP walletClient.getFeeLevels('testnet', function(errTestnet, levelsTestnet) { if (errLivenet || errTestnet) { return cb(gettextCatalog.getString('Could not get dynamic fee')); - } else { - lodash.each(lodash.union(levelsLivenet, levelsTestnet), function(level) { - level.feePerKBUnit = txFormatService.formatAmount(level.feePerKB) + ' ' + unitName; - }); } - return cb(null, { 'livenet': levelsLivenet, 'testnet': levelsTestnet diff --git a/www/views/preferencesFee.html b/www/views/preferencesFee.html index 8254f912c..0a038300c 100644 --- a/www/views/preferencesFee.html +++ b/www/views/preferencesFee.html @@ -12,13 +12,13 @@