@mysten/dapp-kit 0.10.1 → 0.10.3

package/dist/esm/index.js

@@ -136,6 +136,25 @@ function getSelectedAccount(connectedAccounts, accountAddress) {
   return connectedAccounts[0];
 }
 
+// src/utils/walletUtils.ts
+import { getWallets, isWalletWithRequiredFeatureSet } from "@mysten/wallet-standard";
+function getRegisteredWallets(preferredWallets, requiredFeatures) {
+  const walletsApi = getWallets();
+  const wallets = walletsApi.get();
+  const suiWallets = wallets.filter(
+    (wallet) => isWalletWithRequiredFeatureSet(wallet, requiredFeatures)
+  );
+  return [
+    // Preferred wallets, in order:
+    ...preferredWallets.map((name) => suiWallets.find((wallet) => wallet.name === name)).filter(Boolean),
+    // Wallets in default order:
+    ...suiWallets.filter((wallet) => !preferredWallets.includes(wallet.name))
+  ];
+}
+function getWalletUniqueIdentifier(wallet) {
+  return wallet?.id ?? wallet?.name;
+}
+
 // src/components/icons/BackIcon.tsx
 import { jsx } from "react/jsx-runtime";
 function BackIcon(props) {
@@ -450,10 +469,10 @@ function WalletList({ selectedWalletName, onPlaceholderClick, onSelect }) {
     {
       name: wallet.name,
       icon: wallet.icon,
-      isSelected: wallet.name === selectedWalletName,
+      isSelected: getWalletUniqueIdentifier(wallet) === selectedWalletName,
       onClick: () => onSelect(wallet)
     },
-    wallet.name
+    getWalletUniqueIdentifier(wallet)
   )) : /* @__PURE__ */ jsx14(
     WalletListItem,
     {
@@ -528,10 +547,10 @@ function ConnectModal({ trigger, open, defaultOpen, onOpenChange }) {
               /* @__PURE__ */ jsx15(
                 WalletList,
                 {
-                  selectedWalletName: selectedWallet?.name,
+                  selectedWalletName: getWalletUniqueIdentifier(selectedWallet),
                   onPlaceholderClick: () => setCurrentView("getting-started"),
                   onSelect: (wallet) => {
-                    if (selectedWallet?.name !== wallet.name) {
+                    if (getWalletUniqueIdentifier(selectedWallet) !== getWalletUniqueIdentifier(wallet)) {
                       setSelectedWallet(wallet);
                       connectWallet(wallet);
                     }
@@ -779,10 +798,11 @@ function useSwitchAccount({
 
 // src/components/AccountDropdownMenu.css.ts
 var connectedAccount = "AccountDropdownMenu_connectedAccount__div2ql0";
-var menuContent = "AccountDropdownMenu_menuContent__div2ql1";
-var menuItem = "AccountDropdownMenu_menuItem__div2ql2";
-var separator = "AccountDropdownMenu_separator__div2ql4";
-var switchAccountMenuItem = "AccountDropdownMenu_switchAccountMenuItem__div2ql3";
+var menuContainer = "AccountDropdownMenu_menuContainer__div2ql1";
+var menuContent = "AccountDropdownMenu_menuContent__div2ql2";
+var menuItem = "AccountDropdownMenu_menuItem__div2ql3";
+var separator = "AccountDropdownMenu_separator__div2ql5";
+var switchAccountMenuItem = "AccountDropdownMenu_switchAccountMenuItem__div2ql4";
 
 // src/components/icons/CheckIcon.tsx
 import { jsx as jsx17 } from "react/jsx-runtime";
@@ -824,7 +844,7 @@ function AccountDropdownMenu({ currentAccount }) {
       /* @__PURE__ */ jsx19(Text, { mono: true, weight: "bold", children: currentAccount.label ?? domain ?? formatAddress(currentAccount.address) }),
       /* @__PURE__ */ jsx19(ChevronIcon, {})
     ] }) }) }),
-    /* @__PURE__ */ jsx19(DropdownMenu.Portal, { children: /* @__PURE__ */ jsx19(StyleMarker, { children: /* @__PURE__ */ jsxs8(DropdownMenu.Content, { className: menuContent, children: [
+    /* @__PURE__ */ jsx19(DropdownMenu.Portal, { children: /* @__PURE__ */ jsx19(StyleMarker, { className: menuContainer, children: /* @__PURE__ */ jsxs8(DropdownMenu.Content, { className: menuContent, children: [
       accounts.map((account) => /* @__PURE__ */ jsx19(
         AccountDropdownMenuItem,
         {
@@ -915,7 +935,9 @@ function useAutoConnectWallet() {
       if (!lastConnectedWalletName || !lastConnectedAccountAddress || isConnected) {
         return "attempted";
       }
-      const wallet = wallets.find((wallet2) => wallet2.name === lastConnectedWalletName);
+      const wallet = wallets.find(
+        (wallet2) => getWalletUniqueIdentifier(wallet2) === lastConnectedWalletName
+      );
       if (wallet) {
         await connectWallet({
           wallet,
@@ -944,6 +966,9 @@ function useAutoConnectWallet() {
   if (!clientOnly) {
     return "idle";
   }
+  if (isConnected) {
+    return "attempted";
+  }
   if (!lastConnectedWalletName) {
     return "attempted";
   }
@@ -952,7 +977,7 @@ function useAutoConnectWallet() {
 
 // src/hooks/wallet/useUnsafeBurnerWallet.ts
 import { Ed25519Keypair } from "@mysten/sui.js/keypairs/ed25519";
-import { getWallets, ReadonlyWalletAccount, SUI_CHAINS } from "@mysten/wallet-standard";
+import { getWallets as getWallets2, ReadonlyWalletAccount, SUI_CHAINS } from "@mysten/wallet-standard";
 import { useEffect } from "react";
 var WALLET_NAME = "Unsafe Burner Wallet";
 function useUnsafeBurnerWallet(enabled) {
@@ -967,7 +992,7 @@ function useUnsafeBurnerWallet(enabled) {
 }
 function registerUnsafeBurnerWallet(suiClient) {
   var _on, _connect, _signPersonalMessage, _signTransactionBlock, _signAndExecuteTransactionBlock;
-  const walletsApi = getWallets();
+  const walletsApi = getWallets2();
   const registeredWallets = walletsApi.get();
   if (registeredWallets.find((wallet) => wallet.name === WALLET_NAME)) {
     console.warn(
@@ -1087,24 +1112,6 @@ function useWalletPropertiesChanged() {
 // src/hooks/wallet/useWalletsChanged.ts
 import { getWallets as getWallets3 } from "@mysten/wallet-standard";
 import { useEffect as useEffect3 } from "react";
-
-// src/utils/walletUtils.ts
-import { getWallets as getWallets2, isWalletWithRequiredFeatureSet } from "@mysten/wallet-standard";
-function getRegisteredWallets(preferredWallets, requiredFeatures) {
-  const walletsApi = getWallets2();
-  const wallets = walletsApi.get();
-  const suiWallets = wallets.filter(
-    (wallet) => isWalletWithRequiredFeatureSet(wallet, requiredFeatures)
-  );
-  return [
-    // Preferred wallets, in order:
-    ...preferredWallets.map((name) => suiWallets.find((wallet) => wallet.name === name)).filter(Boolean),
-    // Wallets in default order:
-    ...suiWallets.filter((wallet) => !preferredWallets.includes(wallet.name))
-  ];
-}
-
-// src/hooks/wallet/useWalletsChanged.ts
 function useWalletsChanged(preferredWallets, requiredFeatures) {
   const setWalletRegistered = useWalletStore((state) => state.setWalletRegistered);
   const setWalletUnregistered = useWalletStore((state) => state.setWalletUnregistered);
@@ -1215,7 +1222,7 @@ function createWalletStore({
             accounts: connectedAccounts,
             currentWallet: wallet,
             currentAccount: selectedAccount,
-            lastConnectedWalletName: wallet.name,
+            lastConnectedWalletName: getWalletUniqueIdentifier(wallet),
             lastConnectedAccountAddress: selectedAccount?.address,
             connectionStatus: "connected"
           }));
@@ -1477,6 +1484,28 @@ function useSuiClientMutation(method, options = {}) {
   });
 }
 
+// src/hooks/useSuiClientQueries.ts
+import { useQueries } from "@tanstack/react-query";
+function useSuiClientQueries({
+  queries,
+  combine
+}) {
+  const suiContext = useSuiClientContext();
+  return useQueries({
+    combine,
+    queries: queries.map((query) => {
+      const { method, params, options: { queryKey = [], ...restOptions } = {} } = query;
+      return {
+        ...restOptions,
+        queryKey: [suiContext.network, method, params, ...queryKey],
+        queryFn: async () => {
+          return await suiContext.client[method](params);
+        }
+      };
+    })
+  });
+}
+
 // src/hooks/wallet/useSignAndExecuteTransactionBlock.ts
 import { useMutation as useMutation5 } from "@tanstack/react-query";
 function useSignAndExecuteTransactionBlock({
@@ -1639,6 +1668,7 @@ export {
   useSuiClientContext,
   useSuiClientInfiniteQuery,
   useSuiClientMutation,
+  useSuiClientQueries,
   useSuiClientQuery,
   useSwitchAccount,
   useWallets