fix: handle fixed amount lnurls in send screen

getAlby · Sep 24, 2024 · a253715 · a253715
1 parent c39a191
commit a253715
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 16 deletions.
diff --git a/pages/send/LNURLPay.tsx b/pages/send/LNURLPay.tsx
@@ -24,18 +24,10 @@ export function LNURLPay() {
   const [isAmountReadOnly, setAmountReadOnly] = React.useState(false);
 
   useEffect(() => {
-
     // Handle fixed amount LNURLs
     if (lnurlDetails.minSendable === lnurlDetails.maxSendable) {
-      // Allow users to enter a comment if the LNURL allows it,
-      // otherwise go to the confirmation step directly
       setAmount((lnurlDetails.minSendable / 1000).toString());
-
-      if (lnurlDetails.commentAllowed) {
-        setAmountReadOnly(true);
-      } else {
-        requestInvoice(lnurlDetails.minSendable / 1000);
-      }
+      setAmountReadOnly(true);
     }
   }, [lnurlDetails.minSendable, lnurlDetails.maxSendable]);
 
@@ -85,6 +77,7 @@ export function LNURLPay() {
                   value={comment}
                   onChangeText={setComment}
                   returnKeyType="done"
+                  maxLength={lnurlDetails.commentAllowed}
                 />
               </View>
             }

diff --git a/pages/send/Send.tsx b/pages/send/Send.tsx
@@ -83,13 +83,29 @@ export function Send() {
           throw new Error("LNURL tag " + lnurlDetails.tag + " not supported");
         }
 
-        router.replace({
-          pathname: "/send/lnurl-pay",
-          params: {
-            lnurlDetailsJSON: JSON.stringify(lnurlDetails),
-            originalText,
-          },
-        });
+        // Handle fixed amount LNURLs
+        if (lnurlDetails.minSendable === lnurlDetails.maxSendable && !lnurlDetails.commentAllowed) {
+          try {
+            const callback = new URL(lnurlDetails.callback);
+            callback.searchParams.append("amount", (lnurlDetails.minSendable).toString());
+            const lnurlPayInfo = await lnurl.getPayRequest(callback.toString());
+            router.push({
+              pathname: "/send/confirm",
+              params: { invoice: lnurlPayInfo.pr, originalText },
+            });
+          } catch (error) {
+            console.error(error);
+            errorToast(error);
+          }
+        } else {
+          router.replace({
+            pathname: "/send/lnurl-pay",
+            params: {
+              lnurlDetailsJSON: JSON.stringify(lnurlDetails),
+              originalText,
+            },
+          });
+        }
       } else {
         // Check if this is a valid invoice
         new Invoice({