@mysten/dapp-kit 0.8.0 → 0.9.1

package/dist/cjs/index.js

@@ -71,7 +71,7 @@ __export(src_exports, {
   createNetworkConfig: () => createNetworkConfig,
   lightTheme: () => lightTheme,
   useAccounts: () => useAccounts,
-  useAutoConnectionStatus: () => useAutoConnectionStatus,
+  useAutoConnectWallet: () => useAutoConnectWallet,
   useConnectWallet: () => useConnectWallet,
   useCurrentAccount: () => useCurrentAccount,
   useCurrentWallet: () => useCurrentWallet,
@@ -102,6 +102,7 @@ var import_react_query = require("@tanstack/react-query");
 var walletMutationKeys = {
   all: { baseScope: "wallet" },
   connectWallet: formMutationKeyFn("connect-wallet"),
+  autoconnectWallet: formMutationKeyFn("autoconnect-wallet"),
   disconnectWallet: formMutationKeyFn("disconnect-wallet"),
   signPersonalMessage: formMutationKeyFn("sign-personal-message"),
   signTransactionBlock: formMutationKeyFn("sign-transaction-block"),
@@ -915,53 +916,75 @@ function ConnectButton({
 }
 
 // src/components/WalletProvider.tsx
-var import_react15 = require("react");
+var import_react14 = require("react");
 
 // src/hooks/wallet/useAutoConnectWallet.ts
-var import_react11 = require("react");
-function useAutoConnectWallet(autoConnectEnabled) {
-  const { mutate: connectWallet } = useConnectWallet();
-  const setAutoConnectionStatus = useWalletStore((state) => state.setAutoConnectionStatus);
+var import_react_query5 = require("@tanstack/react-query");
+function useAutoConnectWallet() {
+  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();
-  (0, import_react11.useEffect)(() => {
-    if (!autoConnectEnabled || !lastConnectedWalletName || !lastConnectedAccountAddress || !isDisconnected) {
-      return;
-    }
-    const wallet = wallets.find((wallet2) => wallet2.name === lastConnectedWalletName);
-    if (wallet) {
-      connectWallet(
-        {
+  const { data, isError } = (0, import_react_query5.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((wallet2) => wallet2.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: void 0,
+    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";
 }
 
 // src/hooks/wallet/useUnsafeBurnerWallet.ts
 var import_ed25519 = require("@mysten/sui.js/keypairs/ed25519");
 var import_wallet_standard = require("@mysten/wallet-standard");
-var import_react12 = require("react");
+var import_react11 = require("react");
 var WALLET_NAME = "Unsafe Burner Wallet";
 function useUnsafeBurnerWallet(enabled) {
   const suiClient = useSuiClient();
-  (0, import_react12.useEffect)(() => {
+  (0, import_react11.useEffect)(() => {
     if (!enabled) {
       return;
     }
@@ -1071,11 +1094,11 @@ function registerUnsafeBurnerWallet(suiClient) {
 }
 
 // src/hooks/wallet/useWalletPropertiesChanged.ts
-var import_react13 = require("react");
+var import_react12 = require("react");
 function useWalletPropertiesChanged() {
   const { currentWallet } = useCurrentWallet();
   const updateWalletAccounts = useWalletStore((state) => state.updateWalletAccounts);
-  (0, import_react13.useEffect)(() => {
+  (0, import_react12.useEffect)(() => {
     const unsubscribeFromEvents = currentWallet?.features["standard:events"].on(
       "change",
       ({ accounts }) => {
@@ -1090,7 +1113,7 @@ function useWalletPropertiesChanged() {
 
 // src/hooks/wallet/useWalletsChanged.ts
 var import_wallet_standard3 = require("@mysten/wallet-standard");
-var import_react14 = require("react");
+var import_react13 = require("react");
 
 // src/utils/walletUtils.ts
 var import_wallet_standard2 = require("@mysten/wallet-standard");
@@ -1112,7 +1135,7 @@ function getRegisteredWallets(preferredWallets, requiredFeatures) {
 function useWalletsChanged(preferredWallets, requiredFeatures) {
   const setWalletRegistered = useWalletStore((state) => state.setWalletRegistered);
   const setWalletUnregistered = useWalletStore((state) => state.setWalletUnregistered);
-  (0, import_react14.useEffect)(() => {
+  (0, import_react13.useEffect)(() => {
     const walletsApi = (0, import_wallet_standard3.getWallets)();
     const unsubscribeFromRegister = walletsApi.on("register", () => {
       setWalletRegistered(getRegisteredWallets(preferredWallets, requiredFeatures));
@@ -1196,11 +1219,12 @@ function createWalletStore({
   wallets,
   storage,
   storageKey,
-  autoConnect
+  autoConnectEnabled
 }) {
   return (0, import_zustand2.createStore)()(
     (0, import_middleware.persist)(
       (set, get) => ({
+        autoConnectEnabled,
         wallets,
         accounts: [],
         currentWallet: null,
@@ -1208,17 +1232,11 @@ function createWalletStore({
         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,
@@ -1394,12 +1412,12 @@ function WalletProvider({
   theme = lightTheme,
   children
 }) {
-  const storeRef = (0, import_react15.useRef)(
+  const storeRef = (0, import_react14.useRef)(
     createWalletStore({
+      autoConnectEnabled: autoConnect,
       wallets: getRegisteredWallets(preferredWallets, requiredFeatures),
       storageKey,
-      storage,
-      autoConnect
+      storage
     })
   );
   return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(WalletContext.Provider, { value: storeRef.current, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(
@@ -1408,7 +1426,6 @@ function WalletProvider({
       preferredWallets,
       requiredFeatures,
       enableUnsafeBurner,
-      autoConnect,
       children: [
         theme ? /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(InjectedThemeStyles, { theme }) : null,
         children
@@ -1420,13 +1437,12 @@ function WalletConnectionManager({
   preferredWallets,
   requiredFeatures,
   enableUnsafeBurner,
-  autoConnect,
   children
 }) {
   useWalletsChanged(preferredWallets, requiredFeatures);
   useWalletPropertiesChanged();
   useUnsafeBurnerWallet(enableUnsafeBurner);
-  useAutoConnectWallet(autoConnect);
+  useAutoConnectWallet();
   return children;
 }
 
@@ -1456,14 +1472,14 @@ function createNetworkConfig(networkConfig) {
 }
 
 // src/hooks/useSuiClientInfiniteQuery.ts
-var import_react_query5 = require("@tanstack/react-query");
+var import_react_query6 = require("@tanstack/react-query");
 function useSuiClientInfiniteQuery(method, params, {
   queryKey = [],
   enabled = !!params,
   ...options
 } = {}) {
   const suiContext = useSuiClientContext();
-  return (0, import_react_query5.useInfiniteQuery)({
+  return (0, import_react_query6.useInfiniteQuery)({
     ...options,
     initialPageParam: null,
     queryKey: [suiContext.network, method, params, ...queryKey],
@@ -1477,10 +1493,10 @@ function useSuiClientInfiniteQuery(method, params, {
 }
 
 // src/hooks/useSuiClientMutation.ts
-var import_react_query6 = require("@tanstack/react-query");
+var import_react_query7 = require("@tanstack/react-query");
 function useSuiClientMutation(method, options = {}) {
   const suiContext = useSuiClientContext();
-  return (0, import_react_query6.useMutation)({
+  return (0, import_react_query7.useMutation)({
     ...options,
     mutationFn: async (params) => {
       return await suiContext.client[method](params);
@@ -1488,13 +1504,8 @@ 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");
+var import_react_query8 = require("@tanstack/react-query");
 function useSignAndExecuteTransactionBlock({
   mutationKey,
   executeFromWallet,
@@ -1503,7 +1514,7 @@ function useSignAndExecuteTransactionBlock({
   const { currentWallet } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
   const client = useSuiClient();
-  return (0, import_react_query7.useMutation)({
+  return (0, import_react_query8.useMutation)({
     mutationKey: walletMutationKeys.signAndExecuteTransactionBlock(mutationKey),
     mutationFn: async ({ requestType, options, ...signTransactionBlockArgs }) => {
       if (!currentWallet) {
@@ -1553,14 +1564,14 @@ function useSignAndExecuteTransactionBlock({
 }
 
 // src/hooks/wallet/useSignPersonalMessage.ts
-var import_react_query8 = require("@tanstack/react-query");
+var import_react_query9 = require("@tanstack/react-query");
 function useSignPersonalMessage({
   mutationKey,
   ...mutationOptions
 } = {}) {
   const { currentWallet } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
-  return (0, import_react_query8.useMutation)({
+  return (0, import_react_query9.useMutation)({
     mutationKey: walletMutationKeys.signPersonalMessage(mutationKey),
     mutationFn: async (signPersonalMessageArgs) => {
       if (!currentWallet) {
@@ -1572,30 +1583,41 @@ function useSignPersonalMessage({
           "No wallet account is selected to sign the personal message with."
         );
       }
-      const walletFeature = currentWallet.features["sui:signPersonalMessage"];
-      if (!walletFeature) {
-        throw new WalletFeatureNotSupportedError(
-          "This wallet doesn't support the `signPersonalMessage` feature."
+      const signPersonalMessageFeature = currentWallet.features["sui:signPersonalMessage"];
+      if (signPersonalMessageFeature) {
+        return await signPersonalMessageFeature.signPersonalMessage({
+          ...signPersonalMessageArgs,
+          account: signerAccount
+        });
+      }
+      const signMessageFeature = currentWallet.features["sui:signMessage"];
+      if (signMessageFeature) {
+        console.warn(
+          "This wallet doesn't support the `signPersonalMessage` feature... falling back to `signMessage`."
         );
+        const { messageBytes, signature } = await signMessageFeature.signMessage({
+          ...signPersonalMessageArgs,
+          account: signerAccount
+        });
+        return { bytes: messageBytes, signature };
       }
-      return await walletFeature.signPersonalMessage({
-        ...signPersonalMessageArgs,
-        account: signerAccount
-      });
+      throw new WalletFeatureNotSupportedError(
+        "This wallet doesn't support the `signPersonalMessage` feature."
+      );
     },
     ...mutationOptions
   });
 }
 
 // src/hooks/wallet/useSignTransactionBlock.ts
-var import_react_query9 = require("@tanstack/react-query");
+var import_react_query10 = require("@tanstack/react-query");
 function useSignTransactionBlock({
   mutationKey,
   ...mutationOptions
 } = {}) {
   const { currentWallet } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
-  return (0, import_react_query9.useMutation)({
+  return (0, import_react_query10.useMutation)({
     mutationKey: walletMutationKeys.signTransactionBlock(mutationKey),
     mutationFn: async (signTransactionBlockArgs) => {
       if (!currentWallet) {