From 3f27c3d2313841c2b10835f60f77ae71322a0a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 10 Jul 2017 14:19:38 -0300
Subject: [PATCH] code refactor

---
 src/js/controllers/confirm.js        | 21 +++++++++++++++------
 www/views/modals/chooseFeeLevel.html |  4 ++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 3cc2af5aa..f688ed3fc 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -22,6 +22,9 @@ angular.module('copayApp.controllers').controller('confirmController', function(
   var isCordova = platformInfo.isCordova;
   var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP;
 
+  //custom fee flag
+  var usingCustomFee = null;
+
   function refresh() {
     $timeout(function() {
       $scope.$apply();
@@ -202,7 +205,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
       txp.inputs = tx.sendMaxInfo.inputs;
       txp.fee = tx.sendMaxInfo.fee;
     } else {
-      if (tx.feeLevel == 'custom') {
+      if (usingCustomFee) {
         txp.feePerKb = tx.feeRate;
       } else txp.feeLevel = tx.feeLevel;
     }
@@ -252,7 +255,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     feeService.getFeeRate(tx.network, tx.feeLevel, function(err, feeRate) {
       if (err) return cb(err);
 
-      if (tx.feeLevel != 'custom') tx.feeRate = feeRate;
+      if (!usingCustomFee) tx.feeRate = feeRate;
       tx.feeLevelName = feeService.feeOpts[tx.feeLevel];
 
       if (!wallet)
@@ -559,7 +562,11 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     scope.network = tx.network;
     scope.feeLevel = tx.feeLevel;
     scope.noSave = true;
-    if (tx.feeLevel == 'custom') scope.feePerSatByte = (tx.feeRate / 1000).toFixed();
+
+    if (usingCustomFee) {
+      scope.customFeePerKB = tx.feeRate;
+      scope.feePerSatByte = (tx.feeRate / 1000).toFixed();
+    }
 
     $ionicModal.fromTemplateUrl('views/modals/chooseFeeLevel.html', {
       scope: scope,
@@ -573,14 +580,16 @@ angular.module('copayApp.controllers').controller('confirmController', function(
       scope.chooseFeeLevelModal.show();
     };
 
-    scope.hideModal = function(newFeeLevel, customFeePerKBValue) {
+    scope.hideModal = function(newFeeLevel, customFeePerKB) {
       scope.chooseFeeLevelModal.hide();
       $log.debug('New fee level choosen:' + newFeeLevel + ' was:' + tx.feeLevel);
 
-      if (tx.feeLevel == newFeeLevel && !customFeePerKBValue) return;
+      usingCustomFee = newFeeLevel == 'custom' ? true : false;
+
+      if (tx.feeLevel == newFeeLevel && !usingCustomFee) return;
 
       tx.feeLevel = newFeeLevel;
-      if (customFeePerKBValue) tx.feeRate = parseInt(customFeePerKBValue);
+      if (usingCustomFee) tx.feeRate = parseInt(customFeePerKB);
 
       updateTx(tx, wallet, {
         clearCache: true,
diff --git a/www/views/modals/chooseFeeLevel.html b/www/views/modals/chooseFeeLevel.html
index c651b146d..ba2aa85a4 100644
--- a/www/views/modals/chooseFeeLevel.html
+++ b/www/views/modals/chooseFeeLevel.html
@@ -13,12 +13,12 @@
         <div>
           <span translate>Average confirmation time</span>:
           <span class="fee-minutes" ng-if="avgConfirmationTime && currentFeeLevel != 'custom'">{{avgConfirmationTime | amDurationFormat: 'minute'}}</span>
-          <span class="fee-minutes" ng-if="currentFeeLevel == 'custom' && !invalidCustomFeeEntered" translate>Could not be estimated</span>
+          <span class="fee-minutes" ng-if="currentFeeLevel == 'custom' && !invalidCustomFeeEntered && !loadingFee" translate>Could not be estimated</span>
           <span ng-if="loadingFee || invalidCustomFeeEntered">...</span>
         </div>
         <div>
           <span translate>Current fee rate for this policy</span>:
-          <span class="fee-rate" ng-if="feePerSatByte && !invalidCustomFeeEntered">{{feePerSatByte}} satoshis/byte</span>
+          <span class="fee-rate" ng-if="feePerSatByte && !invalidCustomFeeEntered && !loadingFee">{{feePerSatByte}} satoshis/byte</span>
           <span ng-if="loadingFee || invalidCustomFeeEntered">...</span>
         </div>
         <span ng-if="network!='livenet'">[{{network}}]</span>