1
0

send_tab: simplify lock_recipient check

This commit is contained in:
Sander van Grieken
2023-06-27 12:12:23 +02:00
parent 30abcad999
commit 81544fdaed
2 changed files with 4 additions and 4 deletions

View File

@@ -392,9 +392,9 @@ class SendTab(QWidget, MessageBoxMixin, Logger):
self.send_button.setEnabled(False) self.send_button.setEnabled(False)
return return
lock_recipient = pi.type != PaymentIdentifierType.SPK \ lock_recipient = pi.type in [PaymentIdentifierType.LNURLP, PaymentIdentifierType.LNADDR,
and not (pi.type in [PaymentIdentifierType.EMAILLIKE, PaymentIdentifierType.DOMAINLIKE] \ PaymentIdentifierType.OPENALIAS, PaymentIdentifierType.BIP70,
and pi.state in [PaymentIdentifierState.NOT_FOUND, PaymentIdentifierState.NEED_RESOLVE]) PaymentIdentifierType.BIP21, PaymentIdentifierType.BOLT11] and not pi.need_resolve()
lock_amount = pi.is_amount_locked() lock_amount = pi.is_amount_locked()
lock_max = lock_amount or pi.type not in [PaymentIdentifierType.SPK, PaymentIdentifierType.BIP21] lock_max = lock_amount or pi.type not in [PaymentIdentifierType.SPK, PaymentIdentifierType.BIP21]

View File

@@ -298,7 +298,7 @@ class PaymentIdentifier(Logger):
elif self._type in [PaymentIdentifierType.LNURLP, PaymentIdentifierType.LNADDR]: elif self._type in [PaymentIdentifierType.LNURLP, PaymentIdentifierType.LNADDR]:
# amount limits known after resolve, might be specific amount or locked to range # amount limits known after resolve, might be specific amount or locked to range
if self.need_resolve(): if self.need_resolve():
return True return False
if self.need_finalize(): if self.need_finalize():
self.logger.debug(f'lnurl f {self.lnurl_data.min_sendable_sat}-{self.lnurl_data.max_sendable_sat}') 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) return not (self.lnurl_data.min_sendable_sat < self.lnurl_data.max_sendable_sat)