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

Merge pull request #4354 from JDonadio/ref/preferences-fee

Browse source 
Preferences > Fee - Use scope only
This commit is contained in:
Gustavo Maximiliano Cortez 2016-06-13 10:29:54 -03:00 • committed by GitHub
commit c2b9813eda
2 changed files with 28 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
public/views/preferencesFee.html
View file

@ -3,9 +3,9 @@
ng-include="'views/includes/topbar.html'" ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Bitcoin Network Fee Policy'; goBackToState = 'preferencesGlobal'; noColor = true"> ng-init="titleSection='Bitcoin Network Fee Policy'; goBackToState = 'preferencesGlobal'; noColor = true">
</div> </div>
<div class="content preferences" ng-controller="preferencesFeeController as prefFee" ng-init="prefFee.init()"> <div class="content preferences" ng-controller="preferencesFeeController">
<h4></h4> <h4></h4>
<div class="preferences-fee" ng-show="prefFee.loading"> <div class="preferences-fee" ng-show="loading">
<div class="row p20 text-center"> <div class="row p20 text-center">
<div class="columns large-12 medium-12 small-12 m10b"> <div class="columns large-12 medium-12 small-12 m10b">
<ion-spinner class="spinner-dark" icon="lines"></ion-spinner> <ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
@ -16,12 +16,12 @@
</div> </div>
</div> </div>
<ion-radio class="libe-b size-12 radio-label" ng-repeat="fee in prefFee.feeLevels.livenet" ng-value="fee.level" ng-model="data.currentFeeLevel" <ion-radio class="libe-b size-12 radio-label" ng-repeat="fee in feeLevels.livenet" ng-value="fee.level" ng-model="currentFeeLevel"
ng-click="prefFee.save(fee)">{{prefFee.feeOpts[fee.level]|translate}} ng-click="save(fee)">{{feeOpts[fee.level]|translate}}
</ion-radio> </ion-radio>
<div class="row m20t"> <div class="row m20t">
<div class="text-gray size-12 text-center" ng-repeat="fee in prefFee.feeLevels.livenet" ng-if="fee.level == data.currentFeeLevel"> <div class="text-gray size-12 text-center" ng-repeat="fee in feeLevels.livenet" ng-if="fee.level == currentFeeLevel">
<div ng-show="fee.nbBlocks"> <div ng-show="fee.nbBlocks">
<span class="text-bold" translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>. <span class="text-bold" translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>.
</div> </div>

23
src/js/controllers/preferencesFee.js
View file

@ -1,24 +1,18 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('preferencesFeeController', angular.module('copayApp.controllers').controller('preferencesFeeController', function($scope, configService, feeService) {
function($scope, $rootScope, configService, feeService) {
$scope.loading = true;
this.init = function() {
var self = this;
this.loading = true;
feeService.getFeeLevels(function(levels) { feeService.getFeeLevels(function(levels) {
self.loading = false; $scope.loading = false;
self.feeOpts = feeService.feeOpts; $scope.feeOpts = feeService.feeOpts;
$scope.data = { $scope.currentFeeLevel = feeService.getCurrentFeeLevel();
currentFeeLevel: feeService.getCurrentFeeLevel() $scope.feeLevels = levels;
};
self.feeLevels = levels;
$scope.$apply(); $scope.$apply();
}); });
};
this.save = function(newFee) { $scope.save = function(newFee) {
var self = this;
var opts = { var opts = {
wallet: { wallet: {
settings: { settings: {
@ -31,6 +25,5 @@ angular.module('copayApp.controllers').controller('preferencesFeeController',
if (err) $log.debug(err); if (err) $log.debug(err);
$scope.currentFeeLevel = newFee.level; $scope.currentFeeLevel = newFee.level;
}); });
}; };
}); });