From 2cc9554df450736d9394833cfbba13cca920aba9 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 24 Jul 2015 12:23:30 -0300
Subject: [PATCH] Fixes names

---
 public/views/modals/fee.html     |  2 +-
 public/views/walletHome.html     |  4 ++--
 src/js/controllers/walletHome.js |  2 +-
 src/js/services/feeService.js    | 35 ++++++++------------------------
 4 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/public/views/modals/fee.html b/public/views/modals/fee.html
index 13fd682b5..a52eee2fe 100644
--- a/public/views/modals/fee.html
+++ b/public/views/modals/fee.html
@@ -12,7 +12,7 @@
 </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"> 
     <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">
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 68f3f1302..03f1a3f29 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -399,14 +399,14 @@
               </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)"
                 ng-show="index.currentFeeLevel == fee.level">
                 <span translate>Fee</span>: 
                 <span class="text-light" translate>{{fee.feePerKBUnit}} per kB</span> 
                 (<span translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</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 class="row">
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 2473f0555..ae485f5ab 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -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 ModalInstanceCtrl = function($scope, $modalInstance) {
diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js
index e4e753a04..88a84eb23 100644
--- a/src/js/services/feeService.js
+++ b/src/js/services/feeService.js
@@ -3,23 +3,6 @@
 angular.module('copayApp.services').factory('feeService', function($log, lodash, profileService, configService, gettext) {
   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) { 
     var fc = profileService.focusedClient;
     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('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++) {
-        levelsLivenet[i]['feePerKBUnit'] = profileService.formatAmount(levelsLivenet[i].feePerKB) + ' ' + unitName;
-        levelsTestnet[i]['feePerKBUnit'] = profileService.formatAmount(levelsTestnet[i].feePerKB) + ' ' + unitName;
-      }
+        for (var i = 0; i < 3; i++) {
+          levelsLivenet[i]['feePerKBUnit'] = profileService.formatAmount(levelsLivenet[i].feePerKB) + ' ' + unitName;
+          levelsTestnet[i]['feePerKBUnit'] = profileService.formatAmount(levelsTestnet[i].feePerKB) + ' ' + unitName;
+        }
 
-      return cb({
-        'livenet': levelsLivenet,
-        'testnet': levelsTestnet
-      });
+        return cb({
+          'livenet': levelsLivenet,
+          'testnet': levelsTestnet
+        });
       });
     });
   };