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

package/esm/hooks/useAccount.js

@@ -5,11 +5,11 @@ export const useAccount = (chainName, walletName) => {
     const walletManager = useWalletManager();
     const chainAccount = walletManager.getWalletRepositoryByName(walletName)?.getChainAccountByName(chainName);
     useEffect(() => {
-        if (chainAccount?.walletState === WalletState.Connected) {
+        if (chainAccount?.walletState === WalletState.Connected && chainName && walletName) {
             chainAccount.getAccount();
         }
     }, [chainName, walletName, chainAccount?.walletState]);
-    if (chainAccount?.walletState === WalletState.Connected) {
+    if (chainAccount?.walletState === WalletState.Connected && chainName && walletName) {
         return {
             account: chainAccount?.account,
             isLoading: chainAccount.getAccountState().loading,

package/esm/hooks/useChain.js

@@ -1,15 +1,14 @@
 import { useWalletManager } from "./useWalletManager";
 import { useAccount } from "./useAccount";
-import { useCurrentWallet } from './useCurrentWallet';
 import { useInterchainClient } from './useInterchainClient';
 import { useWalletModal } from "../modal";
 import { useRpcEndpoint } from "./useRpcEndpoint";
 import { WalletState } from "@interchain-kit/core";
+import { useCurrentChainWallet } from "./useCurrentChainWallet";
 export const useChain = (chainName) => {
     const walletManager = useWalletManager();
-    const currentWallet = useCurrentWallet();
-    const chainAccount = currentWallet?.getChainAccountByName?.(chainName);
-    const walletName = currentWallet?.info?.name;
+    const chainAccount = useCurrentChainWallet();
+    const walletName = chainAccount?.info?.name;
     const rpcEndpointHook = useRpcEndpoint(chainName, walletName);
     const accountHook = useAccount(chainName, walletName);
     const signingClientHook = useInterchainClient(chainName, walletName);
@@ -19,25 +18,30 @@ export const useChain = (chainName) => {
             if (chainAccount?.walletState === WalletState.Connected) {
                 return;
             }
-            else {
-                open();
-            }
+            walletManager.currentChainName = chainName;
+            open();
+        },
+        disconnect: () => {
+            walletManager.currentChainName = chainName;
+            chainAccount ?? chainAccount.disconnect();
+        },
+        openView: () => {
+            walletManager.currentChainName = chainName;
+            open();
         },
-        disconnect: () => chainAccount.disconnect(),
-        openView: open,
         closeView: close,
         getRpcEndpoint: () => chainAccount.getRpcEndpoint(),
-        status: currentWallet?.walletState,
+        status: chainAccount?.walletState,
         username: accountHook.account?.username,
-        message: currentWallet?.errorMessage
+        message: chainAccount?.errorMessage
     };
-    if (currentWallet && chainAccount?.walletState === WalletState.Connected) {
+    if (chainAccount && chainAccount?.walletState === WalletState.Connected) {
         return {
             logoUrl: walletManager.getChainLogoUrl(chainName),
             chain: chainAccount?.chain,
             assetList: chainAccount?.assetList,
             address: accountHook.account?.address,
-            wallet: currentWallet,
+            wallet: chainAccount,
             rpcEndpoint: rpcEndpointHook.rpcEndpoint,
             ...cosmosKitUserChainReturnType, //for migration cosmos kit
             signingClient: signingClientHook.signingClient,
@@ -56,7 +60,7 @@ export const useChain = (chainName) => {
         chain: chainAccount?.chain,
         assetList: chainAccount?.assetList,
         address: accountHook.account?.address,
-        wallet: currentWallet,
+        wallet: chainAccount,
         rpcEndpoint: rpcEndpointHook.rpcEndpoint,
         ...cosmosKitUserChainReturnType, //for migration cosmos kit
         signingClient: signingClientHook.signingClient,

package/esm/hooks/useCurrentChainWallet.js

@@ -0,0 +1,11 @@
+import { bindAllMethodsToContext } from "../utils/helpers";
+import { useWalletManager } from "./useWalletManager";
+export const useCurrentChainWallet = () => {
+    const walletManager = useWalletManager();
+    const { currentChainName, currentWalletName } = walletManager;
+    const chainWallet = walletManager.getWalletRepositoryByName(currentWalletName)?.getChainAccountByName(currentChainName);
+    if (chainWallet) {
+        return bindAllMethodsToContext(chainWallet);
+    }
+    return {};
+};

package/esm/hooks/useCurrentWallet.js

@@ -9,7 +9,8 @@ export const useCurrentWallet = () => {
     //     open()
     //   }
     // }, [walletManager.currentWalletName, walletManager.state])
-    const wallet = walletManager.getCurrentWallet();
+    const { currentWalletName, currentChainName, getWalletRepositoryByName } = walletManager;
+    const wallet = getWalletRepositoryByName(currentWalletName);
     if (wallet) {
         return bindAllMethodsToContext(wallet);
     }

package/esm/modal/modal.js

@@ -1,46 +1,50 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { ConnectedContent, ConnectedHeader, ConnectingContent, ConnectingHeader, NotExistContent, NotExistHeader, QRCodeContent, QRCodeHeader, RejectContent, RejectHeader, WalletListContent, WalletListHeader, } from "./views";
 import { useWalletModal } from "./provider";
-import { useCurrentWallet, useWalletManager } from "../hooks";
+import { useWalletManager } from "../hooks";
 import { useEffect, useMemo, useState } from "react";
 import { WalletState, } from "@interchain-kit/core";
 import { ConnectModal } from "@interchain-ui/react";
+import { useCurrentChainWallet } from "../hooks/useCurrentChainWallet";
 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);
+        walletManager.currentWalletName = wallet.info.name;
+        const currentWallet = walletManager
+            .getWalletRepositoryByName(wallet.info.name)
+            .getChainAccountByName(walletManager.currentChainName);
         setModalView({
             header: _jsx(ConnectingHeader, { wallet: wallet, onBack: gotoWalletList }),
             content: _jsx(ConnectingContent, { wallet: wallet }),
         });
-        if (selectedWallet.info.mode === "extension" &&
-            !selectedWallet.isExtensionInstalled) {
+        if (currentWallet.wallet.info.mode === "extension" &&
+            !currentWallet.wallet.isExtensionInstalled) {
             setModalView({
-                header: (_jsx(NotExistHeader, { wallet: selectedWallet, onBack: gotoWalletList })),
-                content: _jsx(NotExistContent, { wallet: selectedWallet }),
+                header: (_jsx(NotExistHeader, { wallet: currentWallet, onBack: gotoWalletList })),
+                content: _jsx(NotExistContent, { wallet: currentWallet }),
             });
             return;
         }
         try {
-            if (selectedWallet.info.mode === "wallet-connect") {
-                selectedWallet.setOnPairingUriCreatedCallback(() => {
+            if (currentWallet.wallet.info.mode === "wallet-connect") {
+                currentWallet.wallet.setOnPairingUriCreatedCallback(() => {
                     setModalView({
                         header: _jsx(QRCodeHeader, { onBack: gotoWalletList }),
                         content: _jsx(QRCodeContent, {}),
                     });
                 });
-                selectedWallet.setPairingToConnect(wallet.pairing);
+                currentWallet.wallet.setPairingToConnect(wallet.pairing);
             }
-            await walletManager.connect(selectedWallet?.info?.name);
+            await currentWallet.connect();
+            await currentWallet.getAccount();
             setModalView({
                 header: _jsx(ConnectedHeader, { onBack: gotoWalletList }),
                 content: _jsx(ConnectedContent, {}),
             });
         }
         catch (error) {
+            console.log(error);
             setModalView({
                 header: _jsx(RejectHeader, { wallet: wallet, onBack: gotoWalletList }),
                 content: _jsx(RejectContent, { wallet: wallet }),
@@ -55,9 +59,9 @@ export const WalletModal = () => {
     }, []);
     const [modalView, setModalView] = useState(defaultModalView);
     const gotoWalletList = () => setModalView(defaultModalView);
+    const currentWallet = useCurrentChainWallet();
     useEffect(() => {
-        if (modalIsOpen &&
-            currentChainAccount?.walletState === WalletState.Connected) {
+        if (modalIsOpen && currentWallet?.walletState === WalletState.Connected) {
             setModalView({
                 header: _jsx(ConnectedHeader, { onBack: gotoWalletList }),
                 content: _jsx(ConnectedContent, {}),

package/esm/modal/views/Connected.js

@@ -1,18 +1,19 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { ConnectModalHead, ConnectModalStatus } from "@interchain-ui/react";
-import { useAccount, useCurrentWallet } from "../../hooks";
+import { useAccount, useWalletManager } from "../../hooks";
 import { useWalletModal } from "../provider";
 import { getWalletInfo } from "../../utils";
 import { AstronautSvg } from "./Astronaut";
+import { useCurrentChainWallet } from "../../hooks/useCurrentChainWallet";
 export const ConnectedHeader = ({ onBack }) => {
-    const currentWallet = useCurrentWallet();
+    const currentWallet = useCurrentChainWallet();
     const { close } = useWalletModal();
     return (_jsx(ConnectModalHead, { title: currentWallet?.info?.prettyName || "", hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
 };
 export const ConnectedContent = () => {
-    const currentWallet = useCurrentWallet();
-    const chainAccount = currentWallet?.getChainAccountByName?.(currentWallet.currentChainName);
-    const { account } = useAccount(currentWallet.currentChainName, currentWallet?.info?.name);
+    const currentWallet = useCurrentChainWallet();
+    const walletManager = useWalletManager();
+    const { account } = useAccount(walletManager.currentChainName, currentWallet?.info?.name);
     const { close } = useWalletModal();
     if (!currentWallet) {
         return null;
@@ -26,7 +27,7 @@ export const ConnectedContent = () => {
                 } })),
             address: account?.address,
         }, onDisconnect: async () => {
-            await chainAccount.disconnect();
+            await currentWallet.disconnect();
             close();
         } }));
 };

package/hooks/useAccount.js

@@ -8,11 +8,11 @@ const useAccount = (chainName, walletName) => {
     const walletManager = (0, useWalletManager_1.useWalletManager)();
     const chainAccount = walletManager.getWalletRepositoryByName(walletName)?.getChainAccountByName(chainName);
     (0, react_1.useEffect)(() => {
-        if (chainAccount?.walletState === core_1.WalletState.Connected) {
+        if (chainAccount?.walletState === core_1.WalletState.Connected && chainName && walletName) {
             chainAccount.getAccount();
         }
     }, [chainName, walletName, chainAccount?.walletState]);
-    if (chainAccount?.walletState === core_1.WalletState.Connected) {
+    if (chainAccount?.walletState === core_1.WalletState.Connected && chainName && walletName) {
         return {
             account: chainAccount?.account,
             isLoading: chainAccount.getAccountState().loading,

package/hooks/useChain.js

@@ -3,16 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useChain = void 0;
 const useWalletManager_1 = require("./useWalletManager");
 const useAccount_1 = require("./useAccount");
-const useCurrentWallet_1 = require("./useCurrentWallet");
 const useInterchainClient_1 = require("./useInterchainClient");
 const modal_1 = require("../modal");
 const useRpcEndpoint_1 = require("./useRpcEndpoint");
 const core_1 = require("@interchain-kit/core");
+const useCurrentChainWallet_1 = require("./useCurrentChainWallet");
 const useChain = (chainName) => {
     const walletManager = (0, useWalletManager_1.useWalletManager)();
-    const currentWallet = (0, useCurrentWallet_1.useCurrentWallet)();
-    const chainAccount = currentWallet?.getChainAccountByName?.(chainName);
-    const walletName = currentWallet?.info?.name;
+    const chainAccount = (0, useCurrentChainWallet_1.useCurrentChainWallet)();
+    const walletName = chainAccount?.info?.name;
     const rpcEndpointHook = (0, useRpcEndpoint_1.useRpcEndpoint)(chainName, walletName);
     const accountHook = (0, useAccount_1.useAccount)(chainName, walletName);
     const signingClientHook = (0, useInterchainClient_1.useInterchainClient)(chainName, walletName);
@@ -22,25 +21,30 @@ const useChain = (chainName) => {
             if (chainAccount?.walletState === core_1.WalletState.Connected) {
                 return;
             }
-            else {
-                open();
-            }
+            walletManager.currentChainName = chainName;
+            open();
+        },
+        disconnect: () => {
+            walletManager.currentChainName = chainName;
+            chainAccount ?? chainAccount.disconnect();
+        },
+        openView: () => {
+            walletManager.currentChainName = chainName;
+            open();
         },
-        disconnect: () => chainAccount.disconnect(),
-        openView: open,
         closeView: close,
         getRpcEndpoint: () => chainAccount.getRpcEndpoint(),
-        status: currentWallet?.walletState,
+        status: chainAccount?.walletState,
         username: accountHook.account?.username,
-        message: currentWallet?.errorMessage
+        message: chainAccount?.errorMessage
     };
-    if (currentWallet && chainAccount?.walletState === core_1.WalletState.Connected) {
+    if (chainAccount && chainAccount?.walletState === core_1.WalletState.Connected) {
         return {
             logoUrl: walletManager.getChainLogoUrl(chainName),
             chain: chainAccount?.chain,
             assetList: chainAccount?.assetList,
             address: accountHook.account?.address,
-            wallet: currentWallet,
+            wallet: chainAccount,
             rpcEndpoint: rpcEndpointHook.rpcEndpoint,
             ...cosmosKitUserChainReturnType, //for migration cosmos kit
             signingClient: signingClientHook.signingClient,
@@ -59,7 +63,7 @@ const useChain = (chainName) => {
         chain: chainAccount?.chain,
         assetList: chainAccount?.assetList,
         address: accountHook.account?.address,
-        wallet: currentWallet,
+        wallet: chainAccount,
         rpcEndpoint: rpcEndpointHook.rpcEndpoint,
         ...cosmosKitUserChainReturnType, //for migration cosmos kit
         signingClient: signingClientHook.signingClient,

package/hooks/useCurrentChainWallet.d.ts

@@ -0,0 +1,2 @@
+import { ChainAccount } from "@interchain-kit/core/chain-account";
+export declare const useCurrentChainWallet: () => ChainAccount;

package/hooks/useCurrentChainWallet.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useCurrentChainWallet = void 0;
+const helpers_1 = require("../utils/helpers");
+const useWalletManager_1 = require("./useWalletManager");
+const useCurrentChainWallet = () => {
+    const walletManager = (0, useWalletManager_1.useWalletManager)();
+    const { currentChainName, currentWalletName } = walletManager;
+    const chainWallet = walletManager.getWalletRepositoryByName(currentWalletName)?.getChainAccountByName(currentChainName);
+    if (chainWallet) {
+        return (0, helpers_1.bindAllMethodsToContext)(chainWallet);
+    }
+    return {};
+};
+exports.useCurrentChainWallet = useCurrentChainWallet;

package/hooks/useCurrentWallet.d.ts

@@ -1,2 +1,2 @@
-import { WalletRepository } from '@interchain-kit/core/wallet-repository';
+import { WalletRepository } from "@interchain-kit/core/wallet-repository";
 export declare const useCurrentWallet: () => WalletRepository;

package/hooks/useCurrentWallet.js

@@ -12,7 +12,8 @@ const useCurrentWallet = () => {
     //     open()
     //   }
     // }, [walletManager.currentWalletName, walletManager.state])
-    const wallet = walletManager.getCurrentWallet();
+    const { currentWalletName, currentChainName, getWalletRepositoryByName } = walletManager;
+    const wallet = getWalletRepositoryByName(currentWalletName);
     if (wallet) {
         return (0, helpers_1.bindAllMethodsToContext)(wallet);
     }

package/modal/modal.js

@@ -8,42 +8,46 @@ const hooks_1 = require("../hooks");
 const react_1 = require("react");
 const core_1 = require("@interchain-kit/core");
 const react_2 = require("@interchain-ui/react");
+const useCurrentChainWallet_1 = require("../hooks/useCurrentChainWallet");
 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);
+        walletManager.currentWalletName = wallet.info.name;
+        const currentWallet = walletManager
+            .getWalletRepositoryByName(wallet.info.name)
+            .getChainAccountByName(walletManager.currentChainName);
         setModalView({
             header: (0, jsx_runtime_1.jsx)(views_1.ConnectingHeader, { wallet: wallet, onBack: gotoWalletList }),
             content: (0, jsx_runtime_1.jsx)(views_1.ConnectingContent, { wallet: wallet }),
         });
-        if (selectedWallet.info.mode === "extension" &&
-            !selectedWallet.isExtensionInstalled) {
+        if (currentWallet.wallet.info.mode === "extension" &&
+            !currentWallet.wallet.isExtensionInstalled) {
             setModalView({
-                header: ((0, jsx_runtime_1.jsx)(views_1.NotExistHeader, { wallet: selectedWallet, onBack: gotoWalletList })),
-                content: (0, jsx_runtime_1.jsx)(views_1.NotExistContent, { wallet: selectedWallet }),
+                header: ((0, jsx_runtime_1.jsx)(views_1.NotExistHeader, { wallet: currentWallet, onBack: gotoWalletList })),
+                content: (0, jsx_runtime_1.jsx)(views_1.NotExistContent, { wallet: currentWallet }),
             });
             return;
         }
         try {
-            if (selectedWallet.info.mode === "wallet-connect") {
-                selectedWallet.setOnPairingUriCreatedCallback(() => {
+            if (currentWallet.wallet.info.mode === "wallet-connect") {
+                currentWallet.wallet.setOnPairingUriCreatedCallback(() => {
                     setModalView({
                         header: (0, jsx_runtime_1.jsx)(views_1.QRCodeHeader, { onBack: gotoWalletList }),
                         content: (0, jsx_runtime_1.jsx)(views_1.QRCodeContent, {}),
                     });
                 });
-                selectedWallet.setPairingToConnect(wallet.pairing);
+                currentWallet.wallet.setPairingToConnect(wallet.pairing);
             }
-            await walletManager.connect(selectedWallet?.info?.name);
+            await currentWallet.connect();
+            await currentWallet.getAccount();
             setModalView({
                 header: (0, jsx_runtime_1.jsx)(views_1.ConnectedHeader, { onBack: gotoWalletList }),
                 content: (0, jsx_runtime_1.jsx)(views_1.ConnectedContent, {}),
             });
         }
         catch (error) {
+            console.log(error);
             setModalView({
                 header: (0, jsx_runtime_1.jsx)(views_1.RejectHeader, { wallet: wallet, onBack: gotoWalletList }),
                 content: (0, jsx_runtime_1.jsx)(views_1.RejectContent, { wallet: wallet }),
@@ -58,9 +62,9 @@ const WalletModal = () => {
     }, []);
     const [modalView, setModalView] = (0, react_1.useState)(defaultModalView);
     const gotoWalletList = () => setModalView(defaultModalView);
+    const currentWallet = (0, useCurrentChainWallet_1.useCurrentChainWallet)();
     (0, react_1.useEffect)(() => {
-        if (modalIsOpen &&
-            currentChainAccount?.walletState === core_1.WalletState.Connected) {
+        if (modalIsOpen && currentWallet?.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

@@ -7,16 +7,17 @@ const hooks_1 = require("../../hooks");
 const provider_1 = require("../provider");
 const utils_1 = require("../../utils");
 const Astronaut_1 = require("./Astronaut");
+const useCurrentChainWallet_1 = require("../../hooks/useCurrentChainWallet");
 const ConnectedHeader = ({ onBack }) => {
-    const currentWallet = (0, hooks_1.useCurrentWallet)();
+    const currentWallet = (0, useCurrentChainWallet_1.useCurrentChainWallet)();
     const { close } = (0, provider_1.useWalletModal)();
     return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalHead, { title: currentWallet?.info?.prettyName || "", hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
 };
 exports.ConnectedHeader = ConnectedHeader;
 const ConnectedContent = () => {
-    const currentWallet = (0, hooks_1.useCurrentWallet)();
-    const chainAccount = currentWallet?.getChainAccountByName?.(currentWallet.currentChainName);
-    const { account } = (0, hooks_1.useAccount)(currentWallet.currentChainName, currentWallet?.info?.name);
+    const currentWallet = (0, useCurrentChainWallet_1.useCurrentChainWallet)();
+    const walletManager = (0, hooks_1.useWalletManager)();
+    const { account } = (0, hooks_1.useAccount)(walletManager.currentChainName, currentWallet?.info?.name);
     const { close } = (0, provider_1.useWalletModal)();
     if (!currentWallet) {
         return null;
@@ -30,7 +31,7 @@ const ConnectedContent = () => {
                 } })),
             address: account?.address,
         }, onDisconnect: async () => {
-            await chainAccount.disconnect();
+            await currentWallet.disconnect();
             close();
         } }));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.0.1-beta.47",
+  "version": "0.0.1-beta.48",
   "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.47",
+    "@interchain-kit/core": "0.0.1-beta.48",
     "@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": "ecd10d66d0c74955a26c75659d998f31663fcb93"
+  "gitHead": "b78c7ffdf4e93298add4400bbc85148996ae5545"
 }