@b3dotfun/sdk 0.1.65 → 0.1.66-alpha.0

package/src/anyspend/react/components/AnySpendWorkflowTrigger.tsx

@@ -0,0 +1,73 @@
+import { useMemo } from "react";
+import type { AnySpendAllClasses } from "./types/classes";
+import { AnySpendDeposit } from "./AnySpendDeposit";
+
+export interface AnySpendWorkflowTriggerProps {
+  /** Payment recipient address (hex) */
+  recipientAddress: string;
+  /** Destination chain ID */
+  chainId: number;
+  /** Destination token address */
+  tokenAddress: string;
+  /** Required payment amount in token base units (wei) */
+  amount: string;
+  /** Workflow ID to trigger */
+  workflowId: string;
+  /** Organization ID that owns the workflow */
+  orgId: string;
+  /** Optional callback metadata merged into the order */
+  callbackMetadata?: {
+    /** Passed as trigger result inputs — accessible via {{root.result.inputs.*}} */
+    inputs?: Record<string, unknown>;
+  } & Record<string, unknown>;
+  /** Callback when payment succeeds */
+  onSuccess?: (amount: string) => void;
+  /** Callback when modal is closed */
+  onClose?: () => void;
+  /** Display mode */
+  mode?: "modal" | "page";
+  /** Custom action label */
+  actionLabel?: string;
+  /** Custom class names */
+  classes?: AnySpendAllClasses;
+}
+
+export function AnySpendWorkflowTrigger({
+  recipientAddress,
+  chainId,
+  tokenAddress,
+  amount,
+  workflowId,
+  orgId,
+  callbackMetadata,
+  onSuccess,
+  onClose,
+  mode,
+  actionLabel,
+  classes,
+}: AnySpendWorkflowTriggerProps) {
+  const metadata = useMemo(
+    () => ({
+      workflowId,
+      orgId,
+      ...callbackMetadata,
+    }),
+    [workflowId, orgId, callbackMetadata],
+  );
+
+  return (
+    <AnySpendDeposit
+      recipientAddress={recipientAddress}
+      destinationTokenAddress={tokenAddress}
+      destinationTokenChainId={chainId}
+      destinationTokenAmount={amount}
+      callbackMetadata={metadata}
+      onSuccess={onSuccess}
+      onClose={onClose}
+      mode={mode}
+      actionLabel={actionLabel}
+      classes={classes}
+      allowDirectTransfer
+    />
+  );
+}

package/src/anyspend/react/components/QRDeposit.tsx

@@ -1,4 +1,10 @@
-import { ALL_CHAINS, getAvailableChainIds, isSameChainAndToken } from "@b3dotfun/sdk/anyspend";
+import {
+  ALL_CHAINS,
+  getAvailableChainIds,
+  getPaymentUrl,
+  isSameChainAndToken,
+  ZERO_ADDRESS,
+} from "@b3dotfun/sdk/anyspend";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
 import { Button, toast } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
@@ -8,6 +14,7 @@ import { QRCodeSVG } from "qrcode.react";
 import { useEffect, useRef, useState } from "react";
 import { useAnyspendOrderAndTransactions } from "../hooks/useAnyspendOrderAndTransactions";
 import { useCreateDepositFirstOrder } from "../hooks/useCreateDepositFirstOrder";
+import { useOnOrderSuccess } from "../hooks/useOnOrderSuccess";
 import { TransferResult, useWatchTransfer } from "../hooks/useWatchTransfer";
 import { DepositContractConfig } from "./AnySpendDeposit";
 import { ChainTokenIcon } from "./common/ChainTokenIcon";
