feat(ui): display fee limit when fee is unknown

LN-Zap · May 17, 2020 · 88a9bf2 · 88a9bf2
1 parent 32cde4e
commit 88a9bf2
Show file tree

Hide file tree

Showing 36 changed files with 44 additions and 3 deletions.
diff --git a/renderer/components/Pay/PaySummaryLightning.js b/renderer/components/Pay/PaySummaryLightning.js
@@ -2,6 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { Box, Flex } from 'rebass/styled-components'
 import { FormattedMessage } from 'react-intl'
+import config from 'config'
 import { CoinBig } from '@zap/utils/coin'
 import { convert } from '@zap/utils/btc'
 import { decodePayReq, getNodeAlias, getTag } from '@zap/utils/crypto'
@@ -54,8 +55,8 @@ class PaySummaryLightning extends React.Component {
     }
 
     // Select an appropriate fee message...
-    // Default to unknown.
-    let feeMessage = messages.fee_unknown
+    // Default to configured limit.
+    let feeMessage = messages.fee_config_limit
 
     if (hasMinFee || hasMaxFee) {
       // If thex max fee is 0 or 1 then show a message like "less than 1".
@@ -73,7 +74,12 @@ class PaySummaryLightning extends React.Component {
     }
 
     if (feeMessage) {
-      return <FormattedMessage {...feeMessage} values={{ minFee, maxFee }} />
+      return (
+        <FormattedMessage
+          {...feeMessage}
+          values={{ minFee, maxFee: hasMaxFee ? maxFee : config.payments.feeLimit }}
+        />
+      )
     }
 
     return null

diff --git a/renderer/components/Pay/messages.js b/renderer/components/Pay/messages.js
@@ -23,6 +23,7 @@ export default defineMessages({
   fee_upto: 'up to {maxFee} satoshi',
   fee_unknown: 'unknown',
   fee_per_byte: 'per byte',
+  fee_config_limit: 'unknown (no more than {maxFee} satoshi)',
   fee_subtraction: 'Deducted from total',
   fee_addition: 'Added to total',
   amount: 'Amount',

diff --git a/translations/af-ZA.json b/translations/af-ZA.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/ar-SA.json b/translations/ar-SA.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/bg-BG.json b/translations/bg-BG.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/ca-ES.json b/translations/ca-ES.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/cs-CZ.json b/translations/cs-CZ.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "Pokoušíte se odeslat více, než je vaše současná kapacita jednorázového odesílání {capacity} {unit}",
   "components.Pay.fee": "Poplatek",
   "components.Pay.fee_addition": "Celkem přidáno",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "méně než 1 satoshi",
   "components.Pay.fee_per_byte": "za byte",
   "components.Pay.fee_range": "mezi {minFee} a {maxFee} satoshi",

diff --git a/translations/da-DK.json b/translations/da-DK.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "Gebyr",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "mindre end 1 satoshi",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "mellem {minFee} og {maxFee} satoshis",

diff --git a/translations/de-DE.json b/translations/de-DE.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "Du versuchst, mehr als dein aktuelles Sendevermögen von {capacity} {unit} zu senden",
   "components.Pay.fee": "Gebühr",
   "components.Pay.fee_addition": "Zu Gesamt hinzugefügt",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "weniger als 1 Satoshi",
   "components.Pay.fee_per_byte": "pro Byte",
   "components.Pay.fee_range": "zwischen {minFee} und {maxFee} Satoshi",

diff --git a/translations/el-GR.json b/translations/el-GR.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/en.json b/translations/en.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "You are trying to send more than your current one time send capacity of {capacity} {unit}",
   "components.Pay.fee": "Fee",
   "components.Pay.fee_addition": "Added to total",
+  "components.Pay.fee_config_limit": "unknown (no more than {maxFee} satoshi)",
   "components.Pay.fee_less_than_1": "less than 1 satoshi",
   "components.Pay.fee_per_byte": "per byte",
   "components.Pay.fee_range": "between {minFee} and {maxFee} satoshis",

diff --git a/translations/es-ES.json b/translations/es-ES.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "Estás intentando enviar más de tu capacidad de envío actual de {capacity} {unit}",
   "components.Pay.fee": "Comisión",
   "components.Pay.fee_addition": "Añadido al total",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "menos de 1 satoshi",
   "components.Pay.fee_per_byte": "por byte",
   "components.Pay.fee_range": "entre {minFee} y {maxFee} satoshis",

diff --git a/translations/fi-FI.json b/translations/fi-FI.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/fr-FR.json b/translations/fr-FR.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "Vous essayez d'envoyer plus que ce que votre capacité d'envoi de {capacity}{unit} vous permet d'envoyer d'un coup",
   "components.Pay.fee": "Frais",
   "components.Pay.fee_addition": "Ajoutés au total",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "moins d'1 satoshi",
   "components.Pay.fee_per_byte": "par byte",
   "components.Pay.fee_range": "entre {minFee} et {maxFee} satoshis",

diff --git a/translations/ga-IE.json b/translations/ga-IE.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "Cuireadh leis an iomlán é",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/he-IL.json b/translations/he-IL.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/hi-IN.json b/translations/hi-IN.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/hr-HR.json b/translations/hr-HR.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "Naknada",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "manje od 1 satoshi",
   "components.Pay.fee_per_byte": "po bajtu",
   "components.Pay.fee_range": "između {minFee} i {maxFee} satošija",

diff --git a/translations/hu-HU.json b/translations/hu-HU.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/it-IT.json b/translations/it-IT.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/ja-JP.json b/translations/ja-JP.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/ko-KR.json b/translations/ko-KR.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/nl-NL.json b/translations/nl-NL.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/no-NO.json b/translations/no-NO.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "Avgift",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "mindre enn 1 satoshi",
   "components.Pay.fee_per_byte": "per byte",
   "components.Pay.fee_range": "mellom {minFee} og {maxFee} satoshis",

diff --git a/translations/pl-PL.json b/translations/pl-PL.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/pt-BR.json b/translations/pt-BR.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/pt-PT.json b/translations/pt-PT.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/ro-RO.json b/translations/ro-RO.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/ru-RU.json b/translations/ru-RU.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/sr-SP.json b/translations/sr-SP.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/sv-SE.json b/translations/sv-SE.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/tr-TR.json b/translations/tr-TR.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/uk-UA.json b/translations/uk-UA.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/vi-VN.json b/translations/vi-VN.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/zh-CN.json b/translations/zh-CN.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",

diff --git a/translations/zh-TW.json b/translations/zh-TW.json
@@ -442,6 +442,7 @@
   "components.Pay.error_not_onetime_send_capacity": "",
   "components.Pay.fee": "",
   "components.Pay.fee_addition": "",
+  "components.Pay.fee_config_limit": "",
   "components.Pay.fee_less_than_1": "",
   "components.Pay.fee_per_byte": "",
   "components.Pay.fee_range": "",