fix: use same invoice for NFC (#2728)

GaloyMoney · Oct 27, 2023 · b063518 · b063518
1 parent 5162cf0
commit b063518
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 75 deletions.
diff --git a/app/components/modal-nfc/modal-nfc.tsx b/app/components/modal-nfc/modal-nfc.tsx
@@ -21,22 +21,14 @@ import {
 import { useIsAuthed } from "@app/graphql/is-authed-context"
 import { LNURL_DOMAINS } from "@app/config"
 import { isIOS } from "@rneui/base"
-import {
-  MoneyAmount,
-  WalletAmount,
-  toBtcMoneyAmount,
-  toUsdMoneyAmount,
-} from "@app/types/amounts"
+import { WalletAmount, toUsdMoneyAmount } from "@app/types/amounts"
 import { usePriceConversion } from "@app/hooks"
 
 export const ModalNfc: React.FC<{
   isActive: boolean
   setIsActive: (arg: boolean) => void
   settlementAmount?: WalletAmount<WalletCurrency>
-  receiveViaNFC: (
-    destination: ReceiveDestination,
-    settlementAmount: MoneyAmount<"BTC">,
-  ) => Promise<void>
+  receiveViaNFC: (destination: ReceiveDestination) => Promise<void>
 }> = ({ isActive, setIsActive, settlementAmount, receiveViaNFC }) => {
   const { data } = useScanningQrCodeScreenQuery({ skip: !useIsAuthed() })
   const wallets = data?.me?.defaultAccount.wallets
@@ -67,6 +59,20 @@ export const ModalNfc: React.FC<{
       return
     }
 
+    if (!convertMoneyAmount) return
+
+    if (
+      isActive &&
+      settlementAmount &&
+      convertMoneyAmount &&
+      convertMoneyAmount(toUsdMoneyAmount(settlementAmount?.amount), WalletCurrency.Btc)
+        .amount === 0
+    ) {
+      Alert.alert(LL.ReceiveScreen.cantReceiveZeroSats())
+      setIsActive(false)
+      return
+    }
+
     if (
       !LL ||
       !wallets ||
@@ -161,7 +167,7 @@ export const ModalNfc: React.FC<{
           destination.validDestination.minWithdrawable = amount * 1000 // coz msats
           destination.validDestination.maxWithdrawable = amount * 1000 // coz msats
 
-          receiveViaNFC(destination, toBtcMoneyAmount(settlementAmount.amount))
+          receiveViaNFC(destination)
         }
       }
 

diff --git a/app/i18n/en/index.ts b/app/i18n/en/index.ts
@@ -2133,6 +2133,7 @@ const en: BaseTranslation = {
     receiveViaPaycode: "Receive via Paycode",
     receiveViaOnchain: "Receive via Onchain",
     payCodeOrLNURL: "Paycode / LNURL",
+    cantReceiveZeroSats: "You can't receive zero sats. Please enter an amount corresponding to 1 or more sats."
   },
   RedeemBitcoinScreen: {
     title: "Redeem Bitcoin",

diff --git a/app/i18n/i18n-types.ts b/app/i18n/i18n-types.ts
@@ -6651,6 +6651,10 @@ type RootTranslation = {
 		 * Paycode / LNURL
 		 */
 		payCodeOrLNURL: string
+		/**
+		 * You can't receive zero sats. Please enter an amount corresponding to 1 or more sats.
+		 */
+		cantReceiveZeroSats: string
 	}
 	RedeemBitcoinScreen: {
 		/**
@@ -15346,6 +15350,10 @@ export type TranslationFunctions = {
 		 * Paycode / LNURL
 		 */
 		payCodeOrLNURL: () => LocalizedString
+		/**
+		 * You can't receive zero sats. Please enter an amount corresponding to 1 or more sats.
+		 */
+		cantReceiveZeroSats: () => LocalizedString
 	}
 	RedeemBitcoinScreen: {
 		/**

diff --git a/app/i18n/raw-i18n/source/en.json b/app/i18n/raw-i18n/source/en.json
@@ -2100,7 +2100,8 @@
         "receiveViaInvoice": "Receive via Lightning",
         "receiveViaPaycode": "Receive via Paycode",
         "receiveViaOnchain": "Receive via Onchain",
-        "payCodeOrLNURL": "Paycode / LNURL"
+        "payCodeOrLNURL": "Paycode / LNURL",
+        "cantReceiveZeroSats": "You can't receive zero sats. Please enter an amount corresponding to 1 or more sats."
     },
     "RedeemBitcoinScreen": {
         "title": "Redeem Bitcoin",

diff --git a/app/screens/receive-bitcoin-screen/receive-screen.tsx b/app/screens/receive-bitcoin-screen/receive-screen.tsx
@@ -36,17 +36,27 @@ const ReceiveScreen = () => {
   const [displayReceiveNfc, setDisplayReceiveNfc] = useState(false)
 
   useEffect(() => {
-    navigation.setOptions({
-      headerRight: () => (
-        <TouchableOpacity
-          style={styles.rotateIconHeaderRight}
-          onPress={() => setDisplayReceiveNfc(true)}
-        >
-          <Icon name="wifi" color={colors.black} size={25} />
-        </TouchableOpacity>
-      ),
-    })
-  })
+    if (request?.type === "Lightning" && request.state === "Created")
+      navigation.setOptions({
+        headerRight: () => (
+          <TouchableOpacity
+            style={styles.rotateIconHeaderRight}
+            onPress={() => setDisplayReceiveNfc(true)}
+          >
+            <Icon name="wifi" color={colors.black} size={25} />
+          </TouchableOpacity>
+        ),
+      })
+    else {
+      navigation.setOptions({ headerRight: () => <></> })
+    }
+  }, [
+    colors.black,
+    navigation,
+    request?.state,
+    request?.type,
+    styles.rotateIconHeaderRight,
+  ])
 
   // notification permission
   useEffect(() => {

diff --git a/app/screens/receive-bitcoin-screen/use-receive-bitcoin.ts b/app/screens/receive-bitcoin-screen/use-receive-bitcoin.ts
@@ -1,4 +1,4 @@
-import { useEffect, useLayoutEffect, useMemo, useState } from "react"
+import { useCallback, useEffect, useLayoutEffect, useMemo, useState } from "react"
 import {
   BaseCreatePaymentRequestCreationDataParams,
   Invoice,
@@ -30,6 +30,7 @@ import { generateFutureLocalTime, secondsToH, secondsToHMS } from "./payment/hel
 import { toastShow } from "@app/utils/toast"
 import { useI18nContext } from "@app/i18n/i18n-react"
 import fetch from "cross-fetch"
+import ReactNativeHapticFeedback from "react-native-haptic-feedback"
 
 import crashlytics from "@react-native-firebase/crashlytics"
 import { Alert, Share } from "react-native"
@@ -265,6 +266,9 @@ export const useReceiveBitcoin = () => {
       lastHash === pr.info.data.paymentHash
     ) {
       setPR((pq) => pq && pq.setState(PaymentRequestState.Paid))
+      ReactNativeHapticFeedback.trigger("notificationSuccess", {
+        ignoreAndroidSystemSettings: true,
+      })
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [lastHash])
@@ -369,6 +373,34 @@ export const useReceiveBitcoin = () => {
     }
   }, [pr, LL])
 
+  const receiveViaNFC = useCallback(
+    async (destination: ReceiveDestination) => {
+      if (pr?.info?.data?.invoiceType !== "Lightning" || !pr.info.data.paymentRequest) {
+        Alert.alert(LL.RedeemBitcoinScreen.error())
+        return
+      }
+
+      const { callback, k1 } = destination.validDestination
+
+      const url = `${callback}${callback.includes("?") ? "&" : "?"}k1=${k1}&pr=${
+        pr.info.data.paymentRequest
+      }`
+
+      const result = await fetch(url)
+      if (result.ok) {
+        const lnurlResponse = await result.json()
+        if (lnurlResponse?.status?.toLowerCase() !== "ok") {
+          console.error(lnurlResponse, "error with redeeming")
+          Alert.alert(LL.RedeemBitcoinScreen.redeemingError(), lnurlResponse.reason)
+        }
+      } else {
+        console.error(result.text(), "error with submitting withdrawalRequest")
+        Alert.alert(LL.RedeemBitcoinScreen.submissionError())
+      }
+    },
+    [LL.RedeemBitcoinScreen, pr],
+  )
+
   if (!prcd) return null
 
   const setType = (type: InvoiceType) => {
@@ -460,57 +492,6 @@ export const useReceiveBitcoin = () => {
     readablePaymentRequest = `${pr.info.data.username}@${lnAddressHostname}`
   }
 
-  const receiveViaNFC = async (
-    destination: ReceiveDestination,
-    settlementAmount: MoneyAmount<"BTC">,
-  ) => {
-    const { callback, defaultDescription, k1 } = destination.validDestination
-    const { data } = await lnInvoiceCreate({
-      variables: {
-        input: {
-          walletId: prcd.receivingWalletDescriptor.id,
-          amount: settlementAmount.amount,
-          memo: prcd.memo || defaultDescription,
-        },
-      },
-    })
-
-    if (!data) {
-      Alert.alert(LL.RedeemBitcoinScreen.error())
-      return
-    }
-
-    const {
-      lnInvoiceCreate: { invoice, errors },
-    } = data
-
-    if ((errors && errors.length !== 0) || !invoice) {
-      console.error(errors, "error with lnInvoiceCreate")
-      Alert.alert(LL.RedeemBitcoinScreen.error())
-      return
-    }
-
-    const url = `${callback}${callback.includes("?") ? "&" : "?"}k1=${k1}&pr=${
-      invoice.paymentRequest
-    }`
-
-    const result = await fetch(url)
-
-    if (result.ok) {
-      const lnurlResponse = await result.json()
-      if (lnurlResponse?.status?.toLowerCase() !== "ok") {
-        console.error(lnurlResponse, "error with redeeming")
-        Alert.alert(LL.RedeemBitcoinScreen.redeemingError())
-        if (lnurlResponse?.reason) {
-          Alert.alert(lnurlResponse.reason)
-        }
-      }
-    } else {
-      console.error(result.text(), "error with submitting withdrawalRequest")
-      Alert.alert(LL.RedeemBitcoinScreen.submissionError())
-    }
-  }
-
   return {
     ...prcd,
     setType,