add parsing logic for payment methods and fix lightning send bug with amounts

Author: niteshbalusu11

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
   "editor.formatOnSave": true,
-  "editor.defaultFormatter": "esbenp.prettier-vscode"
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "cmake.sourceDirectory": "/Users/niteshchowdharybalusu/Documents/noah/nitromodules/noah-tools/android"
 }

bun.lock

@@ -70,7 +70,7 @@ PODS:
   - hermes-engine (0.79.4):
     - hermes-engine/Pre-built (= 0.79.4)
   - hermes-engine/Pre-built (0.79.4)
-  - NitroArk (0.0.20):
+  - NitroArk (0.0.22):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2561,7 +2561,7 @@ SPEC CHECKSUMS:
   fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
   glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
   hermes-engine: 8b5a5eb386b990287d072fd7b6f6ebd9544dd251
-  NitroArk: c85047d1793693c9a66cc3bb38d19836759c9304
+  NitroArk: b20eef0d0cbeb910ef06b60532f031c47b7c9520
   NitroModules: f36b94e48ff1705fc6b84bc1953f40e2da4196c2
   NoahTools: 12a4e8705c339d40f7218c725de658f4a62ef646
   RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82

ios/Podfile.lock

@@ -71,7 +71,7 @@
     "react-native-edge-to-edge": "^1.6.1",
     "react-native-keychain": "^10.0.0",
     "react-native-mmkv": "^3.3.0",
-    "react-native-nitro-ark": "^0.0.20",
+    "react-native-nitro-ark": "^0.0.22",
     "react-native-nitro-modules": "0.26.3",
     "react-native-qrcode-svg": "^6.3.15",
     "react-native-reanimated": "~3.17.4",

package.json

@@ -3,7 +3,7 @@ const path = require("path");
 const https = require("https");
 const { execSync } = require("child_process");
 
-const NITRO_ARK_VERSION = "v0.0.19";
+const NITRO_ARK_VERSION = "v0.0.22";
 
 // --- Configuration ---
 const XC_FRAMEWORK_URL = `https://github.com/BlixtWallet/react-native-nitro-ark/releases/download/${NITRO_ARK_VERSION}/Ark.xcframework.zip`;

scripts/download_ark_binaries.js

