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" 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', ]; } 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 @@

<%= ob.polyT('settings.advancedTab.transaction.sectionName')
<% if (ob.errors['defaultTransactionFee']) print(ob.formErrorTmpl({ errors: ob.errors['defaultTransactionFee'] })) %>
+
+ checked<% } %>> + +
{ + valueCat = cat.replace(/&/g, '&'); var flatCat = cat.replace(/\s/g, '-'); // remove spaces %>
> 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,