thirdweb 5.40.0 → 5.40.1-nightly-b128530355f0dc47d897bd2ef7c3823752ea9b6c-20240727000321

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

@@ -15,9 +15,9 @@ import {
   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";
+import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
+import { useActiveWallet } from "../../../../core/hooks/wallets/useActiveWallet.js";
+import { useIsAutoConnecting } from "../../../../core/hooks/wallets/useIsAutoConnecting.js";
 import { WalletUIStatesProvider } from "../../../providers/wallet-ui-states-provider.js";
 import { canFitWideModal } from "../../../utils/canFitWideModal.js";
 import { usePreloadWalletProviders } from "../../../utils/usePreloadWalletProviders.js";
@@ -35,6 +35,7 @@ import {
 } from "../constants.js";
 import { useConnectLocale } from "../locale/getConnectLocale.js";
 import type { ConnectLocale } from "../locale/types.js";
+import type { WelcomeScreen } from "../screens/types.js";
 import { ConnectModalContent } from "./ConnectModalContent.js";
 import { useSetupScreen } from "./screen.js";
 
@@ -148,8 +149,6 @@ export function ConnectEmbed(props: ConnectEmbedProps) {
           client={props.client}
           connectLocale={localeQuery.data}
           size={modalSize}
-          // TODO: no welcome screen for embed right now?
-          // welcomeScreen={undefined}
           meta={meta}
           isEmbed={true}
           localeId={props.locale || "en_US"}
@@ -161,6 +160,7 @@ export function ConnectEmbed(props: ConnectEmbedProps) {
           className={props.className}
           modalSize={modalSize}
           style={props.style}
+          welcomeScreen={props.welcomeScreen}
         />
         {autoConnectComp}
       </WalletUIStatesProvider>
@@ -203,6 +203,7 @@ const ConnectEmbedContent = (props: {
       }
     | undefined;
   wallets: Wallet[];
+  welcomeScreen: WelcomeScreen | undefined;
 }) => {
   // const requiresSignIn = false;
   const screenSetup = useSetupScreen({
@@ -258,9 +259,7 @@ const ConnectEmbedContent = (props: {
         connectLocale={props.connectLocale}
         meta={props.meta}
         size={props.size}
-        // TODO: no welcome screen for embed right now?
-        // welcomeScreen={undefined}
-        welcomeScreen={undefined}
+        welcomeScreen={props.welcomeScreen}
         isEmbed={props.isEmbed}
         onConnect={props.onConnect}
         recommendedWallets={props.recommendedWallets}

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

@@ -5,7 +5,7 @@ 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 { SiweAuthOptions } from "../../../../core/hooks/auth/useSiweAuth.js";
-import { useActiveAccount } from "../../../hooks/wallets/useActiveAccount.js";
+import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
 import {
   useIsWalletModalOpen,
   useSetIsWalletModalOpen,

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

@@ -9,9 +9,9 @@ import {
   type SiweAuthOptions,
   useSiweAuth,
 } from "../../../../core/hooks/auth/useSiweAuth.js";
-import { useActiveWallet } from "../../../hooks/wallets/useActiveWallet.js";
-import { useSetActiveWallet } from "../../../hooks/wallets/useSetActiveWallet.js";
-import { connectionManager } from "../../../index.js";
+import { useActiveWallet } from "../../../../core/hooks/wallets/useActiveWallet.js";
+import { useSetActiveWallet } from "../../../../core/hooks/wallets/useSetActiveWallet.js";
+import { useConnectionManager } from "../../../../core/providers/connection-manager.js";
 import { useSetSelectionData } from "../../../providers/wallet-ui-states-provider.js";
 import { LoadingScreen } from "../../../wallets/shared/LoadingScreen.js";
 import { WalletSelector } from "../WalletSelector.js";
@@ -80,6 +80,7 @@ export const ConnectModalContent = (props: {
   const activeWallet = useActiveWallet();
   const siweAuth = useSiweAuth(activeWallet, props.auth);
   const showSignatureScreen = siweAuth.requiresAuth && !siweAuth.isLoggedIn;
+  const connectionManager = useConnectionManager();
 
   const handleConnected = useCallback(
     (wallet: Wallet) => {
@@ -116,6 +117,7 @@ export const ConnectModalContent = (props: {
       setSelectionData,
       shouldSetActive,
       initialScreen,
+      connectionManager,
     ],
   );
 

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

@@ -12,8 +12,8 @@ import {
   iconSize,
   spacing,
 } from "../../../../core/design-system/index.js";
+import { useConnectionManager } from "../../../../core/providers/connection-manager.js";
 import { useWalletInfo } from "../../../../core/utils/wallet.js";
-import { connectionManager } from "../../../index.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";
@@ -135,6 +135,7 @@ function SmartWalletConnecting(props: {
     useState<"connecting" | "connect-error" | "idle">("idle");
   const [personalWalletChainSwitchStatus, setPersonalWalletChainSwitchStatus] =
     useState<"switching" | "switch-error" | "idle">("idle");
+  const connectionManager = useConnectionManager();
 
   const handleConnect = useCallback(async () => {
     if (!personalWallet) {
@@ -157,7 +158,13 @@ function SmartWalletConnecting(props: {
       console.error(e);
       setSmartWalletConnectionStatus("connect-error");
     }
-  }, [done, personalWallet, props.client, props.accountAbstraction]);
+  }, [
+    done,
+    personalWallet,
+    props.client,
+    props.accountAbstraction,
+    connectionManager,
+  ]);
 
   const connectStarted = useRef(false);
   useEffect(() => {

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

@@ -1,7 +1,7 @@
 "use client";
 import { createContext, useContext, useEffect, useRef, useState } from "react";
 import type { Wallet } from "../../../../../wallets/interfaces/wallet.js";
-import { useActiveAccount } from "../../../hooks/wallets/useActiveAccount.js";
+import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
 import { reservedScreens } from "../constants.js";
 import type { WelcomeScreen } from "../screens/types.js";
 

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

@@ -32,9 +32,9 @@ import {
   useChainName,
   useChainsQuery,
 } from "../../../core/hooks/others/useChainQuery.js";
+import { useActiveWalletChain } from "../../../core/hooks/wallets/useActiveWalletChain.js";
+import { useSwitchActiveWalletChain } from "../../../core/hooks/wallets/useSwitchActiveWalletChain.js";
 import { SetRootElementContext } from "../../../core/providers/RootElementContext.js";
-import { useActiveWalletChain } from "../../hooks/wallets/useActiveWalletChain.js";
-import { useSwitchActiveWalletChain } from "../../hooks/wallets/useSwitchActiveWalletChain.js";
 import { ChainIcon } from "../components/ChainIcon.js";
 import { Modal } from "../components/Modal.js";
 import { Skeleton } from "../components/Skeleton.js";

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

@@ -5,9 +5,9 @@ import { useState } from "react";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { iconSize } from "../../../core/design-system/index.js";
 import { useChainExplorers } from "../../../core/hooks/others/useChainQuery.js";
-import { useActiveAccount } from "../../hooks/wallets/useActiveAccount.js";
-import { useActiveWallet } from "../../hooks/wallets/useActiveWallet.js";
-import { useActiveWalletChain } from "../../hooks/wallets/useActiveWalletChain.js";
+import { useActiveAccount } from "../../../core/hooks/wallets/useActiveAccount.js";
+import { useActiveWallet } from "../../../core/hooks/wallets/useActiveWallet.js";
+import { useActiveWalletChain } from "../../../core/hooks/wallets/useActiveWalletChain.js";
 import { LoadingScreen } from "../../wallets/shared/LoadingScreen.js";
 import { Spacer } from "../components/Spacer.js";
 import Tabs from "../components/Tabs.js";

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

@@ -19,8 +19,8 @@ import type {
 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 { useActiveAccount } from "../../../../../core/hooks/wallets/useActiveAccount.js";
 import type { SupportedTokens } from "../../../../../core/utils/defaultTokens.js";
-import { useActiveAccount } from "../../../../hooks/wallets/useActiveAccount.js";
 import { LoadingScreen } from "../../../../wallets/shared/LoadingScreen.js";
 import type { PayEmbedConnectOptions } from "../../../PayEmbed.js";
 import { ChainName } from "../../../components/ChainName.js";

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

@@ -12,9 +12,9 @@ import { useCustomTheme } from "../../../../../core/design-system/CustomThemePro
 import { iconSize, spacing } from "../../../../../core/design-system/index.js";
 import type { PayUIOptions } from "../../../../../core/hooks/connection/ConnectButtonProps.js";
 import { useChainQuery } from "../../../../../core/hooks/others/useChainQuery.js";
+import { useActiveWallet } from "../../../../../core/hooks/wallets/useActiveWallet.js";
 import type { TokenInfo } from "../../../../../core/utils/defaultTokens.js";
 import { useEnsName } from "../../../../../core/utils/wallet.js";
-import { useActiveWallet } from "../../../../hooks/wallets/useActiveWallet.js";
 import { LoadingScreen } from "../../../../wallets/shared/LoadingScreen.js";
 import type { PayEmbedConnectOptions } from "../../../PayEmbed.js";
 import { ChainIcon } from "../../../components/ChainIcon.js";

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

@@ -3,7 +3,7 @@ import { useMemo, useState, useSyncExternalStore } from "react";
 import type { ThirdwebClient } from "../../../../../../client/client.js";
 import { isAddress } from "../../../../../../utils/address.js";
 import { iconSize } from "../../../../../core/design-system/index.js";
-import { connectionManager } from "../../../../index.js";
+import { useConnectionManager } from "../../../../../core/providers/connection-manager.js";
 import { Spacer } from "../../../components/Spacer.js";
 import { TextDivider } from "../../../components/TextDivider.js";
 import { ToolTip } from "../../../components/Tooltip.js";
@@ -22,6 +22,7 @@ export function ReceiverWalletDrawerScreen(props: {
   const [address, setAddress] = useState<string>("");
   const isValidAddress = useMemo(() => isAddress(address), [address]);
   const showError = !!address && !isValidAddress;
+  const connectionManager = useConnectionManager();
   const connectedWallets = useSyncExternalStore(
     connectionManager.connectedWallets.subscribe,
     connectionManager.connectedWallets.getValue,

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

@@ -8,8 +8,8 @@ import { useCustomTheme } from "../../../../../core/design-system/CustomThemePro
 import { iconSize, spacing } from "../../../../../core/design-system/index.js";
 import type { PayUIOptions } from "../../../../../core/hooks/connection/ConnectButtonProps.js";
 import { useChainQuery } from "../../../../../core/hooks/others/useChainQuery.js";
+import { useActiveWallet } from "../../../../../core/hooks/wallets/useActiveWallet.js";
 import { hasSponsoredTransactionsEnabled } from "../../../../../core/utils/wallet.js";
-import { useActiveWallet } from "../../../../hooks/wallets/useActiveWallet.js";
 import { LoadingScreen } from "../../../../wallets/shared/LoadingScreen.js";
 import type { PayEmbedConnectOptions } from "../../../PayEmbed.js";
 import { ChainIcon } from "../../../components/ChainIcon.js";

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

@@ -8,8 +8,8 @@ import {
   radius,
   spacing,
 } from "../../../../../core/design-system/index.js";
+import { useConnectedWallets } from "../../../../../core/hooks/wallets/useConnectedWallets.js";
 import { useEnsAvatar, useEnsName } from "../../../../../core/utils/wallet.js";
-import { useConnectedWallets } from "../../../../hooks/wallets/useConnectedWallets.js";
 import { Img } from "../../../components/Img.js";
 import { WalletImage } from "../../../components/WalletImage.js";
 import { Container } from "../../../components/basic.js";

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

@@ -5,7 +5,7 @@ import type {
   FundWalletOptions,
   PayUIOptions,
 } from "../../../../../../core/hooks/connection/ConnectButtonProps.js";
-import { useActiveWalletChain } from "../../../../../hooks/wallets/useActiveWalletChain.js";
+import { useActiveWalletChain } from "../../../../../../core/hooks/wallets/useActiveWalletChain.js";
 import { useDebouncedValue } from "../../../../hooks/useDebouncedValue.js";
 import { type ERC20OrNativeToken, NATIVE_TOKEN } from "../../nativeToken.js";
 import { defaultSelectedCurrency } from "../fiat/currencies.js";

package/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/BuyTxHistory.tsx

@@ -12,9 +12,9 @@ import {
   spacing,
 } from "../../../../../../core/design-system/index.js";
 import { useChainExplorers } from "../../../../../../core/hooks/others/useChainQuery.js";
-import { useActiveAccount } from "../../../../../hooks/wallets/useActiveAccount.js";
-import { useActiveWallet } from "../../../../../hooks/wallets/useActiveWallet.js";
-import { useActiveWalletChain } from "../../../../../hooks/wallets/useActiveWalletChain.js";
+import { useActiveAccount } from "../../../../../../core/hooks/wallets/useActiveAccount.js";
+import { useActiveWallet } from "../../../../../../core/hooks/wallets/useActiveWallet.js";
+import { useActiveWalletChain } from "../../../../../../core/hooks/wallets/useActiveWalletChain.js";
 import { LoadingScreen } from "../../../../../wallets/shared/LoadingScreen.js";
 import { Skeleton } from "../../../../components/Skeleton.js";
 import { Spinner } from "../../../../components/Spinner.js";

package/src/react/web/ui/ConnectWallet/screens/Buy/pay-transactions/useBuyTransactionsToShow.ts

@@ -10,7 +10,7 @@ import {
   getBuyWithFiatStatus,
 } from "../../../../../../../pay/buyWithFiat/getStatus.js";
 import { useBuyHistory } from "../../../../../../core/hooks/pay/useBuyHistory.js";
-import { useActiveAccount } from "../../../../../hooks/wallets/useActiveAccount.js";
+import { useActiveAccount } from "../../../../../../core/hooks/wallets/useActiveAccount.js";
 import { pendingTransactions } from "../swap/pendingSwapTx.js";
 
 export type TxStatusInfo =

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

@@ -7,7 +7,7 @@ import {
   radius,
   spacing,
 } from "../../../../../../core/design-system/index.js";
-import { useConnectedWallets } from "../../../../../hooks/wallets/useConnectedWallets.js";
+import { useConnectedWallets } from "../../../../../../core/hooks/wallets/useConnectedWallets.js";
 import { Spacer } from "../../../../components/Spacer.js";
 import { Container } from "../../../../components/basic.js";
 import { Button } from "../../../../components/buttons.js";

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

@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
-import { useActiveAccount } from "../../../../hooks/wallets/useActiveAccount.js";
-import { useActiveWallet } from "../../../../hooks/wallets/useActiveWallet.js";
-import { useActiveWalletChain } from "../../../../hooks/wallets/useActiveWalletChain.js";
+import { useActiveAccount } from "../../../../../core/hooks/wallets/useActiveAccount.js";
+import { useActiveWallet } from "../../../../../core/hooks/wallets/useActiveWallet.js";
+import { useActiveWalletChain } from "../../../../../core/hooks/wallets/useActiveWalletChain.js";
 import type { PayerInfo } from "./types.js";
 
 export function usePayerSetup() {

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

@@ -14,10 +14,10 @@ import {
   spacing,
 } from "../../../../../core/design-system/index.js";
 import { useWalletBalance } from "../../../../../core/hooks/others/useWalletBalance.js";
-import { useActiveWallet } from "../../../../hooks/wallets/useActiveWallet.js";
-import { useConnectedWallets } from "../../../../hooks/wallets/useConnectedWallets.js";
-import { useDisconnect } from "../../../../hooks/wallets/useDisconnect.js";
-import { useSetActiveWallet } from "../../../../hooks/wallets/useSetActiveWallet.js";
+import { useActiveWallet } from "../../../../../core/hooks/wallets/useActiveWallet.js";
+import { useConnectedWallets } from "../../../../../core/hooks/wallets/useConnectedWallets.js";
+import { useDisconnect } from "../../../../../core/hooks/wallets/useDisconnect.js";
+import { useSetActiveWallet } from "../../../../../core/hooks/wallets/useSetActiveWallet.js";
 import { Skeleton } from "../../../components/Skeleton.js";
 import { Spacer } from "../../../components/Spacer.js";
 import { ToolTip } from "../../../components/Tooltip.js";

package/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx

@@ -5,7 +5,7 @@ import { isEcosystemWallet } from "../../../../../wallets/ecosystem/is-ecosystem
 import { isInAppWallet } from "../../../../../wallets/in-app/core/wallet/index.js";
 import { injectedProvider } from "../../../../../wallets/injected/mipdStore.js";
 import { fontSize, iconSize } from "../../../../core/design-system/index.js";
-import { useActiveWallet } from "../../../hooks/wallets/useActiveWallet.js";
+import { useActiveWallet } from "../../../../core/hooks/wallets/useActiveWallet.js";
 import { Spacer } from "../../components/Spacer.js";
 import { Container, Line, ModalHeader } from "../../components/basic.js";
 import { Text } from "../../components/text.js";

package/src/react/web/ui/ConnectWallet/screens/ReceiveFunds.tsx

@@ -6,8 +6,8 @@ import {
   radius,
   spacing,
 } from "../../../../core/design-system/index.js";
+import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
 import { shortenString } from "../../../../core/utils/addresses.js";
-import { useActiveAccount } from "../../../hooks/wallets/useActiveAccount.js";
 import { CopyIcon } from "../../components/CopyIcon.js";
 import { QRCode } from "../../components/QRCode.js";
 import { Spacer } from "../../components/Spacer.js";

package/src/react/web/ui/ConnectWallet/screens/SendFunds.tsx

@@ -7,13 +7,13 @@ import {
   spacing,
 } from "../../../../core/design-system/index.js";
 import { useWalletBalance } from "../../../../core/hooks/others/useWalletBalance.js";
+import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
+import { useActiveWalletChain } from "../../../../core/hooks/wallets/useActiveWalletChain.js";
+import { useSendToken } from "../../../../core/hooks/wallets/useSendToken.js";
 import {
   type SupportedTokens,
   defaultTokens,
 } from "../../../../core/utils/defaultTokens.js";
-import { useActiveAccount } from "../../../hooks/wallets/useActiveAccount.js";
-import { useActiveWalletChain } from "../../../hooks/wallets/useActiveWalletChain.js";
-import { useSendToken } from "../../../hooks/wallets/useSendToken.js";
 import { Skeleton } from "../../components/Skeleton.js";
 import { Spacer } from "../../components/Spacer.js";
 import { Spinner } from "../../components/Spinner.js";

package/src/react/web/ui/ConnectWallet/screens/SignatureScreen.tsx

@@ -11,9 +11,9 @@ import {
 } from "../../../../core/design-system/index.js";
 import { useSiweAuth } from "../../../../core/hooks/auth/useSiweAuth.js";
 import type { ConnectButtonProps } from "../../../../core/hooks/connection/ConnectButtonProps.js";
+import { useActiveWallet } from "../../../../core/hooks/wallets/useActiveWallet.js";
+import { useDisconnect } from "../../../../core/hooks/wallets/useDisconnect.js";
 import { wait } from "../../../../core/utils/wait.js";
-import { useActiveWallet } from "../../../hooks/wallets/useActiveWallet.js";
-import { useDisconnect } from "../../../hooks/wallets/useDisconnect.js";
 import { LoadingScreen } from "../../../wallets/shared/LoadingScreen.js";
 import { Spacer } from "../../components/Spacer.js";
 import { Spinner } from "../../components/Spinner.js";

package/src/react/web/ui/ConnectWallet/screens/TokenSelector.tsx

@@ -17,8 +17,8 @@ import {
   useChainName,
 } from "../../../../core/hooks/others/useChainQuery.js";
 import { useTokenInfo } from "../../../../core/hooks/others/useTokenInfo.js";
+import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
 import type { TokenInfo } from "../../../../core/utils/defaultTokens.js";
-import { useActiveAccount } from "../../../hooks/wallets/useActiveAccount.js";
 import { ChainIcon } from "../../components/ChainIcon.js";
 import { Skeleton } from "../../components/Skeleton.js";
 import { Spacer } from "../../components/Spacer.js";

package/src/react/web/ui/ConnectWallet/screens/ViewNFTs.tsx

@@ -9,9 +9,9 @@ import { isERC721 } from "../../../../../extensions/erc721/read/isERC721.js";
 import { getOwnedNFTs as getErc1155OwnedNFTs } from "../../../../../extensions/erc1155/read/getOwnedNFTs.js";
 import { isERC1155 } from "../../../../../extensions/erc1155/read/isERC1155.js";
 import type { Theme } from "../../../../core/design-system/index.js";
+import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
+import { useActiveWalletChain } from "../../../../core/hooks/wallets/useActiveWalletChain.js";
 import type { SupportedNFTs } from "../../../../core/utils/defaultTokens.js";
-import { useActiveAccount } from "../../../hooks/wallets/useActiveAccount.js";
-import { useActiveWalletChain } from "../../../hooks/wallets/useActiveWalletChain.js";
 import { MediaRenderer } from "../../MediaRenderer/MediaRenderer.js";
 import { Skeleton } from "../../components/Skeleton.js";
 import { Spacer } from "../../components/Spacer.js";

package/src/react/web/ui/ConnectWallet/screens/ViewTokens.tsx

@@ -2,12 +2,12 @@ import type { Chain } from "../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import { fontSize } from "../../../../core/design-system/index.js";
 import { useWalletBalance } from "../../../../core/hooks/others/useWalletBalance.js";
+import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
+import { useActiveWalletChain } from "../../../../core/hooks/wallets/useActiveWalletChain.js";
 import {
   type SupportedTokens,
   defaultTokens,
 } from "../../../../core/utils/defaultTokens.js";
-import { useActiveAccount } from "../../../hooks/wallets/useActiveAccount.js";
-import { useActiveWalletChain } from "../../../hooks/wallets/useActiveWalletChain.js";
 import { Skeleton } from "../../components/Skeleton.js";
 import { Spacer } from "../../components/Spacer.js";
 import { TokenIcon } from "../../components/TokenIcon.js";

package/src/react/web/ui/ConnectWallet/screens/WalletConnectReceiverScreen.tsx

@@ -11,7 +11,7 @@ import {
   getActiveWalletConnectSessions,
 } from "../../../../../wallets/wallet-connect/receiver/index.js";
 import { iconSize, spacing } from "../../../../core/design-system/index.js";
-import { useActiveWallet } from "../../../hooks/wallets/useActiveWallet.js";
+import { useActiveWallet } from "../../../../core/hooks/wallets/useActiveWallet.js";
 import { InputSelectionUI } from "../../../wallets/in-app/InputSelectionUI.js";
 import { Spacer } from "../../components/Spacer.js";
 import { Container, Line, ModalHeader } from "../../components/basic.js";

package/src/react/web/ui/ConnectWallet/screens/WalletSwitcherConnectionScreen.tsx

@@ -3,7 +3,7 @@ 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 { useConnectedWallets } from "../../../hooks/wallets/useConnectedWallets.js";
+import { useConnectedWallets } from "../../../../core/hooks/wallets/useConnectedWallets.js";
 import { getDefaultWallets } from "../../../wallets/defaultWallets.js";
 import { ConnectModalContent } from "../Modal/ConnectModalContent.js";
 import { useSetupScreen } from "../Modal/screen.js";

package/src/react/web/ui/ConnectWallet/screens/WalletTransactionHistory.tsx

@@ -14,7 +14,7 @@ import {
   useChainExplorers,
   useChainIconUrl,
 } from "../../../../core/hooks/others/useChainQuery.js";
-import { useActiveWalletChain } from "../../../hooks/wallets/useActiveWalletChain.js";
+import { useActiveWalletChain } from "../../../../core/hooks/wallets/useActiveWalletChain.js";
 import { ChainIcon } from "../../components/ChainIcon.js";
 import { ChainName } from "../../components/ChainName.js";
 import { Spacer } from "../../components/Spacer.js";

package/src/react/web/ui/TransactionButton/TransactionButton.test.tsx

@@ -37,15 +37,18 @@ const mocks = vi.hoisted(() => {
 
 describe.sequential("TransactionButton", () => {
   beforeAll(() => {
-    vi.mock("../../../web/hooks/wallets/useActiveAccount.js", () => ({
+    vi.mock("../../../core/hooks/wallets/useActiveAccount.js", () => ({
       useActiveAccount: mocks.activeAccount,
     }));
-    vi.mock("../../../web/hooks/wallets/useActiveWallet.js", () => ({
+    vi.mock("../../../core/hooks/wallets/useActiveWallet.js", () => ({
       useActiveWallet: mocks.activeWallet,
     }));
-    vi.mock("../../../web/hooks/wallets/useSwitchActiveWalletChain.js", () => ({
-      useSwitchActiveWalletChain: mocks.switchActiveWalletChain,
-    }));
+    vi.mock(
+      "../../../core/hooks/wallets/useSwitchActiveWalletChain.js",
+      () => ({
+        useSwitchActiveWalletChain: mocks.switchActiveWalletChain,
+      }),
+    );
   });
 
   afterAll(() => {

package/src/react/web/ui/TransactionButton/index.tsx

@@ -4,8 +4,8 @@ import {
   type TransactionButtonProps,
   useTransactionButtonMutation,
 } from "../../../core/hooks/transaction/transaction-button-utils.js";
+import { useActiveAccount } from "../../../core/hooks/wallets/useActiveAccount.js";
 import { useSendTransaction } from "../../hooks/transaction/useSendTransaction.js";
-import { useActiveAccount } from "../../hooks/wallets/useActiveAccount.js";
 import { Spinner } from "../components/Spinner.js";
 import { Button } from "../components/buttons.js";
 

package/src/react/web/ui/components/WalletImage.tsx

@@ -7,6 +7,7 @@ import { getInstalledWalletProviders } from "../../../../wallets/injected/mipdSt
 import { getStoredActiveWalletId } from "../../../../wallets/manager/index.js";
 import type { WalletId } from "../../../../wallets/wallet-types.js";
 import { radius } from "../../../core/design-system/index.js";
+import { useActiveWallet } from "../../../core/hooks/wallets/useActiveWallet.js";
 import {
   appleIconUri,
   discordIconUri,
@@ -19,7 +20,6 @@ import {
 } from "../../../core/utils/socialIcons.js";
 import { getLastAuthProvider } from "../../../core/utils/storage.js";
 import { useWalletImage } from "../../../core/utils/wallet.js";
-import { useActiveWallet } from "../../hooks/wallets/useActiveWallet.js";
 import { Img } from "./Img.js";
 
 /**

package/src/react/web/ui/prebuilt/thirdweb/ClaimButton/index.tsx

@@ -6,7 +6,7 @@ import {
 } from "../../../../../../contract/contract.js";
 import type { PreparedTransaction } from "../../../../../../transaction/prepare-transaction.js";
 import type { Account } from "../../../../../../wallets/interfaces/wallet.js";
-import { useActiveAccount } from "../../../../hooks/wallets/useActiveAccount.js";
+import { useActiveAccount } from "../../../../../core/hooks/wallets/useActiveAccount.js";
 import { TransactionButton } from "../../../TransactionButton/index.js";
 import type {
   ClaimButtonProps,

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.40.0";
+export const version = "5.40.1-nightly-b128530355f0dc47d897bd2ef7c3823752ea9b6c-20240727000321";

package/dist/cjs/react/core/connectionManager.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.connectionManagerSingleton = connectionManagerSingleton;
-const index_js_1 = require("../../wallets/manager/index.js");
-let _connectManager;
-function connectionManagerSingleton(storage) {
-    if (_connectManager) {
-        return _connectManager;
-    }
-    return (0, index_js_1.createConnectionManager)(storage);
-}
-//# sourceMappingURL=connectionManager.js.map

package/dist/cjs/react/core/connectionManager.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"connectionManager.js","sourceRoot":"","sources":["../../../../src/react/core/connectionManager.ts"],"names":[],"mappings":";;AAQA,gEAKC;AAZD,6DAGwC;AAExC,IAAI,eAAkC,CAAC;AAEvC,SAAgB,0BAA0B,CAAC,OAAqB;IAC9D,IAAI,eAAe,EAAE,CAAC;QACpB,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,OAAO,IAAA,kCAAuB,EAAC,OAAO,CAAC,CAAC;AAC1C,CAAC"}

package/dist/cjs/react/native/hooks/transaction/useEstimateGas.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useEstimateGas = useEstimateGas;
-const useEstimateGas_js_1 = require("../../../core/hooks/transaction/useEstimateGas.js");
-const useActiveAccount_js_1 = require("../wallets/useActiveAccount.js");
-/**
- * A hook to estimate the gas for a given transaction.
- * @returns A mutation object to estimate gas.
- * @example
- * ```jsx
- * import { useEstimateGas } from "thirdweb/react";
- * const { mutate: estimateGas, data: gasEstimate } = useEstimateGas();
- *
- * // later
- * const estimatedGas = await estimateGas(tx);
- * ```
- * @transaction
- */
-function useEstimateGas() {
-    const account = (0, useActiveAccount_js_1.useActiveAccount)();
-    return (0, useEstimateGas_js_1.useEstimateGasCore)(account);
-}
-//# sourceMappingURL=useEstimateGas.js.map

package/dist/cjs/react/native/hooks/transaction/useEstimateGas.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useEstimateGas.js","sourceRoot":"","sources":["../../../../../../src/react/native/hooks/transaction/useEstimateGas.ts"],"names":[],"mappings":";;AAmBA,wCAOC;AAvBD,yFAAuF;AACvF,wEAAkE;AAElE;;;;;;;;;;;;GAYG;AACH,SAAgB,cAAc;IAK5B,MAAM,OAAO,GAAG,IAAA,sCAAgB,GAAE,CAAC;IACnC,OAAO,IAAA,sCAAkB,EAAC,OAAO,CAAC,CAAC;AACrC,CAAC"}

package/dist/cjs/react/native/hooks/transaction/useEstimateGasCost.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useEstimateGasCost = useEstimateGasCost;
-const react_query_1 = require("@tanstack/react-query");
-const estimate_gas_cost_js_1 = require("../../../../transaction/actions/estimate-gas-cost.js");
-const useActiveAccount_js_1 = require("../wallets/useActiveAccount.js");
-/**
- * A hook to estimate the gas cost in ether and wei for a given transaction.
- * @returns A mutation object to estimate gas cost.
- * @example
- * ```jsx
- * import { useEstimateGasCost } from "thirdweb/react";
- * const { mutate: estimateGasCost, data: gasEstimate } = useEstimateGas();
- *
- * // later
- * const estimatedGas = await estimateGasCost(tx);
- * console.log("gas cost in ether", estimatedGas.ether);
- * ```
- * @transaction
- */
-function useEstimateGasCost() {
-    const account = (0, useActiveAccount_js_1.useActiveAccount)();
-    return (0, react_query_1.useMutation)({
-        mutationFn: (transaction) => (0, estimate_gas_cost_js_1.estimateGasCost)({ transaction, account }),
-    });
-}
-//# sourceMappingURL=useEstimateGasCost.js.map

package/dist/cjs/react/native/hooks/transaction/useEstimateGasCost.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useEstimateGasCost.js","sourceRoot":"","sources":["../../../../../../src/react/native/hooks/transaction/useEstimateGasCost.ts"],"names":[],"mappings":";;AAsBA,gDAUC;AAhCD,uDAA4E;AAC5E,+FAG8D;AAE9D,wEAAkE;AAElE;;;;;;;;;;;;;GAaG;AACH,SAAgB,kBAAkB;IAKhC,MAAM,OAAO,GAAG,IAAA,sCAAgB,GAAE,CAAC;IAEnC,OAAO,IAAA,yBAAW,EAAC;QACjB,UAAU,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,IAAA,sCAAe,EAAC,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;KACvE,CAAC,CAAC;AACL,CAAC"}

package/dist/cjs/react/native/hooks/transaction/useSendAndConfirmTransaction.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSendAndConfirmTransaction = useSendAndConfirmTransaction;
-const useSendAndConfirmTransaction_js_1 = require("../../../core/hooks/transaction/useSendAndConfirmTransaction.js");
-const useActiveAccount_js_1 = require("../wallets/useActiveAccount.js");
-/**
- * A hook to send a transaction.
- * @returns A mutation object to send a transaction.
- * @example
- * ```jsx
- * import { useSendAndConfirmTransaction } from "thirdweb/react";
- * const { mutate: sendAndConfirmTx, data: transactionReceipt } = useSendAndConfirmTransaction();
- *
- * // later
- * sendAndConfirmTx(tx);
- * ```
- * @transaction
- */
-function useSendAndConfirmTransaction() {
-    const account = (0, useActiveAccount_js_1.useActiveAccount)();
-    return (0, useSendAndConfirmTransaction_js_1.useSendAndConfirmTransactionCore)(account);
-}
-//# sourceMappingURL=useSendAndConfirmTransaction.js.map