From a85e67185796ce8c89c67bfc1a9f4745910e3700 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 18 Jul 2017 15:06:31 -0300
Subject: [PATCH] Fix UI custom fee

---
 src/js/controllers/modals/feeLevels.js        |  7 ++---
 .../includes/modals/choose-fee-level.scss     | 16 ++++------
 www/views/modals/chooseFeeLevel.html          | 30 ++++++++++---------
 3 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/js/controllers/modals/feeLevels.js b/src/js/controllers/modals/feeLevels.js
index 9006fcd01..72a3e2abf 100644
--- a/src/js/controllers/modals/feeLevels.js
+++ b/src/js/controllers/modals/feeLevels.js
@@ -4,7 +4,6 @@ angular.module('copayApp.controllers').controller('feeLevelsController', functio
 
   var FEE_MULTIPLIER = 10;
   var FEE_MIN = 0;
-  var FEE_MAX = 1000000;
 
   var showErrorAndClose = function(title, msg) {
     title = title || gettextCatalog.getString('Error');
@@ -35,10 +34,10 @@ angular.module('copayApp.controllers').controller('feeLevelsController', functio
   };
 
   $scope.setFeesRecommended = function() {
-    $scope.minFeeAllowed = FEE_MIN;
-    $scope.maxFeeAllowed = FEE_MAX;
-    $scope.maxFeeRecommended = getMaxRecommended() * FEE_MULTIPLIER;
+    $scope.maxFeeRecommended = getMaxRecommended();
     $scope.minFeeRecommended = getMinRecommended();
+    $scope.minFeeAllowed = FEE_MIN;
+    $scope.maxFeeAllowed = $scope.maxFeeRecommended * FEE_MULTIPLIER;
   };
 
   $scope.checkFees = function(feePerSatByte) {
diff --git a/src/sass/views/includes/modals/choose-fee-level.scss b/src/sass/views/includes/modals/choose-fee-level.scss
index c37e9b505..920502698 100644
--- a/src/sass/views/includes/modals/choose-fee-level.scss
+++ b/src/sass/views/includes/modals/choose-fee-level.scss
@@ -4,11 +4,14 @@
     text-align: center;
     background: #f9f9f9;
     font-size: 11px;
-    height: 120px;
+    height: 140px;
     padding-top: 25px;
     .row {
       padding: 0;
     }
+    .col {
+      padding-top: 15px;
+    }
     .separator {
       border-left: 1px solid #d9d9df;
       height: 75%;
@@ -36,17 +39,8 @@
       }
     }
   }
-  .warning-fee {
-    padding: 5px 10px;
-    color: $v-warning-color;
-    font-size: 12px;
-    text-align: center;
-    i {
-      margin-right: 8px;
-    }
-  }
   .error-fee {
-    padding: 5px 10px;
+    padding: 8px 10px;
     color: $v-error-color;
     font-size: 12px;
     text-align: center;
diff --git a/www/views/modals/chooseFeeLevel.html b/www/views/modals/chooseFeeLevel.html
index 851cb3096..b0155ed42 100644
--- a/www/views/modals/chooseFeeLevel.html
+++ b/www/views/modals/chooseFeeLevel.html
@@ -49,20 +49,22 @@
               <span class="unit">sat/byte</span>
             </label>
           </div>
-          <div class="error-fee" ng-if="showError">
-            <i class="icon ion-close-circled"></i>
-            <span translate>
-              Transactions without fee are not supported.
-            </span>
-          </div>
-          <div class="warning-fee" ng-if="showMinWarning || showMaxWarning">
-            <i class="icon ion-alert-circled"></i>
-            <span ng-if="showMinWarning" translate>
-              Your fee is lower than recommended.
-            </span>
-            <span ng-if="showMaxWarning" translate>
-              You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte.
-            </span>
+          <div class="error-fee">
+            <div ng-if="showError">
+              <i class="icon ion-close-circled"></i>
+              <span translate>
+                Transactions without fee are not supported.
+              </span>
+            </div>
+            <div ng-if="showMinWarning || showMaxWarning">
+              <i class="icon ion-alert-circled"></i>
+              <span ng-if="showMinWarning" translate>
+                Your fee is lower than recommended.
+              </span>
+              <span ng-if="showMaxWarning" translate>
+                You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte.
+              </span>
+            </div>
           </div>
         </div>
       </div>