thirdweb 5.31.1 → 5.32.0

package/src/react/web/ui/ConnectWallet/Details.tsx

@@ -10,12 +10,9 @@ import {
 } from "@radix-ui/react-icons";
 import { useQuery } from "@tanstack/react-query";
 import { useContext, useEffect, useState } from "react";
-import { ethereum } from "../../../../chains/chain-definitions/ethereum.js";
 import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { getContract } from "../../../../contract/contract.js";
-import { resolveAvatar } from "../../../../extensions/ens/resolve-avatar.js";
-import { resolveName } from "../../../../extensions/ens/resolve-name.js";
 import { isContractDeployed } from "../../../../utils/bytecode/is-contract-deployed.js";
 import type { Account, Wallet } from "../../../../wallets/interfaces/wallet.js";
 import {
@@ -30,19 +27,25 @@ import {
   radius,
   spacing,
 } from "../../../core/design-system/index.js";
+import type {
+  ConnectButtonProps,
+  ConnectButton_detailsButtonOptions,
+  ConnectButton_detailsModalOptions,
+  PayUIOptions,
+} from "../../../core/hooks/connection/ConnectButtonProps.js";
 import {
   useChainQuery,
   useChainsQuery,
 } from "../../../core/hooks/others/useChainQuery.js";
-import { useWalletBalance } from "../../../core/hooks/others/useWalletBalance.js";
 import { SetRootElementContext } from "../../../core/providers/RootElementContext.js";
-import { shortenString } from "../../../core/utils/addresses.js";
+import type { SupportedTokens } from "../../../core/utils/defaultTokens.js";
+import { hasSmartAccount } from "../../../core/utils/isSmartWallet.js";
+import { useConnectedWalletDetails } from "../../../core/utils/wallet.js";
 import { useActiveAccount } from "../../hooks/wallets/useActiveAccount.js";
 import { useActiveWallet } from "../../hooks/wallets/useActiveWallet.js";
 import { useActiveWalletChain } from "../../hooks/wallets/useActiveWalletChain.js";
 import { useDisconnect } from "../../hooks/wallets/useDisconnect.js";
 import { useSwitchActiveWalletChain } from "../../hooks/wallets/useSwitchActiveWalletChain.js";
-import { hasSmartAccount } from "../../utils/isSmartWallet.js";
 import { ChainIcon } from "../components/ChainIcon.js";
 import { CopyIcon } from "../components/CopyIcon.js";
 import { Img } from "../components/Img.js";
@@ -57,19 +60,12 @@ import { Link, Text } from "../components/text.js";
 import { fadeInAnimation } from "../design-system/animations.js";
 import { StyledButton } from "../design-system/elements.js";
 import type { LocaleId } from "../types.js";
-import type {
-  ConnectButtonProps,
-  ConnectButton_detailsButtonOptions,
-  ConnectButton_detailsModalOptions,
-  PayUIOptions,
-} from "./ConnectButtonProps.js";
 import { MenuButton, MenuLink } from "./MenuButton.js";
 import {
   NetworkSelectorContent,
   type NetworkSelectorProps,
 } from "./NetworkSelector.js";
 import { onModalUnmount } from "./constants.js";
-import type { SupportedTokens } from "./defaultTokens.js";
 import { CoinsIcon } from "./icons/CoinsIcon.js";
 import { FundsIcon } from "./icons/FundsIcon.js";
 import { GenericWalletIcon } from "./icons/GenericWalletIcon.js";
@@ -113,14 +109,18 @@ export const ConnectedWalletDetails: React.FC<{
 
   const setRootEl = useContext(SetRootElementContext);
   const activeWallet = useActiveWallet();
+  const activeAccount = useActiveAccount();
   const walletChain = useActiveWalletChain();
 
   useChainsQuery(props.chains, 5);
 
-  const { ensAvatarQuery, addressOrENS, balanceQuery } = useWalletInfo(
-    client,
-    props.detailsButton?.displayBalanceToken,
-  );
+  const { ensAvatarQuery, addressOrENS, balanceQuery } =
+    useConnectedWalletDetails(
+      client,
+      walletChain,
+      activeAccount,
+      props.detailsButton?.displayBalanceToken,
+    );
 
   function closeModal() {
     setRootEl(null);
@@ -245,14 +245,17 @@ function DetailsModal(props: {
   const [isOpen, setIsOpen] = useState(true);
 
   const { client, locale } = props;
-  const { ensAvatarQuery, addressOrENS, balanceQuery } = useWalletInfo(
-    client,
-    props.displayBalanceToken,
-  );
+  const walletChain = useActiveWalletChain();
+  const activeAccount = useActiveAccount();
+  const { ensAvatarQuery, addressOrENS, balanceQuery } =
+    useConnectedWalletDetails(
+      client,
+      walletChain,
+      activeAccount,
+      props.displayBalanceToken,
+    );
 
   const activeWallet = useActiveWallet();
-  const activeAccount = useActiveAccount();
-  const walletChain = useActiveWalletChain();
   const chainQuery = useChainQuery(walletChain);
 
   const disableSwitchChain = !activeWallet?.switchChain;
@@ -1184,58 +1187,3 @@ export function useWalletDetailsModal() {
     open: openModal,
   };
 }
-
-function useWalletInfo(
-  client: ThirdwebClient,
-  displayBalanceToken?: Record<number, string>,
-) {
-  const walletChain = useActiveWalletChain();
-
-  const tokenAddress =
-    walletChain && displayBalanceToken
-      ? displayBalanceToken[Number(walletChain.id)]
-      : undefined;
-
-  const activeAccount = useActiveAccount();
-  const ensNameQuery = useQuery({
-    queryKey: ["ens-name", activeAccount?.address],
-    enabled: !!activeAccount?.address,
-    queryFn: () =>
-      resolveName({
-        client,
-        address: activeAccount?.address || "",
-        resolverChain: ethereum,
-      }),
-  });
-
-  const ensAvatarQuery = useQuery({
-    queryKey: ["ens-avatar", ensNameQuery.data],
-    enabled: !!ensNameQuery.data,
-    queryFn: async () =>
-      resolveAvatar({
-        client,
-        name: ensNameQuery.data || "",
-      }),
-  });
-
-  const shortAddress = activeAccount?.address
-    ? shortenString(activeAccount.address, false)
-    : "";
-
-  const balanceQuery = useWalletBalance({
-    chain: walletChain ? walletChain : undefined,
-    tokenAddress,
-    address: activeAccount?.address,
-    client,
-  });
-
-  const addressOrENS = ensNameQuery.data || shortAddress;
-
-  return {
-    ensNameQuery,
-    ensAvatarQuery,
-    addressOrENS,
-    shortAddress,
-    balanceQuery,
-  };
-}

package/src/react/web/ui/ConnectWallet/Modal/AnyWalletConnectUI.tsx

@@ -1,6 +1,6 @@
 "use client";
 import { useQuery } from "@tanstack/react-query";
-import { Suspense, lazy, useEffect, useState } from "react";
+import { Suspense, lazy, useState } from "react";
 import type { Chain } from "../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import { isMobile } from "../../../../../utils/web/isMobile.js";
@@ -15,7 +15,7 @@ import { getInstalledWalletProviders } from "../../../../../wallets/injected/mip
 import type { Wallet } from "../../../../../wallets/interfaces/wallet.js";
 import type { EcosystemWalletId } from "../../../../../wallets/wallet-types.js";
 import { iconSize } from "../../../../core/design-system/index.js";
-import { useSetSelectionData } from "../../../providers/wallet-ui-states-provider.js";
+import { useWalletInfo } from "../../../../core/utils/wallet.js";
 import EcosystemWalletConnectUI from "../../../wallets/ecosystem/EcosystemWalletConnectUI.js";
 import { getInjectedWalletLocale } from "../../../wallets/injected/locale/getInjectedWalletLocale.js";
 import { GetStartedScreen } from "../../../wallets/shared/GetStartedScreen.js";
@@ -27,7 +27,6 @@ import {
 import { Spacer } from "../../components/Spacer.js";
 import { Container, ModalHeader } from "../../components/basic.js";
 import { Text } from "../../components/text.js";
-import { useWalletInfo } from "../../hooks/useWalletInfo.js";
 import type { LocaleId } from "../../types.js";
 import { AccentFailIcon } from "../icons/AccentFailIcon.js";
 import type { ConnectLocale } from "../locale/types.js";
@@ -71,12 +70,6 @@ export function AnyWalletConnectUI(props: {
   const [screen, setScreen] = useState<"main" | "get-started">("main");
   const { wallet } = props;
   const walletInfo = useWalletInfo(props.wallet.id);
-  const setSelectionData = useSetSelectionData();
-
-  // biome-ignore lint/correctness/useExhaustiveDependencies: reset the selection data when the wallet changes
-  useEffect(() => {
-    setSelectionData({});
-  }, [wallet.id]);
 
   const localeFnQuery = useQuery({
     queryKey: ["injectedWalletLocale", props.localeId, walletInfo.data?.name],

package/src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx

@@ -4,14 +4,16 @@ import type { Chain } from "../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import type { Wallet } from "../../../../../wallets/interfaces/wallet.js";
 import type { SmartWalletOptions } from "../../../../../wallets/smart/types.js";
-import type { AppMetadata } from "../../../../../wallets/types.js";
 import {
   CustomThemeProvider,
   useCustomTheme,
 } from "../../../../core/design-system/CustomThemeProvider.js";
-import { type Theme, radius } from "../../../../core/design-system/index.js";
-import type { SiweAuthOptions } from "../../../../core/hooks/auth/useSiweAuth.js";
-import { useSiweAuth } from "../../../../core/hooks/auth/useSiweAuth.js";
+import { radius } from "../../../../core/design-system/index.js";
+import {
+  type SiweAuthOptions,
+  useSiweAuth,
+} from "../../../../core/hooks/auth/useSiweAuth.js";
+import type { ConnectEmbedProps } from "../../../../core/hooks/connection/ConnectEmbedProps.js";
 import { useActiveAccount } from "../../../hooks/wallets/useActiveAccount.js";
 import { useActiveWallet } from "../../../hooks/wallets/useActiveWallet.js";
 import { useIsAutoConnecting } from "../../../hooks/wallets/useIsAutoConnecting.js";
@@ -35,283 +37,6 @@ import type { ConnectLocale } from "../locale/types.js";
 import { ConnectModalContent } from "./ConnectModalContent.js";
 import { useSetupScreen } from "./screen.js";
 
-export type ConnectEmbedProps = {
-  /**
-   * A client is the entry point to the thirdweb SDK.
-   * It is required for all other actions.
-   * You can create a client using the `createThirdwebClient` function. Refer to the [Creating a Client](https://portal.thirdweb.com/typescript/v5/client) documentation for more information.
-   *
-   * You must provide a `clientId` or `secretKey` in order to initialize a client. Pass `clientId` if you want for client-side usage and `secretKey` for server-side usage.
-   *
-   * ```tsx
-   * import { createThirdwebClient } from "thirdweb";
-   *
-   * const client = createThirdwebClient({
-   *  clientId: "<your_client_id>",
-   * })
-   * ```
-   */
-  client: ThirdwebClient;
-
-  /**
-   * Metadata of the app that will be passed to connected wallet. Setting this is highly recommended.
-   *
-   * Some wallets display this information to the user when they connect to your app.
-   * @example
-   * ```ts
-   * {
-   *   name: "My App",
-   *   url: "https://my-app.com",
-   *   description: "some description about your app",
-   *   logoUrl: "https://path/to/my-app/logo.svg",
-   * };
-   * ```
-   */
-  appMetadata?: AppMetadata;
-
-  /**
-   * By default - ConnectEmbed UI uses the `en-US` locale for english language users.
-   *
-   * You can customize the language used in the ConnectEmbed UI by setting the `locale` prop.
-   *
-   * Refer to the [`LocaleId`](https://portal.thirdweb.com/references/typescript/v5/LocaleId) type for supported locales.
-   */
-  locale?: LocaleId;
-
-  /**
-   * Array of supported wallets. If not provided, default wallets will be used.
-   * @example
-   * ```tsx
-   * import { AutoConnect } from "thirdweb/react";
-   * import { createWallet, inAppWallet } from "thirdweb/wallets";
-   *
-   * const wallets = [
-   *   inAppWallet(),
-   *   createWallet("io.metamask"),
-   *   createWallet("com.coinbase.wallet"),
-   *   createWallet("me.rainbow"),
-   * ];
-   *
-   * function Example() {
-   *  return (
-   *    <ConnectEmbed
-   *      client={client}
-   *      wallets={wallets}
-   *    />
-   *  )
-   * }
-   * ```
-   *
-   * If no wallets are specified. The component will show All the EIP-6963 compliant installed wallet extensions, as well as below default wallets:
-   *
-   * ```tsx
-   * const defaultWallets = [
-   *  inAppWallet(),
-   *  createWallet("io.metamask"),
-   *  createWallet("com.coinbase.wallet"),
-   *  createWallet("me.rainbow"),
-   *  createWallet("io.zerion.wallet"),
-   * ]
-   * ```
-   *
-   * The `ConnectEmbed` also shows a "All wallets" button at the end of wallet list which allows user to connect to any of the 350+ wallets
-   */
-  wallets?: Wallet[];
-
-  /**
-   * When the user has connected their wallet to your site, this configuration determines whether or not you want to automatically connect to the last connected wallet when user visits your site again in the future.
-   *
-   * By default it is set to `{ timeout: 15000 }` meaning that autoConnect is enabled and if the autoConnection does not succeed within 15 seconds, it will be cancelled.
-   *
-   * If you want to disable autoConnect, set this prop to `false`.
-   *
-   * If you want to customize the timeout, you can assign an object with a `timeout` key to this prop.
-   * ```tsx
-   * <ConnectEmbed client={client} autoConnect={{ timeout: 10000 }} />
-   * ```
-   */
-  autoConnect?:
-    | {
-        timeout: number;
-      }
-    | boolean;
-
-  /**
-   * The [`Chain`](https://portal.thirdweb.com/references/typescript/v5/Chain) object of the blockchain you want the wallet to connect to
-   *
-   * If a `chain` is not specified, Wallet will be connected to whatever is the default set in the wallet.
-   *
-   * If a `chain` is specified, Wallet will be prompted to switch to given chain after connection if it is not already connected to it.
-   * This ensures that the wallet is connected to the correct blockchain before interacting with your app.
-   *
-   * You can create a `Chain` object using the [`defineChain`](https://portal.thirdweb.com/references/typescript/v5/defineChain) function.
-   * At minimum, you need to pass the `id` of the blockchain to `defineChain` function to create a `Chain` object.
-   * @example
-   * ```tsx
-   * import { polygon } from "thirdweb/chains";
-   *
-   * function Example() {
-   *  return <div> <ConnectEmbed chain={polygon} /> </div>
-   * }
-   * ```
-   */
-  chain?: Chain;
-
-  /**
-   * Array of chains that your app supports.
-   *
-   * This is only relevant if your app is a multi-chain app and works across multiple blockchains.
-   * If your app only works on a single blockchain, you should only specify the `chain` prop.
-   *
-   * Given list of chains will used in various ways:
-   * - They will be displayed in the network selector in the `ConnectEmbed`'s details modal post connection
-   * - They will be sent to wallet at the time of connection if the wallet supports requesting multiple chains ( example: WalletConnect ) so that users can switch between the chains post connection easily
-   *
-   * ```tsx
-   * <ConnectEmbed chains={[ethereum, polygon, optimism]} />
-   * ```
-   *
-   * You can create a `Chain` object using the [`defineChain`](https://portal.thirdweb.com/references/typescript/v5/defineChain) function.
-   * At minimum, you need to pass the `id` of the blockchain to `defineChain` function to create a `Chain` object.
-   *
-   * ```tsx
-   * import { defineChain } from "thirdweb/react";
-   *
-   * const polygon = defineChain({
-   *   id: 137,
-   * });
-   * ```
-   */
-  chains?: Chain[];
-
-  /**
-   * Class name to be added to the root element of ConnectEmbed
-   */
-  className?: string;
-
-  /**
-   * Set the theme for the `ConnectEmbed` component. By default it is set to `"dark"`
-   *
-   * theme can be set to either `"dark"`, `"light"` or a custom theme object.
-   * You can also import [`lightTheme`](https://portal.thirdweb.com/references/typescript/v5/lightTheme)
-   * or [`darkTheme`](https://portal.thirdweb.com/references/typescript/v5/darkTheme)
-   * functions from `thirdweb/react` to use the default themes as base and overrides parts of it.
-   * @example
-   * ```ts
-   * import { lightTheme } from "thirdweb/react";
-   *
-   * const customTheme = lightTheme({
-   *  colors: {
-   *    modalBg: 'red'
-   *  }
-   * })
-   *
-   * function Example() {
-   *  return <ConnectEmbed theme={customTheme} />
-   * }
-   * ```
-   */
-  theme?: "dark" | "light" | Theme;
-
-  /**
-   * CSS styles to be applied to the root element of ConnectEmbed
-   */
-  style?: React.CSSProperties;
-
-  /**
-   * If provided, Embed will show a Terms of Service message at the bottom with below link
-   */
-  termsOfServiceUrl?: string;
-
-  /**
-   * If provided, Embed will show a Privacy Policy message at the bottom with below link
-   */
-  privacyPolicyUrl?: string;
-
-  /**
-   * Callback to be called on successful connection of wallet - including auto-connect.
-   * The callback is called with the connected wallet
-   *
-   * ```tsx
-   * <ConnectEmbed
-   *  onConnect={(wallet) => {
-   *    console.log("connected to", wallet)
-   *  }}
-   * />
-   * ```
-   * ```
-   */
-  onConnect?: (wallet: Wallet) => void;
-
-  /**
-   * By default, A "Powered by Thirdweb" branding is shown at the bottom of the embed.
-   *
-   * If you want to hide it, set this to `false`
-   * @example
-   * ```tsx
-   * <ConnectEmbed showThirdwebBranding={false} />
-   * ```
-   */
-  showThirdwebBranding?: boolean;
-
-  /**
-   * Configure options for WalletConnect
-   *
-   * By default WalletConnect uses the thirdweb's default project id.
-   * Setting your own project id is recommended.
-   *
-   * You can create a project id by signing up on [walletconnect.com](https://walletconnect.com/)
-   */
-  walletConnect?: {
-    projectId?: string;
-  };
-
-  /**
-   * Enable Account abstraction for all wallets. This will connect to the users's smart account based on the connected personal wallet and the given options.
-   *
-   * This allows to sponsor gas fees for your user's transaction using the thirdweb account abstraction infrastructure.
-   *
-   * ```tsx
-   * <ConnectEmbed
-   *   accountAbstraction={{
-   *    factoryAddress: "0x123...",
-   *    chain: sepolia,
-   *    gasless: true;
-   *   }}
-   * />
-   */
-  accountAbstraction?: SmartWalletOptions;
-
-  /**
-   * Wallets to show as recommended in the `ConnectEmbed` UI
-   */
-  recommendedWallets?: Wallet[];
-
-  /**
-   * By default, `ConnectEmbed` shows a "All Wallets" button that shows a list of 350+ wallets.
-   *
-   * You can disable this button by setting `showAllWallets` prop to `false`
-   */
-  showAllWallets?: boolean;
-
-  /**
-   * ConnectEmbed supports two modal size variants: `compact` and `wide`.
-   *
-   * By default it is set to `compact`, you can set it to `wide` if you want to show a wider modal.
-   *
-   * Note that if the screen width can not fit the wide modal, the `compact` version will be shown regardless of this `modalSize` options provided
-   */
-  modalSize?: "compact" | "wide";
-
-  /**
-   * Enable SIWE (Sign in with Ethererum) by passing an object of type `SiweAuthOptions` to
-   * enforce the users to sign a message after connecting their wallet to authenticate themselves.
-   *
-   * Refer to the [`SiweAuthOptions`](https://portal.thirdweb.com/references/typescript/v5/SiweAuthOptions) for more details
-   */
-  auth?: SiweAuthOptions;
-};
-
 /**
  * A component that allows the user to connect their wallet.
  *
@@ -322,10 +47,6 @@ export type ConnectEmbedProps = {
  * ```tsx
  * <ConnectEmbed
  *    client={client}
- *    appMetadata={{
- *      name: "Example",
- *      url: "https://example.com",
- *    }}
  * />
  * ```
  * @param props -

package/src/react/web/ui/ConnectWallet/Modal/ConnectModalContent.tsx

@@ -109,8 +109,9 @@ export const ConnectModalContent = (props: {
   );
 
   const handleBack = useCallback(() => {
+    setSelectionData({});
     setScreen(initialScreen);
-  }, [setScreen, initialScreen]);
+  }, [setScreen, initialScreen, setSelectionData]);
 
   const walletList = (
     <WalletSelector
@@ -120,6 +121,7 @@ export const ConnectModalContent = (props: {
         setScreen(reservedScreens.getStarted);
       }}
       selectWallet={(newWallet) => {
+        setSelectionData({});
         if (newWallet.onConnectRequested) {
           newWallet
             .onConnectRequested()

package/src/react/web/ui/ConnectWallet/Modal/SmartWalletConnectUI.tsx

@@ -13,6 +13,7 @@ import {
   iconSize,
   spacing,
 } from "../../../../core/design-system/index.js";
+import { useWalletInfo } from "../../../../core/utils/wallet.js";
 import { LoadingScreen } from "../../../wallets/shared/LoadingScreen.js";
 import { getSmartWalletLocale } from "../../../wallets/smartWallet/locale/getSmartWalletLocale.js";
 import type { SmartWalletLocale } from "../../../wallets/smartWallet/locale/types.js";
@@ -21,7 +22,6 @@ import { Spinner } from "../../components/Spinner.js";
 import { Container, ModalHeader } from "../../components/basic.js";
 import { Button } from "../../components/buttons.js";
 import { Text } from "../../components/text.js";
-import { useWalletInfo } from "../../hooks/useWalletInfo.js";
 import type { LocaleId } from "../../types.js";
 import type { ConnectLocale } from "../locale/types.js";
 import { AnyWalletConnectUI } from "./AnyWalletConnectUI.js";

package/src/react/web/ui/ConnectWallet/WalletEntryButton.tsx

@@ -10,12 +10,12 @@ import {
   radius,
   spacing,
 } from "../../../core/design-system/index.js";
+import { useWalletInfo } from "../../../core/utils/wallet.js";
 import { Skeleton } from "../components/Skeleton.js";
 import { WalletImage } from "../components/WalletImage.js";
 import { Container } from "../components/basic.js";
 import { Text } from "../components/text.js";
 import { StyledButton } from "../design-system/elements.js";
-import { useWalletInfo } from "../hooks/useWalletInfo.js";
 import { useScreenContext } from "./Modal/screen.js";
 import type { ConnectLocale } from "./locale/types.js";
 

package/src/react/web/ui/ConnectWallet/WalletSelector.tsx

@@ -16,6 +16,7 @@ import {
   radius,
   spacing,
 } from "../../../core/design-system/index.js";
+import { genericWalletIcon } from "../../../core/utils/socialIcons.js";
 import { sortWallets } from "../../utils/sortWallets.js";
 import { LoadingScreen } from "../../wallets/shared/LoadingScreen.js";
 import { Img } from "../components/Img.js";
@@ -40,7 +41,6 @@ import { PoweredByThirdweb } from "./PoweredByTW.js";
 import { WalletButton, WalletEntryButton } from "./WalletEntryButton.js";
 import { WalletTypeRowButton } from "./WalletTypeRowButton.js";
 import { compactModalMaxHeight } from "./constants.js";
-import { genericWalletIcon } from "./icons/dataUris.js";
 import type { ConnectLocale } from "./locale/types.js";
 
 const InAppWalletSelectionUI = /* @__PURE__ */ lazy(

package/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx

@@ -14,6 +14,7 @@ import {
   iconSize,
   spacing,
 } from "../../../../../core/design-system/index.js";
+import type { PayUIOptions } from "../../../../../core/hooks/connection/ConnectButtonProps.js";
 import {
   useChainQuery,
   useChainsQuery,
@@ -21,6 +22,7 @@ import {
 import { useWalletBalance } from "../../../../../core/hooks/others/useWalletBalance.js";
 import { useBuyWithCryptoQuote } from "../../../../../core/hooks/pay/useBuyWithCryptoQuote.js";
 import { useBuyWithFiatQuote } from "../../../../../core/hooks/pay/useBuyWithFiatQuote.js";
+import type { SupportedTokens } from "../../../../../core/utils/defaultTokens.js";
 import { useActiveAccount } from "../../../../hooks/wallets/useActiveAccount.js";
 import { useActiveWalletChain } from "../../../../hooks/wallets/useActiveWalletChain.js";
 import { LoadingScreen } from "../../../../wallets/shared/LoadingScreen.js";
@@ -40,9 +42,7 @@ import { Container, Line, ModalHeader } from "../../../components/basic.js";
 import { Button } from "../../../components/buttons.js";
 import { Text } from "../../../components/text.js";
 import { TokenSymbol } from "../../../components/token/TokenSymbol.js";
-import type { PayUIOptions } from "../../ConnectButtonProps.js";
 import { ChainButton, NetworkSelectorContent } from "../../NetworkSelector.js";
-import type { SupportedTokens } from "../../defaultTokens.js";
 import { CoinsIcon } from "../../icons/CoinsIcon.js";
 import type { ConnectLocale } from "../../locale/types.js";
 import { TokenSelector } from "../TokenSelector.js";

package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.tsx

@@ -18,13 +18,13 @@ import {
   spacing,
 } from "../../../../../../core/design-system/index.js";
 import { useChainQuery } from "../../../../../../core/hooks/others/useChainQuery.js";
+import type { TokenInfo } from "../../../../../../core/utils/defaultTokens.js";
 import { Spacer } from "../../../../components/Spacer.js";
 import { Spinner } from "../../../../components/Spinner.js";
 import { Container, Line, ModalHeader } from "../../../../components/basic.js";
 import { Button, ButtonLink } from "../../../../components/buttons.js";
 import { Text } from "../../../../components/text.js";
 import { TokenSymbol } from "../../../../components/token/TokenSymbol.js";
-import type { TokenInfo } from "../../../defaultTokens.js";
 import { type ERC20OrNativeToken, NATIVE_TOKEN } from "../../nativeToken.js";
 import { PayTokenIcon } from "../PayTokenIcon.js";
 import { StepIcon } from "../Stepper.js";

package/src/react/web/ui/ConnectWallet/screens/Buy/main/useEnabledPaymentMethods.ts

@@ -1,6 +1,6 @@
 import type { Chain } from "../../../../../../../chains/types.js";
 import { NATIVE_TOKEN_ADDRESS } from "../../../../../../../constants/addresses.js";
-import type { PayUIOptions } from "../../../ConnectButtonProps.js";
+import type { PayUIOptions } from "../../../../../../core/hooks/connection/ConnectButtonProps.js";
 import { type ERC20OrNativeToken, isNativeToken } from "../../nativeToken.js";
 import type { SupportedChainAndTokens } from "../swap/useSwapSupportedChains.js";
 

package/src/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.ts

@@ -3,9 +3,9 @@ import { polygon } from "../../../../../../../chains/chain-definitions/polygon.j
 import type { Chain } from "../../../../../../../chains/types.js";
 import { formatNumber } from "../../../../../../../utils/formatNumber.js";
 import { toEther } from "../../../../../../../utils/units.js";
+import type { PayUIOptions } from "../../../../../../core/hooks/connection/ConnectButtonProps.js";
 import { useActiveWalletChain } from "../../../../../hooks/wallets/useActiveWalletChain.js";
 import { useDebouncedValue } from "../../../../hooks/useDebouncedValue.js";
-import type { PayUIOptions } from "../../../ConnectButtonProps.js";
 import { type ERC20OrNativeToken, NATIVE_TOKEN } from "../../nativeToken.js";
 import { defaultSelectedCurrency } from "../fiat/currencies.js";
 import type { SupportedChainAndTokens } from "../swap/useSwapSupportedChains.js";

package/src/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.tsx

@@ -10,13 +10,13 @@ import {
 } from "../../../../../../core/design-system/index.js";
 import { useChainQuery } from "../../../../../../core/hooks/others/useChainQuery.js";
 import { useWalletBalance } from "../../../../../../core/hooks/others/useWalletBalance.js";
+import type { TokenInfo } from "../../../../../../core/utils/defaultTokens.js";
 import { useActiveAccount } from "../../../../../hooks/wallets/useActiveAccount.js";
 import { Skeleton } from "../../../../components/Skeleton.js";
 import { Container } from "../../../../components/basic.js";
 import { Button } from "../../../../components/buttons.js";
 import { Text } from "../../../../components/text.js";
 import { TokenSymbol } from "../../../../components/token/TokenSymbol.js";
-import type { TokenInfo } from "../../../defaultTokens.js";
 import { GenericWalletIcon } from "../../../icons/GenericWalletIcon.js";
 import { formatTokenBalance } from "../../formatTokenBalance.js";
 import { type NativeToken, isNativeToken } from "../../nativeToken.js";