From 30abcad999d9d81c6f09c830ef51fded11deac4d Mon Sep 17 00:00:00 2001
From: Sander van Grieken <sander@outrightsolutions.nl>
Date: Tue, 27 Jun 2023 12:03:05 +0200
Subject: [PATCH] payment_identifier: move amount_range into payment_identifier

---
 electrum/gui/qt/send_tab.py    | 8 +++-----
 electrum/payment_identifier.py | 9 +++++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/electrum/gui/qt/send_tab.py b/electrum/gui/qt/send_tab.py
index ee1af66d5..f83ca4040 100644
--- a/electrum/gui/qt/send_tab.py
+++ b/electrum/gui/qt/send_tab.py
@@ -418,11 +418,9 @@ class SendTab(QWidget, MessageBoxMixin, Logger):
             self.set_field_validated(self.payto_e, validated=fields.validated)
 
             # LNURLp amount range
-            if pi.type in [PaymentIdentifierType.LNURLP, PaymentIdentifierType.LNADDR] \
-                    and pi.state == PaymentIdentifierState.LNURLP_FINALIZE \
-                    and pi.lnurl_data.min_sendable_sat != pi.lnurl_data.max_sendable_sat:
-                self.amount_e.setToolTip(_('Amount must be between %d and %d sat.') \
-                    % (pi.lnurl_data.min_sendable_sat, pi.lnurl_data.max_sendable_sat))
+            if fields.amount_range:
+                amin, amax = fields.amount_range
+                self.amount_e.setToolTip(_('Amount must be between %d and %d sat.') % (amin, amax))
             else:
                 self.amount_e.setToolTip('')
 
diff --git a/electrum/payment_identifier.py b/electrum/payment_identifier.py
index 157042182..8667d9263 100644
--- a/electrum/payment_identifier.py
+++ b/electrum/payment_identifier.py
@@ -204,6 +204,7 @@ class FieldsForGUI(NamedTuple):
     description: Optional[str]
     validated: Optional[bool]
     comment: Optional[int]
+    amount_range: Optional[tuple[int, int]]
 
 
 class PaymentIdentifier(Logger):
@@ -632,6 +633,7 @@ class PaymentIdentifier(Logger):
         description = None
         validated = None
         comment = None
+        amount_range = None
 
         if (self.emaillike or self.domainlike) and self.openalias_data:
             key = self.emaillike if self.emaillike else self.domainlike
@@ -650,10 +652,13 @@ class PaymentIdentifier(Logger):
         elif self.lnurl and self.lnurl_data:
             domain = urllib.parse.urlparse(self.lnurl).netloc
             recipient = f"{self.lnurl_data.metadata_plaintext} <{domain}>"
-            amount = self.lnurl_data.min_sendable_sat if self.lnurl_data.min_sendable_sat else None
             description = self.lnurl_data.metadata_plaintext
             if self.lnurl_data.comment_allowed:
                 comment = self.lnurl_data.comment_allowed
+            if self.lnurl_data.min_sendable_sat:
+                amount = self.lnurl_data.min_sendable_sat
+                if self.lnurl_data.min_sendable_sat != self.lnurl_data.max_sendable_sat:
+                    amount_range = (self.lnurl_data.min_sendable_sat, self.lnurl_data.max_sendable_sat)
 
         elif self.bip70 and self.bip70_data:
             pr = self.bip70_data
@@ -681,7 +686,7 @@ class PaymentIdentifier(Logger):
                 description = label
 
         return FieldsForGUI(recipient=recipient, amount=amount, description=description,
-                            comment=comment, validated=validated)
+                            comment=comment, validated=validated, amount_range=amount_range)
 
     def _get_bolt11_fields(self, bolt11_invoice):
         """Parse ln invoice, and prepare the send tab for it."""