@b3dotfun/sdk 0.1.65-alpha.0 → 0.1.65-alpha.2

package/dist/cjs/anyspend/react/components/AnySpend.js

@@ -25,6 +25,7 @@ const useAutoSelectCryptoPaymentMethod_1 = require("../hooks/useAutoSelectCrypto
 const useConnectedWalletDisplay_1 = require("../hooks/useConnectedWalletDisplay");
 const useCryptoPaymentMethodState_1 = require("../hooks/useCryptoPaymentMethodState");
 const useDirectTransfer_1 = require("../hooks/useDirectTransfer");
+const useOnOrderSuccess_1 = require("../hooks/useOnOrderSuccess");
 const useRecipientAddressState_1 = require("../hooks/useRecipientAddressState");
 const AnySpendFingerprintWrapper_1 = require("./AnySpendFingerprintWrapper");
 const CryptoPaymentMethod_1 = require("./common/CryptoPaymentMethod");
@@ -72,8 +73,6 @@ function AnySpendInner({ sourceChainId, destinationTokenAddress, destinationToke
     // Add refs to track URL state
     const initialUrlProcessed = (0, react_4.useRef)(false);
     const lastUrlUpdate = (0, react_4.useRef)(null);
-    // Track if onSuccess has been called for the current order
-    const onSuccessCalled = (0, react_4.useRef)(false);
     // Track animation direction for TransitionPanel
     const animationDirection = (0, react_4.useRef)(null);
     // Track previous panel for proper back navigation
@@ -493,18 +492,8 @@ function AnySpendInner({ sourceChainId, destinationTokenAddress, destinationToke
             }
         }
     }, [anyspendQuote, isSrcInputDirty, destinationTokenAmount]);
-    (0, react_4.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
-    (0, react_4.useEffect)(() => {
-        onSuccessCalled.current = false;
-    }, [orderId]);
+    // Call onSuccess when order is executed
+    (0, useOnOrderSuccess_1.useOnOrderSuccess)({ orderData: oat, orderId, onSuccess });
     const { createOrder, isCreatingOrder } = (0, react_1.useAnyspendCreateOrder)({
         onSuccess: data => {
             const orderId = data.data.id;

package/dist/cjs/anyspend/react/components/AnySpendCustom.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -50,9 +17,10 @@ const simplehash_1 = require("../../../shared/utils/simplehash");
 const invariant_1 = __importDefault(require("invariant"));
 const lucide_react_1 = require("lucide-react");
 const react_4 = require("motion/react");
-const react_5 = __importStar(require("react"));
+const react_5 = require("react");
 const chains_1 = require("viem/chains");
 const useCryptoPaymentMethodState_1 = require("../hooks/useCryptoPaymentMethodState");
+const useOnOrderSuccess_1 = require("../hooks/useOnOrderSuccess");
 const useRecipientAddressState_1 = require("../hooks/useRecipientAddressState");
 const AnySpendFingerprintWrapper_1 = require("./AnySpendFingerprintWrapper");
 const CryptoPaymentMethod_1 = require("./common/CryptoPaymentMethod");
@@ -165,8 +133,6 @@ function AnySpendCustomInner({ loadOrder, mode = "modal", activeTab: activeTabPr
         globalAddress: currentWallet.address,
     });
     const [orderId, setOrderId] = (0, react_5.useState)(loadOrder);
-    // Track if onSuccess has been called for the current order
-    const onSuccessCalled = react_5.default.useRef(false);
     const [srcChainId, setSrcChainId] = (0, react_5.useState)(chains_1.base.id);
     // Get token list for token balance check
     const chainName = (0, react_5.useMemo)(() => (0, simplehash_1.simpleHashChainToChainName)(srcChainId), [srcChainId]);
@@ -304,20 +270,8 @@ function AnySpendCustomInner({ loadOrder, mode = "modal", activeTab: activeTabPr
     }, [activeTab, srcFiatAmountForGeoCheck]);
     // Get geo data and onramp options (use srcFiatAmountForGeoCheck to check availability regardless of activeTab)
     const { geoData, isOnrampSupported, coinbaseAvailablePaymentMethods, stripeOnrampSupport, stripeWeb2Support } = (0, react_1.useGeoOnrampOptions)(srcFiatAmountForGeoCheck);
-    (0, react_5.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
-    (0, react_5.useEffect)(() => {
-        onSuccessCalled.current = false;
-    }, [orderId]);
+    // Call onSuccess when order is executed
+    (0, useOnOrderSuccess_1.useOnOrderSuccess)({ orderData: oat, orderId, onSuccess });
     const { createOrder: createRegularOrder, isCreatingOrder: isCreatingRegularOrder } = (0, react_1.useAnyspendCreateOrder)({
         onSuccess: data => {
             setOrderId(data.data.id);

package/dist/cjs/anyspend/react/components/QRDeposit.js

@@ -11,6 +11,7 @@ const qrcode_react_1 = require("qrcode.react");
 const react_2 = require("react");
 const useAnyspendOrderAndTransactions_1 = require("../hooks/useAnyspendOrderAndTransactions");
 const useCreateDepositFirstOrder_1 = require("../hooks/useCreateDepositFirstOrder");
+const useOnOrderSuccess_1 = require("../hooks/useOnOrderSuccess");
 const useWatchTransfer_1 = require("../hooks/useWatchTransfer");
 const ChainTokenIcon_1 = require("./common/ChainTokenIcon");
 const OrderDetails_1 = require("./common/OrderDetails");
@@ -46,7 +47,6 @@ function QRDeposit({ mode = "modal", recipientAddress, sourceToken: sourceTokenP
     const [orderId, setOrderId] = (0, react_2.useState)();
     const [globalAddress, setGlobalAddress] = (0, react_2.useState)();
     const orderCreatedRef = (0, react_2.useRef)(false);
-    const onSuccessCalled = (0, react_2.useRef)(false);
     const [transferResult, setTransferResult] = (0, react_2.useState)(null);
     // Source token/chain as state (can be changed by user)
     const [sourceChainId, setSourceChainId] = (0, react_2.useState)(sourceChainIdProp ?? 8453);
@@ -128,17 +128,7 @@ function QRDeposit({ mode = "modal", recipientAddress, sourceToken: sourceTokenP
         isPureTransfer,
     ]);
     // Call onSuccess when order is executed
-    (0, react_2.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
-    (0, react_2.useEffect)(() => {
-        onSuccessCalled.current = false;
-    }, [orderId]);
+    (0, useOnOrderSuccess_1.useOnOrderSuccess)({ orderData: oat, orderId, onSuccess });
     // For pure transfers, always use recipient address; for orders, use global address
     const displayAddress = isPureTransfer ? recipientAddress : globalAddress || recipientAddress;
     const handleCopyAddress = async () => {

package/dist/cjs/anyspend/react/hooks/index.d.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/dist/cjs/anyspend/react/hooks/index.js

@@ -28,6 +28,7 @@ __exportStar(require("./useGasPrice"), exports);
 __exportStar(require("./useGeoOnrampOptions"), exports);
 __exportStar(require("./useGetGeo"), exports);
 __exportStar(require("./useHyperliquidTransfer"), exports);
+__exportStar(require("./useOnOrderSuccess"), exports);
 __exportStar(require("./useRecipientAddressState"), exports);
 __exportStar(require("./useSigMint"), exports);
 __exportStar(require("./useStripeClientSecret"), exports);

package/dist/cjs/anyspend/react/hooks/useOnOrderSuccess.d.ts

@@ -0,0 +1,10 @@
+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 declare function useOnOrderSuccess({ orderData, orderId, onSuccess, }: {
+    orderData: GetOrderAndTxsResponse | undefined;
+    orderId: string | undefined;
+    onSuccess?: (txHash?: string) => void;
+}): void;

package/dist/cjs/anyspend/react/hooks/useOnOrderSuccess.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useOnOrderSuccess = useOnOrderSuccess;
+const react_1 = require("react");
+/**
+ * Hook to call onSuccess callback when an order is executed.
+ * Handles fallback to relayTxs when executeTx is null.
+ */
+function useOnOrderSuccess({ orderData, orderId, onSuccess, }) {
+    const onSuccessCalled = (0, react_1.useRef)(false);
+    const prevOrderId = (0, react_1.useRef)(orderId);
+    (0, react_1.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/dist/cjs/global-account/react/hooks/useUserQuery.js

@@ -14,6 +14,16 @@ function useUserQuery() {
     const user = (0, userStore_1.useUserStore)(state => state.user);
     const setUserStore = (0, userStore_1.useUserStore)(state => state.setUser);
     const clearUserStore = (0, userStore_1.useUserStore)(state => state.clearUser);
+    // Manually rehydrate persisted store inside useLayoutEffect to avoid
+    // updating AuthenticationProvider state during Hydrate render.
+    // useLayoutEffect (not useEffect) ensures rehydration triggers a
+    // synchronous re-render before any useEffect callbacks fire, so
+    // downstream effects always see the persisted user value.
+    (0, react_1.useLayoutEffect)(() => {
+        if (!userStore_1.useUserStore.persist.hasHydrated()) {
+            userStore_1.useUserStore.persist.rehydrate();
+        }
+    }, []);
     // Listen for storage events from other tabs/windows
     (0, react_1.useEffect)(() => {
         const handleStorageChange = (e) => {

package/dist/cjs/global-account/react/stores/userStore.js

@@ -22,6 +22,7 @@ exports.useUserStore = (0, zustand_1.create)()((0, middleware_1.persist)(set =>
     },
 }), {
     name: "b3-user",
+    skipHydration: true,
     onRehydrateStorage: () => (_, error) => {
         if (error) {
             console.warn("Failed to rehydrate user store:", error);

package/dist/esm/anyspend/react/components/AnySpend.js

@@ -18,6 +18,7 @@ import { useAutoSelectCryptoPaymentMethod } from "../hooks/useAutoSelectCryptoPa
 import { useConnectedWalletDisplay } from "../hooks/useConnectedWalletDisplay.js";
 import { useCryptoPaymentMethodState } from "../hooks/useCryptoPaymentMethodState.js";
 import { useDirectTransfer } from "../hooks/useDirectTransfer.js";
+import { useOnOrderSuccess } from "../hooks/useOnOrderSuccess.js";
 import { useRecipientAddressState } from "../hooks/useRecipientAddressState.js";
 import { AnySpendFingerprintWrapper, getFingerprintConfig } from "./AnySpendFingerprintWrapper.js";
 import { CryptoPaymentMethod, CryptoPaymentMethodType } from "./common/CryptoPaymentMethod.js";
@@ -65,8 +66,6 @@ function AnySpendInner({ sourceChainId, destinationTokenAddress, destinationToke
     // Add refs to track URL state
     const initialUrlProcessed = useRef(false);
     const lastUrlUpdate = useRef(null);
-    // Track if onSuccess has been called for the current order
-    const onSuccessCalled = useRef(false);
     // Track animation direction for TransitionPanel
     const animationDirection = useRef(null);
     // Track previous panel for proper back navigation
@@ -486,18 +485,8 @@ function AnySpendInner({ sourceChainId, destinationTokenAddress, destinationToke
             }
         }
     }, [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 => {
             const orderId = data.data.id;

package/dist/esm/anyspend/react/components/AnySpendCustom.js

@@ -11,9 +11,10 @@ import { simpleHashChainToChainName } from "../../../shared/utils/simplehash.js"
 import invariant from "invariant";
 import { ChevronRight, ChevronRightCircle, Info, Loader2 } from "lucide-react";
 import { motion } from "motion/react";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { base } from "viem/chains";
 import { useCryptoPaymentMethodState } from "../hooks/useCryptoPaymentMethodState.js";
+import { useOnOrderSuccess } from "../hooks/useOnOrderSuccess.js";
 import { useRecipientAddressState } from "../hooks/useRecipientAddressState.js";
 import { AnySpendFingerprintWrapper, getFingerprintConfig } from "./AnySpendFingerprintWrapper.js";
 import { CryptoPaymentMethod, CryptoPaymentMethodType } from "./common/CryptoPaymentMethod.js";
@@ -126,8 +127,6 @@ function AnySpendCustomInner({ loadOrder, mode = "modal", activeTab: activeTabPr
         globalAddress: currentWallet.address,
     });
     const [orderId, setOrderId] = useState(loadOrder);
-    // Track if onSuccess has been called for the current order
-    const onSuccessCalled = React.useRef(false);
     const [srcChainId, setSrcChainId] = useState(base.id);
     // Get token list for token balance check
     const chainName = useMemo(() => simpleHashChainToChainName(srcChainId), [srcChainId]);
@@ -265,20 +264,8 @@ function AnySpendCustomInner({ loadOrder, mode = "modal", activeTab: activeTabPr
     }, [activeTab, srcFiatAmountForGeoCheck]);
     // Get geo data and onramp options (use srcFiatAmountForGeoCheck to check availability regardless of activeTab)
     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 => {
             setOrderId(data.data.id);

package/dist/esm/anyspend/react/components/QRDeposit.js

@@ -8,6 +8,7 @@ import { QRCodeSVG } from "qrcode.react";
 import { useEffect, useRef, useState } from "react";
 import { useAnyspendOrderAndTransactions } from "../hooks/useAnyspendOrderAndTransactions.js";
 import { useCreateDepositFirstOrder } from "../hooks/useCreateDepositFirstOrder.js";
+import { useOnOrderSuccess } from "../hooks/useOnOrderSuccess.js";
 import { useWatchTransfer } from "../hooks/useWatchTransfer.js";
 import { ChainTokenIcon } from "./common/ChainTokenIcon.js";
 import { OrderDetails } from "./common/OrderDetails.js";
@@ -43,7 +44,6 @@ export function QRDeposit({ mode = "modal", recipientAddress, sourceToken: sourc
     const [orderId, setOrderId] = useState();
     const [globalAddress, setGlobalAddress] = useState();
     const orderCreatedRef = useRef(false);
-    const onSuccessCalled = useRef(false);
     const [transferResult, setTransferResult] = useState(null);
     // Source token/chain as state (can be changed by user)
     const [sourceChainId, setSourceChainId] = useState(sourceChainIdProp ?? 8453);
@@ -125,17 +125,7 @@ export function QRDeposit({ mode = "modal", recipientAddress, sourceToken: sourc
         isPureTransfer,
     ]);
     // 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;
     const handleCopyAddress = async () => {

package/dist/esm/anyspend/react/hooks/index.d.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/dist/esm/anyspend/react/hooks/index.js

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

package/dist/esm/anyspend/react/hooks/useOnOrderSuccess.d.ts

@@ -0,0 +1,10 @@
+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 declare function useOnOrderSuccess({ orderData, orderId, onSuccess, }: {
+    orderData: GetOrderAndTxsResponse | undefined;
+    orderId: string | undefined;
+    onSuccess?: (txHash?: string) => void;
+}): void;

package/dist/esm/anyspend/react/hooks/useOnOrderSuccess.js

@@ -0,0 +1,24 @@
+import { useEffect, useRef } from "react";
+/**
+ * Hook to call onSuccess callback when an order is executed.
+ * Handles fallback to relayTxs when executeTx is null.
+ */
+export function useOnOrderSuccess({ orderData, orderId, onSuccess, }) {
+    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/dist/esm/global-account/react/hooks/useUserQuery.js

@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useEffect, useLayoutEffect } from "react";
 import { useUserStore } from "../stores/userStore.js";
 const USER_QUERY_KEY = ["b3-user"];
 /**
@@ -11,6 +11,16 @@ export function useUserQuery() {
     const user = useUserStore(state => state.user);
     const setUserStore = useUserStore(state => state.setUser);
     const clearUserStore = useUserStore(state => state.clearUser);
+    // Manually rehydrate persisted store inside useLayoutEffect to avoid
+    // updating AuthenticationProvider state during Hydrate render.
+    // useLayoutEffect (not useEffect) ensures rehydration triggers a
+    // synchronous re-render before any useEffect callbacks fire, so
+    // downstream effects always see the persisted user value.
+    useLayoutEffect(() => {
+        if (!useUserStore.persist.hasHydrated()) {
+            useUserStore.persist.rehydrate();
+        }
+    }, []);
     // Listen for storage events from other tabs/windows
     useEffect(() => {
         const handleStorageChange = (e) => {

package/dist/esm/global-account/react/stores/userStore.js

@@ -19,6 +19,7 @@ export const useUserStore = create()(persist(set => ({
     },
 }), {
     name: "b3-user",
+    skipHydration: true,
     onRehydrateStorage: () => (_, error) => {
         if (error) {
             console.warn("Failed to rehydrate user store:", error);

package/dist/types/anyspend/react/hooks/index.d.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/dist/types/anyspend/react/hooks/useOnOrderSuccess.d.ts

@@ -0,0 +1,10 @@
+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 declare function useOnOrderSuccess({ orderData, orderId, onSuccess, }: {
+    orderData: GetOrderAndTxsResponse | undefined;
+    orderId: string | undefined;
+    onSuccess?: (txHash?: string) => void;
+}): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b3dotfun/sdk",
-  "version": "0.1.65-alpha.0",
+  "version": "0.1.65-alpha.2",
   "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/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]);
+}

package/src/global-account/react/hooks/useUserQuery.ts

@@ -1,5 +1,5 @@
 import { Users } from "@b3dotfun/b3-api";
-import { useEffect } from "react";
+import { useEffect, useLayoutEffect } from "react";
 import { useUserStore } from "../stores/userStore";
 
 const USER_QUERY_KEY = ["b3-user"];
@@ -15,6 +15,17 @@ export function useUserQuery() {
   const setUserStore = useUserStore(state => state.setUser);
   const clearUserStore = useUserStore(state => state.clearUser);
 
+  // Manually rehydrate persisted store inside useLayoutEffect to avoid
+  // updating AuthenticationProvider state during Hydrate render.
+  // useLayoutEffect (not useEffect) ensures rehydration triggers a
+  // synchronous re-render before any useEffect callbacks fire, so
+  // downstream effects always see the persisted user value.
+  useLayoutEffect(() => {
+    if (!useUserStore.persist.hasHydrated()) {
+      useUserStore.persist.rehydrate();
+    }
+  }, []);
+
   // Listen for storage events from other tabs/windows
   useEffect(() => {
     const handleStorageChange = (e: StorageEvent) => {

package/src/global-account/react/stores/userStore.ts

@@ -31,6 +31,7 @@ export const useUserStore = create<UserStore>()(
     }),
     {
       name: "b3-user",
+      skipHydration: true,
       onRehydrateStorage: () => (_, error) => {
         if (error) {
           console.warn("Failed to rehydrate user store:", error);