From f681122fd6ba84f91676604a25999075320fc862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 17 May 2017 16:37:49 -0300
Subject: [PATCH] change unit/kB for sat/Byte in fee rate

---
 src/js/controllers/preferencesFee.js | 4 ++--
 src/js/services/feeService.js        | 5 -----
 www/views/preferencesFee.html        | 6 +++---
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/js/controllers/preferencesFee.js b/src/js/controllers/preferencesFee.js
index 55ffe42a7..94fe0d3ff 100644
--- a/src/js/controllers/preferencesFee.js
+++ b/src/js/controllers/preferencesFee.js
@@ -53,11 +53,11 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', fu
       level: $scope.currentFeeLevel
     });
     if (lodash.isEmpty(feeLevelValue)) {
-      $scope.feePerKBUnit = null;
+      $scope.feePerSatByte = null;
       $scope.avgConfirmationTime = null;
       return;
     }
-    $scope.feePerKBUnit = feeLevelValue.feePerKBUnit;
+    $scope.feePerSatByte = (feeLevelValue.feePerKB / 1000).toFixed();
     $scope.avgConfirmationTime = feeLevelValue.nbBlocks * 10;
   };
 });
diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js
index 0e4deabc7..51fc62207 100644
--- a/src/js/services/feeService.js
+++ b/src/js/services/feeService.js
@@ -50,12 +50,7 @@ angular.module('copayApp.services').factory('feeService', function($log, $stateP
       walletClient.getFeeLevels('testnet', function(errTestnet, levelsTestnet) {
         if (errLivenet || errTestnet) {
           return cb(gettextCatalog.getString('Could not get dynamic fee'));
-        } else {
-          lodash.each(lodash.union(levelsLivenet, levelsTestnet), function(level) {
-            level.feePerKBUnit = txFormatService.formatAmount(level.feePerKB) + ' ' + unitName;
-          });
         }
-
         return cb(null, {
           'livenet': levelsLivenet,
           'testnet': levelsTestnet
diff --git a/www/views/preferencesFee.html b/www/views/preferencesFee.html
index 8254f912c..0a038300c 100644
--- a/www/views/preferencesFee.html
+++ b/www/views/preferencesFee.html
@@ -12,13 +12,13 @@
       <div class="settings-description" translate>The higher the fee, the greater the incentive a miner has to include that transaction in a block. Current fees are determined based on network load and the selected policy.</div>
       <div class="estimates">
         <div>
-          <span translate>Average confirmation time</span>: 
+          <span translate>Average confirmation time</span>:
           <span class="fee-minutes" ng-if="avgConfirmationTime">{{avgConfirmationTime | amDurationFormat: 'minute'}}</span>
           <span ng-if="loadingFee">...</span>
         </div>
         <div>
-          <span translate>Current fee rate for this policy</span>: 
-          <span class="fee-rate" ng-if="feePerKBUnit">{{feePerKBUnit}}/kiB</span>
+          <span translate>Current fee rate for this policy</span>:
+          <span class="fee-rate" ng-if="feePerSatByte">{{feePerSatByte}} sat/Byte</span>
           <span ng-if="loadingFee">...</span>
         </div>
       </div>