@mysten/dapp-kit 0.5.0 → 0.6.0

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

@@ -68,7 +68,35 @@ function useWalletStore(selector) {
 
 // src/hooks/wallet/useCurrentWallet.ts
 function useCurrentWallet() {
-  return useWalletStore((state) => state.currentWallet);
+  const currentWallet = useWalletStore((state) => state.currentWallet);
+  const connectionStatus = useWalletStore((state) => state.connectionStatus);
+  switch (connectionStatus) {
+    case "connecting":
+      return {
+        connectionStatus,
+        currentWallet: null,
+        isDisconnected: false,
+        isConnecting: true,
+        isConnected: false
+      };
+    case "disconnected":
+      return {
+        connectionStatus,
+        currentWallet: null,
+        isDisconnected: true,
+        isConnecting: false,
+        isConnected: false
+      };
+    case "connected": {
+      return {
+        connectionStatus,
+        currentWallet,
+        isDisconnected: false,
+        isConnecting: false,
+        isConnected: true
+      };
+    }
+  }
 }
 
 // src/hooks/wallet/useSwitchAccount.ts
@@ -76,7 +104,7 @@ function useSwitchAccount({
   mutationKey,
   ...mutationOptions
 } = {}) {
-  const currentWallet = useCurrentWallet();
+  const { currentWallet } = useCurrentWallet();
   const setAccountSwitched = useWalletStore((state) => state.setAccountSwitched);
   return (0, import_react_query.useMutation)({
     mutationKey: walletMutationKeys.switchAccount(mutationKey),

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/hooks/wallet/useSwitchAccount.ts", "../../../../src/constants/walletMutationKeys.ts", "../../../../src/errors/walletErrors.ts", "../../../../src/hooks/wallet/useWalletStore.ts", "../../../../src/contexts/walletContext.ts", "../../../../src/hooks/wallet/useCurrentWallet.ts"],
-  "sourcesContent": ["// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport type { WalletAccount } from '@mysten/wallet-standard';\nimport type { UseMutationOptions } from '@tanstack/react-query';\nimport { useMutation } from '@tanstack/react-query';\n\nimport { walletMutationKeys } from '../../constants/walletMutationKeys.js';\nimport { WalletAccountNotFoundError, WalletNotConnectedError } from '../../errors/walletErrors.js';\nimport { useCurrentWallet } from './useCurrentWallet.js';\nimport { useWalletStore } from './useWalletStore.js';\n\ntype SwitchAccountArgs = {\n\taccount: WalletAccount;\n};\n\ntype SwitchAccountResult = void;\n\ntype UseSwitchAccountError = WalletNotConnectedError | WalletAccountNotFoundError | Error;\n\ntype UseSwitchAccountMutationOptions = Omit<\n\tUseMutationOptions<SwitchAccountResult, UseSwitchAccountError, SwitchAccountArgs, unknown>,\n\t'mutationFn'\n>;\n\n/**\n * Mutation hook for switching to a specific wallet account.\n */\nexport function useSwitchAccount({\n\tmutationKey,\n\t...mutationOptions\n}: UseSwitchAccountMutationOptions = {}) {\n\tconst currentWallet = useCurrentWallet();\n\tconst setAccountSwitched = useWalletStore((state) => state.setAccountSwitched);\n\n\treturn useMutation({\n\t\tmutationKey: walletMutationKeys.switchAccount(mutationKey),\n\t\tmutationFn: async ({ account }) => {\n\t\t\tif (!currentWallet) {\n\t\t\t\tthrow new WalletNotConnectedError('No wallet is connected.');\n\t\t\t}\n\n\t\t\tconst accountToSelect = currentWallet.accounts.find(\n\t\t\t\t(walletAccount) => walletAccount.address === account.address,\n\t\t\t);\n\t\t\tif (!accountToSelect) {\n\t\t\t\tthrow new WalletAccountNotFoundError(\n\t\t\t\t\t`No account with address ${account.address} is connected to ${currentWallet.name}.`,\n\t\t\t\t);\n\t\t\t}\n\n\t\t\tsetAccountSwitched(accountToSelect);\n\t\t},\n\t\t...mutationOptions,\n\t});\n}\n", "// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport type { MutationKey } from '@tanstack/react-query';\n\nexport const walletMutationKeys = {\n\tall: { baseScope: 'wallet' },\n\tconnectWallet: formMutationKeyFn('connect-wallet'),\n\tdisconnectWallet: formMutationKeyFn('disconnect-wallet'),\n\tsignPersonalMessage: formMutationKeyFn('sign-personal-message'),\n\tsignTransactionBlock: formMutationKeyFn('sign-transaction-block'),\n\tsignAndExecuteTransactionBlock: formMutationKeyFn('sign-and-execute-transaction-block'),\n\tswitchAccount: formMutationKeyFn('switch-account'),\n};\n\nfunction formMutationKeyFn(baseEntity: string) {\n\treturn function mutationKeyFn(additionalKeys: MutationKey = []) {\n\t\treturn [{ ...walletMutationKeys.all, baseEntity }, ...additionalKeys];\n\t};\n}\n", "// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\n/**\n * An error that is instantiated when someone attempts to perform an action that requires an active wallet connection.\n */\nexport class WalletNotConnectedError extends Error {}\n\n/**\n * An error that is instantiated when someone attempts to perform an action that requires a selected wallet account.\n * This is more of an edge case stemming from the fact that wallets don't technically require you to authorize any\n * accounts when connecting a wallet.\n */\nexport class WalletNoAccountSelectedError extends Error {}\n\n/**\n * An error that is instantiated when someone attempts to perform an action that isn't supported by a wallet.\n */\nexport class WalletFeatureNotSupportedError extends Error {}\n\n/**\n * An error that is instantiated when a wallet account can't be found for a specific wallet.\n */\nexport class WalletAccountNotFoundError extends Error {}\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", "// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport { useWalletStore } from './useWalletStore.js';\n\n/**\n * Retrieves the wallet that is currently connected to the dApp, if one exists.\n */\nexport function useCurrentWallet() {\n\treturn useWalletStore((state) => state.currentWallet);\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,yBAA4B;;;ACArB,IAAM,qBAAqB;AAAA,EACjC,KAAK,EAAE,WAAW,SAAS;AAAA,EAC3B,eAAe,kBAAkB,gBAAgB;AAAA,EACjD,kBAAkB,kBAAkB,mBAAmB;AAAA,EACvD,qBAAqB,kBAAkB,uBAAuB;AAAA,EAC9D,sBAAsB,kBAAkB,wBAAwB;AAAA,EAChE,gCAAgC,kBAAkB,oCAAoC;AAAA,EACtF,eAAe,kBAAkB,gBAAgB;AAClD;AAEA,SAAS,kBAAkB,YAAoB;AAC9C,SAAO,SAAS,cAAc,iBAA8B,CAAC,GAAG;AAC/D,WAAO,CAAC,EAAE,GAAG,mBAAmB,KAAK,WAAW,GAAG,GAAG,cAAc;AAAA,EACrE;AACD;;;ACbO,IAAM,0BAAN,cAAsC,MAAM;AAAC;AAiB7C,IAAM,6BAAN,cAAyC,MAAM;AAAC;;;ACpBvD,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;;;AETO,SAAS,mBAAmB;AAClC,SAAO,eAAe,CAAC,UAAU,MAAM,aAAa;AACrD;;;ALkBO,SAAS,iBAAiB;AAAA,EAChC;AAAA,EACA,GAAG;AACJ,IAAqC,CAAC,GAAG;AACxC,QAAM,gBAAgB,iBAAiB;AACvC,QAAM,qBAAqB,eAAe,CAAC,UAAU,MAAM,kBAAkB;AAE7E,aAAO,gCAAY;AAAA,IAClB,aAAa,mBAAmB,cAAc,WAAW;AAAA,IACzD,YAAY,OAAO,EAAE,QAAQ,MAAM;AAClC,UAAI,CAAC,eAAe;AACnB,cAAM,IAAI,wBAAwB,yBAAyB;AAAA,MAC5D;AAEA,YAAM,kBAAkB,cAAc,SAAS;AAAA,QAC9C,CAAC,kBAAkB,cAAc,YAAY,QAAQ;AAAA,MACtD;AACA,UAAI,CAAC,iBAAiB;AACrB,cAAM,IAAI;AAAA,UACT,2BAA2B,QAAQ,2BAA2B,cAAc;AAAA,QAC7E;AAAA,MACD;AAEA,yBAAmB,eAAe;AAAA,IACnC;AAAA,IACA,GAAG;AAAA,EACJ,CAAC;AACF;",
+  "sourcesContent": ["// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport type { WalletAccount } from '@mysten/wallet-standard';\nimport type { UseMutationOptions } from '@tanstack/react-query';\nimport { useMutation } from '@tanstack/react-query';\n\nimport { walletMutationKeys } from '../../constants/walletMutationKeys.js';\nimport { WalletAccountNotFoundError, WalletNotConnectedError } from '../../errors/walletErrors.js';\nimport { useCurrentWallet } from './useCurrentWallet.js';\nimport { useWalletStore } from './useWalletStore.js';\n\ntype SwitchAccountArgs = {\n\taccount: WalletAccount;\n};\n\ntype SwitchAccountResult = void;\n\ntype UseSwitchAccountError = WalletNotConnectedError | WalletAccountNotFoundError | Error;\n\ntype UseSwitchAccountMutationOptions = Omit<\n\tUseMutationOptions<SwitchAccountResult, UseSwitchAccountError, SwitchAccountArgs, unknown>,\n\t'mutationFn'\n>;\n\n/**\n * Mutation hook for switching to a specific wallet account.\n */\nexport function useSwitchAccount({\n\tmutationKey,\n\t...mutationOptions\n}: UseSwitchAccountMutationOptions = {}) {\n\tconst { currentWallet } = useCurrentWallet();\n\tconst setAccountSwitched = useWalletStore((state) => state.setAccountSwitched);\n\n\treturn useMutation({\n\t\tmutationKey: walletMutationKeys.switchAccount(mutationKey),\n\t\tmutationFn: async ({ account }) => {\n\t\t\tif (!currentWallet) {\n\t\t\t\tthrow new WalletNotConnectedError('No wallet is connected.');\n\t\t\t}\n\n\t\t\tconst accountToSelect = currentWallet.accounts.find(\n\t\t\t\t(walletAccount) => walletAccount.address === account.address,\n\t\t\t);\n\t\t\tif (!accountToSelect) {\n\t\t\t\tthrow new WalletAccountNotFoundError(\n\t\t\t\t\t`No account with address ${account.address} is connected to ${currentWallet.name}.`,\n\t\t\t\t);\n\t\t\t}\n\n\t\t\tsetAccountSwitched(accountToSelect);\n\t\t},\n\t\t...mutationOptions,\n\t});\n}\n", "// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport type { MutationKey } from '@tanstack/react-query';\n\nexport const walletMutationKeys = {\n\tall: { baseScope: 'wallet' },\n\tconnectWallet: formMutationKeyFn('connect-wallet'),\n\tdisconnectWallet: formMutationKeyFn('disconnect-wallet'),\n\tsignPersonalMessage: formMutationKeyFn('sign-personal-message'),\n\tsignTransactionBlock: formMutationKeyFn('sign-transaction-block'),\n\tsignAndExecuteTransactionBlock: formMutationKeyFn('sign-and-execute-transaction-block'),\n\tswitchAccount: formMutationKeyFn('switch-account'),\n};\n\nfunction formMutationKeyFn(baseEntity: string) {\n\treturn function mutationKeyFn(additionalKeys: MutationKey = []) {\n\t\treturn [{ ...walletMutationKeys.all, baseEntity }, ...additionalKeys];\n\t};\n}\n", "// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\n/**\n * An error that is instantiated when someone attempts to perform an action that requires an active wallet connection.\n */\nexport class WalletNotConnectedError extends Error {}\n\n/**\n * An error that is instantiated when someone attempts to perform an action that requires a selected wallet account.\n * This is more of an edge case stemming from the fact that wallets don't technically require you to authorize any\n * accounts when connecting a wallet.\n */\nexport class WalletNoAccountSelectedError extends Error {}\n\n/**\n * An error that is instantiated when someone attempts to perform an action that isn't supported by a wallet.\n */\nexport class WalletFeatureNotSupportedError extends Error {}\n\n/**\n * An error that is instantiated when a wallet account can't be found for a specific wallet.\n */\nexport class WalletAccountNotFoundError extends Error {}\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", "// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport { useWalletStore } from './useWalletStore.js';\n\n/**\n * Retrieves the wallet that is currently connected to the dApp, if one exists.\n */\nexport function useCurrentWallet() {\n\tconst currentWallet = useWalletStore((state) => state.currentWallet);\n\tconst connectionStatus = useWalletStore((state) => state.connectionStatus);\n\n\tswitch (connectionStatus) {\n\t\tcase 'connecting':\n\t\t\treturn {\n\t\t\t\tconnectionStatus,\n\t\t\t\tcurrentWallet: null,\n\t\t\t\tisDisconnected: false,\n\t\t\t\tisConnecting: true,\n\t\t\t\tisConnected: false,\n\t\t\t} as const;\n\t\tcase 'disconnected':\n\t\t\treturn {\n\t\t\t\tconnectionStatus,\n\t\t\t\tcurrentWallet: null,\n\t\t\t\tisDisconnected: true,\n\t\t\t\tisConnecting: false,\n\t\t\t\tisConnected: false,\n\t\t\t} as const;\n\t\tcase 'connected': {\n\t\t\treturn {\n\t\t\t\tconnectionStatus,\n\t\t\t\tcurrentWallet: currentWallet!,\n\t\t\t\tisDisconnected: false,\n\t\t\t\tisConnecting: false,\n\t\t\t\tisConnected: true,\n\t\t\t} as const;\n\t\t}\n\t}\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,yBAA4B;;;ACArB,IAAM,qBAAqB;AAAA,EACjC,KAAK,EAAE,WAAW,SAAS;AAAA,EAC3B,eAAe,kBAAkB,gBAAgB;AAAA,EACjD,kBAAkB,kBAAkB,mBAAmB;AAAA,EACvD,qBAAqB,kBAAkB,uBAAuB;AAAA,EAC9D,sBAAsB,kBAAkB,wBAAwB;AAAA,EAChE,gCAAgC,kBAAkB,oCAAoC;AAAA,EACtF,eAAe,kBAAkB,gBAAgB;AAClD;AAEA,SAAS,kBAAkB,YAAoB;AAC9C,SAAO,SAAS,cAAc,iBAA8B,CAAC,GAAG;AAC/D,WAAO,CAAC,EAAE,GAAG,mBAAmB,KAAK,WAAW,GAAG,GAAG,cAAc;AAAA,EACrE;AACD;;;ACbO,IAAM,0BAAN,cAAsC,MAAM;AAAC;AAiB7C,IAAM,6BAAN,cAAyC,MAAM;AAAC;;;ACpBvD,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;;;AETO,SAAS,mBAAmB;AAClC,QAAM,gBAAgB,eAAe,CAAC,UAAU,MAAM,aAAa;AACnE,QAAM,mBAAmB,eAAe,CAAC,UAAU,MAAM,gBAAgB;AAEzE,UAAQ,kBAAkB;AAAA,IACzB,KAAK;AACJ,aAAO;AAAA,QACN;AAAA,QACA,eAAe;AAAA,QACf,gBAAgB;AAAA,QAChB,cAAc;AAAA,QACd,aAAa;AAAA,MACd;AAAA,IACD,KAAK;AACJ,aAAO;AAAA,QACN;AAAA,QACA,eAAe;AAAA,QACf,gBAAgB;AAAA,QAChB,cAAc;AAAA,QACd,aAAa;AAAA,MACd;AAAA,IACD,KAAK,aAAa;AACjB,aAAO;AAAA,QACN;AAAA,QACA;AAAA,QACA,gBAAgB;AAAA,QAChB,cAAc;AAAA,QACd,aAAa;AAAA,MACd;AAAA,IACD;AAAA,EACD;AACD;;;ALXO,SAAS,iBAAiB;AAAA,EAChC;AAAA,EACA,GAAG;AACJ,IAAqC,CAAC,GAAG;AACxC,QAAM,EAAE,cAAc,IAAI,iBAAiB;AAC3C,QAAM,qBAAqB,eAAe,CAAC,UAAU,MAAM,kBAAkB;AAE7E,aAAO,gCAAY;AAAA,IAClB,aAAa,mBAAmB,cAAc,WAAW;AAAA,IACzD,YAAY,OAAO,EAAE,QAAQ,MAAM;AAClC,UAAI,CAAC,eAAe;AACnB,cAAM,IAAI,wBAAwB,yBAAyB;AAAA,MAC5D;AAEA,YAAM,kBAAkB,cAAc,SAAS;AAAA,QAC9C,CAAC,kBAAkB,cAAc,YAAY,QAAQ;AAAA,MACtD;AACA,UAAI,CAAC,iBAAiB;AACrB,cAAM,IAAI;AAAA,UACT,2BAA2B,QAAQ,2BAA2B,cAAc;AAAA,QAC7E;AAAA,MACD;AAEA,yBAAmB,eAAe;AAAA,IACnC;AAAA,IACA,GAAG;AAAA,EACJ,CAAC;AACF;",
   "names": ["import_react"]
 }

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

@@ -46,12 +46,40 @@ function useWalletStore(selector) {
 
 // src/hooks/wallet/useCurrentWallet.ts
 function useCurrentWallet() {
-  return useWalletStore((state) => state.currentWallet);
+  const currentWallet = useWalletStore((state) => state.currentWallet);
+  const connectionStatus = useWalletStore((state) => state.connectionStatus);
+  switch (connectionStatus) {
+    case "connecting":
+      return {
+        connectionStatus,
+        currentWallet: null,
+        isDisconnected: false,
+        isConnecting: true,
+        isConnected: false
+      };
+    case "disconnected":
+      return {
+        connectionStatus,
+        currentWallet: null,
+        isDisconnected: true,
+        isConnecting: false,
+        isConnected: false
+      };
+    case "connected": {
+      return {
+        connectionStatus,
+        currentWallet,
+        isDisconnected: false,
+        isConnecting: false,
+        isConnected: true
+      };
+    }
+  }
 }
 
 // src/hooks/wallet/useWalletPropertiesChanged.ts
 function useWalletPropertiesChanged() {
-  const currentWallet = useCurrentWallet();
+  const { currentWallet } = useCurrentWallet();
   const updateWalletAccounts = useWalletStore((state) => state.updateWalletAccounts);
   (0, import_react3.useEffect)(() => {
     const unsubscribeFromEvents = currentWallet?.features["standard:events"].on(

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/hooks/wallet/useWalletPropertiesChanged.ts", "../../../../src/hooks/wallet/useWalletStore.ts", "../../../../src/contexts/walletContext.ts", "../../../../src/hooks/wallet/useCurrentWallet.ts"],
-  "sourcesContent": ["// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport { useEffect } from 'react';\n\nimport { useCurrentWallet } from './useCurrentWallet.js';\nimport { useWalletStore } from './useWalletStore.js';\n\n/**\n * Internal hook for easily handling various changes in properties for a wallet.\n */\nexport function useWalletPropertiesChanged() {\n\tconst currentWallet = useCurrentWallet();\n\tconst updateWalletAccounts = useWalletStore((state) => state.updateWalletAccounts);\n\n\tuseEffect(() => {\n\t\tconst unsubscribeFromEvents = currentWallet?.features['standard:events'].on(\n\t\t\t'change',\n\t\t\t({ accounts }) => {\n\t\t\t\t// TODO: We should handle features changing that might make the list of wallets\n\t\t\t\t// or even the current wallet incompatible with the dApp.\n\t\t\t\tif (accounts) {\n\t\t\t\t\tupdateWalletAccounts(accounts);\n\t\t\t\t}\n\t\t\t},\n\t\t);\n\t\treturn unsubscribeFromEvents;\n\t}, [currentWallet?.features, updateWalletAccounts]);\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", "// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport { useWalletStore } from './useWalletStore.js';\n\n/**\n * Retrieves the wallet that is currently connected to the dApp, if one exists.\n */\nexport function useCurrentWallet() {\n\treturn useWalletStore((state) => state.currentWallet);\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,IAAAA,gBAA0B;;;ACA1B,IAAAC,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;;;AETO,SAAS,mBAAmB;AAClC,SAAO,eAAe,CAAC,UAAU,MAAM,aAAa;AACrD;;;AHCO,SAAS,6BAA6B;AAC5C,QAAM,gBAAgB,iBAAiB;AACvC,QAAM,uBAAuB,eAAe,CAAC,UAAU,MAAM,oBAAoB;AAEjF,+BAAU,MAAM;AACf,UAAM,wBAAwB,eAAe,SAAS,iBAAiB,EAAE;AAAA,MACxE;AAAA,MACA,CAAC,EAAE,SAAS,MAAM;AAGjB,YAAI,UAAU;AACb,+BAAqB,QAAQ;AAAA,QAC9B;AAAA,MACD;AAAA,IACD;AACA,WAAO;AAAA,EACR,GAAG,CAAC,eAAe,UAAU,oBAAoB,CAAC;AACnD;",
+  "sourcesContent": ["// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport { useEffect } from 'react';\n\nimport { useCurrentWallet } from './useCurrentWallet.js';\nimport { useWalletStore } from './useWalletStore.js';\n\n/**\n * Internal hook for easily handling various changes in properties for a wallet.\n */\nexport function useWalletPropertiesChanged() {\n\tconst { currentWallet } = useCurrentWallet();\n\tconst updateWalletAccounts = useWalletStore((state) => state.updateWalletAccounts);\n\n\tuseEffect(() => {\n\t\tconst unsubscribeFromEvents = currentWallet?.features['standard:events'].on(\n\t\t\t'change',\n\t\t\t({ accounts }) => {\n\t\t\t\t// TODO: We should handle features changing that might make the list of wallets\n\t\t\t\t// or even the current wallet incompatible with the dApp.\n\t\t\t\tif (accounts) {\n\t\t\t\t\tupdateWalletAccounts(accounts);\n\t\t\t\t}\n\t\t\t},\n\t\t);\n\t\treturn unsubscribeFromEvents;\n\t}, [currentWallet?.features, updateWalletAccounts]);\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", "// Copyright (c) Mysten Labs, Inc.\n// SPDX-License-Identifier: Apache-2.0\n\nimport { useWalletStore } from './useWalletStore.js';\n\n/**\n * Retrieves the wallet that is currently connected to the dApp, if one exists.\n */\nexport function useCurrentWallet() {\n\tconst currentWallet = useWalletStore((state) => state.currentWallet);\n\tconst connectionStatus = useWalletStore((state) => state.connectionStatus);\n\n\tswitch (connectionStatus) {\n\t\tcase 'connecting':\n\t\t\treturn {\n\t\t\t\tconnectionStatus,\n\t\t\t\tcurrentWallet: null,\n\t\t\t\tisDisconnected: false,\n\t\t\t\tisConnecting: true,\n\t\t\t\tisConnected: false,\n\t\t\t} as const;\n\t\tcase 'disconnected':\n\t\t\treturn {\n\t\t\t\tconnectionStatus,\n\t\t\t\tcurrentWallet: null,\n\t\t\t\tisDisconnected: true,\n\t\t\t\tisConnecting: false,\n\t\t\t\tisConnected: false,\n\t\t\t} as const;\n\t\tcase 'connected': {\n\t\t\treturn {\n\t\t\t\tconnectionStatus,\n\t\t\t\tcurrentWallet: currentWallet!,\n\t\t\t\tisDisconnected: false,\n\t\t\t\tisConnecting: false,\n\t\t\t\tisConnected: true,\n\t\t\t} as const;\n\t\t}\n\t}\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,IAAAA,gBAA0B;;;ACA1B,IAAAC,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;;;AETO,SAAS,mBAAmB;AAClC,QAAM,gBAAgB,eAAe,CAAC,UAAU,MAAM,aAAa;AACnE,QAAM,mBAAmB,eAAe,CAAC,UAAU,MAAM,gBAAgB;AAEzE,UAAQ,kBAAkB;AAAA,IACzB,KAAK;AACJ,aAAO;AAAA,QACN;AAAA,QACA,eAAe;AAAA,QACf,gBAAgB;AAAA,QAChB,cAAc;AAAA,QACd,aAAa;AAAA,MACd;AAAA,IACD,KAAK;AACJ,aAAO;AAAA,QACN;AAAA,QACA,eAAe;AAAA,QACf,gBAAgB;AAAA,QAChB,cAAc;AAAA,QACd,aAAa;AAAA,MACd;AAAA,IACD,KAAK,aAAa;AACjB,aAAO;AAAA,QACN;AAAA,QACA;AAAA,QACA,gBAAgB;AAAA,QAChB,cAAc;AAAA,QACd,aAAa;AAAA,MACd;AAAA,IACD;AAAA,EACD;AACD;;;AH5BO,SAAS,6BAA6B;AAC5C,QAAM,EAAE,cAAc,IAAI,iBAAiB;AAC3C,QAAM,uBAAuB,eAAe,CAAC,UAAU,MAAM,oBAAoB;AAEjF,+BAAU,MAAM;AACf,UAAM,wBAAwB,eAAe,SAAS,iBAAiB,EAAE;AAAA,MACxE;AAAA,MACA,CAAC,EAAE,SAAS,MAAM;AAGjB,YAAI,UAAU;AACb,+BAAqB,QAAQ;AAAA,QAC9B;AAAA,MACD;AAAA,IACD;AACA,WAAO;AAAA,EACR,GAAG,CAAC,eAAe,UAAU,oBAAoB,CAAC;AACnD;",
   "names": ["import_react", "import_react"]
 }

package/dist/cjs/index.d.ts

@@ -10,6 +10,7 @@ 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/useConnectWallet.js';
 export * from './hooks/wallet/useCurrentAccount.js';
 export * from './hooks/wallet/useCurrentWallet.js';

package/dist/cjs/index.js

@@ -71,6 +71,7 @@ __export(src_exports, {
   createNetworkConfig: () => createNetworkConfig,
   lightTheme: () => lightTheme,
   useAccounts: () => useAccounts,
+  useAutoConnectionStatus: () => useAutoConnectionStatus,
   useConnectWallet: () => useConnectWallet,
   useCurrentAccount: () => useCurrentAccount,
   useCurrentWallet: () => useCurrentWallet,
@@ -138,16 +139,23 @@ function useConnectWallet({
   ...mutationOptions
 } = {}) {
   const setWalletConnected = useWalletStore((state) => state.setWalletConnected);
+  const setConnectionStatus = useWalletStore((state) => state.setConnectionStatus);
   return (0, import_react_query.useMutation)({
     mutationKey: walletMutationKeys.connectWallet(mutationKey),
-    mutationFn: async ({ wallet, accountAddress, ...standardConnectInput }) => {
-      const connectResult = await wallet.features["standard:connect"].connect(standardConnectInput);
-      const connectedSuiAccounts = connectResult.accounts.filter(
-        (account) => account.chains.some((chain) => chain.split(":")[0] === "sui")
-      );
-      const selectedAccount = getSelectedAccount(connectedSuiAccounts, accountAddress);
-      setWalletConnected(wallet, connectedSuiAccounts, selectedAccount);
-      return { accounts: connectedSuiAccounts };
+    mutationFn: async ({ wallet, accountAddress, ...connectArgs }) => {
+      try {
+        setConnectionStatus("connecting");
+        const connectResult = await wallet.features["standard:connect"].connect(connectArgs);
+        const connectedSuiAccounts = connectResult.accounts.filter(
+          (account) => account.chains.some((chain) => chain.split(":")[0] === "sui")
+        );
+        const selectedAccount = getSelectedAccount(connectedSuiAccounts, accountAddress);
+        setWalletConnected(wallet, connectedSuiAccounts, selectedAccount);
+        return { accounts: connectedSuiAccounts };
+      } catch (error) {
+        setConnectionStatus("disconnected");
+        throw error;
+      }
     },
     ...mutationOptions
   });
@@ -685,20 +693,20 @@ function useSuiClientQuery(...args) {
 
 // src/hooks/useResolveSuiNSNames.ts
 function useResolveSuiNSName(address, options) {
-  const { data, ...rest } = useSuiClientQuery(
+  return useSuiClientQuery(
     "resolveNameServiceNames",
     {
       address,
       limit: 1
     },
     {
+      ...options,
       refetchOnWindowFocus: false,
       retry: false,
-      ...options,
+      select: (data) => data.data.length > 0 ? data.data[0] : null,
       enabled: !!address && options?.enabled !== false
     }
   );
-  return { data: data?.data?.[0] ?? null, ...rest };
 }
 
 // src/hooks/wallet/useAccounts.ts
@@ -721,7 +729,35 @@ var WalletAccountNotFoundError = class extends Error {
 
 // src/hooks/wallet/useCurrentWallet.ts
 function useCurrentWallet() {
-  return useWalletStore((state) => state.currentWallet);
+  const currentWallet = useWalletStore((state) => state.currentWallet);
+  const connectionStatus2 = useWalletStore((state) => state.connectionStatus);
+  switch (connectionStatus2) {
+    case "connecting":
+      return {
+        connectionStatus: connectionStatus2,
+        currentWallet: null,
+        isDisconnected: false,
+        isConnecting: true,
+        isConnected: false
+      };
+    case "disconnected":
+      return {
+        connectionStatus: connectionStatus2,
+        currentWallet: null,
+        isDisconnected: true,
+        isConnecting: false,
+        isConnected: false
+      };
+    case "connected": {
+      return {
+        connectionStatus: connectionStatus2,
+        currentWallet,
+        isDisconnected: false,
+        isConnecting: false,
+        isConnected: true
+      };
+    }
+  }
 }
 
 // src/hooks/wallet/useDisconnectWallet.ts
@@ -729,7 +765,7 @@ function useDisconnectWallet({
   mutationKey,
   ...mutationOptions
 } = {}) {
-  const currentWallet = useCurrentWallet();
+  const { currentWallet } = useCurrentWallet();
   const setWalletDisconnected = useWalletStore((state) => state.setWalletDisconnected);
   return (0, import_react_query3.useMutation)({
     mutationKey: walletMutationKeys.disconnectWallet(mutationKey),
@@ -754,7 +790,7 @@ function useSwitchAccount({
   mutationKey,
   ...mutationOptions
 } = {}) {
-  const currentWallet = useCurrentWallet();
+  const { currentWallet } = useCurrentWallet();
   const setAccountSwitched = useWalletStore((state) => state.setAccountSwitched);
   return (0, import_react_query4.useMutation)({
     mutationKey: walletMutationKeys.switchAccount(mutationKey),
@@ -880,25 +916,35 @@ var import_react15 = require("react");
 var import_react11 = require("react");
 function useAutoConnectWallet(autoConnectEnabled) {
   const { mutate: connectWallet } = useConnectWallet();
-  const wallets = useWallets();
+  const setAutoConnectionStatus = useWalletStore((state) => state.setAutoConnectionStatus);
   const lastConnectedWalletName = useWalletStore((state) => state.lastConnectedWalletName);
   const lastConnectedAccountAddress = useWalletStore((state) => state.lastConnectedAccountAddress);
+  const wallets = useWallets();
+  const { isDisconnected } = useCurrentWallet();
   (0, import_react11.useEffect)(() => {
-    if (!autoConnectEnabled || !lastConnectedWalletName)
+    if (!autoConnectEnabled || !lastConnectedWalletName || !lastConnectedAccountAddress || !isDisconnected) {
       return;
+    }
     const wallet = wallets.find((wallet2) => wallet2.name === lastConnectedWalletName);
     if (wallet) {
-      connectWallet({
-        wallet,
-        accountAddress: lastConnectedAccountAddress || void 0,
-        silent: true
-      });
+      connectWallet(
+        {
+          wallet,
+          accountAddress: lastConnectedAccountAddress,
+          silent: true
+        },
+        {
+          onSettled: () => setAutoConnectionStatus("settled")
+        }
+      );
     }
   }, [
     autoConnectEnabled,
     connectWallet,
+    isDisconnected,
     lastConnectedAccountAddress,
     lastConnectedWalletName,
+    setAutoConnectionStatus,
     wallets
   ]);
 }
@@ -1022,7 +1068,7 @@ function registerUnsafeBurnerWallet(suiClient) {
 // src/hooks/wallet/useWalletPropertiesChanged.ts
 var import_react13 = require("react");
 function useWalletPropertiesChanged() {
-  const currentWallet = useCurrentWallet();
+  const { currentWallet } = useCurrentWallet();
   const updateWalletAccounts = useWalletStore((state) => state.updateWalletAccounts);
   (0, import_react13.useEffect)(() => {
     const unsubscribeFromEvents = currentWallet?.features["standard:events"].on(
@@ -1141,7 +1187,12 @@ var lightTheme = {
 // src/walletStore.ts
 var import_zustand2 = require("zustand");
 var import_middleware = require("zustand/middleware");
-function createWalletStore({ wallets, storage, storageKey }) {
+function createWalletStore({
+  wallets,
+  storage,
+  storageKey,
+  autoConnect
+}) {
   return (0, import_zustand2.createStore)()(
     (0, import_middleware.persist)(
       (set, get) => ({
@@ -1152,13 +1203,25 @@ function createWalletStore({ wallets, storage, storageKey }) {
         lastConnectedAccountAddress: null,
         lastConnectedWalletName: null,
         connectionStatus: "disconnected",
+        autoConnectionStatus: autoConnect ? "idle" : "disabled",
+        setConnectionStatus(connectionStatus2) {
+          set(() => ({
+            connectionStatus: connectionStatus2
+          }));
+        },
+        setAutoConnectionStatus(autoConnectionStatus) {
+          set(() => ({
+            autoConnectionStatus
+          }));
+        },
         setWalletConnected(wallet, connectedAccounts, selectedAccount) {
           set(() => ({
             accounts: connectedAccounts,
             currentWallet: wallet,
             currentAccount: selectedAccount,
             lastConnectedWalletName: wallet.name,
-            lastConnectedAccountAddress: selectedAccount?.address
+            lastConnectedAccountAddress: selectedAccount?.address,
+            connectionStatus: "connected"
           }));
         },
         setWalletDisconnected() {
@@ -1167,7 +1230,8 @@ function createWalletStore({ wallets, storage, storageKey }) {
             currentWallet: null,
             currentAccount: null,
             lastConnectedWalletName: null,
-            lastConnectedAccountAddress: null
+            lastConnectedAccountAddress: null,
+            connectionStatus: "disconnected"
           }));
         },
         setAccountSwitched(selectedAccount) {
@@ -1187,7 +1251,8 @@ function createWalletStore({ wallets, storage, storageKey }) {
               currentWallet: null,
               currentAccount: null,
               lastConnectedWalletName: null,
-              lastConnectedAccountAddress: null
+              lastConnectedAccountAddress: null,
+              connectionStatus: "disconnected"
             }));
           } else {
             set(() => ({ wallets: updatedWallets }));
@@ -1328,7 +1393,8 @@ function WalletProvider({
     createWalletStore({
       wallets: getRegisteredWallets(preferredWallets, requiredFeatures),
       storageKey,
-      storage
+      storage,
+      autoConnect
     })
   );
   return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(WalletContext.Provider, { value: storeRef.current, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(
@@ -1386,18 +1452,22 @@ function createNetworkConfig(networkConfig) {
 
 // src/hooks/useSuiClientInfiniteQuery.ts
 var import_react_query5 = require("@tanstack/react-query");
-function useSuiClientInfiniteQuery(method, params, { queryKey = [], enabled = !!params, ...options } = {}) {
+function useSuiClientInfiniteQuery(method, params, {
+  queryKey = [],
+  enabled = !!params,
+  ...options
+} = {}) {
   const suiContext = useSuiClientContext();
   return (0, import_react_query5.useInfiniteQuery)({
     ...options,
+    initialPageParam: null,
     queryKey: [suiContext.network, method, params, ...queryKey],
     enabled,
-    queryFn: async () => {
-      return await suiContext.client[method](params);
-    },
-    getNextPageParam: (lastPage) => {
-      return lastPage.nextCursor ?? null;
-    }
+    queryFn: ({ pageParam }) => suiContext.client[method]({
+      ...params ?? {},
+      cursor: pageParam
+    }),
+    getNextPageParam: ({ nextCursor }) => nextCursor ?? null
   });
 }
 
@@ -1413,6 +1483,11 @@ function useSuiClientMutation(method, options = {}) {
   });
 }
 
+// src/hooks/wallet/useAutoConnectionStatus.ts
+function useAutoConnectionStatus() {
+  return useWalletStore((state) => state.autoConnectionStatus);
+}
+
 // src/hooks/wallet/useSignAndExecuteTransactionBlock.ts
 var import_react_query7 = require("@tanstack/react-query");
 function useSignAndExecuteTransactionBlock({
@@ -1420,7 +1495,7 @@ function useSignAndExecuteTransactionBlock({
   executeFromWallet,
   ...mutationOptions
 } = {}) {
-  const currentWallet = useCurrentWallet();
+  const { currentWallet } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
   const client = useSuiClient();
   return (0, import_react_query7.useMutation)({
@@ -1478,7 +1553,7 @@ function useSignPersonalMessage({
   mutationKey,
   ...mutationOptions
 } = {}) {
-  const currentWallet = useCurrentWallet();
+  const { currentWallet } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
   return (0, import_react_query8.useMutation)({
     mutationKey: walletMutationKeys.signPersonalMessage(mutationKey),
@@ -1513,7 +1588,7 @@ function useSignTransactionBlock({
   mutationKey,
   ...mutationOptions
 } = {}) {
-  const currentWallet = useCurrentWallet();
+  const { currentWallet } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
   return (0, import_react_query9.useMutation)({
     mutationKey: walletMutationKeys.signTransactionBlock(mutationKey),