@mysten/dapp-kit 0.9.0 → 0.9.1

package/src/hooks/wallet/useAutoConnectWallet.ts

@@ -1,51 +1,73 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { useEffect } from 'react';
+import { useQuery } from '@tanstack/react-query';
 
 import { useConnectWallet } from './useConnectWallet.js';
 import { useCurrentWallet } from './useCurrentWallet.js';
 import { useWallets } from './useWallets.js';
 import { useWalletStore } from './useWalletStore.js';
 
-export function useAutoConnectWallet(autoConnectEnabled: boolean) {
-	const { mutate: connectWallet } = useConnectWallet();
-	const setAutoConnectionStatus = useWalletStore((state) => state.setAutoConnectionStatus);
+export function useAutoConnectWallet(): 'disabled' | 'idle' | 'attempted' {
+	const { mutateAsync: connectWallet } = useConnectWallet();
+	const autoConnectEnabled = useWalletStore((state) => state.autoConnectEnabled);
 	const lastConnectedWalletName = useWalletStore((state) => state.lastConnectedWalletName);
 	const lastConnectedAccountAddress = useWalletStore((state) => state.lastConnectedAccountAddress);
 	const wallets = useWallets();
 	const { isDisconnected } = useCurrentWallet();
 
-	useEffect(() => {
-		if (
-			!autoConnectEnabled ||
-			!lastConnectedWalletName ||
-			!lastConnectedAccountAddress ||
-			!isDisconnected
-		) {
-			return;
-		}
-
-		const wallet = wallets.find((wallet) => wallet.name === lastConnectedWalletName);
-		if (wallet) {
-			connectWallet(
-				{
+	const { data, isError } = useQuery({
+		queryKey: [
+			'@mysten/dapp-kit',
+			'autoconnect',
+			{
+				isDisconnected,
+				autoConnectEnabled,
+				lastConnectedWalletName,
+				lastConnectedAccountAddress,
+				walletCount: wallets.length,
+			},
+		],
+		queryFn: async () => {
+			if (!autoConnectEnabled) {
+				return 'disabled';
+			}
+
+			if (!lastConnectedWalletName || !lastConnectedAccountAddress || !isDisconnected) {
+				return 'attempted';
+			}
+
+			const wallet = wallets.find((wallet) => wallet.name === lastConnectedWalletName);
+			if (wallet) {
+				await connectWallet({
 					wallet,
 					accountAddress: lastConnectedAccountAddress,
 					silent: true,
-				},
-				{
-					onSettled: () => setAutoConnectionStatus('settled'),
-				},
-			);
-		}
-	}, [
-		autoConnectEnabled,
-		connectWallet,
-		isDisconnected,
-		lastConnectedAccountAddress,
-		lastConnectedWalletName,
-		setAutoConnectionStatus,
-		wallets,
-	]);
+				});
+			}
+
+			return 'attempted';
+		},
+		enabled: autoConnectEnabled,
+		persister: undefined,
+		gcTime: 0,
+		staleTime: 0,
+		retry: false,
+		retryOnMount: false,
+		refetchInterval: false,
+		refetchIntervalInBackground: false,
+		refetchOnMount: false,
+		refetchOnReconnect: false,
+		refetchOnWindowFocus: false,
+	});
+
+	if (!autoConnectEnabled) {
+		return 'disabled';
+	}
+
+	if (!lastConnectedWalletName) {
+		return 'attempted';
+	}
+
+	return isError ? 'attempted' : data ?? 'idle';
 }

package/src/index.ts

@@ -9,11 +9,10 @@ export * from './hooks/networkConfig.js';
 export * from './hooks/useResolveSuiNSNames.js';
 export * from './hooks/useSuiClient.js';
 export * from './hooks/useSuiClientInfiniteQuery.js';
-export * from './hooks/useSuiClientInfiniteQuery.js';
 export * from './hooks/useSuiClientMutation.js';
 export * from './hooks/useSuiClientQuery.js';
 export * from './hooks/wallet/useAccounts.js';
-export * from './hooks/wallet/useAutoConnectionStatus.js';
+export * from './hooks/wallet/useAutoConnectWallet.js';
 export * from './hooks/wallet/useConnectWallet.js';
 export * from './hooks/wallet/useCurrentAccount.js';
 export * from './hooks/wallet/useCurrentWallet.js';

package/src/walletStore.ts

@@ -8,12 +8,9 @@ import { createJSONStorage, persist } from 'zustand/middleware';
 
 type WalletConnectionStatus = 'disconnected' | 'connecting' | 'connected';
 
-type WalletAutoConnectionStatus = 'disabled' | 'idle' | 'settled';
-
 export type WalletActions = {
 	setAccountSwitched: (selectedAccount: WalletAccount) => void;
 	setConnectionStatus: (connectionStatus: WalletConnectionStatus) => void;
-	setAutoConnectionStatus: (autoConnectionStatus: WalletAutoConnectionStatus) => void;
 	setWalletConnected: (
 		wallet: WalletWithRequiredFeatures,
 		connectedAccounts: readonly WalletAccount[],
@@ -31,6 +28,7 @@ export type WalletActions = {
 export type WalletStore = ReturnType<typeof createWalletStore>;
 
 export type StoreState = {
+	autoConnectEnabled: boolean;
 	wallets: WalletWithRequiredFeatures[];
 	accounts: readonly WalletAccount[];
 	currentWallet: WalletWithRequiredFeatures | null;
@@ -38,12 +36,11 @@ export type StoreState = {
 	lastConnectedAccountAddress: string | null;
 	lastConnectedWalletName: string | null;
 	connectionStatus: WalletConnectionStatus;
-	autoConnectionStatus: WalletAutoConnectionStatus;
 } & WalletActions;
 
 type WalletConfiguration = {
+	autoConnectEnabled: boolean;
 	wallets: WalletWithRequiredFeatures[];
-	autoConnect: boolean;
 	storage: StateStorage;
 	storageKey: string;
 };
@@ -52,11 +49,12 @@ export function createWalletStore({
 	wallets,
 	storage,
 	storageKey,
-	autoConnect,
+	autoConnectEnabled,
 }: WalletConfiguration) {
 	return createStore<StoreState>()(
 		persist(
 			(set, get) => ({
+				autoConnectEnabled,
 				wallets,
 				accounts: [],
 				currentWallet: null,
@@ -64,17 +62,11 @@ export function createWalletStore({
 				lastConnectedAccountAddress: null,
 				lastConnectedWalletName: null,
 				connectionStatus: 'disconnected',
-				autoConnectionStatus: autoConnect ? 'idle' : 'disabled',
 				setConnectionStatus(connectionStatus) {
 					set(() => ({
 						connectionStatus,
 					}));
 				},
-				setAutoConnectionStatus(autoConnectionStatus) {
-					set(() => ({
-						autoConnectionStatus,
-					}));
-				},
 				setWalletConnected(wallet, connectedAccounts, selectedAccount) {
 					set(() => ({
 						accounts: connectedAccounts,

package/dist/cjs/hooks/wallet/useAutoConnectionStatus.d.ts

@@ -1,4 +0,0 @@
-/**
- * Retrieves the status for the initial wallet auto-connection process.
- */
-export declare function useAutoConnectionStatus(): "disabled" | "idle" | "settled";

package/dist/cjs/hooks/wallet/useAutoConnectionStatus.js

@@ -1,50 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/hooks/wallet/useAutoConnectionStatus.ts
-var useAutoConnectionStatus_exports = {};
-__export(useAutoConnectionStatus_exports, {
-  useAutoConnectionStatus: () => useAutoConnectionStatus
-});
-module.exports = __toCommonJS(useAutoConnectionStatus_exports);
-
-// src/hooks/wallet/useWalletStore.ts
-var import_react2 = require("react");
-var import_zustand = require("zustand");
-
-// src/contexts/walletContext.ts
-var import_react = require("react");
-var WalletContext = (0, import_react.createContext)(null);
-
-// src/hooks/wallet/useWalletStore.ts
-function useWalletStore(selector) {
-  const store = (0, import_react2.useContext)(WalletContext);
-  if (!store) {
-    throw new Error(
-      "Could not find WalletContext. Ensure that you have set up the WalletProvider."
-    );
-  }
-  return (0, import_zustand.useStore)(store, selector);
-}
-
-// src/hooks/wallet/useAutoConnectionStatus.ts
-function useAutoConnectionStatus() {
-  return useWalletStore((state) => state.autoConnectionStatus);
-}
-//# sourceMappingURL=useAutoConnectionStatus.js.map

package/dist/cjs/hooks/wallet/useAutoConnectionStatus.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../src/hooks/wallet/useAutoConnectionStatus.ts", "../../../../src/hooks/wallet/useWalletStore.ts", "../../../../src/contexts/walletContext.ts"],
-  "sourcesContent": ["// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport { useWalletStore } from './useWalletStore.js';\n\n/**\n * Retrieves the status for the initial wallet auto-connection process.\n */\nexport function useAutoConnectionStatus() {\n\t// TODO: Replace this with shareable mutation state once we require react-query v5\n\treturn useWalletStore((state) => state.autoConnectionStatus);\n}\n", "// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport { useContext } from 'react';\nimport { useStore } from 'zustand';\n\nimport { WalletContext } from '../../contexts/walletContext.js';\nimport type { StoreState } from '../../walletStore.js';\n\nexport function useWalletStore<T>(selector: (state: StoreState) => T): T {\n\tconst store = useContext(WalletContext);\n\tif (!store) {\n\t\tthrow new Error(\n\t\t\t'Could not find WalletContext. Ensure that you have set up the WalletProvider.',\n\t\t);\n\t}\n\treturn useStore(store, selector);\n}\n", "// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport { createContext } from 'react';\n\nimport type { WalletStore } from '../walletStore.js';\n\nexport const WalletContext = createContext<WalletStore | null>(null);\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACGA,IAAAA,gBAA2B;AAC3B,qBAAyB;;;ACDzB,mBAA8B;AAIvB,IAAM,oBAAgB,4BAAkC,IAAI;;;ADE5D,SAAS,eAAkB,UAAuC;AACxE,QAAM,YAAQ,0BAAW,aAAa;AACtC,MAAI,CAAC,OAAO;AACX,UAAM,IAAI;AAAA,MACT;AAAA,IACD;AAAA,EACD;AACA,aAAO,yBAAS,OAAO,QAAQ;AAChC;;;ADTO,SAAS,0BAA0B;AAEzC,SAAO,eAAe,CAAC,UAAU,MAAM,oBAAoB;AAC5D;",
-  "names": ["import_react"]
-}

package/dist/esm/hooks/wallet/useAutoConnectionStatus.d.ts

@@ -1,4 +0,0 @@
-/**
- * Retrieves the status for the initial wallet auto-connection process.
- */
-export declare function useAutoConnectionStatus(): "disabled" | "idle" | "settled";

package/dist/esm/hooks/wallet/useAutoConnectionStatus.js

@@ -1,27 +0,0 @@
-// src/hooks/wallet/useWalletStore.ts
-import { useContext } from "react";
-import { useStore } from "zustand";
-
-// src/contexts/walletContext.ts
-import { createContext } from "react";
-var WalletContext = createContext(null);
-
-// src/hooks/wallet/useWalletStore.ts
-function useWalletStore(selector) {
-  const store = useContext(WalletContext);
-  if (!store) {
-    throw new Error(
-      "Could not find WalletContext. Ensure that you have set up the WalletProvider."
-    );
-  }
-  return useStore(store, selector);
-}
-
-// src/hooks/wallet/useAutoConnectionStatus.ts
-function useAutoConnectionStatus() {
-  return useWalletStore((state) => state.autoConnectionStatus);
-}
-export {
-  useAutoConnectionStatus
-};
-//# sourceMappingURL=useAutoConnectionStatus.js.map

package/dist/esm/hooks/wallet/useAutoConnectionStatus.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../src/hooks/wallet/useWalletStore.ts", "../../../../src/contexts/walletContext.ts", "../../../../src/hooks/wallet/useAutoConnectionStatus.ts"],
-  "sourcesContent": ["// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport { useContext } from 'react';\nimport { useStore } from 'zustand';\n\nimport { WalletContext } from '../../contexts/walletContext.js';\nimport type { StoreState } from '../../walletStore.js';\n\nexport function useWalletStore<T>(selector: (state: StoreState) => T): T {\n\tconst store = useContext(WalletContext);\n\tif (!store) {\n\t\tthrow new Error(\n\t\t\t'Could not find WalletContext. Ensure that you have set up the WalletProvider.',\n\t\t);\n\t}\n\treturn useStore(store, selector);\n}\n", "// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport { createContext } from 'react';\n\nimport type { WalletStore } from '../walletStore.js';\n\nexport const WalletContext = createContext<WalletStore | null>(null);\n", "// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport { useWalletStore } from './useWalletStore.js';\n\n/**\n * Retrieves the status for the initial wallet auto-connection process.\n */\nexport function useAutoConnectionStatus() {\n\t// TODO: Replace this with shareable mutation state once we require react-query v5\n\treturn useWalletStore((state) => state.autoConnectionStatus);\n}\n"],
-  "mappings": ";AAGA,SAAS,kBAAkB;AAC3B,SAAS,gBAAgB;;;ACDzB,SAAS,qBAAqB;AAIvB,IAAM,gBAAgB,cAAkC,IAAI;;;ADE5D,SAAS,eAAkB,UAAuC;AACxE,QAAM,QAAQ,WAAW,aAAa;AACtC,MAAI,CAAC,OAAO;AACX,UAAM,IAAI;AAAA,MACT;AAAA,IACD;AAAA,EACD;AACA,SAAO,SAAS,OAAO,QAAQ;AAChC;;;AETO,SAAS,0BAA0B;AAEzC,SAAO,eAAe,CAAC,UAAU,MAAM,oBAAoB;AAC5D;",
-  "names": []
-}

package/src/hooks/wallet/useAutoConnectionStatus.ts

@@ -1,12 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-import { useWalletStore } from './useWalletStore.js';
-
-/**
- * Retrieves the status for the initial wallet auto-connection process.
- */
-export function useAutoConnectionStatus() {
-	// TODO: Replace this with shareable mutation state once we require react-query v5
-	return useWalletStore((state) => state.autoConnectionStatus);
-}