@b3dotfun/sdk 0.0.83-alpha.3 → 0.0.83-alpha.5

package/dist/esm/global-account/react/components/SignInWithB3/steps/LoginStep.js

@@ -12,7 +12,7 @@ export function LoginStepContainer({ children, partnerId }) {
         },
     }, !!partnerId);
     const partnerLogo = partner?.data?.[0]?.loginCustomization?.logoUrl;
-    return (_jsxs("div", { className: "flex flex-col items-center justify-center pt-6", children: [partnerLogo && (_jsx("img", { src: partnerLogo, alt: "Partner Logo", className: "partner-logo mb-6 h-12 w-auto object-contain" })), children] }));
+    return (_jsxs("div", { className: "bg-b3-react-background flex flex-col items-center justify-center pt-6", children: [partnerLogo && (_jsx("img", { src: partnerLogo, alt: "Partner Logo", className: "partner-logo mb-6 h-12 w-auto object-contain" })), children] }));
 }
 export function LoginStep({ onSuccess, chain }) {
     const { partnerId, theme } = useB3();

package/dist/esm/global-account/react/hooks/index.d.ts

@@ -6,7 +6,6 @@ export { useAnalytics } from "./useAnalytics";
 export { useAuthentication } from "./useAuthentication";
 export { useB3BalanceFromAddresses } from "./useB3BalanceFromAddresses";
 export { useB3EnsName } from "./useB3EnsName";
-export { useBestTransactionPath } from "./useBestTransactionPath";
 export { useChainSwitchWithAction } from "./useChainSwitchWithAction";
 export * from "./useClaim";
 export { useClient } from "./useClient";

package/dist/esm/global-account/react/hooks/index.js

@@ -6,7 +6,6 @@ export { useAnalytics } from "./useAnalytics.js";
 export { useAuthentication } from "./useAuthentication.js";
 export { useB3BalanceFromAddresses } from "./useB3BalanceFromAddresses.js";
 export { useB3EnsName } from "./useB3EnsName.js";
-export { useBestTransactionPath } from "./useBestTransactionPath.js";
 export { useChainSwitchWithAction } from "./useChainSwitchWithAction.js";
 export * from "./useClaim.js";
 export { useClient } from "./useClient.js";

package/dist/esm/global-account/react/hooks/useAccountWallet.js

@@ -1,7 +1,6 @@
 import { useB3, useProfile } from "../../../global-account/react/index.js";
 import { ecosystemWalletId } from "../../../shared/constants/index.js";
 import { debugB3React } from "../../../shared/utils/debug.js";
-import { getIpfsUrl } from "../../../shared/utils/ipfs.js";
 import { useEffect, useMemo, useState } from "react";
 import { getLastAuthProvider, useActiveWallet, useConnectedWallets, useWalletImage } from "thirdweb/react";
 import { socialIcons } from "thirdweb/wallets/in-app";
@@ -18,7 +17,13 @@ function useLastAuthProvider() {
     return lastAuthProvider;
 }
 export function useAccountWallet() {
-    const { account, user } = useB3();
+    // WOJ: --------------------
+    //  values from in useB3:
+    //  const activeAccount = useActiveAccount();
+    // const effectiveAccount = isAuthenticated ? accountOverride || activeAccount : undefined;
+    // can we possibly just use useActiveAccount here?
+    // --------------------
+    const { account } = useB3();
     const activeWallet = useActiveWallet();
     const connectedWallets = useConnectedWallets();
     const connectedSmartWallet = connectedWallets.find(wallet => wallet.id === ecosystemWalletId);
@@ -31,7 +36,6 @@ export function useAccountWallet() {
     debug("connectedEOAWallet", connectedEOAWallet);
     debug("isActiveSmartWallet", isActiveSmartWallet);
     debug("isActiveEOAWallet", isActiveEOAWallet);
-    const { data: walletImage } = useWalletImage(connectedEOAWallet?.id);
     // If not EOA sign in, then we need to show the smart wallet icon
     const lastAuthProvider = useLastAuthProvider();
     const smartWalletIcon = lastAuthProvider && !connectedEOAWallet
@@ -39,13 +43,12 @@ export function useAccountWallet() {
         : "https://gradvatar.com/0x0000000000000000000000000000000000000000"; // show smart wallet of eoa wallet is gradvatar
     const { data: profileData } = useProfile({ address: account?.address });
     const ensName = profileData?.displayName?.replace(/\.b3\.fun/g, "");
-    const avatarUrl = user?.avatar ? getIpfsUrl(user?.avatar) : profileData?.avatar;
     const res = useMemo(() => ({
         wallet: {
             ...account,
             ensName,
             meta: {
-                icon: avatarUrl || (isActiveSmartWallet ? smartWalletIcon : walletImage) || "",
+                icon: "", // deprecated
             },
         },
         address: account?.address,
@@ -55,22 +58,20 @@ export function useAccountWallet() {
         isActiveSmartWallet: isActiveSmartWallet,
         isActiveEOAWallet: isActiveEOAWallet,
         smartWalletIcon: smartWalletIcon,
-        eoaWalletIcon: walletImage,
+        eoaWalletIcon: "", // deprecated
     }), [
         account,
-        avatarUrl,
         connectedEOAWallet,
         connectedSmartWallet,
         ensName,
         isActiveEOAWallet,
         isActiveSmartWallet,
         smartWalletIcon,
-        walletImage,
     ]);
     return res;
 }
 export function useAccountWalletImage() {
-    const { account, user } = useB3();
+    const { account } = useB3();
     const activeWallet = useActiveWallet();
     const connectedWallets = useConnectedWallets();
     const connectedSmartWallet = connectedWallets.find(wallet => wallet.id === ecosystemWalletId);
@@ -83,6 +84,6 @@ export function useAccountWalletImage() {
         ? socialIcons[lastAuthProvider]
         : "https://gradvatar.com/0x0000000000000000000000000000000000000000"; // show smart wallet of eoa wallet is gradvatar
     const { data: profileData } = useProfile({ address: account?.address });
-    const avatarUrl = user?.avatar || profileData?.avatar;
+    const avatarUrl = profileData?.avatar;
     return avatarUrl || (isActiveSmartWallet ? smartWalletIcon : walletImage) || "";
 }

package/dist/types/anyspend/react/components/common/CryptoPaymentMethodDisplay.d.ts

@@ -0,0 +1,15 @@
+import { CryptoPaymentMethodType } from "./CryptoPaymentMethod";
+interface CryptoPaymentMethodDisplayProps {
+    paymentMethod: CryptoPaymentMethodType;
+    connectedAddress?: string | null;
+    connectedName?: string | null;
+}
+/**
+ * Displays the selected crypto payment method with appropriate label
+ * - CONNECT_WALLET: Shows wallet address/name or "Connect wallet"
+ * - GLOBAL_WALLET: Shows "Global Account"
+ * - TRANSFER_CRYPTO: Shows "Transfer crypto"
+ * - NONE: Shows "Select payment method"
+ */
+export declare function CryptoPaymentMethodDisplay({ paymentMethod, connectedAddress, connectedName, }: CryptoPaymentMethodDisplayProps): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/types/anyspend/react/hooks/useConnectedUserProfile.d.ts

@@ -1,8 +1,9 @@
+import { CryptoPaymentMethodType } from "../components/common/CryptoPaymentMethod";
 /**
  * Hook that provides connected user's address, profile, and cleaned display name
  * Combines logic for getting connected address from either global account or thirdweb wallets
  */
-export declare function useConnectedUserProfile(): {
+export declare function useConnectedUserProfile(selectedCryptoPaymentMethod?: CryptoPaymentMethodType): {
     address: string | undefined;
     profile: import("@tanstack/react-query").UseQueryResult<import("@b3dotfun/sdk/global-account/react").CombinedProfile, Error>;
     name: string | null | undefined;

package/dist/types/anyspend/react/hooks/useConnectedWalletDisplay.d.ts

@@ -2,8 +2,6 @@ import { CryptoPaymentMethodType } from "../components/common/CryptoPaymentMetho
 interface UseConnectedWalletDisplayResult {
     walletAddress: string | undefined;
     shouldShowConnectedEOA: boolean;
-    shouldShowWagmiWallet: boolean;
-    isWalletDuplicated: boolean;
     suggestedPaymentMethod: CryptoPaymentMethodType;
 }
 /**

package/dist/types/global-account/react/hooks/index.d.ts

@@ -6,7 +6,6 @@ export { useAnalytics } from "./useAnalytics";
 export { useAuthentication } from "./useAuthentication";
 export { useB3BalanceFromAddresses } from "./useB3BalanceFromAddresses";
 export { useB3EnsName } from "./useB3EnsName";
-export { useBestTransactionPath } from "./useBestTransactionPath";
 export { useChainSwitchWithAction } from "./useChainSwitchWithAction";
 export * from "./useClaim";
 export { useClient } from "./useClient";

package/package.json

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

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

@@ -48,6 +48,7 @@ import { useCryptoPaymentMethodState } from "../hooks/useCryptoPaymentMethodStat
 import { useRecipientAddressState } from "../hooks/useRecipientAddressState";
 import { AnySpendFingerprintWrapper, getFingerprintConfig } from "./AnySpendFingerprintWrapper";
 import { CryptoPaymentMethod, CryptoPaymentMethodType } from "./common/CryptoPaymentMethod";
+import { CryptoPaymentMethodDisplay } from "./common/CryptoPaymentMethodDisplay";
 import { FeeBreakDown } from "./common/FeeBreakDown";
 import { FIAT_PAYMENT_METHOD_DISPLAY, FiatPaymentMethod, FiatPaymentMethodComponent } from "./common/FiatPaymentMethod";
 import { OrderDetails } from "./common/OrderDetails";
@@ -469,7 +470,7 @@ function AnySpendCustomInner({
 
   const isCreatingOrder = isCreatingRegularOrder || isCreatingOnrampOrder;
 
-  const { address: connectedAddress, name: connectedName } = useConnectedUserProfile();
+  const { address: connectedAddress, name: connectedName } = useConnectedUserProfile(effectiveCryptoPaymentMethod);
   const recipientProfile = useProfile({ address: recipientAddress });
   const recipientName = recipientProfile.data?.name;
 
@@ -951,28 +952,11 @@ function AnySpendCustomInner({
                   className="text-as-tertiarry flex flex-wrap items-center justify-end gap-2 text-sm transition-colors hover:text-blue-700"
                   onClick={() => setActivePanel(PanelView.CRYPTO_PAYMENT_METHOD)}
                 >
-                  {effectiveCryptoPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET ? (
-                    <>
-                      {connectedAddress ? (
-                        <span className="text-as-tertiarry whitespace-nowrap">
-                          {connectedName ? formatUsername(connectedName) : shortenAddress(connectedAddress || "")}
-                        </span>
-                      ) : (
-                        <span className="whitespace-nowrap">Connect wallet</span>
-                      )}
-                      <ChevronRight className="h-4 w-4 shrink-0" />
-                    </>
-                  ) : effectiveCryptoPaymentMethod === CryptoPaymentMethodType.TRANSFER_CRYPTO ? (
-                    <>
-                      <span className="whitespace-nowrap">Transfer crypto</span>
-                      <ChevronRight className="h-4 w-4 shrink-0" />
-                    </>
-                  ) : (
-                    <>
-                      <span className="whitespace-nowrap">Select payment method</span>
-                      <ChevronRight className="h-4 w-4 shrink-0" />
-                    </>
-                  )}
+                  <CryptoPaymentMethodDisplay
+                    paymentMethod={effectiveCryptoPaymentMethod}
+                    connectedAddress={connectedAddress}
+                    connectedName={connectedName}
+                  />
                 </button>
               </motion.div>
 

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

@@ -1,13 +1,12 @@
 import { useProfile, useTokenData } from "@b3dotfun/sdk/global-account/react";
-import { formatUsername } from "@b3dotfun/sdk/shared/utils";
-import { shortenAddress } from "@b3dotfun/sdk/shared/utils/formatAddress";
 import { formatDisplayNumber } from "@b3dotfun/sdk/shared/utils/number";
-import { ChevronRight, Info } from "lucide-react";
+import { Info } from "lucide-react";
 import { motion } from "motion/react";
 import { useEffect, useRef } from "react";
 import { components } from "../../../types/api";
 import { useConnectedWalletDisplay } from "../../hooks/useConnectedWalletDisplay";
 import { CryptoPaymentMethodType } from "./CryptoPaymentMethod";
+import { CryptoPaymentMethodDisplay } from "./CryptoPaymentMethodDisplay";
 import { OrderTokenAmount } from "./OrderTokenAmount";
 import { TokenBalance } from "./TokenBalance";
 
@@ -103,33 +102,11 @@ export function CryptoPaySection({
           className="text-as-tertiarry flex h-7 items-center gap-2 text-sm transition-colors focus:!outline-none"
           onClick={onSelectCryptoPaymentMethod}
         >
-          {selectedCryptoPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET ? (
-            <>
-              {walletAddress ? (
-                <div className="flex items-center gap-1">
-                  {connectedName ? formatUsername(connectedName) : shortenAddress(walletAddress || "")}
-                </div>
-              ) : (
-                "Connect wallet"
-              )}
-              <ChevronRight className="h-4 w-4" />
-            </>
-          ) : selectedCryptoPaymentMethod === CryptoPaymentMethodType.GLOBAL_WALLET ? (
-            <>
-              Global Account
-              <ChevronRight className="h-4 w-4" />
-            </>
-          ) : selectedCryptoPaymentMethod === CryptoPaymentMethodType.TRANSFER_CRYPTO ? (
-            <>
-              Transfer crypto
-              <ChevronRight className="h-4 w-4" />
-            </>
-          ) : (
-            <>
-              Select payment method
-              <ChevronRight className="h-4 w-4" />
-            </>
-          )}
+          <CryptoPaymentMethodDisplay
+            paymentMethod={selectedCryptoPaymentMethod}
+            connectedAddress={walletAddress}
+            connectedName={connectedName}
+          />
         </button>
       </div>
       <OrderTokenAmount

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

@@ -0,0 +1,64 @@
+import { formatUsername } from "@b3dotfun/sdk/shared/utils";
+import { shortenAddress } from "@b3dotfun/sdk/shared/utils/formatAddress";
+import { ChevronRight } from "lucide-react";
+import { CryptoPaymentMethodType } from "./CryptoPaymentMethod";
+
+interface CryptoPaymentMethodDisplayProps {
+  paymentMethod: CryptoPaymentMethodType;
+  connectedAddress?: string | null;
+  connectedName?: string | null;
+}
+
+/**
+ * Displays the selected crypto payment method with appropriate label
+ * - CONNECT_WALLET: Shows wallet address/name or "Connect wallet"
+ * - GLOBAL_WALLET: Shows "Global Account"
+ * - TRANSFER_CRYPTO: Shows "Transfer crypto"
+ * - NONE: Shows "Select payment method"
+ */
+export function CryptoPaymentMethodDisplay({
+  paymentMethod,
+  connectedAddress,
+  connectedName,
+}: CryptoPaymentMethodDisplayProps) {
+  if (paymentMethod === CryptoPaymentMethodType.CONNECT_WALLET) {
+    return (
+      <>
+        {connectedAddress ? (
+          <span className="text-as-tertiarry whitespace-nowrap">
+            {connectedName ? formatUsername(connectedName) : shortenAddress(connectedAddress)}
+          </span>
+        ) : (
+          <span className="whitespace-nowrap">Connect wallet</span>
+        )}
+        <ChevronRight className="h-4 w-4 shrink-0" />
+      </>
+    );
+  }
+
+  if (paymentMethod === CryptoPaymentMethodType.GLOBAL_WALLET) {
+    return (
+      <>
+        <span className="whitespace-nowrap">Global Account</span>
+        <ChevronRight className="h-4 w-4 shrink-0" />
+      </>
+    );
+  }
+
+  if (paymentMethod === CryptoPaymentMethodType.TRANSFER_CRYPTO) {
+    return (
+      <>
+        <span className="whitespace-nowrap">Transfer crypto</span>
+        <ChevronRight className="h-4 w-4 shrink-0" />
+      </>
+    );
+  }
+
+  // NONE or any other case
+  return (
+    <>
+      <span className="whitespace-nowrap">Select payment method</span>
+      <ChevronRight className="h-4 w-4 shrink-0" />
+    </>
+  );
+}

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

@@ -1,22 +1,19 @@
-import { useAccountWallet, useProfile } from "@b3dotfun/sdk/global-account/react";
-import { useConnectedWallets } from "thirdweb/react";
+import { useProfile } from "@b3dotfun/sdk/global-account/react";
+import { CryptoPaymentMethodType } from "../components/common/CryptoPaymentMethod";
+import { useConnectedWalletDisplay } from "./useConnectedWalletDisplay";
 
 /**
  * Hook that provides connected user's address, profile, and cleaned display name
  * Combines logic for getting connected address from either global account or thirdweb wallets
  */
-export function useConnectedUserProfile() {
-  const { address: globalAddress } = useAccountWallet();
-  const connectedWallets = useConnectedWallets();
-
-  // Get connected address from global account or first connected wallet
-  const connectedAddress = globalAddress || connectedWallets?.[0]?.getAccount()?.address;
+export function useConnectedUserProfile(selectedCryptoPaymentMethod?: CryptoPaymentMethodType) {
+  const { walletAddress } = useConnectedWalletDisplay(selectedCryptoPaymentMethod);
 
   // Fetch profile data for the connected address with cleaned name
-  const connectedProfile = useProfile({ address: connectedAddress });
+  const connectedProfile = useProfile({ address: walletAddress });
 
   return {
-    address: connectedAddress,
+    address: walletAddress,
     profile: connectedProfile,
     name: connectedProfile.data?.name,
     isLoading: connectedProfile.isLoading,

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

@@ -5,8 +5,6 @@ import { CryptoPaymentMethodType } from "../components/common/CryptoPaymentMetho
 interface UseConnectedWalletDisplayResult {
   walletAddress: string | undefined;
   shouldShowConnectedEOA: boolean;
-  shouldShowWagmiWallet: boolean;
-  isWalletDuplicated: boolean;
   suggestedPaymentMethod: CryptoPaymentMethodType;
 }
 
@@ -22,27 +20,18 @@ export function useConnectedWalletDisplay(
 
   const globalWalletAddress = connectedSmartWallet?.getAccount()?.address;
 
-  // Helper function to check if two addresses are the same
-  const isSameAddress = (addr1?: string, addr2?: string): boolean => {
-    if (!addr1 || !addr2) return false;
-    return addr1.toLowerCase() === addr2.toLowerCase();
-  };
-
   // Check if connectedEOAWallet and wagmi wallet represent the same wallet
   const connectedEOAAddress = connectedEOAWallet?.getAccount()?.address;
-  const isWalletDuplicated =
-    isSameAddress(connectedEOAAddress, wagmiAddress) || isSameAddress(globalWalletAddress, wagmiAddress);
 
   // Determine which wallet to show (prefer connectedEOAWallet if both exist and are the same)
   const shouldShowConnectedEOA = !!connectedEOAWallet;
   // this is disabled because we don't want to display In-App Wallet as a payment method
-  const shouldShowWagmiWallet = false; // wagmiWalletIsConnected && (!isWalletDuplicated || !connectedEOAWallet);
 
   // Determine which address to use based on payment method
   let walletAddress: string | undefined;
 
   if (selectedCryptoPaymentMethod === CryptoPaymentMethodType.GLOBAL_WALLET) {
-    walletAddress = connectedSmartWallet?.getAccount()?.address;
+    walletAddress = globalWalletAddress;
   } else if (selectedCryptoPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET) {
     // Prefer connectedEOAWallet, fallback to wagmi wallet
     walletAddress = connectedEOAAddress || wagmiAddress;
@@ -58,7 +47,7 @@ export function useConnectedWalletDisplay(
   if (connectedEOAAddress || wagmiAddress) {
     // If there's a connected EOA or wagmi wallet, suggest CONNECT_WALLET
     suggestedPaymentMethod = CryptoPaymentMethodType.CONNECT_WALLET;
-  } else if (connectedSmartWallet?.getAccount()?.address) {
+  } else if (globalWalletAddress) {
     // If only global wallet is available, suggest that
     suggestedPaymentMethod = CryptoPaymentMethodType.GLOBAL_WALLET;
   }
@@ -66,8 +55,6 @@ export function useConnectedWalletDisplay(
   return {
     walletAddress,
     shouldShowConnectedEOA,
-    shouldShowWagmiWallet,
-    isWalletDuplicated,
     suggestedPaymentMethod,
   };
 }

package/src/global-account/react/components/SignInWithB3/SignIn.tsx

@@ -13,8 +13,7 @@ import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { cn, truncateAddress } from "@b3dotfun/sdk/shared/utils";
 import { Menu, MenuButton, MenuItems, Transition } from "@headlessui/react";
 import { ReactNode, useEffect } from "react";
-import { useConnectedWallets, useSetActiveWallet } from "thirdweb/react";
-import { useAccountWalletImage } from "../../hooks/useAccountWallet";
+import { useConnectedWallets, useSetActiveWallet, useWalletImage } from "thirdweb/react";
 import { ManageAccountButton } from "../custom/ManageAccountButton";
 
 type SignInProps = {
@@ -40,9 +39,10 @@ export function SignIn(props: SignInWithB3Props) {
     isActiveSmartWallet,
     isActiveEOAWallet,
     smartWalletIcon,
-    eoaWalletIcon,
   } = useAccountWallet();
 
+  const { data: walletImage } = useWalletImage(connectedEOAWallet?.id);
+
   const isMobile = useIsMobile();
   const { logout } = useAuthentication(partnerId);
   const onDisconnect = async (): Promise<void> => {
@@ -72,8 +72,6 @@ export function SignIn(props: SignInWithB3Props) {
     }
   }, [connectedEOAWallet, isActiveEOAWallet, setActiveWallet, automaticallySetFirstEoa]);
 
-  const walletImage = useAccountWalletImage();
-
   // Desktop version - original dropdown menu
   return (
     <StyleRoot>
@@ -115,7 +113,7 @@ export function SignIn(props: SignInWithB3Props) {
                       <div className="flex items-center">
                         <img
                           className="bg-b3-react-primary h-16 w-16 rounded-full opacity-100"
-                          src={eoaWalletIcon}
+                          src={walletImage}
                           alt={connectedEOAWallet?.id}
                         />
                         <div className="ml-4 grow">

package/src/global-account/react/components/SignInWithB3/steps/LoginStep.tsx

@@ -40,7 +40,7 @@ export function LoginStepContainer({ children, partnerId }: LoginStepContainerPr
   const partnerLogo = partner?.data?.[0]?.loginCustomization?.logoUrl;
 
   return (
-    <div className="flex flex-col items-center justify-center pt-6">
+    <div className="bg-b3-react-background flex flex-col items-center justify-center pt-6">
       {partnerLogo && (
         <img src={partnerLogo} alt="Partner Logo" className="partner-logo mb-6 h-12 w-auto object-contain" />
       )}

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

@@ -6,7 +6,6 @@ export { useAnalytics } from "./useAnalytics";
 export { useAuthentication } from "./useAuthentication";
 export { useB3BalanceFromAddresses } from "./useB3BalanceFromAddresses";
 export { useB3EnsName } from "./useB3EnsName";
-export { useBestTransactionPath } from "./useBestTransactionPath";
 export { useChainSwitchWithAction } from "./useChainSwitchWithAction";
 export * from "./useClaim";
 export { useClient } from "./useClient";

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

@@ -1,7 +1,6 @@
 import { useB3, useProfile } from "@b3dotfun/sdk/global-account/react";
 import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
-import { getIpfsUrl } from "@b3dotfun/sdk/shared/utils/ipfs";
 import { useEffect, useMemo, useState } from "react";
 import { getLastAuthProvider, useActiveWallet, useConnectedWallets, useWalletImage } from "thirdweb/react";
 import { Account, Wallet } from "thirdweb/wallets";
@@ -44,7 +43,13 @@ export function useAccountWallet(): {
   eoaWalletIcon?: string;
   smartWalletIcon?: string;
 } {
-  const { account, user } = useB3();
+  // WOJ: --------------------
+  //  values from in useB3:
+  //  const activeAccount = useActiveAccount();
+  // const effectiveAccount = isAuthenticated ? accountOverride || activeAccount : undefined;
+  // can we possibly just use useActiveAccount here?
+  // --------------------
+  const { account } = useB3();
 
   const activeWallet = useActiveWallet();
   const connectedWallets = useConnectedWallets();
@@ -61,8 +66,6 @@ export function useAccountWallet(): {
   debug("isActiveSmartWallet", isActiveSmartWallet);
   debug("isActiveEOAWallet", isActiveEOAWallet);
 
-  const { data: walletImage } = useWalletImage(connectedEOAWallet?.id);
-
   // If not EOA sign in, then we need to show the smart wallet icon
   const lastAuthProvider = useLastAuthProvider();
 
@@ -73,7 +76,6 @@ export function useAccountWallet(): {
 
   const { data: profileData } = useProfile({ address: account?.address });
   const ensName = profileData?.displayName?.replace(/\.b3\.fun/g, "");
-  const avatarUrl = user?.avatar ? getIpfsUrl(user?.avatar) : profileData?.avatar;
 
   const res = useMemo(
     () => ({
@@ -81,7 +83,7 @@ export function useAccountWallet(): {
         ...account,
         ensName,
         meta: {
-          icon: avatarUrl || (isActiveSmartWallet ? smartWalletIcon : walletImage) || "",
+          icon: "", // deprecated
         },
       },
 
@@ -95,18 +97,16 @@ export function useAccountWallet(): {
       isActiveEOAWallet: isActiveEOAWallet,
 
       smartWalletIcon: smartWalletIcon,
-      eoaWalletIcon: walletImage,
+      eoaWalletIcon: "", // deprecated
     }),
     [
       account,
-      avatarUrl,
       connectedEOAWallet,
       connectedSmartWallet,
       ensName,
       isActiveEOAWallet,
       isActiveSmartWallet,
       smartWalletIcon,
-      walletImage,
     ],
   );
 
@@ -114,7 +114,7 @@ export function useAccountWallet(): {
 }
 
 export function useAccountWalletImage(): string {
-  const { account, user } = useB3();
+  const { account } = useB3();
 
   const activeWallet = useActiveWallet();
   const connectedWallets = useConnectedWallets();
@@ -134,7 +134,8 @@ export function useAccountWalletImage(): string {
       : "https://gradvatar.com/0x0000000000000000000000000000000000000000"; // show smart wallet of eoa wallet is gradvatar
 
   const { data: profileData } = useProfile({ address: account?.address });
-  const avatarUrl = user?.avatar || profileData?.avatar;
+
+  const avatarUrl = profileData?.avatar;
 
   return avatarUrl || (isActiveSmartWallet ? smartWalletIcon : walletImage) || "";
 }

package/dist/cjs/global-account/react/hooks/useBestTransactionPath.d.ts

@@ -1,41 +0,0 @@
-import { components } from "../../../anyspend/types/api";
-export type TransactionType = "send" | "swap" | "bridge";
-export interface SprinterOption {
-    chainId: number;
-    balance: bigint;
-    formattedBalance: string;
-}
-export interface TransactionPath {
-    type: "native" | "sprinter" | "anyspend";
-    hasNativePath: boolean;
-    hasSprinterPath: boolean;
-    availableBalance: bigint;
-    totalCrossChainBalance: number;
-    sprinterOptions?: SprinterOption[];
-}
-export interface TransactionPathResult extends TransactionPath {
-    loading: boolean;
-}
-interface UseBestTransactionPathProps {
-    amount: bigint;
-    token: components["schemas"]["Token"];
-    address?: string;
-    transactionType?: TransactionType;
-}
-/**
- * Hook to determine the optimal transaction path based on user's balances across chains
- *
- * @param props.amount - Amount to transact
- * @param props.token - Token (a Token object)
- * @param props.address - Target address (optional, defaults to self)
- * @param props.transactionType - Type of transaction (optional, defaults to 'send')
- *
- * - type: The recommended path type ('native', 'sprinter', or 'anyspend')
- * - hasNativePath: Whether direct native token transfer is possible (1st best path)
- * - hasSprinterPath: Whether bridging via Sprinter is possible (2nd best path)
- * - availableBalance: The user's balance of this asset
- * - sprinterOptions: Available chains and balances for bridging
- * @returns TransactionPathResult object containing path information and loading state
- */
-export declare function useBestTransactionPath({ amount, token, address, transactionType: _transactionType, }: UseBestTransactionPathProps): TransactionPathResult;
-export {};