@@ -77,7 +77,7 @@ export const send = async ({
   noSync = false,
 }: {
   destination: string;
-  amountSat: number;
+  amountSat: number | null;
   comment: string | null;
   noSync?: boolean;
 }): Promise<string> => {

src/lib/paymentsApi.ts

@@ -0,0 +1,84 @@
+import { decodeBolt11, isArkPublicKey, isValidBitcoinAddress, isValidBolt11 } from "../constants";
+
+export type DestinationTypes = "bitcoin" | "lightning" | "ark" | null;
+
+export type ParsedDestination = {
+  destinationType: DestinationTypes;
+  amount?: number;
+  isAmountEditable: boolean;
+  error?: string;
+};
+
+export const isValidDestination = (dest: string): boolean => {
+  const cleanedDest = dest.replace(/^(bitcoin:|lightning:)/i, "");
+  return (
+    isArkPublicKey(cleanedDest) || isValidBitcoinAddress(cleanedDest) || isValidBolt11(cleanedDest)
+  );
+};
+
+export const parseDestination = (destination: string): ParsedDestination => {
+  const cleanedDestination = destination.replace(/^(bitcoin:|lightning:)/i, "");
+
+  if (isValidBolt11(cleanedDestination)) {
+    try {
+      const decoded = decodeBolt11(cleanedDestination);
+      if (decoded === null) {
+        throw new Error("Invalid invoice");
+      }
+
+      const msats = decoded.sections.find((n) => n.name === "amount")?.value;
+
+      if (msats === undefined) {
+        return {
+          destinationType: "lightning",
+          isAmountEditable: true,
+        };
+      }
+
+      if (Number(msats) > 0 && Number(msats) < 1000) {
+        return {
+          destinationType: "lightning",
+          isAmountEditable: true,
+          error: "Invoice amount is less than 1 satoshi.",
+        };
+      }
+
+      const sats = Number(msats) / 1000;
+
+      if (sats >= 1) {
+        return {
+          destinationType: "lightning",
+          amount: sats,
+          isAmountEditable: false,
+        };
+      } else {
+        return {
+          destinationType: "lightning",
+          isAmountEditable: true,
+        };
+      }
+    } catch (e) {
+      console.error("Failed to decode bolt11 invoice", e);
+      return {
+        destinationType: null,
+        isAmountEditable: true,
+        error: "Failed to decode bolt11 invoice",
+      };
+    }
+  } else if (isValidBitcoinAddress(cleanedDestination)) {
+    return {
+      destinationType: "bitcoin",
+      isAmountEditable: true,
+    };
+  } else if (isArkPublicKey(cleanedDestination)) {
+    return {
+      destinationType: "ark",
+      isAmountEditable: true,
+    };
+  }
+
+  return {
+    destinationType: null,
+    isAmountEditable: true,
+  };
+};

src/lib/sendUtils.ts

@@ -7,7 +7,7 @@ import { Text } from "../components/ui/text";
 import { Input } from "../components/ui/input";
 import { Button } from "../components/ui/button";
 import { COLORS } from "../lib/constants";
-import { decodeBolt11, isArkPublicKey, isValidBitcoinAddress, isValidBolt11 } from "../constants";
+import { parseDestination, isValidDestination, type DestinationTypes } from "../lib/sendUtils";
 import { useSend } from "../hooks/usePayments";
 import SuccessAnimation from "../components/SuccessAnimation";
 import { Card, CardContent, CardHeader, CardTitle } from "../components/ui/card";
@@ -32,43 +32,26 @@ const SendScreen = () => {
   const [comment, setComment] = useState("");
   const [showCamera, setShowCamera] = useState(false);
   const [parsedResult, setParsedResult] = useState<SendResult | null>(null);
+  const [destinationType, setDestinationType] = useState<DestinationTypes | null>(null);
 
   useEffect(() => {
-    if (isValidBolt11(destination)) {
-      try {
-        const decoded = decodeBolt11(destination);
-        if (decoded === null) {
-          throw new Error("Invalid invoice");
-        }
-
-        const msats = decoded.sections.find((n) => n.name === "amount")?.value;
-
-        if (msats === undefined) {
-          throw new Error("Missing amount");
-        }
+    if (destination) {
+      const {
+        destinationType: newDestinationType,
+        amount: newAmount,
+        isAmountEditable: newIsAmountEditable,
+        error: parseError,
+      } = parseDestination(destination);
 
-        if (Number(msats) > 0 && Number(msats) < 1000) {
-          Alert.alert("Invalid Amount", "Invoice amount is less than 1 satoshi.");
-          setAmount("");
-          setIsAmountEditable(true);
-          return;
-        }
-
-        const sats = Number(msats) / 1000;
-
-        if (sats >= 1) {
-          setAmount(sats.toString());
-          setIsAmountEditable(false);
-        } else {
-          setAmount("");
-          setIsAmountEditable(true);
-        }
-      } catch (e) {
-        console.error("Failed to decode bolt11 invoice", e);
-        setAmount("");
-        setIsAmountEditable(true);
+      if (parseError) {
+        Alert.alert("Invalid Destination", parseError);
       }
+
+      setDestinationType(newDestinationType);
+      setAmount(newAmount?.toString() ?? "");
+      setIsAmountEditable(newIsAmountEditable);
     } else {
+      setDestinationType(null);
       setAmount("");
       setIsAmountEditable(true);
     }
@@ -87,17 +70,8 @@ const SendScreen = () => {
     }
   }, [result]);
 
-  const isValidDestination = (dest: string) => {
-    const cleanedDest = dest.replace(/^(bitcoin:|lightning:)/i, "");
-    return (
-      isArkPublicKey(cleanedDest) ||
-      isValidBitcoinAddress(cleanedDest) ||
-      isValidBolt11(cleanedDest)
-    );
-  };
-
   const handleSend = () => {
-    const amountSat = parseInt(amount, 10);
+    let amountSat: number | null = parseInt(amount, 10);
     if (!isValidDestination(destination)) {
       Alert.alert(
         "Invalid Destination",
@@ -109,7 +83,14 @@ const SendScreen = () => {
       Alert.alert("Invalid Amount", "Please enter a valid amount.");
       return;
     }
+
+    if (destinationType === "lightning" && amountSat !== 0) {
+      amountSat = null;
+    }
+
     const cleanedDestination = destination.replace(/^(bitcoin:|lightning:)/i, "");
+
+    console.log("send details", cleanedDestination, amountSat, comment);
     send({ destination: cleanedDestination, amountSat, comment: comment || null });
   };