From 9cbe4085e15d45476c709bb88206dce6ea9b87d4 Mon Sep 17 00:00:00 2001
From: Brian Hoffman <brianchoffman@gmail.com>
Date: Mon, 4 May 2020 13:41:34 -0400
Subject: [PATCH 1/6] Update en_US for SUPER ECONOMIC

---
 js/languages/en_US.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/languages/en_US.json b/js/languages/en_US.json
index 333cf69e9..e41bbe694 100644
--- a/js/languages/en_US.json
+++ b/js/languages/en_US.json
@@ -20,7 +20,8 @@
   "feeLevels": {
     "PRIORITY": "Priority",
     "NORMAL": "Normal",
-    "ECONOMIC": "Economic"
+    "ECONOMIC": "Economic",
+    "SUPER_ECONOMIC": "Super Economic"
   },
   "feeChangeWidget": {
     "btnChange": "change",
@@ -650,6 +651,7 @@
         "sectionName": "Transactions",
         "saveMetadata": "Save Metadata",
         "defaultFee": "Network Fee",
+        "superlow": "Super Economic",
         "low": "Economic",
         "medium": "Normal",
         "high": "Priority"

From f69cf88e8ecd1092e7d48c8aa72cfcbbec284498 Mon Sep 17 00:00:00 2001
From: Brian Hoffman <brianchoffman@gmail.com>
Date: Mon, 4 May 2020 13:41:53 -0400
Subject: [PATCH 2/6] Add SUPER_ECONOMIC to spend model

---
 js/models/wallet/Spend.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/models/wallet/Spend.js b/js/models/wallet/Spend.js
index 412c9293e..bf2029e75 100644
--- a/js/models/wallet/Spend.js
+++ b/js/models/wallet/Spend.js
@@ -44,6 +44,7 @@ class Spend extends BaseModel {
       'PRIORITY',
       'NORMAL',
       'ECONOMIC',
+      'SUPER_ECONOMIC',
     ];
   }
 

From 8b34d9c44bd84e1db32c501de3439ffab64de14e Mon Sep 17 00:00:00 2001
From: Brian Hoffman <brianchoffman@gmail.com>
Date: Mon, 4 May 2020 13:42:12 -0400
Subject: [PATCH 3/6] Add Super Economic as an option in advanced

---
 js/templates/modals/settings/advanced/advanced.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/js/templates/modals/settings/advanced/advanced.html b/js/templates/modals/settings/advanced/advanced.html
index db2348af4..18847f072 100644
--- a/js/templates/modals/settings/advanced/advanced.html
+++ b/js/templates/modals/settings/advanced/advanced.html
@@ -119,6 +119,16 @@ <h2 class="h4 clrT"><%= ob.polyT('settings.advancedTab.transaction.sectionName')
             <div class="col9">
               <% if (ob.errors['defaultTransactionFee']) print(ob.formErrorTmpl({ errors: ob.errors['defaultTransactionFee'] })) %>
               <div class="btnStrip">
+                <div class="btnRadio clrBr">
+                  <input type="radio"
+                         data-persistence-location="local"
+                         name="defaultTransactionFee"
+                         value="SUPER_ECONOMIC"
+                         id="defaultTransactionFeeSuperLow"
+                         data-var-type="string"
+                  <% if(ob.defaultTransactionFee == "SUPER_ECONOMIC") { %>checked<% } %>>
+                  <label for="defaultTransactionFeeSuperLow"><%= ob.polyT('settings.advancedTab.transaction.superlow') %></label>
+                </div>
                 <div class="btnRadio clrBr">
                   <input type="radio"
                          data-persistence-location="local"

From 23764ea89af98c03bac8bb59c3695beca8a24c2e Mon Sep 17 00:00:00 2001
From: Brian Hoffman <brianchoffman@gmail.com>
Date: Mon, 4 May 2020 13:42:55 -0400
Subject: [PATCH 4/6] Update fees utility

---
 js/utils/fees.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/js/utils/fees.js b/js/utils/fees.js
index 973f7ea69..12b0f9976 100644
--- a/js/utils/fees.js
+++ b/js/utils/fees.js
@@ -17,6 +17,7 @@ export const feeLevels = [
   'PRIORITY',
   'NORMAL',
   'ECONOMIC',
+  'SUPER_ECONOMIC',
 ];
 
 const cacheExpires = 1000 * 60 * 5;
@@ -190,11 +191,16 @@ export function getFees(coinType) {
 
     $.get(app.getServerUrl(`wallet/fees/${coinType}`))
       .done(data => {
+        let superEconomic;
         let economic;
         let normal;
         let priority;
 
         try {
+          superEconomic = integerToDecimal(
+            data.superEconomic.amount,
+            data.superEconomic.currency.divisibility
+          );
           economic = integerToDecimal(
             data.economic.amount,
             data.economic.currency.divisibility
@@ -213,6 +219,7 @@ export function getFees(coinType) {
         }
 
         deferred.resolve({
+          superEconomic,
           economic,
           normal,
           priority,

From b58167aab24a8975a45802ac03cb9049ae247546 Mon Sep 17 00:00:00 2001
From: Brian Hoffman <brianchoffman@gmail.com>
Date: Wed, 6 May 2020 15:14:20 -0400
Subject: [PATCH 5/6] Handle amps in listing categories

---
 js/templates/userPage/categoryFilter.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/templates/userPage/categoryFilter.html b/js/templates/userPage/categoryFilter.html
index e672e4e2f..8febd391d 100644
--- a/js/templates/userPage/categoryFilter.html
+++ b/js/templates/userPage/categoryFilter.html
@@ -13,12 +13,13 @@
 
 <%
   ob.categories.slice(0, ob.maxInitiallyVisibleCats - 1).forEach((cat, index) => {
+    valueCat = cat.replace(/&/g, "&amp;");
     var flatCat = cat.replace(/\s/g, '-'); // remove spaces
 %>
 <div class="btnRadio">
   <input type="radio"
          name="filterShippingCategory"
-         value="<%= cat %>"
+         value="<%= valueCat %>"
          id="<%= `filterShippingCategory${flatCat}` %>"
          <% if (ob.selected === cat) print('checked') %>>
   <label for="<%= `filterShippingCategory${flatCat}` %>"><%= cat %></label>

From ebe5fa283088d959cf5a6f7d5fa149af227f0b4d Mon Sep 17 00:00:00 2001
From: Brian Hoffman <brianchoffman@gmail.com>
Date: Wed, 6 May 2020 15:15:40 -0400
Subject: [PATCH 6/6] Fix string quotes

---
 js/templates/userPage/categoryFilter.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/templates/userPage/categoryFilter.html b/js/templates/userPage/categoryFilter.html
index 8febd391d..2a4a10112 100644
--- a/js/templates/userPage/categoryFilter.html
+++ b/js/templates/userPage/categoryFilter.html
@@ -13,7 +13,7 @@
 
 <%
   ob.categories.slice(0, ob.maxInitiallyVisibleCats - 1).forEach((cat, index) => {
-    valueCat = cat.replace(/&/g, "&amp;");
+    valueCat = cat.replace(/&/g, '&amp;');
     var flatCat = cat.replace(/\s/g, '-'); // remove spaces
 %>
 <div class="btnRadio">