@solana/connector 0.2.0 → 0.2.2

package/dist/{chunk-EM4KNOKG.js → chunk-VVLY6QPI.js}

@@ -1,17 +1,18 @@
 'use strict';
 
-var chunkBZ2VBJCZ_js = require('./chunk-BZ2VBJCZ.js');
-var chunkSITQ4JWM_js = require('./chunk-SITQ4JWM.js');
-var React2 = require('react');
+var chunkTRSJSU33_js = require('./chunk-TRSJSU33.js');
+var chunkBF67LVVM_js = require('./chunk-BF67LVVM.js');
+var chunkL5FWMNWO_js = require('./chunk-L5FWMNWO.js');
+var React4 = require('react');
 var jsxRuntime = require('react/jsx-runtime');
 var addresses = require('@solana/addresses');
 var keys = require('@solana/keys');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var React2__default = /*#__PURE__*/_interopDefault(React2);
+var React4__default = /*#__PURE__*/_interopDefault(React4);
 
-var logger = chunkSITQ4JWM_js.createLogger("ErrorBoundary");
+var logger = chunkBF67LVVM_js.createLogger("ErrorBoundary");
 var ErrorLogger = class {
   static log(error, errorInfo, context) {
     if (process.env.NODE_ENV === "development" && logger.error(error.message, {
@@ -31,39 +32,39 @@ var ErrorLogger = class {
   }
 };
 function classifyError(error) {
-  if (chunkSITQ4JWM_js.isConnectorError(error)) {
+  if (chunkBF67LVVM_js.isConnectorError(error)) {
     let typeMapping = {
-      WALLET_NOT_CONNECTED: chunkSITQ4JWM_js.WalletErrorType.CONNECTION_FAILED,
-      WALLET_NOT_FOUND: chunkSITQ4JWM_js.WalletErrorType.WALLET_NOT_FOUND,
-      CONNECTION_FAILED: chunkSITQ4JWM_js.WalletErrorType.CONNECTION_FAILED,
-      USER_REJECTED: chunkSITQ4JWM_js.WalletErrorType.USER_REJECTED,
-      RPC_ERROR: chunkSITQ4JWM_js.WalletErrorType.NETWORK_ERROR,
-      NETWORK_TIMEOUT: chunkSITQ4JWM_js.WalletErrorType.NETWORK_ERROR,
-      SIGNING_FAILED: chunkSITQ4JWM_js.WalletErrorType.TRANSACTION_FAILED,
-      SEND_FAILED: chunkSITQ4JWM_js.WalletErrorType.TRANSACTION_FAILED
+      WALLET_NOT_CONNECTED: chunkBF67LVVM_js.WalletErrorType.CONNECTION_FAILED,
+      WALLET_NOT_FOUND: chunkBF67LVVM_js.WalletErrorType.WALLET_NOT_FOUND,
+      CONNECTION_FAILED: chunkBF67LVVM_js.WalletErrorType.CONNECTION_FAILED,
+      USER_REJECTED: chunkBF67LVVM_js.WalletErrorType.USER_REJECTED,
+      RPC_ERROR: chunkBF67LVVM_js.WalletErrorType.NETWORK_ERROR,
+      NETWORK_TIMEOUT: chunkBF67LVVM_js.WalletErrorType.NETWORK_ERROR,
+      SIGNING_FAILED: chunkBF67LVVM_js.WalletErrorType.TRANSACTION_FAILED,
+      SEND_FAILED: chunkBF67LVVM_js.WalletErrorType.TRANSACTION_FAILED
     };
     return {
       ...error,
-      type: typeMapping[error.code] || chunkSITQ4JWM_js.WalletErrorType.UNKNOWN_ERROR,
+      type: typeMapping[error.code] || chunkBF67LVVM_js.WalletErrorType.UNKNOWN_ERROR,
       recoverable: error.recoverable,
       context: error.context
     };
   }
   let walletError = error;
   if (walletError.type) return walletError;
-  let type = chunkSITQ4JWM_js.WalletErrorType.UNKNOWN_ERROR, recoverable = false;
-  return error.message.includes("User rejected") || error.message.includes("User denied") ? (type = chunkSITQ4JWM_js.WalletErrorType.USER_REJECTED, recoverable = true) : error.message.includes("Insufficient funds") ? (type = chunkSITQ4JWM_js.WalletErrorType.INSUFFICIENT_FUNDS, recoverable = false) : error.message.includes("Network") || error.message.includes("fetch") ? (type = chunkSITQ4JWM_js.WalletErrorType.NETWORK_ERROR, recoverable = true) : error.message.includes("Wallet not found") || error.message.includes("not installed") ? (type = chunkSITQ4JWM_js.WalletErrorType.WALLET_NOT_FOUND, recoverable = true) : (error.message.includes("Failed to connect") || error.message.includes("Connection")) && (type = chunkSITQ4JWM_js.WalletErrorType.CONNECTION_FAILED, recoverable = true), {
+  let type = chunkBF67LVVM_js.WalletErrorType.UNKNOWN_ERROR, recoverable = false;
+  return error.message.includes("User rejected") || error.message.includes("User denied") ? (type = chunkBF67LVVM_js.WalletErrorType.USER_REJECTED, recoverable = true) : error.message.includes("Insufficient funds") ? (type = chunkBF67LVVM_js.WalletErrorType.INSUFFICIENT_FUNDS, recoverable = false) : error.message.includes("Network") || error.message.includes("fetch") ? (type = chunkBF67LVVM_js.WalletErrorType.NETWORK_ERROR, recoverable = true) : error.message.includes("Wallet not found") || error.message.includes("not installed") ? (type = chunkBF67LVVM_js.WalletErrorType.WALLET_NOT_FOUND, recoverable = true) : (error.message.includes("Failed to connect") || error.message.includes("Connection")) && (type = chunkBF67LVVM_js.WalletErrorType.CONNECTION_FAILED, recoverable = true), {
     ...error,
     type,
     recoverable,
     context: { originalMessage: error.message }
   };
 }
-var ConnectorErrorBoundary = class extends React2.Component {
+var ConnectorErrorBoundary = class extends React4.Component {
   constructor(props) {
     super(props);
-    chunkSITQ4JWM_js.__publicField(this, "retryTimeouts", /* @__PURE__ */ new Set());
-    chunkSITQ4JWM_js.__publicField(this, "retry", () => {
+    chunkL5FWMNWO_js.__publicField(this, "retryTimeouts", /* @__PURE__ */ new Set());
+    chunkL5FWMNWO_js.__publicField(this, "retry", () => {
       let { maxRetries = 3 } = this.props;
       this.state.retryCount >= maxRetries || this.setState((prevState) => ({
         hasError: false,
@@ -106,36 +107,36 @@ var ConnectorErrorBoundary = class extends React2.Component {
   }
 };
 function DefaultErrorFallback({ error, onRetry }) {
-  let [isPending, startTransition] = React2.useTransition(), [isRetrying, setIsRetrying] = React2.useState(false), handleRetry = React2.useCallback(() => {
+  let [isPending, startTransition] = React4.useTransition(), [isRetrying, setIsRetrying] = React4.useState(false), handleRetry = React4.useCallback(() => {
     setIsRetrying(true), startTransition(() => {
       setTimeout(() => {
         onRetry(), setIsRetrying(false);
       }, 500);
     });
-  }, [onRetry]), { title, message, actionText, showRetry } = React2.useMemo(() => {
+  }, [onRetry]), { title, message, actionText, showRetry } = React4.useMemo(() => {
     switch (error.type) {
-      case chunkSITQ4JWM_js.WalletErrorType.USER_REJECTED:
+      case chunkBF67LVVM_js.WalletErrorType.USER_REJECTED:
         return {
           title: "Transaction Cancelled",
           message: "You cancelled the transaction. No problem!",
           actionText: "Try Again",
           showRetry: true
         };
-      case chunkSITQ4JWM_js.WalletErrorType.WALLET_NOT_FOUND:
+      case chunkBF67LVVM_js.WalletErrorType.WALLET_NOT_FOUND:
         return {
           title: "Wallet Not Found",
           message: "Please install a supported Solana wallet to continue.",
           actionText: "Check Wallets",
           showRetry: true
         };
-      case chunkSITQ4JWM_js.WalletErrorType.NETWORK_ERROR:
+      case chunkBF67LVVM_js.WalletErrorType.NETWORK_ERROR:
         return {
           title: "Network Error",
           message: "Having trouble connecting. Please check your internet connection.",
           actionText: "Retry",
           showRetry: true
         };
-      case chunkSITQ4JWM_js.WalletErrorType.INSUFFICIENT_FUNDS:
+      case chunkBF67LVVM_js.WalletErrorType.INSUFFICIENT_FUNDS:
         return {
           title: "Insufficient Funds",
           message: "You don't have enough SOL for this transaction.",
@@ -285,25 +286,25 @@ function withErrorBoundary(Component2, errorBoundaryProps) {
   let WrappedComponent = (props) => /* @__PURE__ */ jsxRuntime.jsx(ConnectorErrorBoundary, { ...errorBoundaryProps, children: /* @__PURE__ */ jsxRuntime.jsx(Component2, { ...props }) });
   return WrappedComponent.displayName = `withErrorBoundary(${Component2.displayName || Component2.name})`, WrappedComponent;
 }
-var WalletConnectContext = React2.createContext(null);
+var WalletConnectContext = React4.createContext(null);
 function WalletConnectProvider({ children }) {
-  let [uri, setUriState] = React2.useState(null), isMountedRef = React2.useRef(false), pendingUriRef = React2.useRef(null);
-  React2.useEffect(() => (isMountedRef.current = true, pendingUriRef.current !== null && (setUriState(pendingUriRef.current), pendingUriRef.current = null), () => {
+  let [uri, setUriState] = React4.useState(null), isMountedRef = React4.useRef(false), pendingUriRef = React4.useRef(null);
+  React4.useEffect(() => (isMountedRef.current = true, pendingUriRef.current !== null && (setUriState(pendingUriRef.current), pendingUriRef.current = null), () => {
     isMountedRef.current = false;
   }), []);
-  let setUri = React2.useCallback((newUri) => {
+  let setUri = React4.useCallback((newUri) => {
     if (!isMountedRef.current) {
       pendingUriRef.current = newUri;
       return;
     }
     setUriState(newUri);
-  }, []), clearUri = React2.useCallback(() => {
+  }, []), clearUri = React4.useCallback(() => {
     pendingUriRef.current = null, isMountedRef.current && setUriState(null);
   }, []);
   return /* @__PURE__ */ jsxRuntime.jsx(WalletConnectContext.Provider, { value: { uri, setUri, clearUri }, children });
 }
 function useWalletConnectUri() {
-  let context = React2.useContext(WalletConnectContext);
+  let context = React4.useContext(WalletConnectContext);
   return context || {
     uri: null,
     setUri: () => {
@@ -312,19 +313,19 @@ function useWalletConnectUri() {
     }
   };
 }
-var logger2 = chunkSITQ4JWM_js.createLogger("ConnectorProvider");
-chunkBZ2VBJCZ_js.installPolyfills();
-var ConnectorContext = React2.createContext(null);
+var logger2 = chunkBF67LVVM_js.createLogger("ConnectorProvider");
+chunkTRSJSU33_js.installPolyfills();
+var ConnectorContext = React4.createContext(null);
 ConnectorContext.displayName = "ConnectorContext";
 function ConnectorProviderInternal({
   children,
   config,
   mobile
 }) {
-  let clientRef = React2.useRef(null), client = React2__default.default.useCallback(() => {
+  let clientRef = React4.useRef(null), client = React4__default.default.useCallback(() => {
     if (!clientRef.current)
       try {
-        clientRef.current = new chunkBZ2VBJCZ_js.ConnectorClient(config), typeof window < "u" && (window.__connectorClient = clientRef.current), config?.debug && logger2.info("Client initialized successfully");
+        clientRef.current = new chunkTRSJSU33_js.ConnectorClient(config), typeof window < "u" && (window.__connectorClient = clientRef.current), config?.debug && logger2.info("Client initialized successfully");
       } catch (error) {
         let err = error;
         logger2.error("Failed to initialize client", { error: err });
@@ -336,7 +337,7 @@ function ConnectorProviderInternal({
       }
     return clientRef.current;
   }, [config])();
-  return React2__default.default.useEffect(() => {
+  return React4__default.default.useEffect(() => {
     let currentClient = clientRef.current;
     if (currentClient) {
       let privateClient = currentClient;
@@ -345,7 +346,7 @@ function ConnectorProviderInternal({
     return () => {
       typeof window < "u" && (window.__connectorClient = void 0), currentClient && typeof currentClient.destroy == "function" && currentClient.destroy();
     };
-  }, []), React2__default.default.useEffect(() => {
+  }, []), React4__default.default.useEffect(() => {
     if (!mobile) return;
     let cancelled = false;
     return (async () => {
@@ -394,16 +395,16 @@ function ConnectorProvider({
   ) : /* @__PURE__ */ jsxRuntime.jsx(ConnectorProviderInternal, { config, mobile, children });
 }
 function useConnector() {
-  let client = React2.useContext(ConnectorContext);
+  let client = React4.useContext(ConnectorContext);
   if (!client)
     throw new Error(
       "useConnector must be used within ConnectorProvider. Wrap your app with <ConnectorProvider> or <UnifiedProvider> to use connector hooks."
     );
-  let { uri: walletConnectUri, clearUri: clearWalletConnectUri } = useWalletConnectUri(), state = React2.useSyncExternalStore(
-    React2__default.default.useCallback((cb) => client.subscribe(cb), [client]),
-    React2__default.default.useCallback(() => client.getSnapshot(), [client]),
-    React2__default.default.useCallback(() => client.getSnapshot(), [client])
-  ), methods = React2.useMemo(
+  let { uri: walletConnectUri, clearUri: clearWalletConnectUri } = useWalletConnectUri(), state = React4.useSyncExternalStore(
+    React4__default.default.useCallback((cb) => client.subscribe(cb), [client]),
+    React4__default.default.useCallback(() => client.getSnapshot(), [client]),
+    React4__default.default.useCallback(() => client.getSnapshot(), [client])
+  ), methods = React4.useMemo(
     () => ({
       // Legacy (kept for backwards compatibility)
       select: client.select.bind(client),
@@ -414,7 +415,7 @@ function useConnector() {
       disconnectWallet: client.disconnectWallet.bind(client)
     }),
     [client]
-  ), vNextFields = React2.useMemo(() => {
+  ), vNextFields = React4.useMemo(() => {
     let walletStatus = state.wallet, isConnected2 = walletStatus.status === "connected", isConnecting2 = walletStatus.status === "connecting", isError = walletStatus.status === "error", connectorId = null, account = null, sessionAccounts = [], walletError = null;
     walletStatus.status === "connected" ? (connectorId = walletStatus.session.connectorId, account = walletStatus.session.selectedAccount.address, sessionAccounts = walletStatus.session.accounts) : walletStatus.status === "connecting" ? connectorId = walletStatus.connectorId : walletStatus.status === "error" && (walletError = walletStatus.error, connectorId = walletStatus.connectorId ?? null);
     let connector = connectorId ? state.connectors.find((c) => c.id === connectorId) ?? null : null;
@@ -430,7 +431,7 @@ function useConnector() {
       connector
     };
   }, [state.wallet, state.connectors]);
-  return React2.useMemo(
+  return React4.useMemo(
     () => ({
       ...state,
       ...methods,
@@ -442,10 +443,10 @@ function useConnector() {
   );
 }
 function useConnectorClient() {
-  return React2.useContext(ConnectorContext);
+  return React4.useContext(ConnectorContext);
 }
 function AppProviderInner({ children, connectorConfig, mobile, providers = [] }) {
-  let { setUri, clearUri } = useWalletConnectUri(), enhancedConfig = React2.useMemo(() => {
+  let { setUri, clearUri } = useWalletConnectUri(), enhancedConfig = React4.useMemo(() => {
     if (!connectorConfig?.walletConnect?.enabled)
       return connectorConfig;
     let wcConfig = connectorConfig.walletConnect;
@@ -471,17 +472,17 @@ function AppProvider(props) {
 }
 var UnifiedProvider = AppProvider;
 function useWallet() {
-  let client = React2.useContext(ConnectorContext);
+  let client = React4.useContext(ConnectorContext);
   if (!client)
     throw new Error(
       "useWallet must be used within ConnectorProvider. Wrap your app with <ConnectorProvider> or <UnifiedProvider> to use wallet hooks."
     );
-  let walletStatus = React2.useSyncExternalStore(
-    React2.useCallback((cb) => client.subscribe(cb), [client]),
-    React2.useCallback(() => client.getSnapshot().wallet, [client]),
-    React2.useCallback(() => client.getSnapshot().wallet, [client])
+  let walletStatus = React4.useSyncExternalStore(
+    React4.useCallback((cb) => client.subscribe(cb), [client]),
+    React4.useCallback(() => client.getSnapshot().wallet, [client]),
+    React4.useCallback(() => client.getSnapshot().wallet, [client])
   );
-  return React2.useMemo(() => {
+  return React4.useMemo(() => {
     let status = walletStatus.status, isConnected2 = status === "connected", isConnecting2 = status === "connecting", isError = status === "error", connectorId = null, account = null, accounts = [], session = null, error = null;
     return walletStatus.status === "connected" ? (connectorId = walletStatus.session.connectorId, account = walletStatus.session.selectedAccount.address, accounts = walletStatus.session.accounts, session = walletStatus.session) : walletStatus.status === "connecting" ? connectorId = walletStatus.connectorId : walletStatus.status === "error" && (error = walletStatus.error, connectorId = walletStatus.connectorId ?? null), {
       status,
@@ -498,24 +499,24 @@ function useWallet() {
   }, [walletStatus]);
 }
 function useWalletConnectors() {
-  let client = React2.useContext(ConnectorContext);
+  let client = React4.useContext(ConnectorContext);
   if (!client)
     throw new Error(
       "useWalletConnectors must be used within ConnectorProvider. Wrap your app with <ConnectorProvider> or <UnifiedProvider> to use wallet hooks."
     );
-  return React2.useSyncExternalStore(
-    React2.useCallback((cb) => client.subscribe(cb), [client]),
-    React2.useCallback(() => client.getSnapshot().connectors, [client]),
-    React2.useCallback(() => client.getSnapshot().connectors, [client])
+  return React4.useSyncExternalStore(
+    React4.useCallback((cb) => client.subscribe(cb), [client]),
+    React4.useCallback(() => client.getSnapshot().connectors, [client]),
+    React4.useCallback(() => client.getSnapshot().connectors, [client])
   );
 }
 function useConnectWallet() {
-  let client = React2.useContext(ConnectorContext), [isConnecting2, setIsConnecting] = React2.useState(false), [error, setError] = React2.useState(null);
+  let client = React4.useContext(ConnectorContext), [isConnecting2, setIsConnecting] = React4.useState(false), [error, setError] = React4.useState(null);
   if (!client)
     throw new Error(
       "useConnectWallet must be used within ConnectorProvider. Wrap your app with <ConnectorProvider> or <UnifiedProvider> to use wallet hooks."
     );
-  let connect = React2.useCallback(
+  let connect = React4.useCallback(
     async (connectorId, options) => {
       setIsConnecting(true), setError(null);
       try {
@@ -528,7 +529,7 @@ function useConnectWallet() {
       }
     },
     [client]
-  ), resetError = React2.useCallback(() => {
+  ), resetError = React4.useCallback(() => {
     setError(null);
   }, []);
   return {
@@ -539,13 +540,13 @@ function useConnectWallet() {
   };
 }
 function useDisconnectWallet() {
-  let client = React2.useContext(ConnectorContext), [isDisconnecting, setIsDisconnecting] = React2.useState(false);
+  let client = React4.useContext(ConnectorContext), [isDisconnecting, setIsDisconnecting] = React4.useState(false);
   if (!client)
     throw new Error(
       "useDisconnectWallet must be used within ConnectorProvider. Wrap your app with <ConnectorProvider> or <UnifiedProvider> to use wallet hooks."
     );
   return {
-    disconnect: React2.useCallback(async () => {
+    disconnect: React4.useCallback(async () => {
       setIsDisconnecting(true);
       try {
         await client.disconnectWallet();
@@ -560,14 +561,14 @@ function useCluster() {
   let { cluster, clusters } = useConnector(), client = useConnectorClient();
   if (!client)
     throw new Error("useCluster must be used within ConnectorProvider");
-  let setCluster = React2.useMemo(
+  let setCluster = React4.useMemo(
     () => async (id) => {
       await client.setCluster(id);
     },
     [client]
   );
-  return React2.useMemo(() => {
-    let isMainnet = cluster ? chunkBZ2VBJCZ_js.isMainnetCluster(cluster) : false, isDevnet = cluster ? chunkBZ2VBJCZ_js.isDevnetCluster(cluster) : false, isTestnet = cluster ? chunkBZ2VBJCZ_js.isTestnetCluster(cluster) : false, isLocal = cluster ? chunkBZ2VBJCZ_js.isLocalCluster(cluster) : false, explorerUrl = cluster ? chunkBZ2VBJCZ_js.getClusterExplorerUrl(cluster) : "", type = cluster ? chunkBZ2VBJCZ_js.getClusterType(cluster) : null;
+  return React4.useMemo(() => {
+    let isMainnet = cluster ? chunkTRSJSU33_js.isMainnetCluster(cluster) : false, isDevnet = cluster ? chunkTRSJSU33_js.isDevnetCluster(cluster) : false, isTestnet = cluster ? chunkTRSJSU33_js.isTestnetCluster(cluster) : false, isLocal = cluster ? chunkTRSJSU33_js.isLocalCluster(cluster) : false, explorerUrl = cluster ? chunkTRSJSU33_js.getClusterExplorerUrl(cluster) : "", type = cluster ? chunkTRSJSU33_js.getClusterType(cluster) : null;
     return {
       cluster,
       clusters,
@@ -582,10 +583,10 @@ function useCluster() {
   }, [cluster, clusters, setCluster]);
 }
 function useAccount() {
-  let { selectedAccount, accounts, connected, selectAccount } = useConnector(), [copied, setCopied] = React2.useState(false), copyTimeoutRef = React2__default.default.useRef(void 0), account = React2.useMemo(
+  let { selectedAccount, accounts, connected, selectAccount } = useConnector(), [copied, setCopied] = React4.useState(false), copyTimeoutRef = React4__default.default.useRef(void 0), account = React4.useMemo(
     () => accounts.find((a) => a.address === selectedAccount) ?? null,
     [accounts, selectedAccount]
-  ), formatted = React2.useMemo(() => selectedAccount ? chunkBZ2VBJCZ_js.formatAddress(selectedAccount) : "", [selectedAccount]), copy = React2.useCallback(async () => selectedAccount ? (copyTimeoutRef.current && clearTimeout(copyTimeoutRef.current), await chunkBZ2VBJCZ_js.copyAddressToClipboard(selectedAccount, {
+  ), formatted = React4.useMemo(() => selectedAccount ? chunkTRSJSU33_js.formatAddress(selectedAccount) : "", [selectedAccount]), copy = React4.useCallback(async () => selectedAccount ? (copyTimeoutRef.current && clearTimeout(copyTimeoutRef.current), await chunkTRSJSU33_js.copyAddressToClipboard(selectedAccount, {
     onSuccess: () => {
       setCopied(true), copyTimeoutRef.current = setTimeout(() => setCopied(false), 2e3);
     }
@@ -594,9 +595,9 @@ function useAccount() {
     error: "empty_value" /* EMPTY_VALUE */,
     errorMessage: "No account selected"
   }, [selectedAccount]);
-  return React2__default.default.useEffect(() => () => {
+  return React4__default.default.useEffect(() => () => {
     copyTimeoutRef.current && clearTimeout(copyTimeoutRef.current);
-  }, []), React2.useMemo(
+  }, []), React4.useMemo(
     () => ({
       address: selectedAccount,
       account,
@@ -611,18 +612,18 @@ function useAccount() {
   );
 }
 function useWalletInfo() {
-  let { selectedWallet, wallets, connected, connecting } = useConnector(), mappedWallets = React2.useMemo(
+  let { selectedWallet, wallets, connected, connecting } = useConnector(), mappedWallets = React4.useMemo(
     () => wallets.map(
       (walletInfo) => ({
         name: walletInfo.wallet.name,
-        connectorId: chunkBZ2VBJCZ_js.createConnectorId(walletInfo.wallet.name),
+        connectorId: chunkTRSJSU33_js.createConnectorId(walletInfo.wallet.name),
         icon: walletInfo.wallet.icon,
         installed: walletInfo.installed,
         connectable: walletInfo.connectable
       })
     ),
     [wallets]
-  ), selectedWalletInfo = React2.useMemo(() => {
+  ), selectedWalletInfo = React4.useMemo(() => {
     if (!selectedWallet)
       return {
         name: null,
@@ -638,7 +639,7 @@ function useWalletInfo() {
       connectable: walletInfo?.connectable ?? false
     };
   }, [selectedWallet, wallets]);
-  return React2.useMemo(
+  return React4.useMemo(
     () => ({
       ...selectedWalletInfo,
       connected,
@@ -649,10 +650,10 @@ function useWalletInfo() {
   );
 }
 function useTransactionSigner() {
-  let { selectedWallet, selectedAccount, accounts, cluster, connected } = useConnector(), client = useConnectorClient(), account = React2.useMemo(
+  let { selectedWallet, selectedAccount, accounts, cluster, connected } = useConnector(), client = useConnectorClient(), account = React4.useMemo(
     () => accounts.find((a) => a.address === selectedAccount)?.raw ?? null,
     [accounts, selectedAccount]
-  ), signer = React2.useMemo(() => !connected || !selectedWallet || !account ? null : chunkBZ2VBJCZ_js.createTransactionSigner({
+  ), signer = React4.useMemo(() => !connected || !selectedWallet || !account ? null : chunkTRSJSU33_js.createTransactionSigner({
     wallet: selectedWallet,
     account,
     cluster: cluster ?? void 0,
@@ -661,7 +662,7 @@ function useTransactionSigner() {
         client.emitEvent(event);
       }
     } : void 0
-  }), [connected, selectedWallet, account, cluster, client]), capabilities = React2.useMemo(
+  }), [connected, selectedWallet, account, cluster, client]), capabilities = React4.useMemo(
     () => signer?.getCapabilities() ?? {
       canSign: false,
       canSend: false,
@@ -680,27 +681,27 @@ function useTransactionSigner() {
 function useKitTransactionSigner() {
   let { signer: connectorSigner, ready } = useTransactionSigner();
   return {
-    signer: React2.useMemo(() => connectorSigner ? chunkBZ2VBJCZ_js.createKitTransactionSigner(connectorSigner) : null, [connectorSigner]),
+    signer: React4.useMemo(() => connectorSigner ? chunkTRSJSU33_js.createKitTransactionSigner(connectorSigner) : null, [connectorSigner]),
     ready
   };
 }
 var useGillTransactionSigner = useKitTransactionSigner;
-var logger3 = chunkSITQ4JWM_js.createLogger("useSolanaClient");
+var logger3 = chunkBF67LVVM_js.createLogger("useSolanaClient");
 function useSolanaClient() {
-  let { type } = useCluster(), connectorClient = useConnectorClient(), client = React2.useMemo(() => {
+  let { type } = useCluster(), connectorClient = useConnectorClient(), client = React4.useMemo(() => {
     if (!type || !connectorClient) return null;
     try {
       let rpcUrl = connectorClient.getRpcUrl();
-      return rpcUrl ? chunkSITQ4JWM_js.createSolanaClient({
+      return rpcUrl ? chunkBF67LVVM_js.createSolanaClient({
         urlOrMoniker: rpcUrl
-      }) : type !== "custom" ? chunkSITQ4JWM_js.createSolanaClient({
+      }) : type !== "custom" ? chunkBF67LVVM_js.createSolanaClient({
         urlOrMoniker: type
       }) : null;
     } catch (error) {
       return logger3.error("Failed to create Solana client", { error }), null;
     }
   }, [type, connectorClient]);
-  return React2.useMemo(
+  return React4.useMemo(
     () => ({
       client,
       ready: !!client,
@@ -711,11 +712,11 @@ function useSolanaClient() {
 }
 var useGillSolanaClient = useSolanaClient;
 function useTransactionPreparer() {
-  let { client, ready } = useSolanaClient(), prepare = React2.useCallback(
+  let { client, ready } = useSolanaClient(), prepare = React4.useCallback(
     async (transaction, options = {}) => {
       if (!client)
-        throw new chunkSITQ4JWM_js.NetworkError("RPC_ERROR", "Solana client not available. Cannot prepare transaction.");
-      return chunkSITQ4JWM_js.prepareTransaction({
+        throw new chunkBF67LVVM_js.NetworkError("RPC_ERROR", "Solana client not available. Cannot prepare transaction.");
+      return chunkBF67LVVM_js.prepareTransaction({
         transaction,
         rpc: client.rpc,
         computeUnitLimitMultiplier: options.computeUnitLimitMultiplier,
@@ -725,7 +726,7 @@ function useTransactionPreparer() {
     },
     [client]
   );
-  return React2.useMemo(
+  return React4.useMemo(
     () => ({
       prepare,
       ready
@@ -864,13 +865,13 @@ function useSharedQuery(key, queryFn, options = {}) {
     refetchOnMount = "stale",
     refetchIntervalMs = false,
     select
-  } = options, queryFnRef = React2.useRef(queryFn);
+  } = options, queryFnRef = React4.useRef(queryFn);
   queryFnRef.current = queryFn;
-  let stableQueryFn = React2.useCallback((signal) => queryFnRef.current(signal), []), subscribe = React2.useCallback(
+  let stableQueryFn = React4.useCallback((signal) => queryFnRef.current(signal), []), subscribe = React4.useCallback(
     (onChange) => key ? subscribeSharedQuery(key, onChange, cacheTimeMs) : () => {
     },
     [key, cacheTimeMs]
-  ), emptySnapshot = React2.useMemo(
+  ), emptySnapshot = React4.useMemo(
     () => ({
       data: void 0,
       error: null,
@@ -879,8 +880,8 @@ function useSharedQuery(key, queryFn, options = {}) {
       isFetching: false
     }),
     []
-  ), getSnapshot = React2.useCallback(() => key ? getOrCreateEntry(key).snapshot : emptySnapshot, [key, emptySnapshot]), snapshot = React2.useSyncExternalStore(subscribe, getSnapshot, getSnapshot), selectedData = React2.useMemo(() => select ? select(snapshot.data) : snapshot.data, [snapshot.data, select]), prevSelectedRef = React2.useRef(selectedData), stableSelectedData = React2.useMemo(() => Object.is(prevSelectedRef.current, selectedData) ? prevSelectedRef.current : (prevSelectedRef.current = selectedData, selectedData), [selectedData]), fetchedKeyRef = React2.useRef(null);
-  React2.useEffect(() => {
+  ), getSnapshot = React4.useCallback(() => key ? getOrCreateEntry(key).snapshot : emptySnapshot, [key, emptySnapshot]), snapshot = React4.useSyncExternalStore(subscribe, getSnapshot, getSnapshot), selectedData = React4.useMemo(() => select ? select(snapshot.data) : snapshot.data, [snapshot.data, select]), prevSelectedRef = React4.useRef(selectedData), stableSelectedData = React4.useMemo(() => Object.is(prevSelectedRef.current, selectedData) ? prevSelectedRef.current : (prevSelectedRef.current = selectedData, selectedData), [selectedData]), fetchedKeyRef = React4.useRef(null);
+  React4.useEffect(() => {
     if (!key || !enabled) {
       fetchedKeyRef.current = null;
       return;
@@ -894,7 +895,7 @@ function useSharedQuery(key, queryFn, options = {}) {
       force: refetchOnMount === true
     }).catch(() => {
     })) : fetchedKeyRef.current = key;
-  }, [key, enabled, staleTimeMs, refetchOnMount, stableQueryFn]), React2.useEffect(() => {
+  }, [key, enabled, staleTimeMs, refetchOnMount, stableQueryFn]), React4.useEffect(() => {
     if (!key || !enabled || refetchIntervalMs === false) return;
     let entry = getOrCreateEntry(key);
     entry.queryFn = stableQueryFn;
@@ -904,7 +905,7 @@ function useSharedQuery(key, queryFn, options = {}) {
       count <= 1 ? entry.intervalCounts.delete(refetchIntervalMs) : entry.intervalCounts.set(refetchIntervalMs, count - 1), startOrRestartInterval(key, entry);
     };
   }, [key, enabled, refetchIntervalMs, stableQueryFn]);
-  let refetch = React2.useCallback(
+  let refetch = React4.useCallback(
     async (refetchOptions) => {
       if (key)
         return fetchSharedQuery(key, stableQueryFn, {
@@ -913,12 +914,12 @@ function useSharedQuery(key, queryFn, options = {}) {
         });
     },
     [key, stableQueryFn]
-  ), abort = React2.useCallback(() => {
+  ), abort = React4.useCallback(() => {
     if (!key) return;
     let entry = store.get(key);
     entry?.abortController && entry.abortController.abort();
   }, [key]);
-  return React2.useMemo(
+  return React4.useMemo(
     () => ({
       data: stableSelectedData,
       error: snapshot.error,
@@ -997,13 +998,13 @@ function useWalletAssets(options = {}) {
     refetchIntervalMs = false,
     client: clientOverride,
     select
-  } = options, { address, connected } = useAccount(), { client: providerClient } = useSolanaClient(), rpcClient = clientOverride ?? providerClient, key = React2.useMemo(() => {
-    if (!enabled || !connected || !address || !rpcClient) return null;
+  } = options, { account, isConnected: isConnected2 } = useWallet(), address = account ? String(account) : null, { client: providerClient } = useSolanaClient(), rpcClient = clientOverride ?? providerClient, key = React4.useMemo(() => {
+    if (!enabled || !isConnected2 || !address || !rpcClient) return null;
     let rpcUrl = rpcClient.urlOrMoniker instanceof URL ? rpcClient.urlOrMoniker.toString() : String(rpcClient.urlOrMoniker);
     return getWalletAssetsQueryKey(rpcUrl, address);
-  }, [enabled, connected, address, rpcClient]), queryFn = React2.useCallback(
+  }, [enabled, isConnected2, address, rpcClient]), queryFn = React4.useCallback(
     async (signal) => {
-      if (!connected || !address || !rpcClient)
+      if (!isConnected2 || !address || !rpcClient)
         return { lamports: 0n, tokenAccounts: [] };
       if (signal.aborted)
         throw new DOMException("Query aborted", "AbortError");
@@ -1019,12 +1020,12 @@ function useWalletAssets(options = {}) {
       if (signal.aborted)
         throw new DOMException("Query aborted", "AbortError");
       let tokenAccounts = [];
-      for (let account of tokenAccountsResult.value) {
-        let parsed = parseTokenAccount(account, "token");
+      for (let account2 of tokenAccountsResult.value) {
+        let parsed = parseTokenAccount(account2, "token");
         parsed && tokenAccounts.push(parsed);
       }
-      for (let account of token2022AccountsResult.value) {
-        let parsed = parseTokenAccount(account, "token-2022");
+      for (let account2 of token2022AccountsResult.value) {
+        let parsed = parseTokenAccount(account2, "token-2022");
         parsed && tokenAccounts.push(parsed);
       }
       return {
@@ -1032,7 +1033,7 @@ function useWalletAssets(options = {}) {
         tokenAccounts
       };
     },
-    [connected, address, rpcClient]
+    [isConnected2, address, rpcClient]
   ), { data, error, status, updatedAt, isFetching, refetch, abort } = useSharedQuery(
     key,
     queryFn,
@@ -1045,7 +1046,7 @@ function useWalletAssets(options = {}) {
       select
     }
   ), isLoading = status === "loading" || status === "idle";
-  return React2.useMemo(
+  return React4.useMemo(
     () => ({
       data,
       isLoading,
@@ -1065,7 +1066,7 @@ function getBalanceQueryKey(rpcUrl, address) {
 }
 var LAMPORTS_PER_SOL2 = 1000000000n;
 function formatTokenAccount(account) {
-  let formatted = chunkBZ2VBJCZ_js.formatBigIntBalance(account.amount, account.decimals, {
+  let formatted = chunkTRSJSU33_js.formatBigIntBalance(account.amount, account.decimals, {
     maxDecimals: Math.min(account.decimals, 6)
   });
   return {
@@ -1109,13 +1110,13 @@ function useBalance(options = {}) {
     refetchIntervalMs: autoRefresh ? refreshInterval : false,
     client: clientOverride,
     select: selectBalance
-  }), lamports = data?.lamports ?? 0n, tokens = data?.tokens ?? [], solBalance = React2.useMemo(() => Number(lamports) / Number(LAMPORTS_PER_SOL2), [lamports]), formattedSol = React2.useMemo(() => chunkBZ2VBJCZ_js.formatLamportsToSolSafe(lamports, { maxDecimals: 4, suffix: true }), [lamports]), visibleError = updatedAt ? null : error, refetch = React2.useCallback(
+  }), lamports = data?.lamports ?? 0n, tokens = data?.tokens ?? [], solBalance = React4.useMemo(() => Number(lamports) / Number(LAMPORTS_PER_SOL2), [lamports]), formattedSol = React4.useMemo(() => chunkTRSJSU33_js.formatLamportsToSolSafe(lamports, { maxDecimals: 4, suffix: true }), [lamports]), visibleError = updatedAt ? null : error, refetch = React4.useCallback(
     async (opts) => {
       await sharedRefetch(opts);
     },
     [sharedRefetch]
   );
-  return React2.useMemo(
+  return React4.useMemo(
     () => ({
       solBalance,
       lamports,
@@ -1490,7 +1491,7 @@ function useTransactions(options = {}) {
     // 5 minutes
     refetchOnMount = "stale",
     client: clientOverride
-  } = options, { address, connected } = useAccount(), { cluster } = useCluster(), { client: providerClient } = useSolanaClient(), connectorClient = useConnectorClient(), [paginatedTransactions, setPaginatedTransactions] = React2.useState([]), [isPaginationLoading, setIsPaginationLoading] = React2.useState(false), [hasMore, setHasMore] = React2.useState(true), beforeSignatureRef = React2.useRef(void 0), rpcClient = clientOverride ?? providerClient, connectorConfig = connectorClient?.getConfig(), imageProxy = connectorConfig?.imageProxy, programLabels = connectorConfig?.programLabels, parseTransaction = React2.useCallback(
+  } = options, { account, isConnected: isConnected2 } = useWallet(), address = React4.useMemo(() => account ? String(account) : null, [account]), { cluster } = useCluster(), { client: providerClient } = useSolanaClient(), connectorClient = useConnectorClient(), [paginatedTransactions, setPaginatedTransactions] = React4.useState([]), [isPaginationLoading, setIsPaginationLoading] = React4.useState(false), [hasMore, setHasMore] = React4.useState(true), beforeSignatureRef = React4.useRef(void 0), rpcClient = clientOverride ?? providerClient, connectorConfig = connectorClient?.getConfig(), imageProxy = connectorConfig?.imageProxy, programLabels = connectorConfig?.programLabels, parseTransaction = React4.useCallback(
     (tx, walletAddress, sig, blockTime, slot, err, explorerUrl) => {
       let { date, time } = formatDate(blockTime), baseInfo = {
         signature: sig,
@@ -1541,15 +1542,15 @@ function useTransactions(options = {}) {
       }
     },
     [programLabels]
-  ), key = React2.useMemo(() => {
-    if (!enabled || !connected || !address || !rpcClient || !cluster) return null;
+  ), key = React4.useMemo(() => {
+    if (!enabled || !isConnected2 || !address || !rpcClient || !cluster) return null;
     let rpcUrl = rpcClient.urlOrMoniker instanceof URL ? rpcClient.urlOrMoniker.toString() : String(rpcClient.urlOrMoniker);
     return getTransactionsQueryKey({ rpcUrl, address, clusterId: cluster.id, limit, fetchDetails });
-  }, [enabled, connected, address, rpcClient, cluster, limit, fetchDetails]);
-  React2.useEffect(() => {
+  }, [enabled, isConnected2, address, rpcClient, cluster, limit, fetchDetails]);
+  React4.useEffect(() => {
     beforeSignatureRef.current = void 0, setPaginatedTransactions([]), setIsPaginationLoading(false), setHasMore(true);
   }, [key]);
-  let fetchAndEnrichTransactions = React2.useCallback(
+  let fetchAndEnrichTransactions = React4.useCallback(
     async (beforeSignature, currentCluster, signal) => {
       if (!rpcClient || !address)
         return { transactions: [], hasMore: false };
@@ -1578,7 +1579,7 @@ function useTransactions(options = {}) {
             blockTimeNum,
             Number(sig.slot),
             sig.err,
-            chunkBZ2VBJCZ_js.getTransactionUrl(String(sig.signature), currentCluster)
+            chunkTRSJSU33_js.getTransactionUrl(String(sig.signature), currentCluster)
           );
         });
       } else
@@ -1593,7 +1594,7 @@ function useTransactions(options = {}) {
             type: "unknown",
             formattedDate: date,
             formattedTime: time,
-            explorerUrl: chunkBZ2VBJCZ_js.getTransactionUrl(String(sig.signature), currentCluster)
+            explorerUrl: chunkTRSJSU33_js.getTransactionUrl(String(sig.signature), currentCluster)
           };
         });
       let mintsToFetch = [
@@ -1607,7 +1608,7 @@ function useTransactions(options = {}) {
         throwIfAborted(signal);
         let tokenMetadata = await fetchTransactionTokenMetadata(mintsToFetch, {
           signal,
-          cluster: chunkBZ2VBJCZ_js.getClusterType(currentCluster)
+          cluster: chunkTRSJSU33_js.getClusterType(currentCluster)
         });
         tokenMetadata.size > 0 && (newTransactions = newTransactions.map((tx) => {
           let enrichedTx = { ...tx };
@@ -1651,15 +1652,15 @@ function useTransactions(options = {}) {
       };
     },
     [rpcClient, address, limit, fetchDetails, detailsConcurrency, parseTransaction, imageProxy]
-  ), queryFn = React2.useCallback(
+  ), queryFn = React4.useCallback(
     async (signal) => {
-      if (!connected || !address || !rpcClient || !cluster)
+      if (!isConnected2 || !address || !rpcClient || !cluster)
         return [];
       throwIfAborted(signal);
       let result = await fetchAndEnrichTransactions(void 0, cluster, signal);
       return throwIfAborted(signal), result.transactions;
     },
-    [connected, address, rpcClient, cluster, fetchAndEnrichTransactions]
+    [isConnected2, address, rpcClient, cluster, fetchAndEnrichTransactions]
   ), {
     data: initialTransactions,
     error,
@@ -1674,10 +1675,10 @@ function useTransactions(options = {}) {
     refetchOnMount,
     refetchIntervalMs: autoRefresh ? refreshInterval : false
   });
-  React2.useEffect(() => {
+  React4.useEffect(() => {
     initialTransactions && (beforeSignatureRef.current = initialTransactions.length ? initialTransactions[initialTransactions.length - 1].signature : void 0, setHasMore(initialTransactions.length === limit), setPaginatedTransactions((prev) => prev.length ? [] : prev));
   }, [initialTransactions, limit]);
-  let loadMoreFn = React2.useCallback(async () => {
+  let loadMoreFn = React4.useCallback(async () => {
     if (!(!hasMore || isPaginationLoading || !cluster)) {
       setIsPaginationLoading(true);
       try {
@@ -1689,13 +1690,13 @@ function useTransactions(options = {}) {
         setIsPaginationLoading(false);
       }
     }
-  }, [hasMore, isPaginationLoading, cluster, fetchAndEnrichTransactions]), refetch = React2.useCallback(
+  }, [hasMore, isPaginationLoading, cluster, fetchAndEnrichTransactions]), refetch = React4.useCallback(
     async (opts) => {
       beforeSignatureRef.current = void 0, setPaginatedTransactions([]), setHasMore(true), await sharedRefetch(opts);
     },
     [sharedRefetch]
-  ), transactions = React2.useMemo(() => [...initialTransactions ?? [], ...paginatedTransactions], [initialTransactions, paginatedTransactions]), isLoading = isInitialLoading || isPaginationLoading, visibleError = updatedAt ? null : error;
-  return React2.useMemo(
+  ), transactions = React4.useMemo(() => [...initialTransactions ?? [], ...paginatedTransactions], [initialTransactions, paginatedTransactions]), isLoading = isInitialLoading || isPaginationLoading, visibleError = updatedAt ? null : error;
+  return React4.useMemo(
     () => ({
       transactions,
       isLoading,
@@ -1714,10 +1715,10 @@ function getTokensQueryKey(rpcUrl, address) {
 }
 var CACHE_MAX_SIZE = 500, PRICE_CACHE_TTL = 6e4, STALE_CLEANUP_INTERVAL = 12e4, COINGECKO_DEFAULT_MAX_RETRIES = 3, COINGECKO_DEFAULT_BASE_DELAY = 1e3, COINGECKO_DEFAULT_MAX_TIMEOUT = 3e4, COINGECKO_API_BASE_URL = "https://api.coingecko.com/api/v3", LRUCache = class {
   constructor(maxSize, options) {
-    chunkSITQ4JWM_js.__publicField(this, "cache", /* @__PURE__ */ new Map());
-    chunkSITQ4JWM_js.__publicField(this, "maxSize");
-    chunkSITQ4JWM_js.__publicField(this, "getTtl");
-    chunkSITQ4JWM_js.__publicField(this, "getTimestamp");
+    chunkL5FWMNWO_js.__publicField(this, "cache", /* @__PURE__ */ new Map());
+    chunkL5FWMNWO_js.__publicField(this, "maxSize");
+    chunkL5FWMNWO_js.__publicField(this, "getTtl");
+    chunkL5FWMNWO_js.__publicField(this, "getTimestamp");
     this.maxSize = maxSize, this.getTtl = options?.getTtl, this.getTimestamp = options?.getTimestamp;
   }
   get(key) {
@@ -1887,12 +1888,12 @@ async function fetchTokenMetadataHybrid(mints, coingeckoConfig, options) {
   return didUpdatePrices && options?.onUpdate?.(), didUpdate;
 }
 function formatBalance(amount, decimals) {
-  return chunkBZ2VBJCZ_js.formatBigIntBalance(amount, decimals, {
+  return chunkTRSJSU33_js.formatBigIntBalance(amount, decimals, {
     maxDecimals: Math.min(decimals, 6)
   });
 }
 function formatUsd(amount, decimals, usdPrice) {
-  return chunkBZ2VBJCZ_js.formatBigIntUsd(amount, decimals, usdPrice);
+  return chunkTRSJSU33_js.formatBigIntUsd(amount, decimals, usdPrice);
 }
 function selectTokens(assets, address) {
   return {
@@ -1920,7 +1921,7 @@ function useTokens(options = {}) {
     // 5 minutes
     refetchOnMount = "stale",
     client: clientOverride
-  } = options, { address, connected } = useAccount(), { type: clusterType } = useCluster(), connectorConfig = useConnectorClient()?.getConfig(), imageProxy = connectorConfig?.imageProxy, coingeckoConfig = connectorConfig?.coingecko, selectFn = React2.useCallback(
+  } = options, { account, isConnected: isConnected2 } = useWallet(), address = React4.useMemo(() => account ? String(account) : null, [account]), { type: clusterType } = useCluster(), connectorConfig = useConnectorClient()?.getConfig(), imageProxy = connectorConfig?.imageProxy, coingeckoConfig = connectorConfig?.coingecko, selectFn = React4.useCallback(
     (assets) => selectTokens(assets, address ?? ""),
     [address]
   ), {
@@ -1938,7 +1939,7 @@ function useTokens(options = {}) {
     refetchIntervalMs: autoRefresh ? refreshInterval : false,
     client: clientOverride,
     select: selectFn
-  }), lamports = selection?.lamports ?? 0n, tokenAccounts = selection?.tokenAccounts ?? [], walletAddress = selection?.address ?? "", baseTokens = React2.useMemo(() => {
+  }), lamports = selection?.lamports ?? 0n, tokenAccounts = selection?.tokenAccounts ?? [], walletAddress = selection?.address ?? "", baseTokens = React4.useMemo(() => {
     let result = [];
     includeNativeSol && walletAddress && (includeZeroBalance || lamports > 0n) && result.push({
       mint: NATIVE_SOL_MINT,
@@ -1949,25 +1950,25 @@ function useTokens(options = {}) {
       isFrozen: false,
       owner: walletAddress
     });
-    for (let account of tokenAccounts)
-      !includeZeroBalance && account.amount === 0n || result.push({
-        mint: account.mint,
-        tokenAccount: account.pubkey,
-        amount: account.amount,
-        decimals: account.decimals,
-        formatted: formatBalance(account.amount, account.decimals),
-        isFrozen: account.isFrozen,
-        owner: account.owner,
-        programId: account.programId
+    for (let account2 of tokenAccounts)
+      !includeZeroBalance && account2.amount === 0n || result.push({
+        mint: account2.mint,
+        tokenAccount: account2.pubkey,
+        amount: account2.amount,
+        decimals: account2.decimals,
+        formatted: formatBalance(account2.amount, account2.decimals),
+        isFrozen: account2.isFrozen,
+        owner: account2.owner,
+        programId: account2.programId
       });
     return result;
-  }, [lamports, tokenAccounts, walletAddress, includeNativeSol, includeZeroBalance]), mints = React2.useMemo(() => {
+  }, [lamports, tokenAccounts, walletAddress, includeNativeSol, includeZeroBalance]), mints = React4.useMemo(() => {
     let unique = /* @__PURE__ */ new Set();
     for (let token of baseTokens)
       unique.add(token.mint);
     return [...unique].sort();
-  }, [baseTokens]), mintsKey = React2.useMemo(() => mints.join(","), [mints]), [metadataVersion, setMetadataVersion] = React2.useState(0);
-  React2.useEffect(() => {
+  }, [baseTokens]), mintsKey = React4.useMemo(() => mints.join(","), [mints]), [metadataVersion, setMetadataVersion] = React4.useState(0);
+  React4.useEffect(() => {
     if (!fetchMetadata || !mintsKey) return;
     let isMounted = true;
     return (async () => {
@@ -1986,7 +1987,7 @@ function useTokens(options = {}) {
       isMounted = false;
     };
   }, [mintsKey, fetchMetadata, coingeckoConfig, clusterType]);
-  let tokens = React2.useMemo(() => fetchMetadata ? baseTokens.map((token) => {
+  let tokens = React4.useMemo(() => fetchMetadata ? baseTokens.map((token) => {
     let meta = metadataCache.get(token.mint);
     if (!meta) return token;
     let usdPrice = (meta.coingeckoId ? priceCache.get(meta.coingeckoId) : void 0)?.price ?? meta.usdPrice;
@@ -1999,18 +2000,18 @@ function useTokens(options = {}) {
       formattedUsd: usdPrice ? formatUsd(token.amount, token.decimals, usdPrice) : void 0
     };
   }).sort(sortByValueDesc) : baseTokens.slice().sort(sortByValueDesc), [baseTokens, fetchMetadata, imageProxy, metadataVersion]), totalAccounts = tokenAccounts.length + (includeNativeSol ? 1 : 0);
-  React2.useEffect(() => (startCacheCleanup(), () => stopCacheCleanup()), []);
-  let wasConnectedRef = React2.useRef(connected);
-  React2.useEffect(() => {
-    wasConnectedRef.current && !connected && clearTokenCaches(), wasConnectedRef.current = connected;
-  }, [connected]);
-  let visibleError = updatedAt ? null : error, refetch = React2.useCallback(
+  React4.useEffect(() => (startCacheCleanup(), () => stopCacheCleanup()), []);
+  let wasConnectedRef = React4.useRef(isConnected2);
+  React4.useEffect(() => {
+    wasConnectedRef.current && !isConnected2 && clearTokenCaches(), wasConnectedRef.current = isConnected2;
+  }, [isConnected2]);
+  let visibleError = updatedAt ? null : error, refetch = React4.useCallback(
     async (opts) => {
       await sharedRefetch(opts);
     },
     [sharedRefetch]
   );
-  return React2.useMemo(
+  return React4.useMemo(
     () => ({
       tokens,
       isLoading: isFetching,
@@ -2032,17 +2033,12 @@ function DisconnectElement({
   onDisconnect,
   render
 }) {
-  let { disconnect, connecting } = useConnector(), [disconnecting, setDisconnecting] = React2__default.default.useState(false), handleDisconnect = async () => {
-    setDisconnecting(true);
-    try {
-      await disconnect(), onDisconnect?.();
-    } finally {
-      setDisconnecting(false);
-    }
+  let { isConnecting: isConnecting2 } = useWallet(), { disconnect, isDisconnecting } = useDisconnectWallet(), handleDisconnect = async () => {
+    await disconnect(), onDisconnect?.();
   };
   if (render)
-    return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: render({ disconnect: handleDisconnect, disconnecting }) });
-  let isDisabled = connecting || disconnecting, content = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: render({ disconnect: handleDisconnect, disconnecting: isDisconnecting }) });
+  let isDisabled = isConnecting2 || isDisconnecting, content = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     showIcon && (icon || showIcon && !icon && /* @__PURE__ */ jsxRuntime.jsxs(
       "svg",
       {
@@ -2074,7 +2070,7 @@ function DisconnectElement({
       disabled: isDisabled,
       "data-slot": "disconnect-element",
       "data-variant": "button",
-      "data-disconnecting": disconnecting,
+      "data-disconnecting": isDisconnecting,
       children: content
     }
   ) : variant === "link" ? /* @__PURE__ */ jsxRuntime.jsx(
@@ -2086,7 +2082,7 @@ function DisconnectElement({
       disabled: isDisabled,
       "data-slot": "disconnect-element",
       "data-variant": "link",
-      "data-disconnecting": disconnecting,
+      "data-disconnecting": isDisconnecting,
       children: content
     }
   ) : /* @__PURE__ */ jsxRuntime.jsx(
@@ -2099,7 +2095,7 @@ function DisconnectElement({
       disabled: isDisabled,
       "data-slot": "disconnect-element",
       "data-variant": "menuitem",
-      "data-disconnecting": disconnecting,
+      "data-disconnecting": isDisconnecting,
       children: content
     }
   );
@@ -2114,8 +2110,16 @@ function AccountElement({
   variant = "compact",
   render
 }) {
-  let { address, formatted, copy, copied } = useAccount(), { name: walletName, icon: walletIcon } = useWalletInfo();
-  if (render)
+  let { account, connectorId } = useWallet(), connectors = useWalletConnectors(), address = React4__default.default.useMemo(() => account ? String(account) : null, [account]), formatted = React4__default.default.useMemo(() => address ? chunkTRSJSU33_js.formatAddress(address) : "", [address]), connector = React4__default.default.useMemo(() => connectorId ? connectors.find((c) => c.id === connectorId) ?? null : null, [connectors, connectorId]), walletName = connector?.name ?? null, walletIcon = connector?.icon ? connector.icon : null, [copied, setCopied] = React4__default.default.useState(false), copyTimeoutRef = React4__default.default.useRef(void 0), copy = React4__default.default.useCallback(async () => address ? (copyTimeoutRef.current && clearTimeout(copyTimeoutRef.current), await chunkTRSJSU33_js.copyAddressToClipboard(address, {
+    onSuccess: () => {
+      setCopied(true), copyTimeoutRef.current = setTimeout(() => setCopied(false), 2e3);
+    }
+  })) : {
+    success: false
+  }, [address]);
+  if (React4__default.default.useEffect(() => () => {
+    copyTimeoutRef.current && clearTimeout(copyTimeoutRef.current);
+  }, []), render)
     return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: render({ address, formatted, walletName, walletIcon, copy, copied }) });
   if (!address) return null;
   let displayAddress = showFullAddress ? address : formatted, handleCopy = async (e) => {
@@ -2276,7 +2280,7 @@ function ClusterElement({
   labels = {},
   render
 }) {
-  let { cluster, clusters, setCluster, isMainnet, isDevnet, isTestnet, isLocal } = useCluster(), [isOpen, setIsOpen] = React2__default.default.useState(false);
+  let { cluster, clusters, setCluster, isMainnet, isDevnet, isTestnet, isLocal } = useCluster(), [isOpen, setIsOpen] = React4__default.default.useState(false);
   if (render)
     return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: render({ cluster, clusters, setCluster, isMainnet, isDevnet, isTestnet, isLocal }) });
   if (!cluster) return null;
@@ -2487,19 +2491,28 @@ function WalletListElement({
   render,
   renderWallet
 }) {
-  let { wallets, connecting } = useWalletInfo(), { select } = useConnector(), installedWallets = wallets.filter((w) => w.installed), displayWallets = installedOnly ? installedWallets : wallets, handleSelect = async (walletName) => {
-    await select(walletName), onSelect?.(walletName);
-  }, handleConnectById = async (connectorId) => {
-    let wallet = wallets.find((w) => w.connectorId === connectorId);
+  let connectors = useWalletConnectors(), { isConnecting: isConnectingGlobal } = useWallet(), { connect, isConnecting: isConnectingLocal } = useConnectWallet(), connecting = isConnectingGlobal || isConnectingLocal, wallets = React4__default.default.useMemo(
+    () => connectors.map((c) => ({
+      name: c.name,
+      connectorId: c.id,
+      icon: c.icon || void 0,
+      installed: c.ready,
+      connectable: c.ready
+    })),
+    [connectors]
+  ), installedWallets = wallets.filter((w) => w.installed), displayWallets = installedOnly ? installedWallets : wallets, handleSelect = async (walletName) => {
+    let wallet = wallets.find((w) => w.name === walletName);
     if (!wallet) {
-      let availableConnectorIds = wallets.map((w) => w.connectorId);
+      let availableWalletNames = wallets.map((w) => w.name);
       console.warn(
-        `[WalletListElement] Wallet not found for connectorId: ${connectorId}. Available connectorIds (${availableConnectorIds.length}):`,
-        availableConnectorIds
+        `[WalletListElement] Wallet not found for walletName: ${walletName}. Available wallets (${availableWalletNames.length}):`,
+        availableWalletNames
       );
       return;
     }
-    await select(wallet.name), onConnect?.(connectorId);
+    await connect(wallet.connectorId), onSelect?.(walletName), onConnect?.(wallet.connectorId);
+  }, handleConnectById = async (connectorId) => {
+    await connect(connectorId), onConnect?.(connectorId);
   };
   if (render)
     return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: render({
@@ -2568,7 +2581,7 @@ function WalletListElement({
       "data-variant": "grid",
       children: displayWallets.map((wallet) => {
         let handleWalletConnect = () => handleConnectById(wallet.connectorId);
-        return renderWallet ? /* @__PURE__ */ jsxRuntime.jsx(React2__default.default.Fragment, { children: renderWallet({
+        return renderWallet ? /* @__PURE__ */ jsxRuntime.jsx(React4__default.default.Fragment, { children: renderWallet({
           wallet,
           select: handleWalletConnect,
           connect: handleWalletConnect,
@@ -2579,7 +2592,7 @@ function WalletListElement({
             type: "button",
             className: "ck-wallet-list-item ck-wallet-list-item--grid",
             onClick: handleWalletConnect,
-            disabled: connecting || !wallet.installed && installedOnly,
+            disabled: connecting || !wallet.connectable,
             "data-slot": "wallet-list-item",
             "data-wallet": wallet.name,
             "data-connector-id": wallet.connectorId,
@@ -2602,7 +2615,7 @@ function WalletListElement({
       "data-variant": "compact",
       children: displayWallets.map((wallet) => {
         let handleWalletConnect = () => handleConnectById(wallet.connectorId);
-        return renderWallet ? /* @__PURE__ */ jsxRuntime.jsx(React2__default.default.Fragment, { children: renderWallet({
+        return renderWallet ? /* @__PURE__ */ jsxRuntime.jsx(React4__default.default.Fragment, { children: renderWallet({
           wallet,
           select: handleWalletConnect,
           connect: handleWalletConnect,
@@ -2613,7 +2626,7 @@ function WalletListElement({
             type: "button",
             className: "ck-wallet-list-item ck-wallet-list-item--compact",
             onClick: handleWalletConnect,
-            disabled: connecting || !wallet.installed && installedOnly,
+            disabled: connecting || !wallet.connectable,
             "data-slot": "wallet-list-item",
             "data-wallet": wallet.name,
             "data-connector-id": wallet.connectorId,
@@ -2635,7 +2648,7 @@ function WalletListElement({
       "data-variant": "list",
       children: displayWallets.map((wallet) => {
         let handleWalletConnect = () => handleConnectById(wallet.connectorId);
-        return renderWallet ? /* @__PURE__ */ jsxRuntime.jsx(React2__default.default.Fragment, { children: renderWallet({
+        return renderWallet ? /* @__PURE__ */ jsxRuntime.jsx(React4__default.default.Fragment, { children: renderWallet({
           wallet,
           select: handleWalletConnect,
           connect: handleWalletConnect,
@@ -2646,7 +2659,7 @@ function WalletListElement({
             type: "button",
             className: "ck-wallet-list-item ck-wallet-list-item--list",
             onClick: handleWalletConnect,
-            disabled: connecting || !wallet.installed && installedOnly,
+            disabled: connecting || !wallet.connectable,
             "data-slot": "wallet-list-item",
             "data-wallet": wallet.name,
             "data-connector-id": wallet.connectorId,
@@ -2722,7 +2735,7 @@ function injectStyles() {
   }
 }
 function SkeletonShine() {
-  return React2__default.default.useEffect(() => {
+  return React4__default.default.useEffect(() => {
     injectStyles();
   }, []), /* @__PURE__ */ jsxRuntime.jsx("div", { className: "ck-skeleton-shine", "data-slot": "skeleton-shine" });
 }
@@ -3296,5 +3309,5 @@ exports.useWalletConnectUri = useWalletConnectUri;
 exports.useWalletConnectors = useWalletConnectors;
 exports.useWalletInfo = useWalletInfo;
 exports.withErrorBoundary = withErrorBoundary;
-//# sourceMappingURL=chunk-EM4KNOKG.js.map
-//# sourceMappingURL=chunk-EM4KNOKG.js.map
+//# sourceMappingURL=chunk-VVLY6QPI.js.map
+//# sourceMappingURL=chunk-VVLY6QPI.js.map