From 10892f860fc8418d6b69a79b1f4b5d075dc44fe2 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Thu, 9 Jun 2016 10:32:40 -0300
Subject: [PATCH 1/3] fix spinner color

---
 public/views/preferencesFee.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html
index 878e5909d..85196e01f 100644
--- a/public/views/preferencesFee.html
+++ b/public/views/preferencesFee.html
@@ -8,7 +8,7 @@
   <div class="preferences-fee" ng-show="prefFee.loading">
     <div  class="row p20 text-center">
       <div class="columns large-12 medium-12 small-12 m10b">
-        <ion-spinner class="spinner-stable" icon="lines"></ion-spinner>
+        <ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
       </div>
       <div class="size-12 text-gray m20t" translate>
         Loading...

From 376b52e93a640aa4ce3f13888f8a1f2561e8dfa8 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Thu, 9 Jun 2016 11:55:21 -0300
Subject: [PATCH 2/3] Fix selection fee level

---
 public/views/preferencesFee.html     | 13 +++++--------
 src/css/ionic-migration.css          |  4 ++++
 src/js/controllers/preferencesFee.js |  8 +++++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html
index 85196e01f..ce39dacf9 100644
--- a/public/views/preferencesFee.html
+++ b/public/views/preferencesFee.html
@@ -15,16 +15,13 @@
       </div>
     </div>
   </div>
-  <ul class="no-bullet m0">
-    <li ng-repeat="fee in prefFee.feeLevels.livenet"
-      ng-click="prefFee.save(fee.level)">
-      {{prefFee.feeOpts[fee.level]|translate}}
-      <i class="fi-check size-16 right" ng-show="prefFee.currentFeeLevel == fee.level"></i>
-    </li>
-  </ul>
+
+  <ion-radio class="size-12" ng-repeat="fee in prefFee.feeLevels.livenet" ng-value="fee.level" ng-model="data.currentFeeLevel"
+    ng-click="prefFee.save(fee)">{{prefFee.feeOpts[fee.level]|translate}}
+  </ion-radio>
 
   <div class="row m20t">
-    <div class="text-gray size-12 text-center" ng-repeat="fee in prefFee.feeLevels.livenet" ng-if="fee.level == prefFee.currentFeeLevel">
+    <div class="text-gray size-12 text-center" ng-repeat="fee in prefFee.feeLevels.livenet" ng-if="fee.level == data.currentFeeLevel">
       <div ng-show="fee.nbBlocks">
         <span translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>.
       </div>
diff --git a/src/css/ionic-migration.css b/src/css/ionic-migration.css
index 3cea2be6c..d1cf5e5e1 100644
--- a/src/css/ionic-migration.css
+++ b/src/css/ionic-migration.css
@@ -20,6 +20,10 @@
 	z-index: -1;
 }
 
+.item-radio .radio-icon {
+	font-size: 16px;
+}
+
 .popup-container.active .popup {
 	border-radius: 10px;
 }
diff --git a/src/js/controllers/preferencesFee.js b/src/js/controllers/preferencesFee.js
index 9093dc236..774acf08a 100644
--- a/src/js/controllers/preferencesFee.js
+++ b/src/js/controllers/preferencesFee.js
@@ -9,7 +9,9 @@ angular.module('copayApp.controllers').controller('preferencesFeeController',
       feeService.getFeeLevels(function(levels) {
         self.loading = false;
         self.feeOpts = feeService.feeOpts;
-        self.currentFeeLevel = feeService.getCurrentFeeLevel();     
+        $scope.data = {
+          currentFeeLevel: feeService.getCurrentFeeLevel()
+        };
         self.feeLevels = levels;
         $scope.$apply();
       });
@@ -20,14 +22,14 @@ angular.module('copayApp.controllers').controller('preferencesFeeController',
       var opts = {
         wallet: {
           settings: {
-            feeLevel: newFee
+            feeLevel: newFee.level
           }
         }
       };
 
       configService.set(opts, function(err) {
         if (err) $log.debug(err);
-        self.currentFeeLevel = feeService.getCurrentFeeLevel();     
+        $scope.currentFeeLevel = newFee.level;
       });
 
     };

From 93b789f050f8c7b3784f24ef2c9a01de55574fd7 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Thu, 9 Jun 2016 12:06:13 -0300
Subject: [PATCH 3/3] add bold style

---
 public/views/preferencesFee.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html
index ce39dacf9..38963d26b 100644
--- a/public/views/preferencesFee.html
+++ b/public/views/preferencesFee.html
@@ -23,13 +23,13 @@
   <div class="row m20t">
     <div class="text-gray size-12 text-center" ng-repeat="fee in prefFee.feeLevels.livenet" ng-if="fee.level == data.currentFeeLevel">
       <div ng-show="fee.nbBlocks">
-        <span translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>.
+        <span class="text-bold" translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>.
       </div>
-      <span class="size-12 text-light" translate>Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB</span>
+      <span class="text-bold" translate>Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB</span>
     </div>
   </div>
 
-  <div class="row m20t">
+  <div class="m15">
     <div class="text-gray size-12 text-center" translate>
       Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy.
     </div>