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

Fix selection fee level

Browse source
This commit is contained in:
Javier 2016-06-09 11:55:21 -03:00
commit 376b52e93a
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
public/views/preferencesFee.html
View file

@ -15,16 +15,13 @@
</div> </div>
</div> </div>
</div> </div>
<ul class="no-bullet m0">
<li ng-repeat="fee in prefFee.feeLevels.livenet" <ion-radio class="size-12" ng-repeat="fee in prefFee.feeLevels.livenet" ng-value="fee.level" ng-model="data.currentFeeLevel"
ng-click="prefFee.save(fee.level)"> ng-click="prefFee.save(fee)">{{prefFee.feeOpts[fee.level]|translate}}
{{prefFee.feeOpts[fee.level]|translate}} </ion-radio>
<i class="fi-check size-16 right" ng-show="prefFee.currentFeeLevel == fee.level"></i>
</li>
</ul>
<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 == prefFee.currentFeeLevel"> <div class="text-gray size-12 text-center" ng-repeat="fee in prefFee.feeLevels.livenet" ng-if="fee.level == data.currentFeeLevel">
<div ng-show="fee.nbBlocks"> <div ng-show="fee.nbBlocks">
<span translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>. <span translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>.
</div> </div>

4
src/css/ionic-migration.css
View file

@ -20,6 +20,10 @@
z-index: -1; z-index: -1;
} }
.item-radio .radio-icon {
font-size: 16px;
}
.popup-container.active .popup { .popup-container.active .popup {
border-radius: 10px; border-radius: 10px;
} }

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

@ -9,7 +9,9 @@ angular.module('copayApp.controllers').controller('preferencesFeeController',
feeService.getFeeLevels(function(levels) { feeService.getFeeLevels(function(levels) {
self.loading = false; self.loading = false;
self.feeOpts = feeService.feeOpts; self.feeOpts = feeService.feeOpts;
self.currentFeeLevel = feeService.getCurrentFeeLevel(); $scope.data = {
currentFeeLevel: feeService.getCurrentFeeLevel()
};
self.feeLevels = levels; self.feeLevels = levels;
$scope.$apply(); $scope.$apply();
}); });
@ -20,14 +22,14 @@ angular.module('copayApp.controllers').controller('preferencesFeeController',
var opts = { var opts = {
wallet: { wallet: {
settings: { settings: {
feeLevel: newFee feeLevel: newFee.level
} }
} }
}; };
configService.set(opts, function(err) { configService.set(opts, function(err) {
if (err) $log.debug(err); if (err) $log.debug(err);
self.currentFeeLevel = feeService.getCurrentFeeLevel(); $scope.currentFeeLevel = newFee.level;
}); });
}; };