From 376b52e93a640aa4ce3f13888f8a1f2561e8dfa8 Mon Sep 17 00:00:00 2001 From: Javier Date: Thu, 9 Jun 2016 11:55:21 -0300 Subject: [PATCH] Fix selection fee level --- public/views/preferencesFee.html | 13 +++++-------- src/css/ionic-migration.css | 4 ++++ src/js/controllers/preferencesFee.js | 8 +++++--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index 85196e01f..ce39dacf9 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -15,16 +15,13 @@ - + + {{prefFee.feeOpts[fee.level]|translate}} +
-
+
Average confirmation time: {{fee.nbBlocks * 10}} minutes.
diff --git a/src/css/ionic-migration.css b/src/css/ionic-migration.css index 3cea2be6c..d1cf5e5e1 100644 --- a/src/css/ionic-migration.css +++ b/src/css/ionic-migration.css @@ -20,6 +20,10 @@ z-index: -1; } +.item-radio .radio-icon { + font-size: 16px; +} + .popup-container.active .popup { border-radius: 10px; } diff --git a/src/js/controllers/preferencesFee.js b/src/js/controllers/preferencesFee.js index 9093dc236..774acf08a 100644 --- a/src/js/controllers/preferencesFee.js +++ b/src/js/controllers/preferencesFee.js @@ -9,7 +9,9 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', feeService.getFeeLevels(function(levels) { self.loading = false; self.feeOpts = feeService.feeOpts; - self.currentFeeLevel = feeService.getCurrentFeeLevel(); + $scope.data = { + currentFeeLevel: feeService.getCurrentFeeLevel() + }; self.feeLevels = levels; $scope.$apply(); }); @@ -20,14 +22,14 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', var opts = { wallet: { settings: { - feeLevel: newFee + feeLevel: newFee.level } } }; configService.set(opts, function(err) { if (err) $log.debug(err); - self.currentFeeLevel = feeService.getCurrentFeeLevel(); + $scope.currentFeeLevel = newFee.level; }); };