Merge pull request #3528 from mrfelton/fix/fee-limit-tooltip

Show tooltip when fee limit is unknown
LN-Zap · May 24, 2020 · 1965637 · 1965637
2 parents a026fdf + 8410149
commit 1965637
Show file tree

Hide file tree

Showing 37 changed files with 64 additions and 16 deletions.
diff --git a/renderer/components/Pay/PaySummaryLightning.js b/renderer/components/Pay/PaySummaryLightning.js
@@ -7,7 +7,7 @@ import { CoinBig } from '@zap/utils/coin'
 import { convert } from '@zap/utils/btc'
 import { decodePayReq, getNodeAlias, getTag } from '@zap/utils/crypto'
 import BigArrowRight from 'components/Icon/BigArrowRight'
-import { Bar, DataRow, Spinner, Text } from 'components/UI'
+import { Bar, DataRow, Spinner, Text, Tooltip } from 'components/UI'
 import { CryptoSelector, CryptoValue, FiatValue } from 'containers/UI'
 import { Truncate } from 'components/Util'
 import messages from './messages'
@@ -55,9 +55,7 @@ class PaySummaryLightning extends React.Component {
     }
 
     // Select an appropriate fee message...
-    // Default to configured limit.
-    let feeMessage = messages.fee_config_limit
-
+    let feeMessage
     if (hasMinFee || hasMaxFee) {
       // If thex max fee is 0 or 1 then show a message like "less than 1".
       if (hasMaxFee && maxFee >= 0 && maxFee < 1) {
@@ -82,7 +80,17 @@ class PaySummaryLightning extends React.Component {
       )
     }
 
-    return null
+    return (
+      <Flex alignItems="center">
+        <Tooltip mr={1}>
+          <FormattedMessage {...messages.no_route_tooltip} />
+        </Tooltip>
+        <FormattedMessage
+          {...messages.fee_config_limit}
+          values={{ maxFee: config.payments.feeLimit }}
+        />
+      </Flex>
+    )
   }
 
   render() {
@@ -181,11 +189,13 @@ class PaySummaryLightning extends React.Component {
               </Flex>
             ) : (
               <Flex alignItems="baseline">
-                <CryptoSelector mr={2} />
                 {totalAmountInSatoshis === 'NaN' ? (
                   <FormattedMessage {...messages.fee_unknown} />
                 ) : (
-                  <CryptoValue value={totalAmountInSatoshis} />
+                  <>
+                    <CryptoSelector mr={2} />
+                    <CryptoValue value={totalAmountInSatoshis} />
+                  </>
                 )}
               </Flex>
             )

diff --git a/renderer/components/Pay/messages.js b/renderer/components/Pay/messages.js
@@ -10,6 +10,8 @@ export default defineMessages({
   request_label_onchain: 'Address',
   request_label_pubkey: 'Node Pubkey',
   searching_routes: 'searching for routes…',
+  no_route_tooltip:
+    'Unable to find payment route. You can try sending the payment anyway and fees will be capped at your configured payment fee limit, which you can edit in your preferences.',
   subtitle_onchain: 'On-Chain Payment',
   subtitle_offchain: 'Lightning Payment',
   next_block_confirmation: 'next block confirmation',
@@ -23,7 +25,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_config_limit: 'unknown (up to {maxFee} satoshi)',
   fee_subtraction: 'Deducted from total',
   fee_addition: 'Added to total',
   amount: 'Amount',

diff --git a/test/unit/components/Pay/__snapshots__/PaySummaryLightning.spec.js.snap b/test/unit/components/Pay/__snapshots__/PaySummaryLightning.spec.js.snap
@@ -135,12 +135,14 @@ exports[`component.Form.PaySummaryLightning should render correctly 1`] = `
       <Styled(styled.div)
         alignItems="baseline"
       >
-        <Memo(Connect(Dropdown))
-          mr={2}
-        />
-        <CryptoValue
-          value="10000"
-        />
+        <React.Fragment>
+          <Memo(Connect(Dropdown))
+            mr={2}
+          />
+          <CryptoValue
+            value="10000"
+          />
+        </React.Fragment>
       </Styled(styled.div)>
     }
   />

diff --git a/translations/af-ZA.json b/translations/af-ZA.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/ar-SA.json b/translations/ar-SA.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/bg-BG.json b/translations/bg-BG.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Бележка",
   "components.Pay.next": "Напред",
   "components.Pay.next_block_confirmation": "следващ блок за потвърждение",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "{amount} {cryptoUnitName} (on-chain)",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "Заявка за плащане",

diff --git a/translations/ca-ES.json b/translations/ca-ES.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/cs-CZ.json b/translations/cs-CZ.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Poznámka",
   "components.Pay.next": "Další",
   "components.Pay.next_block_confirmation": "další potvrzení bloku",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "{amount} {cryptoUnitName} (on-chain)",
   "components.Pay.request_label_combined": "Žádost o platbu nebo adresa",
   "components.Pay.request_label_offchain": "Žádost o platbu",

diff --git a/translations/da-DK.json b/translations/da-DK.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Notat",
   "components.Pay.next": "Næste",
   "components.Pay.next_block_confirmation": "næste blok bekæftelse",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "Betalings Anmodning eller Adresse",
   "components.Pay.request_label_offchain": "Betalings Anmodning",

diff --git a/translations/de-DE.json b/translations/de-DE.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Memo",
   "components.Pay.next": "Weiter",
   "components.Pay.next_block_confirmation": "nächste Blockbestätigung",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "{amount} {cryptoUnitName} (Onchain)",
   "components.Pay.request_label_combined": "Zahlungsanforderung oder Adresse",
   "components.Pay.request_label_offchain": "Zahlungsanfrage",

diff --git a/translations/el-GR.json b/translations/el-GR.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Τιμολόγιο",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/en.json b/translations/en.json
@@ -442,7 +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_config_limit": "unknown (up to {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",
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Memo",
   "components.Pay.next": "Next",
   "components.Pay.next_block_confirmation": "next block confirmation",
+  "components.Pay.no_route_tooltip": "Unable to find payment route. You can try sending the payment anyway and fees will be capped at your configured payment fee limit, which you can edit in your preferences.",
   "components.Pay.onchain_balance": "{amount} {cryptoUnitName} (onchain)",
   "components.Pay.request_label_combined": "Payment Request, Address, or Node Pubkey",
   "components.Pay.request_label_offchain": "Payment Request",

diff --git a/translations/es-ES.json b/translations/es-ES.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Memorándum",
   "components.Pay.next": "Siguiente",
   "components.Pay.next_block_confirmation": "próxima confirmación de bloque",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "{amount} {cryptoUnitName} (onchain)",
   "components.Pay.request_label_combined": "Solicitud de Pago o Dirección",
   "components.Pay.request_label_offchain": "Solicitud de Pago",

diff --git a/translations/fi-FI.json b/translations/fi-FI.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/fr-FR.json b/translations/fr-FR.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Note",
   "components.Pay.next": "Continuer",
   "components.Pay.next_block_confirmation": "confirmation au prochain bloc",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "{amount} {cryptoUnitName} (On-chain)",
   "components.Pay.request_label_combined": "Demande de paiement ou adresse",
   "components.Pay.request_label_offchain": "Demande de paiement",

diff --git a/translations/ga-IE.json b/translations/ga-IE.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Meabhrán",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/he-IL.json b/translations/he-IL.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "תזכיר",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/hi-IN.json b/translations/hi-IN.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/hr-HR.json b/translations/hr-HR.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Bilješka",
   "components.Pay.next": "Slijedeće",
   "components.Pay.next_block_confirmation": "potvrda u slijedećem bloku",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "Zahtjev za plaćanjem ili adresa",
   "components.Pay.request_label_offchain": "Zahtjev za plaćanjem",

diff --git a/translations/hu-HU.json b/translations/hu-HU.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/it-IT.json b/translations/it-IT.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/ja-JP.json b/translations/ja-JP.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "メモ",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/ko-KR.json b/translations/ko-KR.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/nl-NL.json b/translations/nl-NL.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/no-NO.json b/translations/no-NO.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Beskjed",
   "components.Pay.next": "Neste",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "Betalingsforespørsel",

diff --git a/translations/pl-PL.json b/translations/pl-PL.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Notatka",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/pt-BR.json b/translations/pt-BR.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/pt-PT.json b/translations/pt-PT.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/ro-RO.json b/translations/ro-RO.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Notificare",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/ru-RU.json b/translations/ru-RU.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Памятка",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "Запрос платежа",

diff --git a/translations/sr-SP.json b/translations/sr-SP.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/sv-SE.json b/translations/sv-SE.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/tr-TR.json b/translations/tr-TR.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Açıklama",
   "components.Pay.next": "Sonraki",
   "components.Pay.next_block_confirmation": "sıradaki blok onayında",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "{amount} {cryptoUnitName} (Ana-Ağ'da)",
   "components.Pay.request_label_combined": "Ödeme Talebi, Adres veya Nod Anahtarı",
   "components.Pay.request_label_offchain": "Ödeme Talebi",

diff --git a/translations/uk-UA.json b/translations/uk-UA.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "Пам'ятка",
   "components.Pay.next": "Далі",
   "components.Pay.next_block_confirmation": "наступне підтвердження блоку",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "{amount} {cryptoUnitName} (в каналі)",
   "components.Pay.request_label_combined": "Запит на оплату, адреса або вузол відкритого ключа",
   "components.Pay.request_label_offchain": "Запит оплати",
@@ -664,7 +665,7 @@
   "reducers.activity.activity_invoice_download_success": "Звантаження завершено",
   "reducers.channels.channels_open_warning": "Ініційовано відкриття каналу",
   "reducers.invoice.invoice_keysend_receive_body": "Вітання, хтось щойно вам заплатив",
-  "reducers.invoice.invoice_receive_body":"Вітаю, хтось щойно оплатив ваш рахунок",
+  "reducers.invoice.invoice_receive_body": "Вітаю, хтось щойно оплатив ваш рахунок",
   "reducers.invoice.invoice_receive_title": "Ви були Zap-нуті",
   "reducers.messages.address_new_address_error": "Не вдалося отримати {addressType} адресу: {error}",
   "reducers.messages.app_init_db_error": "Не вдається ініціалізувати базу даних: {error}",

diff --git a/translations/vi-VN.json b/translations/vi-VN.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/zh-CN.json b/translations/zh-CN.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "备注",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",

diff --git a/translations/zh-TW.json b/translations/zh-TW.json
@@ -453,6 +453,7 @@
   "components.Pay.memo": "备注",
   "components.Pay.next": "",
   "components.Pay.next_block_confirmation": "",
+  "components.Pay.no_route_tooltip": "",
   "components.Pay.onchain_balance": "",
   "components.Pay.request_label_combined": "",
   "components.Pay.request_label_offchain": "",