diff --git a/renderer/components/Pay/PaySummaryLightning.js b/renderer/components/Pay/PaySummaryLightning.js
index 3831f558aeb..463869375a8 100644
--- 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 (
+
+
+
+
+
+
+ )
}
render() {
@@ -181,11 +189,13 @@ class PaySummaryLightning extends React.Component {
) : (
-
{totalAmountInSatoshis === 'NaN' ? (
) : (
-
+ <>
+
+
+ >
)}
)
diff --git a/renderer/components/Pay/messages.js b/renderer/components/Pay/messages.js
index 292933103c1..27b640ab79e 100644
--- 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
index aa09f59d3cb..f3fa709b3c7 100644
--- 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`] = `
-
-
+
+
+
+
}
/>
diff --git a/translations/af-ZA.json b/translations/af-ZA.json
index a34b12fada5..56f815676b6 100644
--- 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
index fa37fef6cf3..806c32d7d29 100644
--- 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
index 5dfc222e05a..e4e010cebb9 100644
--- 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
index a34b12fada5..56f815676b6 100644
--- 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
index 09d1b50e187..d0e23243a6b 100644
--- 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
index bc2f8ca78b2..28cb9d54160 100644
--- 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
index 66fb99dfa42..2bad72b89ab 100644
--- 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
index 29f02cb58f0..c93f3b699f6 100644
--- 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
index a3ea4e12457..f7133c7c647 100644
--- 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
index 894a454da10..04caafedd1d 100644
--- 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
index a34b12fada5..56f815676b6 100644
--- 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
index 985077a2394..67fa29a98f3 100644
--- 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
index 6c361a2a841..19e64692203 100644
--- 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
index eee380d8730..d15bf4db35d 100644
--- 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
index 45ebf53b020..cf77fa558d6 100644
--- 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
index 04a821c354b..b3e35148771 100644
--- 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
index a34b12fada5..56f815676b6 100644
--- 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
index 91d937c36bb..f6135fafa68 100644
--- 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
index 7a2e1183ead..3104a0a9764 100644
--- 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
index a34b12fada5..56f815676b6 100644
--- 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
index 249ef4afe24..6547dd7d1ca 100644
--- 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
index 02c4af8fd11..2d934f04d37 100644
--- 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
index 18dbb024cd6..3a76a186a81 100644
--- 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
index a08bbe705b8..9bb5e0a45f1 100644
--- 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
index 3becdea4489..d18fa46cd55 100644
--- 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
index 12108e8a583..1577f4b5bff 100644
--- 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
index 0f01ac26bab..1462341b3da 100644
--- 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
index a34b12fada5..56f815676b6 100644
--- 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
index 4b96f55162f..726dd955e27 100644
--- 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
index e2280fae6f4..451403cdf50 100644
--- 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
index 5945696cbc2..c36ad7aee2e 100644
--- 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
index a34b12fada5..56f815676b6 100644
--- 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
index 1ec5e72e8e4..a01ec8ad742 100644
--- 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
index 59e24cd1cfd..0eaab577bd9 100644
--- 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": "",