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

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

@@ -0,0 +1,71 @@
+import { useState } from "react";
+import { CryptoPaymentMethodType } from "../components/common/CryptoPaymentMethod";
+
+interface UseCryptoPaymentMethodStateResult {
+  /** Auto-selected payment method based on balance */
+  cryptoPaymentMethod: CryptoPaymentMethodType;
+  /** Function to update the auto-selected payment method */
+  setCryptoPaymentMethod: (method: CryptoPaymentMethodType) => void;
+  /** User explicitly selected payment method (NONE means no explicit selection) */
+  selectedCryptoPaymentMethod: CryptoPaymentMethodType;
+  /** Function to update the user-selected payment method */
+  setSelectedCryptoPaymentMethod: (method: CryptoPaymentMethodType) => void;
+  /** Effective payment method (user selection takes priority over auto-selection) */
+  effectiveCryptoPaymentMethod: CryptoPaymentMethodType;
+  /** Reset both payment method states to NONE */
+  resetPaymentMethods: () => void;
+}
+
+/**
+ * Custom hook to manage crypto payment method state with dual-state system:
+ *
+ * - `cryptoPaymentMethod`: Auto-selected based on wallet availability and balance
+ * - `selectedCryptoPaymentMethod`: Explicitly selected by user
+ * - `effectiveCryptoPaymentMethod`: User selection takes priority over auto-selection
+ *
+ * This allows automatic payment method suggestions while respecting explicit user choices.
+ *
+ * @example
+ * ```tsx
+ * const {
+ *   cryptoPaymentMethod,
+ *   setCryptoPaymentMethod,
+ *   selectedCryptoPaymentMethod,
+ *   setSelectedCryptoPaymentMethod,
+ *   effectiveCryptoPaymentMethod,
+ *   resetPaymentMethods
+ * } = useCryptoPaymentMethodState();
+ *
+ * // Use effectiveCryptoPaymentMethod for display
+ * // Use setSelectedCryptoPaymentMethod when user explicitly selects
+ * // Call resetPaymentMethods when switching tabs or going back
+ * ```
+ */
+export function useCryptoPaymentMethodState(): UseCryptoPaymentMethodStateResult {
+  // cryptoPaymentMethod: auto-selected based on balance
+  const [cryptoPaymentMethod, setCryptoPaymentMethod] = useState<CryptoPaymentMethodType>(CryptoPaymentMethodType.NONE);
+
+  // selectedCryptoPaymentMethod: explicitly selected by user (NONE means no explicit selection)
+  const [selectedCryptoPaymentMethod, setSelectedCryptoPaymentMethod] = useState<CryptoPaymentMethodType>(
+    CryptoPaymentMethodType.NONE,
+  );
+
+  // The effective payment method (user selection takes priority over auto-selection)
+  const effectiveCryptoPaymentMethod =
+    selectedCryptoPaymentMethod !== CryptoPaymentMethodType.NONE ? selectedCryptoPaymentMethod : cryptoPaymentMethod;
+
+  // Helper function to reset both states
+  const resetPaymentMethods = () => {
+    setCryptoPaymentMethod(CryptoPaymentMethodType.NONE);
+    setSelectedCryptoPaymentMethod(CryptoPaymentMethodType.NONE);
+  };
+
+  return {
+    cryptoPaymentMethod,
+    setCryptoPaymentMethod,
+    selectedCryptoPaymentMethod,
+    setSelectedCryptoPaymentMethod,
+    effectiveCryptoPaymentMethod,
+    resetPaymentMethods,
+  };
+}

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

@@ -6,7 +6,6 @@ import invariant from "invariant";
 import { useCallback, useState } from "react";
 import { toast } from "sonner";
 import { prepareTransaction, sendTransaction as twSendTransaction } from "thirdweb";
-import { useActiveWallet } from "thirdweb/react";
 import { isAddress } from "viem";
 import { useSwitchChain } from "wagmi";
 import { useB3 } from "../components";
@@ -29,7 +28,6 @@ invariant(partnerId, "Partner ID is required");
 export function useUnifiedChainSwitchAndExecute() {
   const { switchChainAsync } = useSwitchChain();
   const [isSwitchingOrExecuting, setIsSwitchingOrExecuting] = useState(false);
-  const activeWallet = useActiveWallet();
 
   const { isActiveSmartWallet, isActiveEOAWallet, connectedEOAWallet } = useAccountWallet();
   const { account: aaAccount } = useB3();
@@ -49,12 +47,12 @@ export function useUnifiedChainSwitchAndExecute() {
         return;
       }
 
-      const currentChainId = activeWallet?.getChain()?.id;
+      const currentChainId = connectedEOAWallet?.getChain()?.id;
       const onCorrectChain = currentChainId === targetChainId;
 
       // Helper function to execute the transaction
       const executeTransaction = async (): Promise<string> => {
-        const signer = activeWallet?.getAccount();
+        const signer = connectedEOAWallet?.getAccount();
         if (!signer) {
           throw new Error("No account connected");
         }
@@ -62,7 +60,7 @@ export function useUnifiedChainSwitchAndExecute() {
         // Coinbase Smart Wallet specific chain switching (different behavior from other wallets)
         const walletChain = connectedEOAWallet.getChain();
         if (walletChain?.id !== targetChainId) {
-          activeWallet?.switchChain(getThirdwebChain(targetChainId));
+          connectedEOAWallet?.switchChain(getThirdwebChain(targetChainId));
         }
 
         invariant(isAddress(params.to), "params.to is not a valid address");
@@ -121,7 +119,7 @@ export function useUnifiedChainSwitchAndExecute() {
         setIsSwitchingOrExecuting(false);
       }
     },
-    [connectedEOAWallet, activeWallet, switchChainAsync],
+    [connectedEOAWallet, switchChainAsync],
   );
 
   // Handle AA wallet transaction (no chain switch needed for AA)
@@ -186,14 +184,10 @@ export function useUnifiedChainSwitchAndExecute() {
       // Check which wallet type is active
       if (isActiveSmartWallet) {
         return handleAASendTransaction(targetChainId, params);
-      } else if (isActiveEOAWallet) {
-        return handleEOASwitchChainAndSendTransaction(targetChainId, params);
-      } else {
-        toast.error("No wallet connected");
-        return undefined;
       }
+      return handleEOASwitchChainAndSendTransaction(targetChainId, params);
     },
-    [isActiveSmartWallet, isActiveEOAWallet, handleAASendTransaction, handleEOASwitchChainAndSendTransaction],
+    [isActiveSmartWallet, handleAASendTransaction, handleEOASwitchChainAndSendTransaction],
   );
 
   return {