From 81544fdaedcd013ebff6f3b569f1fbd34774cf04 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Tue, 27 Jun 2023 12:12:23 +0200 Subject: [PATCH] send_tab: simplify lock_recipient check --- electrum/gui/qt/send_tab.py | 6 +++--- electrum/payment_identifier.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/electrum/gui/qt/send_tab.py b/electrum/gui/qt/send_tab.py index f83ca4040..670111281 100644 --- a/electrum/gui/qt/send_tab.py +++ b/electrum/gui/qt/send_tab.py @@ -392,9 +392,9 @@ class SendTab(QWidget, MessageBoxMixin, Logger): self.send_button.setEnabled(False) return - lock_recipient = pi.type != PaymentIdentifierType.SPK \ - and not (pi.type in [PaymentIdentifierType.EMAILLIKE, PaymentIdentifierType.DOMAINLIKE] \ - and pi.state in [PaymentIdentifierState.NOT_FOUND, PaymentIdentifierState.NEED_RESOLVE]) + lock_recipient = pi.type in [PaymentIdentifierType.LNURLP, PaymentIdentifierType.LNADDR, + PaymentIdentifierType.OPENALIAS, PaymentIdentifierType.BIP70, + PaymentIdentifierType.BIP21, PaymentIdentifierType.BOLT11] and not pi.need_resolve() lock_amount = pi.is_amount_locked() lock_max = lock_amount or pi.type not in [PaymentIdentifierType.SPK, PaymentIdentifierType.BIP21] diff --git a/electrum/payment_identifier.py b/electrum/payment_identifier.py index 8667d9263..a2619339a 100644 --- a/electrum/payment_identifier.py +++ b/electrum/payment_identifier.py @@ -298,7 +298,7 @@ class PaymentIdentifier(Logger): elif self._type in [PaymentIdentifierType.LNURLP, PaymentIdentifierType.LNADDR]: # amount limits known after resolve, might be specific amount or locked to range if self.need_resolve(): - return True + return False if self.need_finalize(): self.logger.debug(f'lnurl f {self.lnurl_data.min_sendable_sat}-{self.lnurl_data.max_sendable_sat}') return not (self.lnurl_data.min_sendable_sat < self.lnurl_data.max_sendable_sat)