@b3dotfun/sdk 0.0.41 → 0.0.42-alpha.1

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

@@ -7,6 +7,7 @@ import { motion } from "motion/react";
 import { components } from "../../../types/api";
 import { useFeatureFlags } from "../../contexts/FeatureFlagsContext";
 import { OrderTokenAmount } from "./OrderTokenAmount";
+import { PointsBadge } from "./PointsBadge";
 
 interface CryptoReceiveSectionProps {
   isDepositMode?: boolean;
@@ -163,15 +164,12 @@ export function CryptoReceiveSection({
               );
             })()}
         </div>
-        {featureFlags.showPoints && anyspendQuote?.data?.pointsAmount && anyspendQuote.data.pointsAmount > 0 && (
-          <button
-            key={`points-${anyspendQuote.data.pointsAmount}`}
-            className="bg-as-brand hover:scale-102 active:scale-98 active:scale-98 relative flex cursor-pointer items-center gap-1 rounded-lg px-2 py-1 transition-all"
+        {featureFlags.showPoints && anyspendQuote?.data?.pointsAmount > 0 && (
+          <PointsBadge
+            pointsAmount={anyspendQuote.data.pointsAmount}
+            pointsMultiplier={anyspendQuote.data.pointsMultiplier}
             onClick={() => onShowPointsDetail?.()}
-          >
-            <div className="pointer-events-none absolute inset-0 h-full w-full rounded-lg border border-white/10 border-t-white/20 bg-gradient-to-b from-white/10 to-white/0" />
-            <span className="text-xs text-white">+{anyspendQuote.data.pointsAmount.toLocaleString()} pts</span>
-          </button>
+          />
         )}
       </div>
     </motion.div>

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

@@ -11,6 +11,7 @@ import { toast } from "sonner";
 import { useFeatureFlags } from "../../contexts/FeatureFlagsContext";
 import { FiatPaymentMethod } from "./FiatPaymentMethod";
 import { OrderTokenAmountFiat } from "./OrderTokenAmountFiat";
+import { PointsBadge } from "./PointsBadge";
 
 export function PanelOnramp({
   srcAmountOnRamp,
@@ -259,16 +260,15 @@ export function PanelOnramp({
                   return fee !== null ? `Total (included $${fee.toFixed(2)} fee)` : "Total";
                 })()}
               </span>
-              {featureFlags.showPoints && anyspendQuote?.data?.pointsAmount && anyspendQuote.data.pointsAmount > 0 && (
-                <button
-                  key={`points-${anyspendQuote.data.pointsAmount}`}
-                  className="bg-as-brand hover:scale-102 active:scale-98 relative flex cursor-pointer items-center gap-1 rounded-lg px-2 py-1 transition-all"
-                  onClick={() => onShowPointsDetail?.()}
-                >
-                  <div className="pointer-events-none absolute inset-0 h-full w-full rounded-lg border border-white/10 border-t-white/20 bg-gradient-to-b from-white/10 to-white/0" />
-                  <span className="text-xs text-white">+{anyspendQuote.data.pointsAmount.toLocaleString()} pts</span>
-                </button>
-              )}
+              {featureFlags.showPoints &&
+                anyspendQuote?.data?.pointsAmount &&
+                anyspendQuote?.data?.pointsAmount > 0 && (
+                  <PointsBadge
+                    pointsAmount={anyspendQuote.data.pointsAmount}
+                    pointsMultiplier={anyspendQuote.data.pointsMultiplier}
+                    onClick={() => onShowPointsDetail?.()}
+                  />
+                )}
             </div>
             <span className="text-as-primary font-semibold">
               ${getTotalAmount(selectedPaymentMethod || FiatPaymentMethod.NONE).toFixed(2)}

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

@@ -0,0 +1,20 @@
+interface PointsBadgeProps {
+  pointsAmount: number;
+  pointsMultiplier?: number;
+  onClick?: () => void;
+}
+
+export function PointsBadge({ pointsAmount, pointsMultiplier, onClick }: PointsBadgeProps) {
+  return (
+    <button
+      className="bg-as-brand hover:scale-102 active:scale-98 relative flex cursor-pointer items-center gap-1 rounded-lg px-2 py-1 transition-all"
+      onClick={onClick}
+    >
+      <div className="pointer-events-none absolute inset-0 h-full w-full rounded-lg border border-white/10 border-t-white/20 bg-gradient-to-b from-white/10 to-white/0" />
+      <span className="relative text-xs text-white">
+        +{pointsAmount.toLocaleString()} pts
+        {pointsMultiplier && pointsMultiplier > 1 && <span className="ml-1 opacity-80">({pointsMultiplier}x)</span>}
+      </span>
+    </button>
+  );
+}

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

@@ -157,15 +157,17 @@ export function useAnyspendFlow({
   };
 
   // Get quote
-  const activeInputAmountInWei = parseUnits(srcAmount.replace(/,/g, ""), selectedSrcToken.decimals).toString();
+  // For fiat payments, always use USDC decimals (6) regardless of selectedSrcToken
+  const effectiveDecimals = paymentType === "fiat" ? USDC_BASE.decimals : selectedSrcToken.decimals;
+  const activeInputAmountInWei = parseUnits(srcAmount.replace(/,/g, ""), effectiveDecimals).toString();
   const { anyspendQuote, isLoadingAnyspendQuote, getAnyspendQuoteError } = useAnyspendQuote({
     srcChain: paymentType === "fiat" ? base.id : selectedSrcChainId,
     dstChain: isDepositMode ? base.id : selectedDstChainId, // For deposits, always Base; for swaps, use selected destination
     srcTokenAddress: paymentType === "fiat" ? USDC_BASE.address : selectedSrcToken.address,
     dstTokenAddress: isDepositMode ? B3_TOKEN.address : selectedSrcToken.address, // For deposits, always B3
-    type: "swap",
-    tradeType: "EXACT_INPUT",
+    type: "hype_duel",
     amount: activeInputAmountInWei,
+    recipientAddress: selectedRecipientAddress,
     onrampVendor: paymentType === "fiat" ? getOnrampVendor(selectedFiatPaymentMethod) : undefined,
   });
 

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

@@ -35,7 +35,7 @@ export function useAnyspendOrderAndTransactions(orderId: string | undefined) {
 
   const { data, isLoading, refetch, error } = useQuery<GetOrderAndTxsResponse>({
     queryKey: ["getAnyspendOrderAndTransactions", orderId],
-    queryFn: () => anyspendService.getOrderAndTransactions(orderId!),
+    queryFn: () => anyspendService.getOrderAndTransactions(orderId),
     enabled: !!orderId,
     refetchInterval: 3000,
     staleTime: 1000,

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

@@ -6,7 +6,7 @@ import { useMemo } from "react";
 export function useCoinbaseOnrampOptions(country?: string, visitorData?: VisitorData, isLoadingVisitorData?: boolean) {
   const { data, isLoading, error, refetch } = useQuery({
     queryKey: ["getCoinbaseOnrampOptions", country, visitorData],
-    queryFn: () => anyspendService.getCoinbaseOnrampOptions(country!, visitorData),
+    queryFn: () => anyspendService.getCoinbaseOnrampOptions(country, visitorData),
     enabled: Boolean(country) && !isLoadingVisitorData,
   });
 

package/src/anyspend/services/anyspend.ts

@@ -111,6 +111,7 @@ export const anyspendService = {
   },
 
   getOrderAndTransactions: async (orderId: string | undefined): Promise<GetOrderAndTxsResponse> => {
+    invariant(orderId, "orderId is required");
     const response = await fetch(`${ANYSPEND_MAINNET_BASE_URL}/orders/${orderId}`);
     const data: GetOrderAndTxsResponse = await response.json();
     return data;
@@ -134,9 +135,10 @@ export const anyspendService = {
   },
 
   getCoinbaseOnrampOptions: async (
-    country: string,
+    country: string | undefined,
     visitorData?: VisitorData,
   ): Promise<GetCoinbaseOnrampOptionsResponse> => {
+    invariant(country, "country is required");
     const params = new URLSearchParams({
       country,
       // include fingerprintId and requestId in the query params

package/src/anyspend/types/api.ts

@@ -505,11 +505,16 @@ export interface paths {
                  * @example 0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913
                  */
                 dstTokenAddress: string;
+                /**
+                 * @description Recipient address
+                 * @example 0x55c71fca5e01cf246718748ae540473e608d0282
+                 */
+                recipientAddress?: string;
                 /**
                  * @description Type of trade execution
                  * @enum {string}
                  */
-                tradeType: "EXACT_INPUT" | "EXPECTED_OUTPUT" | "EXACT_OUTPUT";
+                tradeType: "EXACT_INPUT" | "EXACT_OUTPUT";
                 /**
                  * @description Amount to quote
                  * @example 1000000000000000000
@@ -547,6 +552,11 @@ export interface paths {
                  * @example 0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913
                  */
                 dstTokenAddress: string;
+                /**
+                 * @description Recipient address
+                 * @example 0x55c71fca5e01cf246718748ae540473e608d0282
+                 */
+                recipientAddress?: string;
                 /** @description Custom payload for execution */
                 payload: {
                   /** @description Encoded transaction data */
@@ -571,6 +581,11 @@ export interface paths {
                 dstChain: number;
                 srcTokenAddress: string;
                 dstTokenAddress: string;
+                /**
+                 * @description Recipient address
+                 * @example 0x55c71fca5e01cf246718748ae540473e608d0282
+                 */
+                recipientAddress?: string;
                 /** @enum {string} */
                 onrampVendor?: "coinbase" | "stripe" | "stripe-web2";
                 contractAddress: string;
@@ -586,6 +601,11 @@ export interface paths {
                 dstChain: number;
                 srcTokenAddress: string;
                 dstTokenAddress: string;
+                /**
+                 * @description Recipient address
+                 * @example 0x55c71fca5e01cf246718748ae540473e608d0282
+                 */
+                recipientAddress?: string;
                 /** @enum {string} */
                 onrampVendor?: "coinbase" | "stripe" | "stripe-web2";
                 contractAddress: string;
@@ -598,6 +618,11 @@ export interface paths {
                 dstChain: number;
                 srcTokenAddress: string;
                 dstTokenAddress: string;
+                /**
+                 * @description Recipient address
+                 * @example 0x55c71fca5e01cf246718748ae540473e608d0282
+                 */
+                recipientAddress?: string;
                 /** @enum {string} */
                 onrampVendor?: "coinbase" | "stripe" | "stripe-web2";
                 contractAddress: string;
@@ -629,6 +654,11 @@ export interface paths {
                  * @example 0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913
                  */
                 dstTokenAddress: string;
+                /**
+                 * @description Recipient address
+                 * @example 0x55c71fca5e01cf246718748ae540473e608d0282
+                 */
+                recipientAddress?: string;
                 /**
                  * @description Amount to quote
                  * @example 1000000000000000000
@@ -1094,6 +1124,11 @@ export interface components {
        * @example 990000
        */
       actualDstAmount: string | null;
+      /**
+       * @description Amount in after fee
+       * @example 990000
+       */
+      amountInAfterFee: string | null;
     };
     /** @description HypeDuel-specific payload */
     HypeDuelPayload: {
@@ -1107,6 +1142,11 @@ export interface components {
        * @example 990000
        */
       actualDstAmount: string | null;
+      /**
+       * @description Amount in after fee
+       * @example 990000
+       */
+      amountInAfterFee: string | null;
     };
     /** @description Custom execution payload */
     CustomPayload: {

package/src/anyspend/utils/orderPayload.ts

@@ -18,6 +18,7 @@ export const buildPayload = (orderType: components["schemas"]["Order"]["type"],
       return {
         expectedDstAmount,
         actualDstAmount: null,
+        amountInAfterFee: null,
       };
     case "mint_nft":
       if (nft?.type === "erc1155") {
@@ -31,6 +32,7 @@ export const buildPayload = (orderType: components["schemas"]["Order"]["type"],
         return {
           contractAddress: normalizeAddress(nft.contractAddress),
           nftPrice: nft?.price || "",
+          tokenId: null,
           contractType: nft?.type,
         };
       } else {
@@ -52,6 +54,7 @@ export const buildPayload = (orderType: components["schemas"]["Order"]["type"],
       return {
         expectedDstAmount,
         actualDstAmount: null,
+        amountInAfterFee: null,
       };
     default:
       throw new Error(`Invalid order type: ${orderType}`);

package/src/bondkit/components/TradingView.tsx

@@ -1,10 +1,10 @@
 "use client";
 
-import { loadScriptFromCDN } from "./utils/cdn-loader";
-import { formatNumberSmall } from "./utils/format";
 import { Loader2 } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
 import { TradingViewProps } from "./types";
+import { loadScriptFromCDN } from "./utils/cdn-loader";
+import { formatNumberSmall } from "./utils/format";
 
 // TypeScript types - these will be loaded from CDN at runtime
 type ChartingLibraryWidgetOptions = any;
@@ -24,8 +24,6 @@ const GifLoadingOverlay = ({ className }: { className?: string }) => (
 );
 
 const TradingView = ({ className, tokenAddress, tokenSymbol }: TradingViewProps) => {
-  const theme = "light";
-
   // Use token info for the current trade
   const currentTrade = {
     product_id: tokenAddress && tokenSymbol ? `${tokenSymbol}-${tokenAddress}` : "BONDKIT",
@@ -282,7 +280,7 @@ const TradingView = ({ className, tokenAddress, tokenSymbol }: TradingViewProps)
         tvWidgetRef.current = null;
       }
     };
-  }, [theme, librariesLoaded]);
+  }, [librariesLoaded, currentTrade?.product_id, tradingViewDefaultInterval, tradingViewTimezone]);
 
   useEffect(() => {
     if (

package/src/bondkit/swapService.ts

@@ -1,15 +1,15 @@
-import type { Address, Hex, WalletClient, PublicClient } from "viem";
+import type { Address, Hex, PublicClient, WalletClient } from "viem";
 import {
-  parseUnits,
-  formatUnits,
+  createPublicClient,
   encodeAbiParameters,
-  parseAbiParameters,
+  formatUnits,
   getContract,
-  createPublicClient,
   http,
+  parseAbiParameters,
+  parseUnits,
 } from "viem";
 import { base } from "viem/chains";
-import { UniversalRouterAddress, QuoterAddress, Permit2Address, BaseMainnetRpcUrl } from "./constants";
+import { BaseMainnetRpcUrl, Permit2Address, QuoterAddress, UniversalRouterAddress } from "./constants";
 import type { SwapQuote } from "./types";
 
 // Minimal ABIs needed for swap functionality
@@ -230,7 +230,10 @@ export class BondkitSwapService {
    */
   private async getV4Config(): Promise<V4PoolConfig> {
     await this.initializeV4Config();
-    return this.v4Config!;
+    if (!this.v4Config) {
+      throw new Error("Failed to initialize V4 configuration");
+    }
+    return this.v4Config;
   }
 
   /**

package/src/global-account/react/components/B3Provider/B3Provider.tsx

@@ -88,30 +88,34 @@ export function B3Provider({
     };
   }, [partnerId]);
 
+  // Stringify rpcUrls for stable comparison to prevent wagmiConfig recreation
+  // when parent component passes new object references with same content
+  const rpcUrlsString = useMemo(() => (rpcUrls ? JSON.stringify(rpcUrls) : undefined), [rpcUrls]);
+
   /**
    * Creates wagmi config with optional custom RPC URLs
    * @param rpcUrls - Optional mapping of chain IDs to RPC URLs
    */
-  const wagmiConfig = useMemo(
-    () =>
-      createConfig({
-        chains: [supportedChains[0], ...supportedChains.slice(1)],
-        transports: Object.fromEntries(supportedChains.map(chain => [chain.id, http(rpcUrls?.[chain.id])])) as any,
-        connectors: [
-          inAppWalletConnector({
-            ...(ecocystemConfig || {}),
-            client,
-          }),
-          // injected(),
-          // coinbaseWallet({ appName: "HypeDuel" }),
-        ],
-      }),
-    [partnerId],
-  );
+  const wagmiConfig = useMemo(() => {
+    const parsedRpcUrls = rpcUrlsString ? JSON.parse(rpcUrlsString) : undefined;
+
+    return createConfig({
+      chains: [supportedChains[0], ...supportedChains.slice(1)],
+      transports: Object.fromEntries(supportedChains.map(chain => [chain.id, http(parsedRpcUrls?.[chain.id])])),
+      connectors: [
+        inAppWalletConnector({
+          ...(ecocystemConfig || {}),
+          client,
+        }),
+        // injected(),
+        // coinbaseWallet({ appName: "HypeDuel" }),
+      ],
+    });
+  }, [ecocystemConfig, rpcUrlsString]);
 
   return (
     <ThirdwebProvider>
-      <WagmiProvider config={wagmiConfig} reconnectOnMount={false}>
+      <WagmiProvider config={wagmiConfig}>
         <QueryClientProvider client={queryClient}>
           <TooltipProvider>
             <InnerProvider

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

@@ -14,6 +14,7 @@ export { useExchangeRate } from "./useExchangeRate";
 export { useFirstEOA } from "./useFirstEOA";
 export { useGetAllTWSigners, type TWSignerWithMetadata } from "./useGetAllTWSigners";
 export { useGetGeo } from "./useGetGeo";
+export { useGlobalAccount } from "./useGlobalAccount";
 export { useHandleConnectWithPrivy } from "./useHandleConnectWithPrivy";
 export { useHasMounted } from "./useHasMounted";
 export { useIsMobile } from "./useIsMobile";

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

@@ -1,8 +1,9 @@
 import { fetchSimpleHashData } from "@b3dotfun/sdk/shared/utils/simplehash";
 import { useQuery } from "@tanstack/react-query";
+import invariant from "invariant";
 
-async function fetchAccountAssets(address: string) {
-  if (!address) throw new Error("Address is required");
+async function fetchAccountAssets(address: string | undefined) {
+  invariant(address, "Address is required");
 
   const [nftResponse] = await Promise.all([
     fetchSimpleHashData(`/v0/nfts/owners`, {
@@ -27,7 +28,7 @@ async function fetchAccountAssets(address: string) {
 export function useAccountAssets(address?: string) {
   return useQuery({
     queryKey: ["accountAssets", address],
-    queryFn: () => fetchAccountAssets(address!),
+    queryFn: () => fetchAccountAssets(address),
     enabled: Boolean(address),
     staleTime: 30 * 1000, // Consider data fresh for 30 seconds
     gcTime: 5 * 60 * 1000, // Keep unused data in cache for 5 minutes

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

@@ -100,7 +100,7 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
       setIsAuthenticating(false);
     }
     useAutoConnectLoadingPrevious.current = useAutoConnectLoading;
-  }, [useAutoConnectLoading]);
+  }, [useAutoConnectLoading, hasStartedConnecting, setIsAuthenticating]);
 
   // Ensure isAuthenticating stays true until we're fully ready
   useEffect(() => {

package/src/global-account/react/hooks/useGlobalAccount.tsx

@@ -0,0 +1,36 @@
+import { useAuthStore } from "@b3dotfun/sdk/global-account/react";
+import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
+import { useEffect, useState } from "react";
+import { useConnectedWallets, useWalletInfo } from "thirdweb/react";
+import { Wallet } from "thirdweb/wallets";
+
+const debug = debugB3React("useGlobalAccount");
+
+export function useGlobalAccount() {
+  const wallets = useConnectedWallets();
+  const isConnected = useAuthStore(state => state.isConnected);
+  const [globalAccount, setGlobalAccount] = useState<Wallet | undefined>(undefined);
+  const [address, setAddress] = useState<string | undefined>(undefined);
+  const walletInfo = useWalletInfo(globalAccount?.id);
+
+  useEffect(() => {
+    if (!isConnected) {
+      debug("Not connected");
+      setGlobalAccount(undefined);
+      setAddress(undefined);
+      return;
+    }
+
+    const globalAccountWallet = wallets.find(wallet => wallet.id.startsWith("ecosystem."));
+
+    const account = globalAccountWallet?.getAccount();
+    setGlobalAccount(globalAccountWallet);
+    setAddress(account?.address);
+  }, [isConnected, wallets]);
+
+  return {
+    account: globalAccount,
+    address,
+    info: walletInfo,
+  };
+}

package/src/global-account/react/hooks/useOneBalance.tsx

@@ -30,7 +30,7 @@ export const useOneBalance = (bypassCache = false) => {
 
   const { data, isLoading, refetch } = useQuery({
     queryKey: ["balances", address, `testnet-${sprinterTestnet}`],
-    queryFn: () => fetchBalances(address!, sprinterTestnet),
+    queryFn: () => fetchBalances(address, sprinterTestnet),
     enabled: !!address,
     staleTime: 1000 * 60 * 1, // 1 minute
     gcTime: 1000 * 60 * 5, // 5 minutes (renamed from cacheTime in v5)

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

@@ -47,26 +47,33 @@ export function useQueryB3<
   const [error, setError] = useState<Error | null>(null);
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
-  const runQuery = useCallback(async (queryParams: ParamsType<T, M>) => {
-    setIsLoading(true);
-    try {
-      // Cast the service to avoid TypeScript issues with dynamic services
-      const serviceInstance = app.service(service) as any;
-      const result = await serviceInstance[method](queryParams);
-      setData(result); // Now `data` is correctly typed!
-      return result;
-    } catch (err) {
-      setError(err instanceof Error ? err : new Error("An error occurred"));
-    } finally {
-      setIsLoading(false);
-    }
-  }, []);
+  const runQuery = useCallback(
+    async (queryParams: ParamsType<T, M>) => {
+      setIsLoading(true);
+      try {
+        // Cast the service to avoid TypeScript issues with dynamic services
+        const serviceInstance = app.service(service) as any;
+        const result = await serviceInstance[method](queryParams);
+        setData(result); // Now `data` is correctly typed!
+        return result;
+      } catch (err) {
+        setError(err instanceof Error ? err : new Error("An error occurred"));
+      } finally {
+        setIsLoading(false);
+      }
+    },
+    [service, method],
+  );
+
+  // Serialize params for stable comparison
+  const paramsJson = JSON.stringify(params);
 
   useEffect(() => {
     if (fetchInitially) {
       runQuery(params);
     }
-  }, [runQuery, fetchInitially, JSON.stringify(params)]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [runQuery, fetchInitially, paramsJson]);
 
   return { data, error, isLoading, runQuery };
 }

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

@@ -47,26 +47,33 @@ export function useQueryBSMNT<
   const [error, setError] = useState<Error | null>(null);
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
-  const runQuery = useCallback(async (queryParams: ParamsType<T, M>) => {
-    setIsLoading(true);
-    try {
-      // Cast the service to avoid TypeScript issues with dynamic services
-      const serviceInstance = app.service(service) as any;
-      const result = await serviceInstance[method](queryParams);
-      setData(result); // Now `data` is correctly typed!
-      return result;
-    } catch (err) {
-      setError(err instanceof Error ? err : new Error("An error occurred"));
-    } finally {
-      setIsLoading(false);
-    }
-  }, []);
+  const runQuery = useCallback(
+    async (queryParams: ParamsType<T, M>) => {
+      setIsLoading(true);
+      try {
+        // Cast the service to avoid TypeScript issues with dynamic services
+        const serviceInstance = app.service(service) as any;
+        const result = await serviceInstance[method](queryParams);
+        setData(result); // Now `data` is correctly typed!
+        return result;
+      } catch (err) {
+        setError(err instanceof Error ? err : new Error("An error occurred"));
+      } finally {
+        setIsLoading(false);
+      }
+    },
+    [service, method],
+  );
+
+  // Serialize params for stable comparison
+  const paramsJson = JSON.stringify(params);
 
   useEffect(() => {
     if (fetchInitially) {
       runQuery(params);
     }
-  }, [runQuery, fetchInitially, JSON.stringify(params)]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [runQuery, fetchInitially, paramsJson]);
 
   return { data, error, isLoading, runQuery };
 }

package/src/global-account/react/hooks/useTokenBalancesByChain.tsx

@@ -7,6 +7,7 @@ import { viemToThirdwebChain } from "@b3dotfun/sdk/shared/constants/chains/b3Cha
 import { getChainById } from "@b3dotfun/sdk/shared/utils/chains";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { getWalletBalance } from "thirdweb/wallets";
+import invariant from "invariant";
 
 type GetWalletBalanceResult = {
   value: bigint;
@@ -51,10 +52,12 @@ export function useTokenBalancesByChain({
           // Fetch native token balances
           Promise.all(
             chainIds.map(async chainId => {
+              const chain = getChainById(chainId);
+              invariant(chain, "Chain is required");
               const walletBalance = await getWalletBalance({
                 address,
                 client,
-                chain: viemToThirdwebChain(getChainById(chainId)!),
+                chain: viemToThirdwebChain(chain),
               });
 
               return {

package/src/global-account/react/hooks/useTokenFromUrl.tsx

@@ -69,7 +69,7 @@ export function useTokenFromUrl({ defaultToken, prefix }: UseTokenFromUrlOptions
 
   const { data: tokenInfo, isError } = useQuery({
     queryKey: ["tokenInfo", network, currencyParam],
-    queryFn: () => fetchTokenInfo(network, currencyParam!),
+    queryFn: () => fetchTokenInfo(network, currencyParam || ""),
     enabled: shouldFetchToken,
     staleTime: Infinity,
     gcTime: Infinity,
@@ -84,7 +84,7 @@ export function useTokenFromUrl({ defaultToken, prefix }: UseTokenFromUrlOptions
   if (isError || !tokenInfo) {
     return {
       ...defaultToken,
-      address: currencyParam!,
+      address: currencyParam || "",
       chainId: Number(chainIdParam),
     };
   }

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

@@ -8,7 +8,7 @@ import { toast } from "sonner";
 import { prepareTransaction, sendTransaction as twSendTransaction } from "thirdweb";
 import { useActiveWallet } from "thirdweb/react";
 import { isAddress } from "viem";
-import { useSwitchChain, useWalletClient } from "wagmi";
+import { useSwitchChain } from "wagmi";
 import { useB3 } from "../components";
 import { useAccountWallet } from "./useAccountWallet";
 
@@ -27,7 +27,6 @@ const partnerId = String(
 invariant(partnerId, "Partner ID is required");
 
 export function useUnifiedChainSwitchAndExecute() {
-  const { data: walletClient } = useWalletClient();
   const { switchChainAsync } = useSwitchChain();
   const [isSwitchingOrExecuting, setIsSwitchingOrExecuting] = useState(false);
   const activeWallet = useActiveWallet();
@@ -122,7 +121,7 @@ export function useUnifiedChainSwitchAndExecute() {
         setIsSwitchingOrExecuting(false);
       }
     },
-    [walletClient, switchChainAsync],
+    [connectedEOAWallet, activeWallet, switchChainAsync],
   );
 
   // Handle AA wallet transaction (no chain switch needed for AA)