From 0eb612ec3c04a3e55439e3e39842f0547f438730 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 30 Jun 2015 11:04:34 -0300
Subject: [PATCH 1/4] allow emergency fee

---
 public/views/preferencesFee.html     | 10 +++++++++-
 src/js/controllers/preferencesFee.js |  6 +++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html
index 230ed1f01..7e1c199d2 100644
--- a/public/views/preferencesFee.html
+++ b/public/views/preferencesFee.html
@@ -7,8 +7,16 @@
 
 <div class="content preferences" ng-controller="preferencesFeeController as prefFee">
   <div ng-repeat="fee in prefFee.feeOpts" ng-click="prefFee.save(fee)" class="line-b p20 size-14">
-    <span>{{fee.name|translate}} (<span translate>{{fee.value}} bits per kB</span>)</span>
+    <span ng-if="fee.red" style="color:red">{{fee.name|translate}} (<span translate>{{fee.value}} bits per kB</span>)</span>
+    <span ng-if="!fee.red">{{fee.name|translate}} (<span translate>{{fee.value}} bits per kB</span>)</span>
     <i class="fi-check size-16 right" ng-show="prefFee.feeName == fee.name"></i>
   </div>
+  <div class="row column m20t">
+    <div class="text-gray size-12 text-center m20b"  translate>
+      Bitcoin Transactions may include a fee that is collected by the miner that include it on a block. Higher the fee, higher is the incentive of the miners to include it. The 'Emergency' level should only be used when there is a network congestion.
+    </div>
+  </div>
+
 </div>
+
 <div class="extra-margin-bottom"></div>
diff --git a/src/js/controllers/preferencesFee.js b/src/js/controllers/preferencesFee.js
index cc8b825b6..c966e9ca4 100644
--- a/src/js/controllers/preferencesFee.js
+++ b/src/js/controllers/preferencesFee.js
@@ -13,7 +13,11 @@ angular.module('copayApp.controllers').controller('preferencesFeeController',
     }, {
       name: gettext('Economy'),
       value: 10,
-    }];
+    }, {
+      name: gettext('Emergency'),
+      red: true,
+      value: 500,
+    }, ];
 
     this.save = function(newFee) {
       var opts = {

From 5fd8733e39c7ec80bc91dd02519e9e21902fa57c Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 30 Jun 2015 11:17:48 -0300
Subject: [PATCH 2/4] update text

---
 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 7e1c199d2..53e0374f9 100644
--- a/public/views/preferencesFee.html
+++ b/public/views/preferencesFee.html
@@ -13,7 +13,7 @@
   </div>
   <div class="row column m20t">
     <div class="text-gray size-12 text-center m20b"  translate>
-      Bitcoin Transactions may include a fee that is collected by the miner that include it on a block. Higher the fee, higher is the incentive of the miners to include it. The 'Emergency' level should only be used when there is a network congestion.
+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. The ‘Emergency’ level should only be used when there is a network congestion.
     </div>
   </div>
 

From 44b2599492c0f9fb92a48c97c52a6810ff38d539 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 30 Jun 2015 17:19:03 -0300
Subject: [PATCH 3/4] fix bug in expire

---
 src/js/services/addressService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/services/addressService.js b/src/js/services/addressService.js
index 975961214..39978f94a 100644
--- a/src/js/services/addressService.js
+++ b/src/js/services/addressService.js
@@ -6,7 +6,7 @@ angular.module('copayApp.services')
 
 
     root.expireAddress = function(walletId,cb) {
-      $log.debug('Cleaning Address ' + addr );
+      $log.debug('Cleaning Address ' + walletId );
       storageService.clearLastAddress(walletId, function(err) {
         return cb(err);
       });

From 083efc32325afb2c9069ee90357d985328256958 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 30 Jun 2015 18:11:58 -0300
Subject: [PATCH 4/4] lowercase unit name

---
 src/js/controllers/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 56e5a0e6d..d27c89879 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -178,7 +178,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
     //prefs.email  (may come from arguments)
     prefs.language = self.defaultLanguageIsoCode;
-    prefs.unit = self.unitName;
+    prefs.unit = self.unitName.toLowerCase();
 
     var clients = [];
     if (opts.saveAll) {