@@ -90,7 +97,6 @@ export function QRDeposit({
   const [orderId, setOrderId] = useState<string | undefined>();
   const [globalAddress, setGlobalAddress] = useState<string | undefined>();
   const orderCreatedRef = useRef(false);
-  const onSuccessCalled = useRef(false);
   const [transferResult, setTransferResult] = useState<TransferResult | null>(null);
 
   // Source token/chain as state (can be changed by user)
@@ -189,22 +195,20 @@ export function QRDeposit({
   ]);
 
   // Call onSuccess when order is executed
-  useEffect(() => {
-    if (oat?.data?.order.status === "executed" && !onSuccessCalled.current) {
-      const txHash = oat?.data?.executeTx?.txHash;
-      onSuccess?.(txHash);
-      onSuccessCalled.current = true;
-    }
-  }, [oat?.data?.order.status, oat?.data?.executeTx?.txHash, onSuccess]);
-
-  // Reset onSuccess flag when orderId changes
-  useEffect(() => {
-    onSuccessCalled.current = false;
-  }, [orderId]);
+  useOnOrderSuccess({ orderData: oat, orderId, onSuccess });
 
   // For pure transfers, always use recipient address; for orders, use global address
   const displayAddress = isPureTransfer ? recipientAddress : globalAddress || recipientAddress;
 
+  // Generate EIP-681 payment URI for the QR code so wallets know which chain/token to use
+  const qrValue = getPaymentUrl(
+    displayAddress,
+    undefined,
+    sourceToken.address === ZERO_ADDRESS ? "ETH" : sourceToken.address,
+    sourceChainId,
+    sourceToken.decimals,
+  );
+
   const handleCopyAddress = async () => {
     if (displayAddress) {
       await navigator.clipboard.writeText(displayAddress);
@@ -387,7 +391,7 @@ export function QRDeposit({
           {/* QR Code */}
           <div className={classes?.qrCodeContainer || "anyspend-qr-code-container flex flex-col items-center gap-2"}>
             <div className={classes?.qrCode || "anyspend-qr-code rounded-lg bg-white p-2"}>
-              <QRCodeSVG value={displayAddress} size={120} level="M" marginSize={0} />
+              <QRCodeSVG value={qrValue} size={120} level="M" marginSize={0} />
             </div>
             <span className={classes?.qrScanHint || "anyspend-qr-scan-hint text-as-secondary text-xs"}>
               SCAN WITH <span className="inline-block">🦊</span>

package/src/anyspend/react/components/ccShopAbi.ts

@@ -0,0 +1,64 @@
+// CCShop contract ABI fragments used by AnySpendCollectorClubPurchase
+
+export const BUY_PACKS_FOR_ABI = {
+  inputs: [
+    { internalType: "address", name: "user", type: "address" },
+    { internalType: "uint256", name: "packId", type: "uint256" },
+    { internalType: "uint256", name: "amount", type: "uint256" },
+  ],
+  name: "buyPacksFor",
+  outputs: [],
+  stateMutability: "nonpayable",
+  type: "function",
+} as const;
+
+export const BUY_PACKS_FOR_WITH_DISCOUNT_ABI = {
+  inputs: [
+    { internalType: "address", name: "user", type: "address" },
+    { internalType: "uint256", name: "packId", type: "uint256" },
+    { internalType: "uint256", name: "amount", type: "uint256" },
+    { internalType: "string", name: "discountCode", type: "string" },
+  ],
+  name: "buyPacksForWithDiscount",
+  outputs: [],
+  stateMutability: "nonpayable",
+  type: "function",
+} as const;
+
+export const IS_DISCOUNT_CODE_VALID_FOR_PACK_ABI = {
+  inputs: [
+    { internalType: "string", name: "code", type: "string" },
+    { internalType: "uint256", name: "packId", type: "uint256" },
+  ],
+  name: "isDiscountCodeValidForPack",
+  outputs: [
+    { internalType: "bool", name: "isValid", type: "bool" },
+    { internalType: "uint256", name: "discountAmount", type: "uint256" },
+  ],
+  stateMutability: "view",
+  type: "function",
+} as const;
+
+export const GET_DISCOUNT_CODE_ABI = {
+  inputs: [{ internalType: "string", name: "code", type: "string" }],
+  name: "getDiscountCode",
+  outputs: [
+    {
+      components: [
+        { internalType: "uint256", name: "discountAmount", type: "uint256" },
+        { internalType: "uint256", name: "expiresAt", type: "uint256" },
+        { internalType: "bool", name: "used", type: "bool" },
+        { internalType: "bool", name: "exists", type: "bool" },
+        { internalType: "uint256", name: "maxUses", type: "uint256" },
+        { internalType: "uint256", name: "usedCount", type: "uint256" },
+        { internalType: "uint256", name: "packId", type: "uint256" },
+        { internalType: "uint256", name: "minPurchaseAmount", type: "uint256" },
+      ],
+      internalType: "struct CCShop.DiscountCode",
+      name: "",
+      type: "tuple",
+    },
+  ],
+  stateMutability: "view",
+  type: "function",
+} as const;

package/src/anyspend/react/components/common/CryptoPaySection.tsx

@@ -32,8 +32,6 @@ interface CryptoPaySectionProps {
   onShowFeeDetail?: () => void;
   // Custom classes for styling
   classes?: CryptoPaySectionClasses;
-  /** When true, skip auto-setting max balance when token changes (used for fixed destination amount mode) */
-  skipAutoMaxOnTokenChange?: boolean;
 }
 
 export function CryptoPaySection({
@@ -51,7 +49,6 @@ export function CryptoPaySection({
   onTokenSelect,
   onShowFeeDetail,
   classes,
-  skipAutoMaxOnTokenChange = false,
 }: CryptoPaySectionProps) {
   const { data: srcTokenMetadata } = useTokenData(selectedSrcToken?.chainId, selectedSrcToken?.address);
 
@@ -125,7 +122,6 @@ export function CryptoPaySection({
       <div className={classes?.inputContainer}>
         <OrderTokenAmount
           address={walletAddress}
-          walletAddress={walletAddress}
           context="from"
           inputValue={srcAmount}
           onChangeInput={value => {
@@ -137,7 +133,6 @@ export function CryptoPaySection({
           token={selectedSrcToken}
           setToken={setSelectedSrcToken}
           onTokenSelect={onTokenSelect}
-          skipAutoMaxOnTokenChange={skipAutoMaxOnTokenChange}
         />
       </div>
       <div className={classes?.balanceRow || "flex items-center justify-between"}>

package/src/anyspend/react/components/common/OrderTokenAmount.tsx

@@ -1,15 +1,11 @@
 "use client";
 
 import { ChevronsUpDown } from "lucide-react";
-import { useEffect, useRef } from "react";
 import { NumericFormat } from "react-number-format";
-import { formatUnits } from "viem";
 
 import { ALL_CHAINS, RELAY_SOLANA_MAINNET_CHAIN_ID, getAvailableChainIds } from "@b3dotfun/sdk/anyspend";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
-import { getNativeRequired } from "@b3dotfun/sdk/anyspend/utils/chain";
-import { isNativeToken } from "@b3dotfun/sdk/anyspend/utils/token";
-import { Button, useTokenBalance } from "@b3dotfun/sdk/global-account/react";
+import { Button } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils";
 import { TokenSelector } from "@relayprotocol/relay-kit-ui";
 import { ChainTokenIcon } from "./ChainTokenIcon";
@@ -31,8 +27,6 @@ export function OrderTokenAmount({
   amountClassName,
   tokenSelectClassName,
   onTokenSelect,
-  walletAddress,
-  skipAutoMaxOnTokenChange = false,
 }: {
   disabled?: boolean;
   inputValue: string;
@@ -50,64 +44,7 @@ export function OrderTokenAmount({
   amountClassName?: string;
   tokenSelectClassName?: string;
   onTokenSelect?: (token: components["schemas"]["Token"], event: { preventDefault: () => void }) => void;
-  walletAddress?: string | undefined;
-  /** When true, skip auto-setting max balance when token changes (used for fixed destination amount mode) */
-  skipAutoMaxOnTokenChange?: boolean;
 }) {
-  // Track previous token to detect changes
-  const prevTokenRef = useRef<string>(token.address);
-
-  // Only get token balance when context is "from" (for setting max amount)
-  const { rawBalance } = useTokenBalance({
-    token,
-    address: context === "from" && walletAddress ? walletAddress : undefined,
-  });
-
-  useEffect(() => {
-    // Only handle "from" context
-    if (context !== "from") return;
-
-    // Skip auto-max when in fixed destination amount mode
-    if (skipAutoMaxOnTokenChange) {
-      prevTokenRef.current = token.address;
-      return;
-    }
-
-    // Check if token changed or if this is the initial load with balance
-    const isTokenChanged = prevTokenRef.current !== token.address;
-
-    if (isTokenChanged && rawBalance) {
-      console.log(`Setting max balance - Token: ${token.address}, Changed: ${isTokenChanged}`);
-
-      // Calculate max amount with gas reserve for native tokens
-      let maxAmount: bigint;
-
-      if (isNativeToken(token.address)) {
-        const gasReserve = getNativeRequired(token.chainId);
-        // Ensure we don't go negative
-        maxAmount = rawBalance > gasReserve ? rawBalance - gasReserve : BigInt(0);
-      } else {
-        // For ERC20 tokens, use full balance
-        maxAmount = rawBalance;
-      }
-
-      // Set the max amount as input value
-      onChangeInput(formatUnits(maxAmount, token.decimals));
-
-      // Update refs
-      prevTokenRef.current = token.address;
-    }
-  }, [
-    token.address,
-    token.chainId,
-    token.decimals,
-    chainId,
-    context,
-    onChangeInput,
-    rawBalance,
-    skipAutoMaxOnTokenChange,
-  ]);
-
   const handleTokenSelect = (newToken: any) => {
     const token: components["schemas"]["Token"] = {
       address: newToken.address,
@@ -134,13 +71,7 @@ export function OrderTokenAmount({
       }
     }
 
-    // Mark that we're about to change tokens
-    prevTokenRef.current = "changing"; // Temporary value to force effect
-
-    // Set the chain ID first
     setChainId(newToken.chainId);
-
-    // Then set the new token - the useEffect will handle setting the max balance
     setToken(token);
   };
 

package/src/anyspend/react/components/common/PaySection.tsx

@@ -116,7 +116,6 @@ export function CryptoPaySection({
       </div>
       <OrderTokenAmount
         address={connectedAddress}
-        walletAddress={connectedAddress}
         context="from"
         inputValue={srcAmount}
         onChangeInput={value => {

package/src/anyspend/react/components/index.ts

@@ -24,6 +24,8 @@ export type {
   RecipientSelectionClasses,
 } from "./types/classes";
 export { AnySpendDepositHype, HYPE_TOKEN_DETAILS } from "./AnyspendDepositHype";
+export { AnySpendWorkflowTrigger } from "./AnySpendWorkflowTrigger";
+export type { AnySpendWorkflowTriggerProps } from "./AnySpendWorkflowTrigger";
 export * from "./AnySpendFingerprintWrapper";
 export { AnySpendNFT } from "./AnySpendNFT";
 export { AnyspendSignatureMint } from "./AnyspendSignatureMint";

package/src/anyspend/react/hooks/index.ts

@@ -12,6 +12,7 @@ export * from "./useGasPrice";
 export * from "./useGeoOnrampOptions";
 export * from "./useGetGeo";
 export * from "./useHyperliquidTransfer";
+export * from "./useOnOrderSuccess";
 export * from "./useRecipientAddressState";
 export * from "./useSigMint";
 export * from "./useStripeClientSecret";

package/src/anyspend/react/hooks/useAnyspendCreateOnrampOrder.ts

@@ -113,6 +113,7 @@ export function useAnyspendCreateOnrampOrder({ onSuccess, onError }: UseAnyspend
           partnerId,
           clientReferenceId,
           visitorData,
+          callbackMetadata: params.callbackMetadata,
         });
       } catch (error: any) {
         // If the error has a response with message and statusCode, throw that

package/src/anyspend/react/hooks/useAnyspendCreateOrder.ts

@@ -22,6 +22,7 @@ export type CreateOrderParams = {
   creatorAddress?: string;
   payload?: any;
   metadata?: Record<string, any>;
+  callbackMetadata?: Record<string, unknown>;
 };
 
 export type UseAnyspendCreateOrderProps = {
@@ -87,6 +88,7 @@ export function useAnyspendCreateOrder({ onSuccess, onError }: UseAnyspendCreate
           partnerId,
           clientReferenceId,
           visitorData,
+          callbackMetadata: params.callbackMetadata,
         });
       } catch (error: any) {
         // If the error has a response with message and statusCode, throw that

package/src/anyspend/react/hooks/useOnOrderSuccess.ts

@@ -0,0 +1,36 @@
+import { useEffect, useRef } from "react";
+import { GetOrderAndTxsResponse } from "../../types/api_req_res";
+
+/**
+ * Hook to call onSuccess callback when an order is executed.
+ * Handles fallback to relayTxs when executeTx is null.
+ */
+export function useOnOrderSuccess({
+  orderData,
+  orderId,
+  onSuccess,
+}: {
+  orderData: GetOrderAndTxsResponse | undefined;
+  orderId: string | undefined;
+  onSuccess?: (txHash?: string) => void;
+}) {
+  const onSuccessCalled = useRef(false);
+  const prevOrderId = useRef(orderId);
+
+  useEffect(() => {
+    // Reset flag when orderId changes
+    if (prevOrderId.current !== orderId) {
+      onSuccessCalled.current = false;
+      prevOrderId.current = orderId;
+    }
+
+    // Call onSuccess when order is executed
+    if (orderData?.data?.order.status === "executed" && !onSuccessCalled.current) {
+      const relayTxs = orderData?.data?.relayTxs;
+      const lastSuccessfulRelayTx = relayTxs?.filter(tx => tx.status === "success").pop();
+      const txHash = orderData?.data?.executeTx?.txHash || lastSuccessfulRelayTx?.txHash;
+      onSuccess?.(txHash);
+      onSuccessCalled.current = true;
+    }
+  }, [orderData, orderId, onSuccess]);
+}

package/src/anyspend/services/anyspend.ts

@@ -70,6 +70,7 @@ export const anyspendService = {
     partnerId,
     clientReferenceId,
     visitorData,
+    callbackMetadata,
   }: {
     recipientAddress: string;
     type: string;
@@ -85,6 +86,7 @@ export const anyspendService = {
     partnerId?: string;
     clientReferenceId?: string;
     visitorData?: VisitorData;
+    callbackMetadata?: Record<string, unknown>;
   }) => {
     const accessToken = await app.authentication.getAccessToken();
     const response = await fetch(`${ANYSPEND_MAINNET_BASE_URL}/orders`, {
@@ -109,6 +111,7 @@ export const anyspendService = {
         creatorAddress,
         partnerId,
         ...(clientReferenceId && { clientReferenceId }),
+        ...(callbackMetadata && { callbackMetadata }),
       }),
     });
     const data: CreateOrderResponse = await response.json();

package/src/anyspend/utils/chain.ts

@@ -421,7 +421,13 @@ export function getCoingeckoName(chainId: number): string | null {
   return ALL_CHAINS[chainId].coingeckoName;
 }
 
-export function getPaymentUrl(address: string, amount: bigint, currency: string, chainId: number, decimals?: number) {
+export function getPaymentUrl(
+  address: string,
+  amount: bigint | undefined,
+  currency: string,
+  chainId: number,
+  decimals?: number,
+) {
   // Get chain type to determine URL format
   const chainType = getChainType(chainId);
   const chain = ALL_CHAINS[chainId];
@@ -433,8 +439,8 @@ export function getPaymentUrl(address: string, amount: bigint, currency: string,
       // Format: ethereum:[address]@[chainId]?value=[amount]&symbol=[symbol]
       const params = new URLSearchParams();
 
-      // Add value for native token transfers
-      if (currency === chain.nativeToken.symbol) {
+      // Add value for native token transfers (skip if amount not provided, e.g. deposit_first)
+      if (currency === chain.nativeToken.symbol && amount !== undefined) {
         params.append("value", amount.toString());
       }
 
@@ -453,28 +459,31 @@ export function getPaymentUrl(address: string, amount: bigint, currency: string,
 
         // For ERC20 tokens, convert from smallest unit to display units using decimals
         // For example: 2400623 (raw) with 6 decimals becomes "2.400623"
-        let displayAmount: string;
-        if (decimals !== undefined && currency !== chain.nativeToken.symbol) {
-          // Convert from smallest unit to display unit for ERC20 tokens
-          const divisor = BigInt(10 ** decimals);
-          const wholePart = amount / divisor;
-          const fractionalPart = amount % divisor;
-
-          if (fractionalPart === BigInt(0)) {
-            displayAmount = wholePart.toString();
+        // Skip amount if not provided (e.g. deposit_first orders)
+        if (amount !== undefined) {
+          let displayAmount: string;
+          if (decimals !== undefined && currency !== chain.nativeToken.symbol) {
+            // Convert from smallest unit to display unit for ERC20 tokens
+            const divisor = BigInt(10 ** decimals);
+            const wholePart = amount / divisor;
+            const fractionalPart = amount % divisor;
+
+            if (fractionalPart === BigInt(0)) {
+              displayAmount = wholePart.toString();
+            } else {
+              // Format fractional part with leading zeros if needed
+              const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
+              // Remove trailing zeros
+              const trimmedFractional = fractionalStr.replace(/0+$/, "");
+              displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+            }
           } else {
-            // Format fractional part with leading zeros if needed
-            const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
-            // Remove trailing zeros
-            const trimmedFractional = fractionalStr.replace(/0+$/, "");
-            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+            // For native tokens or when decimals not provided, use raw amount
+            displayAmount = amount.toString();
           }
-        } else {
-          // For native tokens or when decimals not provided, use raw amount
-          displayAmount = amount.toString();
-        }
 
-        tokenParams.append("amount", displayAmount);
+          tokenParams.append("amount", displayAmount);
+        }
         tokenParams.append("address", address); // recipient address
 
         // For Arbitrum and other L2s, try a more explicit format
@@ -495,7 +504,9 @@ export function getPaymentUrl(address: string, amount: bigint, currency: string,
         // to make sure wallets recognize the correct chain
         const nativeParams = new URLSearchParams();
         nativeParams.append("chainId", chainId.toString());
-        nativeParams.append("value", amount.toString());
+        if (amount !== undefined) {
+          nativeParams.append("value", amount.toString());
+        }
         const url = `ethereum:${address}@${chainId}?${nativeParams.toString()}`;
         return url;
       } else {
@@ -517,60 +528,65 @@ export function getPaymentUrl(address: string, amount: bigint, currency: string,
 
       if (isNativeSOL) {
         // Native SOL transfers - convert from lamports to SOL
-        let displayAmount: string;
-        if (decimals !== undefined) {
-          const divisor = BigInt(10 ** decimals);
-          const wholePart = amount / divisor;
-          const fractionalPart = amount % divisor;
-
-          if (fractionalPart === BigInt(0)) {
-            displayAmount = wholePart.toString();
+        if (amount !== undefined) {
+          let displayAmount: string;
+          if (decimals !== undefined) {
+            const divisor = BigInt(10 ** decimals);
+            const wholePart = amount / divisor;
+            const fractionalPart = amount % divisor;
+
+            if (fractionalPart === BigInt(0)) {
+              displayAmount = wholePart.toString();
+            } else {
+              const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
+              const trimmedFractional = fractionalStr.replace(/0+$/, "");
+              displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+            }
           } else {
-            const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
-            const trimmedFractional = fractionalStr.replace(/0+$/, "");
-            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+            // Fallback: assume SOL has 9 decimals
+            const divisor = BigInt(1000000000); // 1e9
+            const wholePart = amount / divisor;
+            const fractionalPart = amount % divisor;
+
+            if (fractionalPart === BigInt(0)) {
+              displayAmount = wholePart.toString();
+            } else {
+              const fractionalStr = fractionalPart.toString().padStart(9, "0");
+              const trimmedFractional = fractionalStr.replace(/0+$/, "");
+              displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+            }
           }
-        } else {
-          // Fallback: assume SOL has 9 decimals
-          const divisor = BigInt(1000000000); // 1e9
-          const wholePart = amount / divisor;
-          const fractionalPart = amount % divisor;
 
-          if (fractionalPart === BigInt(0)) {
-            displayAmount = wholePart.toString();
-          } else {
-            const fractionalStr = fractionalPart.toString().padStart(9, "0");
-            const trimmedFractional = fractionalStr.replace(/0+$/, "");
-            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
-          }
+          // For native SOL, use simple format without spl-token parameter
+          params.append("amount", displayAmount);
         }
-
-        // For native SOL, use simple format without spl-token parameter
-        params.append("amount", displayAmount);
       } else {
         // SPL token transfers
-        let displayAmount: string;
-        if (decimals !== undefined) {
-          const divisor = BigInt(10 ** decimals);
-          const wholePart = amount / divisor;
-          const fractionalPart = amount % divisor;
-
-          if (fractionalPart === BigInt(0)) {
-            displayAmount = wholePart.toString();
+        if (amount !== undefined) {
+          let displayAmount: string;
+          if (decimals !== undefined) {
+            const divisor = BigInt(10 ** decimals);
+            const wholePart = amount / divisor;
+            const fractionalPart = amount % divisor;
+
+            if (fractionalPart === BigInt(0)) {
+              displayAmount = wholePart.toString();
+            } else {
+              const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
+              const trimmedFractional = fractionalStr.replace(/0+$/, "");
+              displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+            }
           } else {
-            const fractionalStr = fractionalPart.toString().padStart(decimals, "0");
-            const trimmedFractional = fractionalStr.replace(/0+$/, "");
-            displayAmount = trimmedFractional ? `${wholePart}.${trimmedFractional}` : wholePart.toString();
+            displayAmount = amount.toString();
           }
-        } else {
-          displayAmount = amount.toString();
-        }
 
-        params.append("amount", displayAmount);
+          params.append("amount", displayAmount);
+        }
         params.append("spl-token", currency); // token mint address
       }
 
-      const url = `solana:${address}?${params.toString()}`;
+      const queryString = params.toString();
+      const url = queryString ? `solana:${address}?${queryString}` : `solana:${address}`;
       console.log("Solana URL (isNativeSOL:", isNativeSOL, "):", url);
       return url;
     }