Merge pull request #1889 from OpenBazaar/brian.supereconomy

Add Super Economic Fee Level
OpenBazaar · May 6, 2020 · 6d1cc70 · 6d1cc70
2 parents f307bea + ebe5fa2
commit 6d1cc70
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git 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"

diff --git 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',
     ];
   }
 

diff --git 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"

diff --git 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>

diff --git 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,