diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index 45b648619..7541487ad 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -3,9 +3,9 @@ ng-include="'views/includes/topbar.html'" ng-init="titleSection='Bitcoin Network Fee Policy'; goBackToState = 'preferencesGlobal'; noColor = true"> -
+

-
+
@@ -16,12 +16,12 @@
- {{prefFee.feeOpts[fee.level]|translate}} + {{feeOpts[fee.level]|translate}}
-
+
Average confirmation time: {{fee.nbBlocks * 10}} minutes.
diff --git a/src/js/controllers/preferencesFee.js b/src/js/controllers/preferencesFee.js index 774acf08a..c7b084df0 100644 --- a/src/js/controllers/preferencesFee.js +++ b/src/js/controllers/preferencesFee.js @@ -1,36 +1,29 @@ 'use strict'; -angular.module('copayApp.controllers').controller('preferencesFeeController', - function($scope, $rootScope, configService, feeService) { +angular.module('copayApp.controllers').controller('preferencesFeeController', function($scope, configService, feeService) { - this.init = function() { - var self = this; - this.loading = true; - feeService.getFeeLevels(function(levels) { - self.loading = false; - self.feeOpts = feeService.feeOpts; - $scope.data = { - currentFeeLevel: feeService.getCurrentFeeLevel() - }; - self.feeLevels = levels; - $scope.$apply(); - }); - }; + $scope.loading = true; - this.save = function(newFee) { - var self = this; - var opts = { - wallet: { - settings: { - feeLevel: newFee.level - } - } - }; - - configService.set(opts, function(err) { - if (err) $log.debug(err); - $scope.currentFeeLevel = newFee.level; - }); - - }; + feeService.getFeeLevels(function(levels) { + $scope.loading = false; + $scope.feeOpts = feeService.feeOpts; + $scope.currentFeeLevel = feeService.getCurrentFeeLevel(); + $scope.feeLevels = levels; + $scope.$apply(); }); + + $scope.save = function(newFee) { + var opts = { + wallet: { + settings: { + feeLevel: newFee.level + } + } + }; + + configService.set(opts, function(err) { + if (err) $log.debug(err); + $scope.currentFeeLevel = newFee.level; + }); + }; +});