@interchain-kit/react 0.0.1-beta.46 → 0.0.1-beta.47

package/esm/hooks/useChain.js

@@ -15,7 +15,14 @@ export const useChain = (chainName) => {
     const signingClientHook = useInterchainClient(chainName, walletName);
     const { open, close } = useWalletModal();
     const cosmosKitUserChainReturnType = {
-        connect: () => chainAccount.connect(),
+        connect: () => {
+            if (chainAccount?.walletState === WalletState.Connected) {
+                return;
+            }
+            else {
+                open();
+            }
+        },
         disconnect: () => chainAccount.disconnect(),
         openView: open,
         closeView: close,

package/esm/hooks/useChainWallet.js

@@ -2,6 +2,7 @@ import { useWalletManager } from "./useWalletManager";
 import { useAccount } from "./useAccount";
 import { useInterchainClient } from "./useInterchainClient";
 import { useRpcEndpoint } from "./useRpcEndpoint";
+import { WalletState } from "@interchain-kit/core";
 export const useChainWallet = (chainName, walletName) => {
     const walletManager = useWalletManager();
     const walletRepository = walletManager.getWalletRepositoryByName(walletName);
@@ -10,7 +11,12 @@ export const useChainWallet = (chainName, walletName) => {
     const accountHook = useAccount(chainName, walletName);
     const signingClientHook = useInterchainClient(chainName, walletName);
     return {
-        connect: () => chainAccount.connect(),
+        connect: () => {
+            if (!chainAccount && chainAccount.walletState === WalletState.Connected) {
+                return;
+            }
+            chainAccount.connect();
+        },
         disconnect: () => chainAccount.disconnect(),
         getRpcEndpoint: () => chainAccount.getRpcEndpoint(),
         status: chainAccount.walletState,

package/esm/modal/modal.js

@@ -8,6 +8,7 @@ import { ConnectModal } from "@interchain-ui/react";
 export const WalletModal = () => {
     const { modalIsOpen, open, close } = useWalletModal();
     const currentWallet = useCurrentWallet();
+    const currentChainAccount = currentWallet?.getChainAccountByName?.(currentWallet.currentChainName);
     const walletManager = useWalletManager();
     const handleSelectWallet = async (wallet) => {
         const selectedWallet = walletManager.getWalletByName(wallet.info.name);
@@ -55,7 +56,8 @@ export const WalletModal = () => {
     const [modalView, setModalView] = useState(defaultModalView);
     const gotoWalletList = () => setModalView(defaultModalView);
     useEffect(() => {
-        if (modalIsOpen && currentWallet?.walletState === WalletState.Connected) {
+        if (modalIsOpen &&
+            currentChainAccount?.walletState === WalletState.Connected) {
             setModalView({
                 header: _jsx(ConnectedHeader, { onBack: gotoWalletList }),
                 content: _jsx(ConnectedContent, {}),

package/esm/modal/views/Connected.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { ConnectModalHead, ConnectModalStatus } from "@interchain-ui/react";
-import { useAccount, useCurrentWallet, useWalletManager } from "../../hooks";
+import { useAccount, useCurrentWallet } from "../../hooks";
 import { useWalletModal } from "../provider";
 import { getWalletInfo } from "../../utils";
 import { AstronautSvg } from "./Astronaut";
@@ -11,7 +11,7 @@ export const ConnectedHeader = ({ onBack }) => {
 };
 export const ConnectedContent = () => {
     const currentWallet = useCurrentWallet();
-    const walletManager = useWalletManager();
+    const chainAccount = currentWallet?.getChainAccountByName?.(currentWallet.currentChainName);
     const { account } = useAccount(currentWallet.currentChainName, currentWallet?.info?.name);
     const { close } = useWalletModal();
     if (!currentWallet) {
@@ -26,7 +26,7 @@ export const ConnectedContent = () => {
                 } })),
             address: account?.address,
         }, onDisconnect: async () => {
-            await walletManager.disconnect(currentWallet?.info?.name);
+            await chainAccount.disconnect();
             close();
         } }));
 };

package/hooks/useChain.js

@@ -18,7 +18,14 @@ const useChain = (chainName) => {
     const signingClientHook = (0, useInterchainClient_1.useInterchainClient)(chainName, walletName);
     const { open, close } = (0, modal_1.useWalletModal)();
     const cosmosKitUserChainReturnType = {
-        connect: () => chainAccount.connect(),
+        connect: () => {
+            if (chainAccount?.walletState === core_1.WalletState.Connected) {
+                return;
+            }
+            else {
+                open();
+            }
+        },
         disconnect: () => chainAccount.disconnect(),
         openView: open,
         closeView: close,

package/hooks/useChainWallet.js

@@ -5,6 +5,7 @@ const useWalletManager_1 = require("./useWalletManager");
 const useAccount_1 = require("./useAccount");
 const useInterchainClient_1 = require("./useInterchainClient");
 const useRpcEndpoint_1 = require("./useRpcEndpoint");
+const core_1 = require("@interchain-kit/core");
 const useChainWallet = (chainName, walletName) => {
     const walletManager = (0, useWalletManager_1.useWalletManager)();
     const walletRepository = walletManager.getWalletRepositoryByName(walletName);
@@ -13,7 +14,12 @@ const useChainWallet = (chainName, walletName) => {
     const accountHook = (0, useAccount_1.useAccount)(chainName, walletName);
     const signingClientHook = (0, useInterchainClient_1.useInterchainClient)(chainName, walletName);
     return {
-        connect: () => chainAccount.connect(),
+        connect: () => {
+            if (!chainAccount && chainAccount.walletState === core_1.WalletState.Connected) {
+                return;
+            }
+            chainAccount.connect();
+        },
         disconnect: () => chainAccount.disconnect(),
         getRpcEndpoint: () => chainAccount.getRpcEndpoint(),
         status: chainAccount.walletState,

package/modal/modal.js

@@ -11,6 +11,7 @@ const react_2 = require("@interchain-ui/react");
 const WalletModal = () => {
     const { modalIsOpen, open, close } = (0, provider_1.useWalletModal)();
     const currentWallet = (0, hooks_1.useCurrentWallet)();
+    const currentChainAccount = currentWallet?.getChainAccountByName?.(currentWallet.currentChainName);
     const walletManager = (0, hooks_1.useWalletManager)();
     const handleSelectWallet = async (wallet) => {
         const selectedWallet = walletManager.getWalletByName(wallet.info.name);
@@ -58,7 +59,8 @@ const WalletModal = () => {
     const [modalView, setModalView] = (0, react_1.useState)(defaultModalView);
     const gotoWalletList = () => setModalView(defaultModalView);
     (0, react_1.useEffect)(() => {
-        if (modalIsOpen && currentWallet?.walletState === core_1.WalletState.Connected) {
+        if (modalIsOpen &&
+            currentChainAccount?.walletState === core_1.WalletState.Connected) {
             setModalView({
                 header: (0, jsx_runtime_1.jsx)(views_1.ConnectedHeader, { onBack: gotoWalletList }),
                 content: (0, jsx_runtime_1.jsx)(views_1.ConnectedContent, {}),

package/modal/views/Connected.js

@@ -15,7 +15,7 @@ const ConnectedHeader = ({ onBack }) => {
 exports.ConnectedHeader = ConnectedHeader;
 const ConnectedContent = () => {
     const currentWallet = (0, hooks_1.useCurrentWallet)();
-    const walletManager = (0, hooks_1.useWalletManager)();
+    const chainAccount = currentWallet?.getChainAccountByName?.(currentWallet.currentChainName);
     const { account } = (0, hooks_1.useAccount)(currentWallet.currentChainName, currentWallet?.info?.name);
     const { close } = (0, provider_1.useWalletModal)();
     if (!currentWallet) {
@@ -30,7 +30,7 @@ const ConnectedContent = () => {
                 } })),
             address: account?.address,
         }, onDisconnect: async () => {
-            await walletManager.disconnect(currentWallet?.info?.name);
+            await chainAccount.disconnect();
             close();
         } }));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.0.1-beta.46",
+  "version": "0.0.1-beta.47",
   "author": "cosmology-tech <developers@cosmology.zone>",
   "description": "interchain-kit wallet connector react package",
   "main": "index.js",
@@ -33,7 +33,7 @@
   "keywords": [],
   "dependencies": {
     "@chain-registry/v2-types": "^0.53.40",
-    "@interchain-kit/core": "0.0.1-beta.46",
+    "@interchain-kit/core": "0.0.1-beta.47",
     "@interchain-ui/react": "1.26.1",
     "@interchainjs/cosmos": "1.6.3",
     "@interchainjs/cosmos-types": "1.6.3",
@@ -48,5 +48,5 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
-  "gitHead": "c3d891660283751114a218e8abcbc278700442bd"
+  "gitHead": "ecd10d66d0c74955a26c75659d998f31663fcb93"
 }