From 458a17e0bed0c5d34c65b43512c036acc8261d41 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 30 Jul 2015 15:26:16 -0300 Subject: [PATCH] Uses object for level options --- public/views/preferences.html | 2 +- public/views/preferencesFee.html | 2 +- src/js/controllers/index.js | 4 ++-- src/js/services/feeService.js | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/views/preferences.html b/public/views/preferences.html index 6f3c7db24..c5f31797e 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -81,7 +81,7 @@ Bitcoin Network Fee Policy - {{index.currentFeeLevel|translate}} + {{index.feeOpts[index.currentFeeLevel]|translate}}
  • diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index a1c2c4c84..cc9d8c9b6 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -7,7 +7,7 @@ diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 737cb0520..c47660b94 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -10,12 +10,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r return (parseFloat(number.toPrecision(12))); }; - self.goHome = function() { go.walletHome(); }; - self.menu = [{ 'title': gettext('Home'), 'icon': 'icon-home', @@ -66,6 +64,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r isoCode: 'ja', }]; + self.feeOpts = feeService.feeOpts; + self.setOngoingProcess = function(processName, isOn) { $log.debug('onGoingProcess', processName, isOn); self[processName] = isOn; diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index c76c76223..99dde9bff 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -4,11 +4,11 @@ angular.module('copayApp.services').factory('feeService', function($log, profile var root = {}; // Constant fee options to translate - var feeOpts = [ - gettextCatalog.getString('priority'), - gettextCatalog.getString('normal'), - gettextCatalog.getString('economy') - ]; + root.feeOpts = { + priority: gettextCatalog.getString('Priority'), + normal: gettextCatalog.getString('Normal'), + economy: gettextCatalog.getString('Economy') + }; root.getCurrentFeeValue = function(cb) { var fc = profileService.focusedClient;