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

Fixes names

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-07-24 12:23:30 -03:00
commit 2cc9554df4
4 changed files with 13 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/modals/fee.html
View file

@ -12,7 +12,7 @@
</nav> </nav>
<div class="modal-content fix-modals-touch" ng-controller="preferencesFeeController as prefFee"> <div class="modal-content fix-modals-touch">
<ul class="no-bullet m0 size-14"> <ul class="no-bullet m0 size-14">
<h4 class="title m0" translate>Fee level</h4> <h4 class="title m0" translate>Fee level</h4>
<li ng-repeat="fee in (network == 'livenet' ? feeLevels.livenet : feeLevels.testnet)" ng-click="save(fee.level)" class="line-b p20"> <li ng-repeat="fee in (network == 'livenet' ? feeLevels.livenet : feeLevels.testnet)" ng-click="save(fee.level)" class="line-b p20">

4
public/views/walletHome.html
View file

@ -399,14 +399,14 @@
</div> </div>
</div> </div>
<div class="text-right size-12 m10b"> <div class="text-right size-12 m10b" ng-if="index.feeLevels.livenet && index.feeLevels.testnet">
<span ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)" <span ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)"
ng-show="index.currentFeeLevel == fee.level"> ng-show="index.currentFeeLevel == fee.level">
<span translate>Fee</span>: <span translate>Fee</span>:
<span class="text-light" translate>{{fee.feePerKBUnit}} per kB</span> <span class="text-light" translate>{{fee.feePerKBUnit}} per kB</span>
(<span translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>) (<span translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>)
</span> </span>
<a href ng-click="home.openFeeModal(index.feeLevels, index.currentFeeLevel)" translate>Change</a> <a href ng-click="home.openFeeLevelsModal(index.feeLevels, index.currentFeeLevel)" translate>Change</a>
</div> </div>
<div class="row"> <div class="row">

2
src/js/controllers/walletHome.js
View file

@ -977,7 +977,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
} }
}; };
this.openFeeModal = function(feeLevels, currentFeeLevel) { this.openFeeLevelsModal = function(feeLevels, currentFeeLevel) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var ModalInstanceCtrl = function($scope, $modalInstance) { var ModalInstanceCtrl = function($scope, $modalInstance) {

35
src/js/services/feeService.js
View file

@ -3,23 +3,6 @@
angular.module('copayApp.services').factory('feeService', function($log, lodash, profileService, configService, gettext) { angular.module('copayApp.services').factory('feeService', function($log, lodash, profileService, configService, gettext) {
var root = {}; var root = {};
root.feeStaticOpts = [{
name: gettext('Priority'),
level: 'priority',
feePerKB: 10000,
nbBlocks: 1
}, {
name: gettext('Normal'),
level: 'normal',
feePerKB: 5000,
nbBlocks: 4
}, {
name: gettext('Economy'),
level: 'economy',
feePerKB: 1000,
nbBlocks: 12
}];
root.getCurrentFeeValue = function(cb) { root.getCurrentFeeValue = function(cb) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var config = configService.getSync().wallet.settings; var config = configService.getSync().wallet.settings;
@ -69,17 +52,17 @@ angular.module('copayApp.services').factory('feeService', function($log, lodash,
fc.getFeeLevels('livenet', function(errLivenet, levelsLivenet) { fc.getFeeLevels('livenet', function(errLivenet, levelsLivenet) {
fc.getFeeLevels('testnet', function(errTestnet, levelsTestnet) { fc.getFeeLevels('testnet', function(errTestnet, levelsTestnet) {
if (errLivenet || errTestnet) $log.error('Error getting dynamic fee'); if (errLivenet || errTestnet) $log.error('Error getting dynamic fee');
for (var i = 0; i < 3; i++) { for (var i = 0; i < 3; i++) {
levelsLivenet[i]['feePerKBUnit'] = profileService.formatAmount(levelsLivenet[i].feePerKB) + ' ' + unitName; levelsLivenet[i]['feePerKBUnit'] = profileService.formatAmount(levelsLivenet[i].feePerKB) + ' ' + unitName;
levelsTestnet[i]['feePerKBUnit'] = profileService.formatAmount(levelsTestnet[i].feePerKB) + ' ' + unitName; levelsTestnet[i]['feePerKBUnit'] = profileService.formatAmount(levelsTestnet[i].feePerKB) + ' ' + unitName;
} }
return cb({ return cb({
'livenet': levelsLivenet, 'livenet': levelsLivenet,
'testnet': levelsTestnet 'testnet': levelsTestnet
}); });
}); });
}); });
}; };