From 14fced1b98ad3149fec889401eaf4ae5b7391c3e Mon Sep 17 00:00:00 2001
From: nicolasburtey <nicolasburtey@users.noreply.github.com>
Date: Wed, 31 Jan 2024 02:36:15 +0000
Subject: [PATCH] fix: passing comment requestInvoice should be optional
 (#3032)

if the server return commentAllowed = 0 or false in the prior request, and a comment it still send nonethless, then the requestInvoice may be request (at least this is the default behavior with lnbits)

Co-authored-by: Nicolas Burtey <nb@galoy.io>
---
 .../send-bitcoin-details-screen.tsx           | 44 ++++++++++++-------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/app/screens/send-bitcoin-screen/send-bitcoin-details-screen.tsx b/app/screens/send-bitcoin-screen/send-bitcoin-details-screen.tsx
index 56aade3539..042922915f 100644
--- a/app/screens/send-bitcoin-screen/send-bitcoin-details-screen.tsx
+++ b/app/screens/send-bitcoin-screen/send-bitcoin-details-screen.tsx
@@ -1,6 +1,15 @@
+import { testProps } from "../../utils/testProps"
+import { ConfirmFeesModal } from "./confirm-fees-modal"
+import { isValidAmount } from "./payment-details"
+import { PaymentDetail } from "./payment-details/index.types"
+import { SendBitcoinDetailsExtraInfo } from "./send-bitcoin-details-extra-info"
 import { gql } from "@apollo/client"
 import { AmountInput } from "@app/components/amount-input/amount-input"
+import { GaloyIcon } from "@app/components/atomic/galoy-icon"
 import { GaloyPrimaryButton } from "@app/components/atomic/galoy-primary-button"
+import { GaloyTertiaryButton } from "@app/components/atomic/galoy-tertiary-button"
+import { NoteInput } from "@app/components/note-input"
+import { PaymentDestinationDisplay } from "@app/components/payment-destination-display"
 import { Screen } from "@app/components/screen"
 import {
   Network,
@@ -11,9 +20,10 @@ import {
   Wallet,
   WalletCurrency,
 } from "@app/graphql/generated"
+import { useHideAmount } from "@app/graphql/hide-amount-context"
 import { useIsAuthed } from "@app/graphql/is-authed-context"
-import Clipboard from "@react-native-clipboard/clipboard"
 import { useLevel } from "@app/graphql/level-context"
+import { getBtcWallet, getDefaultWallet, getUsdWallet } from "@app/graphql/wallets-utils"
 import { usePriceConversion } from "@app/hooks"
 import { useDisplayCurrency } from "@app/hooks/use-display-currency"
 import { useI18nContext } from "@app/i18n/i18n-react"
@@ -25,27 +35,18 @@ import {
   toUsdMoneyAmount,
   WalletOrDisplayCurrency,
 } from "@app/types/amounts"
+import { toastShow } from "@app/utils/toast"
 import { decodeInvoiceString, Network as NetworkLibGaloy } from "@galoymoney/client"
+import Clipboard from "@react-native-clipboard/clipboard"
 import crashlytics from "@react-native-firebase/crashlytics"
 import { NavigationProp, RouteProp, useNavigation } from "@react-navigation/native"
 import { makeStyles, Text, useTheme } from "@rneui/themed"
+import { requestInvoice, utils } from "lnurl-pay"
+import { Satoshis } from "lnurl-pay/dist/types/types"
 import React, { useEffect, useState } from "react"
 import { TouchableOpacity, TouchableWithoutFeedback, View } from "react-native"
 import ReactNativeModal from "react-native-modal"
 import Icon from "react-native-vector-icons/Ionicons"
-import { testProps } from "../../utils/testProps"
-import { isValidAmount } from "./payment-details"
-import { PaymentDetail } from "./payment-details/index.types"
-import { SendBitcoinDetailsExtraInfo } from "./send-bitcoin-details-extra-info"
-import { requestInvoice, utils } from "lnurl-pay"
-import { GaloyTertiaryButton } from "@app/components/atomic/galoy-tertiary-button"
-import { getBtcWallet, getDefaultWallet, getUsdWallet } from "@app/graphql/wallets-utils"
-import { NoteInput } from "@app/components/note-input"
-import { PaymentDestinationDisplay } from "@app/components/payment-destination-display"
-import { useHideAmount } from "@app/graphql/hide-amount-context"
-import { ConfirmFeesModal } from "./confirm-fees-modal"
-import { GaloyIcon } from "@app/components/atomic/galoy-icon"
-import { toastShow } from "@app/utils/toast"
 
 gql`
   query sendBitcoinDetailsScreen {
@@ -363,11 +364,20 @@ const SendBitcoinDetailsScreen: React.FC<Props> = ({ route }) => {
             "BTC",
           )
 
-          const result = await requestInvoice({
+          const requestInvoiceParams: {
+            lnUrlOrAddress: string
+            tokens: Satoshis
+            comment?: string
+          } = {
             lnUrlOrAddress: paymentDetail.destination,
             tokens: utils.toSats(btcAmount.amount),
-            comment: paymentDetail.memo,
-          })
+          }
+
+          if (lnurlParams?.commentAllowed) {
+            requestInvoiceParams.comment = paymentDetail.memo
+          }
+
+          const result = await requestInvoice(requestInvoiceParams)
           setIsLoadingLnurl(false)
           const invoice = result.invoice
           const decodedInvoice = decodeInvoiceString(invoice, network as NetworkLibGaloy)