@b3dotfun/sdk 0.1.64 → 0.1.65-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b3dotfun/sdk",
-  "version": "0.1.64",
+  "version": "0.1.65-alpha.1",
   "source": "src/index.ts",
   "main": "./dist/cjs/index.js",
   "react-native": "./dist/cjs/index.native.js",

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

@@ -52,6 +52,7 @@ import { useAutoSelectCryptoPaymentMethod } from "../hooks/useAutoSelectCryptoPa
 import { useConnectedWalletDisplay } from "../hooks/useConnectedWalletDisplay";
 import { useCryptoPaymentMethodState } from "../hooks/useCryptoPaymentMethodState";
 import { useDirectTransfer } from "../hooks/useDirectTransfer";
+import { useOnOrderSuccess } from "../hooks/useOnOrderSuccess";
 import { useRecipientAddressState } from "../hooks/useRecipientAddressState";
 import { AnySpendFingerprintWrapper, getFingerprintConfig } from "./AnySpendFingerprintWrapper";
 import { CryptoPaymentMethod, CryptoPaymentMethodType } from "./common/CryptoPaymentMethod";
@@ -208,9 +209,6 @@ function AnySpendInner({
     toAmount?: string;
   } | null>(null);
 
-  // Track if onSuccess has been called for the current order
-  const onSuccessCalled = useRef(false);
-
   // Track animation direction for TransitionPanel
   const animationDirection = useRef<"forward" | "back" | null>(null);
   // Track previous panel for proper back navigation
@@ -704,19 +702,8 @@ function AnySpendInner({
     }
   }, [anyspendQuote, isSrcInputDirty, destinationTokenAmount]);
 
-  useEffect(() => {
-    if (oat?.data?.order.status === "executed" && !onSuccessCalled.current) {
-      console.log("Calling onSuccess");
-      const txHash = oat?.data?.executeTx?.txHash;
-      onSuccess?.(txHash);
-      onSuccessCalled.current = true;
-    }
-  }, [oat?.data?.order.status, oat?.data?.executeTx?.txHash, onSuccess]);
-
-  // Reset flag when orderId changes
-  useEffect(() => {
-    onSuccessCalled.current = false;
-  }, [orderId]);
+  // Call onSuccess when order is executed
+  useOnOrderSuccess({ orderData: oat, orderId, onSuccess });
 
   const { createOrder, isCreatingOrder } = useAnyspendCreateOrder({
     onSuccess: data => {

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

@@ -45,6 +45,7 @@ import React, { useCallback, useEffect, useMemo, useState } from "react";
 
 import { base } from "viem/chains";
 import { useCryptoPaymentMethodState } from "../hooks/useCryptoPaymentMethodState";
+import { useOnOrderSuccess } from "../hooks/useOnOrderSuccess";
 import { useRecipientAddressState } from "../hooks/useRecipientAddressState";
 import { AnySpendFingerprintWrapper, getFingerprintConfig } from "./AnySpendFingerprintWrapper";
 import { CryptoPaymentMethod, CryptoPaymentMethodType } from "./common/CryptoPaymentMethod";
@@ -274,9 +275,6 @@ function AnySpendCustomInner({
 
   const [orderId, setOrderId] = useState<string | undefined>(loadOrder);
 
-  // Track if onSuccess has been called for the current order
-  const onSuccessCalled = React.useRef(false);
-
   const [srcChainId, setSrcChainId] = useState<number>(base.id);
 
   // Get token list for token balance check
@@ -433,21 +431,8 @@ function AnySpendCustomInner({
   const { geoData, isOnrampSupported, coinbaseAvailablePaymentMethods, stripeOnrampSupport, stripeWeb2Support } =
     useGeoOnrampOptions(srcFiatAmountForGeoCheck);
 
-  useEffect(() => {
-    if (oat?.data?.order.status === "executed" && !onSuccessCalled.current) {
-      console.log("Calling onSuccess");
-      const relayTxs = oat?.data?.relayTxs;
-      const lastRelayTxHash = relayTxs?.[relayTxs.length - 1]?.txHash;
-      const txHash = oat?.data?.executeTx?.txHash || lastRelayTxHash;
-      onSuccess?.(txHash);
-      onSuccessCalled.current = true;
-    }
-  }, [oat?.data?.order.status, oat?.data?.executeTx?.txHash, oat?.data?.relayTxs, onSuccess]);
-
-  // Reset flag when orderId changes
-  useEffect(() => {
-    onSuccessCalled.current = false;
-  }, [orderId]);
+  // Call onSuccess when order is executed
+  useOnOrderSuccess({ orderData: oat, orderId, onSuccess });
 
   const { createOrder: createRegularOrder, isCreatingOrder: isCreatingRegularOrder } = useAnyspendCreateOrder({
     onSuccess: data => {

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

@@ -8,6 +8,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 +91,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,18 +189,7 @@ 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;

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

@@ -959,7 +959,7 @@ export const OrderDetails = memo(function OrderDetails({
       <OrderStatus order={order} selectedCryptoPaymentMethod={effectiveCryptoPaymentMethod} />
       {statusDisplay === "processing" && (
         <>
-          {order.onrampMetadata ? (
+          {order.onrampMetadata && order.onrampMetadata.vendor !== "none" ? (
             <PaymentVendorUI order={order} dstTokenSymbol={dstToken.symbol} />
           ) : effectiveCryptoPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET ||
             effectiveCryptoPaymentMethod === CryptoPaymentMethodType.GLOBAL_WALLET ? (

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/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]);
+}