diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index 878e5909d..38963d26b 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -8,31 +8,28 @@
- +
Loading...
- + + {{prefFee.feeOpts[fee.level]|translate}} +
-
+
- Average confirmation time: {{fee.nbBlocks * 10}} minutes. + Average confirmation time: {{fee.nbBlocks * 10}} minutes.
- Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB + Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB
-
+
Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy.
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; }); };