@iota/dapp-kit 0.5.3 → 0.8.0

package/dist/cjs/index.js

@@ -135,6 +135,7 @@ function useWalletStore(selector) {
 
 // src/hooks/wallet/useConnectWallet.ts
 function useConnectWallet({
+  onConnected,
   mutationKey,
   ...mutationOptions
 } = {}) {
@@ -156,6 +157,7 @@ function useConnectWallet({
           selectedAccount,
           connectResult.supportedIntents
         );
+        onConnected?.({ wallet });
         return { accounts: connectedIotaAccounts };
       } catch (error) {
         setConnectionStatus("disconnected");
@@ -543,11 +545,19 @@ function WalletList({ selectedWalletName, onPlaceholderClick, onSelect }) {
 
 // src/components/connect-modal/ConnectModal.tsx
 var import_jsx_runtime15 = require("react/jsx-runtime");
-function ConnectModal({ trigger, open, defaultOpen, onOpenChange }) {
+function ConnectModal({
+  trigger,
+  open,
+  defaultOpen,
+  onOpenChange,
+  onConnected
+}) {
   const [isModalOpen, setModalOpen] = (0, import_react8.useState)(open ?? defaultOpen);
   const [currentView, setCurrentView] = (0, import_react8.useState)();
   const [selectedWallet, setSelectedWallet] = (0, import_react8.useState)();
-  const { mutate, isError } = useConnectWallet();
+  const { mutate, isError } = useConnectWallet({
+    onConnected
+  });
   const resetSelection = () => {
     setSelectedWallet(void 0);
     setCurrentView(void 0);
@@ -810,27 +820,129 @@ function ChevronIcon(props) {
   ) });
 }
 
-// src/components/AccountDropdownMenu.tsx
+// src/hooks/useGetDefaultIotaName.ts
+var import_client2 = require("@iota/iota-sdk/client");
+var import_react_query4 = require("@tanstack/react-query");
+var import_iota_names_sdk = require("@iota/iota-names-sdk");
+
+// src/hooks/useIotaClient.ts
+var import_react10 = require("react");
+
+// src/components/IotaClientProvider.tsx
+var import_client = require("@iota/iota-sdk/client");
+var import_react9 = require("react");
 var import_jsx_runtime18 = require("react/jsx-runtime");
-function AccountDropdownMenu({ currentAccount, size = "lg" }) {
+var IotaClientContext = (0, import_react9.createContext)(null);
+var DEFAULT_NETWORKS = {
+  localnet: { url: (0, import_client.getNetwork)(import_client.Network.Localnet)?.url }
+};
+var DEFAULT_CREATE_CLIENT = function createClient(_name, config) {
+  if ((0, import_client.isIotaClient)(config)) {
+    return config;
+  }
+  return new import_client.IotaClient(config);
+};
+function IotaClientProvider(props) {
+  const { onNetworkChange, network, children } = props;
+  const networks = props.networks ?? DEFAULT_NETWORKS;
+  const createClient2 = props.createClient ?? DEFAULT_CREATE_CLIENT;
+  const [selectedNetwork, setSelectedNetwork] = (0, import_react9.useState)(
+    props.network ?? props.defaultNetwork ?? Object.keys(networks)[0]
+  );
+  const currentNetwork = props.network ?? selectedNetwork;
+  const client = (0, import_react9.useMemo)(() => {
+    return createClient2(currentNetwork, networks[currentNetwork]);
+  }, [createClient2, currentNetwork, networks]);
+  const ctx = (0, import_react9.useMemo)(() => {
+    return {
+      client,
+      networks,
+      network: currentNetwork,
+      config: networks[currentNetwork] instanceof import_client.IotaClient ? null : networks[currentNetwork],
+      selectNetwork: (newNetwork) => {
+        if (currentNetwork === newNetwork) {
+          return;
+        }
+        if (!network && newNetwork !== selectedNetwork) {
+          setSelectedNetwork(newNetwork);
+        }
+        onNetworkChange?.(newNetwork);
+      }
+    };
+  }, [client, networks, selectedNetwork, currentNetwork, network, onNetworkChange]);
+  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(IotaClientContext.Provider, { value: ctx, children });
+}
+
+// src/hooks/useIotaClient.ts
+function useIotaClientContext() {
+  const iotaClient = (0, import_react10.useContext)(IotaClientContext);
+  if (!iotaClient) {
+    throw new Error(
+      "Could not find IotaClientContext. Ensure that you have set up the IotaClientProvider"
+    );
+  }
+  return iotaClient;
+}
+function useIotaClient() {
+  return useIotaClientContext().client;
+}
+
+// src/hooks/useGetDefaultIotaName.ts
+var import_react11 = require("react");
+var import_graphql = require("@iota/iota-sdk/graphql");
+function useGetDefaultIotaName(address, iotaNamesEnabled) {
+  const iotaContext = useIotaClientContext();
+  const network = (0, import_client2.getNetwork)(iotaContext.network);
+  const iotaNamesClient = (0, import_react11.useMemo)(() => {
+    const iotaGraphQLClient = new import_graphql.IotaGraphQLClient({
+      url: network.graphql
+    });
+    return new import_iota_names_sdk.IotaNamesClient({
+      graphQlClient: iotaGraphQLClient,
+      network: network.id
+    });
+  }, [network.id]);
+  const iotaNamesSupported = !!iotaNamesClient.config;
+  return (0, import_react_query4.useQuery)({
+    queryKey: ["iota-name", "default-name", address],
+    queryFn: async () => {
+      if (!address) return null;
+      const name = await iotaNamesClient?.getDefaultName(address);
+      return name ? (0, import_iota_names_sdk.normalizeIotaName)(name) : name;
+    },
+    enabled: !!iotaNamesClient && !!address && iotaNamesEnabled && iotaNamesSupported,
+    staleTime: 1e3 * 60 * 10
+  });
+}
+
+// src/components/AccountDropdownMenu.tsx
+var import_jsx_runtime19 = require("react/jsx-runtime");
+function AccountDropdownMenu({
+  currentAccount,
+  size = "lg",
+  iotaNamesEnabled
+}) {
   const { mutate: disconnectWallet } = useDisconnectWallet();
   const accounts = useAccounts();
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(DropdownMenu.Root, { modal: false, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(StyleMarker, { children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(DropdownMenu.Trigger, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(Button, { size, className: connectedAccount, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Text, { mono: true, weight: "bold", children: currentAccount.label ?? (0, import_utils.formatAddress)(currentAccount.address) }),
-      /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(ChevronIcon, {})
+  const { data: iotaName } = useGetDefaultIotaName(currentAccount.address, iotaNamesEnabled);
+  const displayAccount = iotaName ?? currentAccount.label ?? (0, import_utils.formatAddress)(currentAccount.address);
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(DropdownMenu.Root, { modal: false, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(StyleMarker, { children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(DropdownMenu.Trigger, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(Button, { size, className: connectedAccount, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(Text, { mono: true, weight: "bold", children: displayAccount }),
+      /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(ChevronIcon, {})
     ] }) }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(DropdownMenu.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(StyleMarker, { className: menuContainer, children: /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(DropdownMenu.Content, { className: menuContent, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: scrollableContent, children: accounts.map((account) => /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(DropdownMenu.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(StyleMarker, { className: menuContainer, children: /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(DropdownMenu.Content, { className: menuContent, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: scrollableContent, children: accounts.map((account) => /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
         AccountDropdownMenuItem,
         {
           account,
-          active: currentAccount.address === account.address
+          active: currentAccount.address === account.address,
+          iotaNamesEnabled
         },
         account.address
       )) }),
-      /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(DropdownMenu.Separator, { className: separator }),
-      /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(DropdownMenu.Separator, { className: separator }),
+      /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
         DropdownMenu.Item,
         {
           className: (0, import_clsx7.default)(menuItem),
@@ -843,85 +955,53 @@ function AccountDropdownMenu({ currentAccount, size = "lg" }) {
 }
 function AccountDropdownMenuItem({
   account,
-  active
+  active,
+  iotaNamesEnabled
 }) {
   const { mutate: switchAccount } = useSwitchAccount();
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(
+  const { data: iotaName } = useGetDefaultIotaName(account.address, iotaNamesEnabled);
+  const displayAccount = iotaName ?? account.label ?? (0, import_utils.formatAddress)(account.address);
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(
     DropdownMenu.Item,
     {
       className: (0, import_clsx7.default)(menuItem, switchAccountMenuItem),
       onSelect: () => switchAccount({ account }),
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Text, { mono: true, children: account.label ?? (0, import_utils.formatAddress)(account.address) }),
-        active ? /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(CheckIcon, {}) : null
+        /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(Text, { mono: true, children: displayAccount }),
+        active ? /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(CheckIcon, {}) : null
       ]
     }
   );
 }
 
 // src/components/ConnectButton.tsx
-var import_jsx_runtime19 = require("react/jsx-runtime");
+var import_jsx_runtime20 = require("react/jsx-runtime");
 function ConnectButton({
   connectText = "Connect Wallet",
   size,
+  iotaNamesEnabled = true,
+  onConnected,
   ...buttonProps
 }) {
   const currentAccount = useCurrentAccount();
-  return currentAccount ? /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(AccountDropdownMenu, { currentAccount, size }) : /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+  return currentAccount ? /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+    AccountDropdownMenu,
+    {
+      currentAccount,
+      size,
+      iotaNamesEnabled
+    }
+  ) : /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
     ConnectModal,
     {
-      trigger: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(StyleMarker, { children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(Button, { ...buttonProps, size, children: connectText }) })
+      onConnected,
+      trigger: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(StyleMarker, { children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Button, { ...buttonProps, size, children: connectText }) })
     }
   );
 }
 
-// src/components/IotaClientProvider.tsx
-var import_client = require("@iota/iota-sdk/client");
-var import_react9 = require("react");
-var import_jsx_runtime20 = require("react/jsx-runtime");
-var IotaClientContext = (0, import_react9.createContext)(null);
-var DEFAULT_NETWORKS = {
-  localnet: { url: (0, import_client.getNetwork)(import_client.Network.Localnet)?.url }
-};
-var DEFAULT_CREATE_CLIENT = function createClient(_name, config) {
-  if ((0, import_client.isIotaClient)(config)) {
-    return config;
-  }
-  return new import_client.IotaClient(config);
-};
-function IotaClientProvider(props) {
-  const { onNetworkChange, network, children } = props;
-  const networks = props.networks ?? DEFAULT_NETWORKS;
-  const createClient2 = props.createClient ?? DEFAULT_CREATE_CLIENT;
-  const [selectedNetwork, setSelectedNetwork] = (0, import_react9.useState)(
-    props.network ?? props.defaultNetwork ?? Object.keys(networks)[0]
-  );
-  const currentNetwork = props.network ?? selectedNetwork;
-  const client = (0, import_react9.useMemo)(() => {
-    return createClient2(currentNetwork, networks[currentNetwork]);
-  }, [createClient2, currentNetwork, networks]);
-  const ctx = (0, import_react9.useMemo)(() => {
-    return {
-      client,
-      networks,
-      network: currentNetwork,
-      config: networks[currentNetwork] instanceof import_client.IotaClient ? null : networks[currentNetwork],
-      selectNetwork: (newNetwork) => {
-        if (currentNetwork === newNetwork) {
-          return;
-        }
-        if (!network && newNetwork !== selectedNetwork) {
-          setSelectedNetwork(newNetwork);
-        }
-        onNetworkChange?.(newNetwork);
-      }
-    };
-  }, [client, networks, selectedNetwork, currentNetwork, network, onNetworkChange]);
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(IotaClientContext.Provider, { value: ctx, children });
-}
-
 // src/components/WalletProvider.tsx
-var import_react15 = require("react");
+var import_react16 = require("react");
 
 // src/utils/stateStorage.ts
 function createInMemoryStore() {
@@ -950,8 +1030,8 @@ var WALLET_CHROME_EXTENSION_ID = "iidjkmdceolghepehaaddojmnjnkkija";
 var WALLET_DOWNLOAD_URL = "https://chromewebstore.google.com/detail/" + WALLET_CHROME_EXTENSION_ID;
 
 // src/hooks/wallet/useAutoConnectWallet.ts
-var import_react_query4 = require("@tanstack/react-query");
-var import_react10 = require("react");
+var import_react_query5 = require("@tanstack/react-query");
+var import_react12 = require("react");
 function useAutoConnectWallet() {
   const { mutateAsync: connectWallet } = useConnectWallet();
   const autoConnectEnabled = useWalletStore((state) => state.autoConnectEnabled);
@@ -961,11 +1041,11 @@ function useAutoConnectWallet() {
   );
   const wallets = useWallets();
   const { isConnected } = useCurrentWallet();
-  const [clientOnly, setClientOnly] = (0, import_react10.useState)(false);
-  (0, import_react10.useLayoutEffect)(() => {
+  const [clientOnly, setClientOnly] = (0, import_react12.useState)(false);
+  (0, import_react12.useLayoutEffect)(() => {
     setClientOnly(true);
   }, []);
-  const { data, isError } = (0, import_react_query4.useQuery)({
+  const { data, isError } = (0, import_react_query5.useQuery)({
     queryKey: [
       "@iota/dapp-kit",
       "autoconnect",
@@ -1029,28 +1109,11 @@ var import_ed25519 = require("@iota/iota-sdk/keypairs/ed25519");
 var import_transactions = require("@iota/iota-sdk/transactions");
 var import_utils2 = require("@iota/iota-sdk/utils");
 var import_wallet_standard3 = require("@iota/wallet-standard");
-var import_react12 = require("react");
-
-// src/hooks/useIotaClient.ts
-var import_react11 = require("react");
-function useIotaClientContext() {
-  const iotaClient = (0, import_react11.useContext)(IotaClientContext);
-  if (!iotaClient) {
-    throw new Error(
-      "Could not find IotaClientContext. Ensure that you have set up the IotaClientProvider"
-    );
-  }
-  return iotaClient;
-}
-function useIotaClient() {
-  return useIotaClientContext().client;
-}
-
-// src/hooks/wallet/useUnsafeBurnerWallet.ts
+var import_react13 = require("react");
 var WALLET_NAME = "Unsafe Burner Wallet";
 function useUnsafeBurnerWallet(enabled) {
   const iotaClient = useIotaClient();
-  (0, import_react12.useEffect)(() => {
+  (0, import_react13.useEffect)(() => {
     if (!enabled) {
       return;
     }
@@ -1177,11 +1240,11 @@ function registerUnsafeBurnerWallet(iotaClient) {
 }
 
 // src/hooks/wallet/useWalletPropertiesChanged.ts
-var import_react13 = require("react");
+var import_react14 = require("react");
 function useWalletPropertiesChanged() {
   const { currentWallet } = useCurrentWallet();
   const updateWalletAccounts = useWalletStore((state) => state.updateWalletAccounts);
-  (0, import_react13.useEffect)(() => {
+  (0, import_react14.useEffect)(() => {
     const unsubscribeFromEvents = currentWallet?.features["standard:events"].on(
       "change",
       ({ accounts }) => {
@@ -1196,11 +1259,11 @@ function useWalletPropertiesChanged() {
 
 // src/hooks/wallet/useWalletsChanged.ts
 var import_wallet_standard4 = require("@iota/wallet-standard");
-var import_react14 = require("react");
+var import_react15 = require("react");
 function useWalletsChanged(preferredWallets, walletFilter) {
   const setWalletRegistered = useWalletStore((state) => state.setWalletRegistered);
   const setWalletUnregistered = useWalletStore((state) => state.setWalletUnregistered);
-  (0, import_react14.useEffect)(() => {
+  (0, import_react15.useEffect)(() => {
     const walletsApi = (0, import_wallet_standard4.getWallets)();
     setWalletRegistered(getRegisteredWallets(preferredWallets, walletFilter));
     const unsubscribeFromRegister = walletsApi.on("register", () => {
@@ -1290,7 +1353,8 @@ function createWalletStore({
   wallets,
   storage,
   storageKey,
-  autoConnectEnabled
+  autoConnectEnabled,
+  chain
 }) {
   return (0, import_zustand2.createStore)()(
     (0, import_middleware.persist)(
@@ -1304,6 +1368,7 @@ function createWalletStore({
         lastConnectedWalletName: null,
         connectionStatus: "disconnected",
         supportedIntents: [],
+        chain,
         setConnectionStatus(connectionStatus2) {
           set(() => ({
             connectionStatus: connectionStatus2
@@ -1489,14 +1554,16 @@ function WalletProvider({
   enableUnsafeBurner = false,
   autoConnect = false,
   theme = lightTheme,
-  children
+  children,
+  chain
 }) {
-  const storeRef = (0, import_react15.useRef)(
+  const storeRef = (0, import_react16.useRef)(
     createWalletStore({
       autoConnectEnabled: autoConnect,
       wallets: getRegisteredWallets(preferredWallets, walletFilter),
       storage: storage || createInMemoryStore(),
-      storageKey
+      storageKey,
+      chain
     })
   );
   return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(WalletContext.Provider, { value: storeRef.current, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(
@@ -1551,14 +1618,14 @@ function createNetworkConfig(networkConfig) {
 }
 
 // src/hooks/useIotaClientInfiniteQuery.ts
-var import_react_query5 = require("@tanstack/react-query");
+var import_react_query6 = require("@tanstack/react-query");
 function useIotaClientInfiniteQuery(method, params, {
   queryKey = [],
   enabled = !!params,
   ...options
 } = {}) {
   const iotaContext = useIotaClientContext();
-  return (0, import_react_query5.useInfiniteQuery)({
+  return (0, import_react_query6.useInfiniteQuery)({
     ...options,
     initialPageParam: null,
     queryKey: [iotaContext.network, method, params, ...queryKey],
@@ -1572,10 +1639,10 @@ function useIotaClientInfiniteQuery(method, params, {
 }
 
 // src/hooks/useIotaClientMutation.ts
-var import_react_query6 = require("@tanstack/react-query");
+var import_react_query7 = require("@tanstack/react-query");
 function useIotaClientMutation(method, options = {}) {
   const iotaContext = useIotaClientContext();
-  return (0, import_react_query6.useMutation)({
+  return (0, import_react_query7.useMutation)({
     ...options,
     mutationFn: async (params) => {
       return await iotaContext.client[method](params);
@@ -1584,8 +1651,8 @@ function useIotaClientMutation(method, options = {}) {
 }
 
 // src/hooks/useIotaClientQuery.ts
-var import_react_query7 = require("@tanstack/react-query");
-var import_react16 = require("react");
+var import_react_query8 = require("@tanstack/react-query");
+var import_react17 = require("react");
 function getIotaClientQuery({
   client,
   network,
@@ -1593,7 +1660,7 @@ function getIotaClientQuery({
   params,
   options
 }) {
-  return (0, import_react_query7.queryOptions)({
+  return (0, import_react_query8.queryOptions)({
     ...options,
     queryKey: [network, method, params],
     queryFn: async () => {
@@ -1604,7 +1671,7 @@ function getIotaClientQuery({
 function useIotaClientQuery(...args) {
   const [method, params, { queryKey = [], ...options } = {}] = args;
   const iotaContext = useIotaClientContext();
-  return (0, import_react_query7.useQuery)({
+  return (0, import_react_query8.useQuery)({
     ...options,
     queryKey: [iotaContext.network, method, params, ...queryKey],
     queryFn: async () => {
@@ -1617,7 +1684,7 @@ function useIotaClientQuery(...args) {
 function useIotaClientSuspenseQuery(...args) {
   const [method, params, options = {}] = args;
   const iotaContext = useIotaClientContext();
-  const query = (0, import_react16.useMemo)(() => {
+  const query = (0, import_react17.useMemo)(() => {
     return getIotaClientQuery({
       client: iotaContext.client,
       network: iotaContext.network,
@@ -1626,17 +1693,17 @@ function useIotaClientSuspenseQuery(...args) {
       options
     });
   }, [iotaContext.network, method, params, options]);
-  return (0, import_react_query7.useSuspenseQuery)(query);
+  return (0, import_react_query8.useSuspenseQuery)(query);
 }
 
 // src/hooks/useIotaClientQueries.ts
-var import_react_query8 = require("@tanstack/react-query");
+var import_react_query9 = require("@tanstack/react-query");
 function useIotaClientQueries({
   queries,
   combine
 }) {
   const iotaContext = useIotaClientContext();
-  return (0, import_react_query8.useQueries)({
+  return (0, import_react_query9.useQueries)({
     combine,
     queries: queries.map((query) => {
       const { method, params, options: { queryKey = [], ...restOptions } = {} } = query;
@@ -1654,18 +1721,18 @@ function useIotaClientQueries({
 // src/hooks/wallet/useSignAndExecuteTransaction.ts
 var import_utils4 = require("@iota/iota-sdk/utils");
 var import_wallet_standard5 = require("@iota/wallet-standard");
-var import_react_query10 = require("@tanstack/react-query");
+var import_react_query11 = require("@tanstack/react-query");
 
 // src/hooks/wallet/useReportTransactionEffects.ts
 var import_utils3 = require("@iota/iota-sdk/utils");
-var import_react_query9 = require("@tanstack/react-query");
+var import_react_query10 = require("@tanstack/react-query");
 function useReportTransactionEffects({
   mutationKey,
   ...mutationOptions
 } = {}) {
   const { currentWallet } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
-  return (0, import_react_query9.useMutation)({
+  return (0, import_react_query10.useMutation)({
     mutationKey: walletMutationKeys.reportTransactionEffects(mutationKey),
     mutationFn: async ({
       effects,
@@ -1693,12 +1760,18 @@ function useReportTransactionEffects({
   });
 }
 
+// src/hooks/wallet/useCurrentChain.ts
+function useCurrentChain() {
+  return useWalletStore((state) => state.chain);
+}
+
 // src/hooks/wallet/useSignAndExecuteTransaction.ts
 function useSignAndExecuteTransaction({
   mutationKey,
   execute,
   ...mutationOptions
 } = {}) {
+  const currentChain = useCurrentChain();
   const { currentWallet, supportedIntents } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
   const client = useIotaClient();
@@ -1719,7 +1792,7 @@ function useSignAndExecuteTransaction({
       signature
     };
   });
-  return (0, import_react_query10.useMutation)({
+  return (0, import_react_query11.useMutation)({
     mutationKey: walletMutationKeys.signAndExecuteTransaction(mutationKey),
     mutationFn: async ({ transaction, ...signTransactionArgs }) => {
       if (!currentWallet) {
@@ -1731,12 +1804,12 @@ function useSignAndExecuteTransaction({
           "No wallet account is selected to sign the transaction with."
         );
       }
-      const chain = signTransactionArgs.chain ?? signerAccount?.chains[0];
       if (!currentWallet.features["iota:signTransaction"]) {
         throw new WalletFeatureNotSupportedError(
           "This wallet doesn't support the `signTransaction` feature."
         );
       }
+      const chain = signTransactionArgs.chain ?? currentChain ?? signerAccount?.chains[0];
       const { signature, bytes } = await (0, import_wallet_standard5.signTransaction)(currentWallet, {
         ...signTransactionArgs,
         transaction: {
@@ -1748,7 +1821,7 @@ function useSignAndExecuteTransaction({
           }
         },
         account: signerAccount,
-        chain: signTransactionArgs.chain ?? signerAccount.chains[0]
+        chain
       });
       const result = await executeTransaction({ bytes, signature });
       let effects;
@@ -1772,14 +1845,14 @@ function useSignAndExecuteTransaction({
 }
 
 // src/hooks/wallet/useSignPersonalMessage.ts
-var import_react_query11 = require("@tanstack/react-query");
+var import_react_query12 = require("@tanstack/react-query");
 function useSignPersonalMessage({
   mutationKey,
   ...mutationOptions
 } = {}) {
   const { currentWallet } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
-  return (0, import_react_query11.useMutation)({
+  return (0, import_react_query12.useMutation)({
     mutationKey: walletMutationKeys.signPersonalMessage(mutationKey),
     mutationFn: async (signPersonalMessageArgs) => {
       if (!currentWallet) {
@@ -1808,7 +1881,7 @@ function useSignPersonalMessage({
 
 // src/hooks/wallet/useSignTransaction.ts
 var import_wallet_standard6 = require("@iota/wallet-standard");
-var import_react_query12 = require("@tanstack/react-query");
+var import_react_query13 = require("@tanstack/react-query");
 function useSignTransaction({
   mutationKey,
   ...mutationOptions
@@ -1817,7 +1890,7 @@ function useSignTransaction({
   const currentAccount = useCurrentAccount();
   const client = useIotaClient();
   const { mutate: reportTransactionEffects } = useReportTransactionEffects();
-  return (0, import_react_query12.useMutation)({
+  return (0, import_react_query13.useMutation)({
     mutationKey: walletMutationKeys.signTransaction(mutationKey),
     mutationFn: async ({ transaction, ...signTransactionArgs }) => {
       if (!currentWallet) {