@interchain-kit/react 0.0.1-beta.33 → 0.0.1-beta.36

package/esm/hooks/useAccount.js

@@ -4,7 +4,7 @@ import { useWalletManager } from './useWalletManager';
 export const useAccount = (chainName, walletName) => {
     const walletManager = useWalletManager();
     const wallet = useMemo(() => {
-        return walletManager.wallets.find(w => w.option.name === walletName);
+        return walletManager.wallets.find(w => w.info.name === walletName);
     }, [walletManager, walletName]);
     const [account, setAccount] = useState(null);
     const chain = useMemo(() => {

package/esm/hooks/useChain.js

@@ -3,15 +3,15 @@ import { useAccount } from "./useAccount";
 import { useCurrentWallet } from './useCurrentWallet';
 import { useInterchainClient } from './useInterchainClient';
 import { useWalletModal } from "../modal";
-import { ChainNameNotExist } from "@interchain-kit/core";
+import { ChainNameNotExist, WalletState } from "@interchain-kit/core";
 import { useCallback } from "react";
 export const useChain = (chainName) => {
     const walletManager = useWalletManager();
     const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
     const assetList = walletManager.assetLists.find((a) => a.chainName === chainName);
     const currentWallet = useCurrentWallet();
-    const account = useAccount(chainName, currentWallet?.option?.name);
-    const interchainClient = useInterchainClient(chainName, currentWallet?.option?.name);
+    const account = useAccount(chainName, currentWallet?.info?.name);
+    const interchainClient = useInterchainClient(chainName, currentWallet?.info?.name);
     if (!chainToShow) {
         throw new ChainNameNotExist(chainName);
     }
@@ -20,11 +20,11 @@ export const useChain = (chainName) => {
         return await walletManager.getRpcEndpoint(currentWallet, chainName);
     }, [walletManager, currentWallet, chainName]);
     const disconnect = useCallback(() => {
-        walletManager.disconnect(currentWallet?.option?.name);
+        walletManager.disconnect(currentWallet?.info?.name);
     }, [walletManager, currentWallet]);
     const cosmosKitUserChainReturnType = {
         connect: () => {
-            if (currentWallet) {
+            if (currentWallet?.walletState === WalletState.Connected) {
                 return;
             }
             open();

package/esm/hooks/useChainWallet.js

@@ -1,14 +1,45 @@
 import { useWalletManager } from "./useWalletManager";
 import { useAccount } from "./useAccount";
+import { ChainNotExist, WalletNotExist, WalletState } from "@interchain-kit/core";
 import { useInterchainClient } from "./useInterchainClient";
+import { useCallback } from "react";
 export const useChainWallet = (chainName, walletName) => {
     const walletManager = useWalletManager();
     const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
     const assetList = walletManager.assetLists.find((a) => a.chainName === chainName);
-    const wallet = walletManager.wallets.find((w) => w.option.name === walletName);
+    const wallet = walletManager.wallets.find((w) => w.info.name === walletName);
     const account = useAccount(chainName, walletName);
     const interchainClient = useInterchainClient(chainName, walletName);
+    const connect = useCallback(() => {
+        if (!wallet) {
+            const error = new WalletNotExist(walletName);
+            console.error(error.message);
+            return;
+        }
+        if (!chainToShow) {
+            const error = new ChainNotExist(chainName);
+            console.error(error.message);
+            return;
+        }
+        if (wallet.walletState !== WalletState.Connected) {
+            walletManager.connect(wallet.info.name);
+        }
+    }, [chainName, walletName]);
+    const disconnect = useCallback(() => {
+        if (wallet.walletState === WalletState.Connected) {
+            walletManager.disconnect(wallet.info.name);
+        }
+    }, [chainName, walletName]);
+    const getRpcEndpoint = useCallback(async () => {
+        return walletManager.getRpcEndpoint(wallet, chainName);
+    }, []);
     return {
+        connect,
+        disconnect,
+        getRpcEndpoint,
+        status: wallet?.walletState,
+        username: account?.username,
+        message: wallet?.errorMessage,
         logoUrl: walletManager.getChainLogoUrl(chainName),
         chain: chainToShow,
         assetList,

package/esm/hooks/useInterchainClient.js

@@ -10,7 +10,7 @@ export const useInterchainClient = (chainName, walletName) => {
     const [isLoading, setIsLoading] = useState(false);
     const walletManager = useWalletManager();
     const account = useAccount(chainName, walletName);
-    const wallet = walletManager.wallets.find((w) => w.option.name === walletName);
+    const wallet = walletManager.wallets.find((w) => w.info.name === walletName);
     const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
     const initialize = async () => {
         if (wallet && chainToShow && wallet?.walletState === WalletState.Connected) {

package/esm/hooks/useOfflineSigner.js

@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
 import { useWalletManager } from "./useWalletManager";
 export const useOfflineSigner = (chainName, walletName) => {
     const walletManager = useWalletManager();
-    const wallet = walletManager.wallets.find((w) => w.option.name === walletName);
+    const wallet = walletManager.wallets.find((w) => w.info.name === walletName);
     const [offlineSigner, setOfflineSigner] = useState(null);
     useEffect(() => {
         if (wallet && chainName) {

package/esm/modal/modal.js

@@ -16,7 +16,7 @@ export const WalletModal = () => {
     const gotoWalletList = () => setModalView(defaultModalView);
     useEffect(() => {
         switch (true) {
-            case currentWallet?.option?.mode === "wallet-connect":
+            case currentWallet?.info?.mode === "wallet-connect":
                 setModalView({
                     header: _jsx(QRCodeHeader, { onBack: gotoWalletList }),
                     content: _jsx(QRCodeContent, {}),
@@ -34,7 +34,7 @@ export const WalletModal = () => {
                     content: _jsx(ConnectedContent, {}),
                 });
                 break;
-            case currentWallet?.walletState === WalletState.Reject:
+            case currentWallet?.walletState === WalletState.Rejected:
                 setModalView({
                     header: _jsx(RejectHeader, { onBack: gotoWalletList }),
                     content: _jsx(RejectContent, {}),

package/esm/modal/views/Connected.js

@@ -7,12 +7,12 @@ import { AstronautSvg } from "./Astronaut";
 export const ConnectedHeader = ({ onBack }) => {
     const currentWallet = useCurrentWallet();
     const { close } = useWalletModal();
-    return (_jsx(ConnectModalHead, { title: currentWallet?.option?.prettyName || "", hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
+    return (_jsx(ConnectModalHead, { title: currentWallet?.info?.prettyName || "", hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
 };
 export const ConnectedContent = () => {
     const currentWallet = useCurrentWallet();
     const walletManager = useWalletManager();
-    const account = useAccount(walletManager.chains[0].chainName, currentWallet?.option?.name);
+    const account = useAccount(walletManager.chains[0].chainName, currentWallet?.info?.name);
     const { close } = useWalletModal();
     if (!currentWallet) {
         return null;
@@ -26,7 +26,7 @@ export const ConnectedContent = () => {
                 } })),
             address: account?.address,
         }, onDisconnect: async () => {
-            await walletManager.disconnect(currentWallet?.option?.name);
+            await walletManager.disconnect(currentWallet?.info?.name);
             close();
         } }));
 };

package/esm/modal/views/Connecting.js

@@ -8,16 +8,16 @@ export const ConnectingHeader = ({ onBack }) => {
     const walletManager = useWalletManager();
     if (!currentWallet)
         return null;
-    return (_jsx(ConnectModalHead, { title: currentWallet.option.prettyName, hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: {
+    return (_jsx(ConnectModalHead, { title: currentWallet.info.prettyName, hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: {
             onClick: async () => {
-                await walletManager.disconnect(currentWallet.option.name);
+                await walletManager.disconnect(currentWallet.info.name);
                 close();
             },
         } }));
 };
 export const ConnectingContent = () => {
     const currentWallet = useCurrentWallet();
-    const { option: { prettyName, mode }, } = currentWallet;
+    const { info: { prettyName, mode }, } = currentWallet;
     let title = "Requesting Connection";
     let desc = mode === "wallet-connect"
         ? `Approve ${prettyName} connection request on your mobile.`
@@ -25,9 +25,9 @@ export const ConnectingContent = () => {
     if (!currentWallet)
         return null;
     return (_jsx(ConnectModalStatus, { wallet: {
-            name: currentWallet.option.name,
-            prettyName: currentWallet.option.prettyName,
-            logo: currentWallet.option.logo,
+            name: currentWallet.info.name,
+            prettyName: currentWallet.info.prettyName,
+            logo: currentWallet.info.logo,
             mobileDisabled: true,
         }, status: "Connecting", contentHeader: title, contentDesc: desc }));
 };

package/esm/modal/views/QRCode.js

@@ -6,8 +6,8 @@ export const QRCodeHeader = ({ onBack }) => {
     const currentWallet = useCurrentWallet();
     const walletManager = useWalletManager();
     const { close } = useWalletModal();
-    return (_jsx(ConnectModalHead, { title: currentWallet?.option?.prettyName || "", hasBackButton: true, onClose: () => void 0, onBack: async () => {
-            await walletManager.disconnect(currentWallet?.option?.name || "");
+    return (_jsx(ConnectModalHead, { title: currentWallet?.info?.prettyName || "", hasBackButton: true, onClose: () => void 0, onBack: async () => {
+            await walletManager.disconnect(currentWallet?.info?.name || "");
             onBack();
         }, closeButtonProps: { onClick: close } }));
 };
@@ -15,5 +15,5 @@ export const QRCodeContent = () => {
     const currentWallet = useCurrentWallet();
     const walletManager = useWalletManager();
     const data = currentWallet.pairingUri;
-    return (_jsx(ConnectModalQRCode, { status: data ? "Done" : "Pending", link: data, description: "Open App to connect", errorTitle: "errorTitle", errorDesc: currentWallet.errorMessage || "", onRefresh: () => walletManager.connect(currentWallet?.option?.name || "") }));
+    return (_jsx(ConnectModalQRCode, { status: data ? "Done" : "Pending", link: data, description: "Open App to connect", errorTitle: "errorTitle", errorDesc: currentWallet.errorMessage || "", onRefresh: () => walletManager.connect(currentWallet?.info?.name || "") }));
 };

package/esm/modal/views/Reject.js

@@ -6,11 +6,11 @@ import { getWalletInfo } from "../../utils";
 export const RejectHeader = ({ onBack }) => {
     const { close } = useWalletModal();
     const currentWallet = useCurrentWallet();
-    return (_jsx(ConnectModalHead, { title: currentWallet.option.prettyName, hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
+    return (_jsx(ConnectModalHead, { title: currentWallet.info.prettyName, hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
 };
 export const RejectContent = () => {
     const currentWallet = useCurrentWallet();
     const walletManager = useWalletManager();
     const { close } = useWalletModal();
-    return (_jsx(ConnectModalStatus, { status: "Rejected", wallet: getWalletInfo(currentWallet), contentHeader: "Request Rejected", contentDesc: currentWallet.errorMessage || "Connection permission is denied.", onConnect: () => walletManager.connect(currentWallet.option.name).then(close) }));
+    return (_jsx(ConnectModalStatus, { status: "Rejected", wallet: getWalletInfo(currentWallet), contentHeader: "Request Rejected", contentDesc: currentWallet.errorMessage || "Connection permission is denied.", onConnect: () => walletManager.connect(currentWallet.info.name).then(close) }));
 };

package/esm/modal/views/WalletList.js

@@ -10,23 +10,23 @@ export const WalletListContent = () => {
     const walletManager = useWalletManager();
     const { close } = useWalletModal();
     const wallets = walletManager.wallets.map((w) => {
-        return ({
-            name: w.option.name,
-            prettyName: w.option.prettyName,
-            logo: w.option.logo,
+        return {
+            name: w.info.name,
+            prettyName: w.info.prettyName,
+            logo: w.info.logo,
             mobileDisabled: true,
-            shape: 'list',
-            originalWallet: w
-        });
+            shape: "list",
+            originalWallet: w,
+        };
     });
     const onWalletClick = async (wallet) => {
         try {
-            await walletManager.connect(wallet.option.name);
+            await walletManager.connect(wallet.info.name);
             close();
         }
         catch (error) {
             console.log(error);
         }
     };
-    return _jsx(ConnectModalWalletList, { wallets: wallets, onWalletItemClick: onWalletClick });
+    return (_jsx(ConnectModalWalletList, { wallets: wallets, onWalletItemClick: onWalletClick }));
 };

package/esm/types/index.js

@@ -1 +1,2 @@
 export * from './wallet';
+export * from './sign-client';

package/esm/types/sign-client.js

@@ -0,0 +1 @@
+export {};

package/esm/utils/wallet.js

@@ -1,8 +1,8 @@
 export const getWalletInfo = (wallet) => {
     return {
-        name: wallet.option.name,
-        prettyName: wallet.option.prettyName,
-        logo: wallet.option.logo,
+        name: wallet.info.name,
+        prettyName: wallet.info.prettyName,
+        logo: wallet.info.logo,
         mobileDisabled: true,
     };
 };

package/hooks/useAccount.js

@@ -7,7 +7,7 @@ const useWalletManager_1 = require("./useWalletManager");
 const useAccount = (chainName, walletName) => {
     const walletManager = (0, useWalletManager_1.useWalletManager)();
     const wallet = (0, react_1.useMemo)(() => {
-        return walletManager.wallets.find(w => w.option.name === walletName);
+        return walletManager.wallets.find(w => w.info.name === walletName);
     }, [walletManager, walletName]);
     const [account, setAccount] = (0, react_1.useState)(null);
     const chain = (0, react_1.useMemo)(() => {

package/hooks/useChain.d.ts

@@ -1,2 +1,2 @@
-import { CosmosKitUseChainReturnType, UseChainReturnType } from '../types/chain';
-export declare const useChain: (chainName: string) => UseChainReturnType & CosmosKitUseChainReturnType;
+import { UseChainReturnType } from '../types/chain';
+export declare const useChain: (chainName: string) => UseChainReturnType;

package/hooks/useChain.js

@@ -13,8 +13,8 @@ const useChain = (chainName) => {
     const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
     const assetList = walletManager.assetLists.find((a) => a.chainName === chainName);
     const currentWallet = (0, useCurrentWallet_1.useCurrentWallet)();
-    const account = (0, useAccount_1.useAccount)(chainName, currentWallet?.option?.name);
-    const interchainClient = (0, useInterchainClient_1.useInterchainClient)(chainName, currentWallet?.option?.name);
+    const account = (0, useAccount_1.useAccount)(chainName, currentWallet?.info?.name);
+    const interchainClient = (0, useInterchainClient_1.useInterchainClient)(chainName, currentWallet?.info?.name);
     if (!chainToShow) {
         throw new core_1.ChainNameNotExist(chainName);
     }
@@ -23,11 +23,11 @@ const useChain = (chainName) => {
         return await walletManager.getRpcEndpoint(currentWallet, chainName);
     }, [walletManager, currentWallet, chainName]);
     const disconnect = (0, react_1.useCallback)(() => {
-        walletManager.disconnect(currentWallet?.option?.name);
+        walletManager.disconnect(currentWallet?.info?.name);
     }, [walletManager, currentWallet]);
     const cosmosKitUserChainReturnType = {
         connect: () => {
-            if (currentWallet) {
+            if (currentWallet?.walletState === core_1.WalletState.Connected) {
                 return;
             }
             open();

package/hooks/useChainWallet.d.ts

@@ -1,2 +1,2 @@
-import { UseChainReturnType } from "../types/chain";
-export declare const useChainWallet: (chainName: string, walletName: string) => UseChainReturnType;
+import { UseChainWalletReturnType } from "../types/chain";
+export declare const useChainWallet: (chainName: string, walletName: string) => UseChainWalletReturnType;

package/hooks/useChainWallet.js

@@ -3,15 +3,46 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useChainWallet = void 0;
 const useWalletManager_1 = require("./useWalletManager");
 const useAccount_1 = require("./useAccount");
+const core_1 = require("@interchain-kit/core");
 const useInterchainClient_1 = require("./useInterchainClient");
+const react_1 = require("react");
 const useChainWallet = (chainName, walletName) => {
     const walletManager = (0, useWalletManager_1.useWalletManager)();
     const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
     const assetList = walletManager.assetLists.find((a) => a.chainName === chainName);
-    const wallet = walletManager.wallets.find((w) => w.option.name === walletName);
+    const wallet = walletManager.wallets.find((w) => w.info.name === walletName);
     const account = (0, useAccount_1.useAccount)(chainName, walletName);
     const interchainClient = (0, useInterchainClient_1.useInterchainClient)(chainName, walletName);
+    const connect = (0, react_1.useCallback)(() => {
+        if (!wallet) {
+            const error = new core_1.WalletNotExist(walletName);
+            console.error(error.message);
+            return;
+        }
+        if (!chainToShow) {
+            const error = new core_1.ChainNotExist(chainName);
+            console.error(error.message);
+            return;
+        }
+        if (wallet.walletState !== core_1.WalletState.Connected) {
+            walletManager.connect(wallet.info.name);
+        }
+    }, [chainName, walletName]);
+    const disconnect = (0, react_1.useCallback)(() => {
+        if (wallet.walletState === core_1.WalletState.Connected) {
+            walletManager.disconnect(wallet.info.name);
+        }
+    }, [chainName, walletName]);
+    const getRpcEndpoint = (0, react_1.useCallback)(async () => {
+        return walletManager.getRpcEndpoint(wallet, chainName);
+    }, []);
     return {
+        connect,
+        disconnect,
+        getRpcEndpoint,
+        status: wallet?.walletState,
+        username: account?.username,
+        message: wallet?.errorMessage,
         logoUrl: walletManager.getChainLogoUrl(chainName),
         chain: chainToShow,
         assetList,

package/hooks/useInterchainClient.d.ts

@@ -1,8 +1,2 @@
-import { HttpEndpoint } from '@interchainjs/types';
-import { SigningClient } from '@interchainjs/cosmos/signing-client';
-export declare const useInterchainClient: (chainName: string, walletName: string) => {
-    rpcEndpoint: string | HttpEndpoint;
-    signingClient: SigningClient;
-    error: unknown;
-    isLoading: boolean;
-};
+import { UseInterchainClientReturnType } from '../types/chain';
+export declare const useInterchainClient: (chainName: string, walletName: string) => UseInterchainClientReturnType;

package/hooks/useInterchainClient.js

@@ -13,7 +13,7 @@ const useInterchainClient = (chainName, walletName) => {
     const [isLoading, setIsLoading] = (0, react_1.useState)(false);
     const walletManager = (0, useWalletManager_1.useWalletManager)();
     const account = (0, useAccount_1.useAccount)(chainName, walletName);
-    const wallet = walletManager.wallets.find((w) => w.option.name === walletName);
+    const wallet = walletManager.wallets.find((w) => w.info.name === walletName);
     const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
     const initialize = async () => {
         if (wallet && chainToShow && wallet?.walletState === core_1.WalletState.Connected) {

package/hooks/useOfflineSigner.d.ts

@@ -1,4 +1,4 @@
-import { OfflineSigner } from '@interchainjs/cosmos/types/wallet';
+import { ICosmosGeneralOfflineSigner } from '@interchainjs/cosmos/types/wallet';
 export declare const useOfflineSigner: (chainName: string, walletName: string) => {
-    offlineSigner: OfflineSigner;
+    offlineSigner: ICosmosGeneralOfflineSigner;
 };

package/hooks/useOfflineSigner.js

@@ -5,7 +5,7 @@ const react_1 = require("react");
 const useWalletManager_1 = require("./useWalletManager");
 const useOfflineSigner = (chainName, walletName) => {
     const walletManager = (0, useWalletManager_1.useWalletManager)();
-    const wallet = walletManager.wallets.find((w) => w.option.name === walletName);
+    const wallet = walletManager.wallets.find((w) => w.info.name === walletName);
     const [offlineSigner, setOfflineSigner] = (0, react_1.useState)(null);
     (0, react_1.useEffect)(() => {
         if (wallet && chainName) {

package/modal/modal.js

@@ -19,7 +19,7 @@ const WalletModal = () => {
     const gotoWalletList = () => setModalView(defaultModalView);
     (0, react_2.useEffect)(() => {
         switch (true) {
-            case currentWallet?.option?.mode === "wallet-connect":
+            case currentWallet?.info?.mode === "wallet-connect":
                 setModalView({
                     header: (0, jsx_runtime_1.jsx)(views_1.QRCodeHeader, { onBack: gotoWalletList }),
                     content: (0, jsx_runtime_1.jsx)(views_1.QRCodeContent, {}),
@@ -37,7 +37,7 @@ const WalletModal = () => {
                     content: (0, jsx_runtime_1.jsx)(views_1.ConnectedContent, {}),
                 });
                 break;
-            case currentWallet?.walletState === core_1.WalletState.Reject:
+            case currentWallet?.walletState === core_1.WalletState.Rejected:
                 setModalView({
                     header: (0, jsx_runtime_1.jsx)(views_1.RejectHeader, { onBack: gotoWalletList }),
                     content: (0, jsx_runtime_1.jsx)(views_1.RejectContent, {}),

package/modal/views/Connected.js

@@ -10,13 +10,13 @@ const Astronaut_1 = require("./Astronaut");
 const ConnectedHeader = ({ onBack }) => {
     const currentWallet = (0, hooks_1.useCurrentWallet)();
     const { close } = (0, provider_1.useWalletModal)();
-    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalHead, { title: currentWallet?.option?.prettyName || "", hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
+    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 walletManager = (0, hooks_1.useWalletManager)();
-    const account = (0, hooks_1.useAccount)(walletManager.chains[0].chainName, currentWallet?.option?.name);
+    const account = (0, hooks_1.useAccount)(walletManager.chains[0].chainName, currentWallet?.info?.name);
     const { close } = (0, provider_1.useWalletModal)();
     if (!currentWallet) {
         return null;
@@ -30,7 +30,7 @@ const ConnectedContent = () => {
                 } })),
             address: account?.address,
         }, onDisconnect: async () => {
-            await walletManager.disconnect(currentWallet?.option?.name);
+            await walletManager.disconnect(currentWallet?.info?.name);
             close();
         } }));
 };

package/modal/views/Connecting.js

@@ -11,9 +11,9 @@ const ConnectingHeader = ({ onBack }) => {
     const walletManager = (0, hooks_1.useWalletManager)();
     if (!currentWallet)
         return null;
-    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalHead, { title: currentWallet.option.prettyName, hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: {
+    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalHead, { title: currentWallet.info.prettyName, hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: {
             onClick: async () => {
-                await walletManager.disconnect(currentWallet.option.name);
+                await walletManager.disconnect(currentWallet.info.name);
                 close();
             },
         } }));
@@ -21,7 +21,7 @@ const ConnectingHeader = ({ onBack }) => {
 exports.ConnectingHeader = ConnectingHeader;
 const ConnectingContent = () => {
     const currentWallet = (0, hooks_1.useCurrentWallet)();
-    const { option: { prettyName, mode }, } = currentWallet;
+    const { info: { prettyName, mode }, } = currentWallet;
     let title = "Requesting Connection";
     let desc = mode === "wallet-connect"
         ? `Approve ${prettyName} connection request on your mobile.`
@@ -29,9 +29,9 @@ const ConnectingContent = () => {
     if (!currentWallet)
         return null;
     return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalStatus, { wallet: {
-            name: currentWallet.option.name,
-            prettyName: currentWallet.option.prettyName,
-            logo: currentWallet.option.logo,
+            name: currentWallet.info.name,
+            prettyName: currentWallet.info.prettyName,
+            logo: currentWallet.info.logo,
             mobileDisabled: true,
         }, status: "Connecting", contentHeader: title, contentDesc: desc }));
 };

package/modal/views/QRCode.js

@@ -9,8 +9,8 @@ const QRCodeHeader = ({ onBack }) => {
     const currentWallet = (0, hooks_1.useCurrentWallet)();
     const walletManager = (0, hooks_1.useWalletManager)();
     const { close } = (0, provider_1.useWalletModal)();
-    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalHead, { title: currentWallet?.option?.prettyName || "", hasBackButton: true, onClose: () => void 0, onBack: async () => {
-            await walletManager.disconnect(currentWallet?.option?.name || "");
+    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalHead, { title: currentWallet?.info?.prettyName || "", hasBackButton: true, onClose: () => void 0, onBack: async () => {
+            await walletManager.disconnect(currentWallet?.info?.name || "");
             onBack();
         }, closeButtonProps: { onClick: close } }));
 };
@@ -19,6 +19,6 @@ const QRCodeContent = () => {
     const currentWallet = (0, hooks_1.useCurrentWallet)();
     const walletManager = (0, hooks_1.useWalletManager)();
     const data = currentWallet.pairingUri;
-    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalQRCode, { status: data ? "Done" : "Pending", link: data, description: "Open App to connect", errorTitle: "errorTitle", errorDesc: currentWallet.errorMessage || "", onRefresh: () => walletManager.connect(currentWallet?.option?.name || "") }));
+    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalQRCode, { status: data ? "Done" : "Pending", link: data, description: "Open App to connect", errorTitle: "errorTitle", errorDesc: currentWallet.errorMessage || "", onRefresh: () => walletManager.connect(currentWallet?.info?.name || "") }));
 };
 exports.QRCodeContent = QRCodeContent;

package/modal/views/Reject.js

@@ -9,13 +9,13 @@ const utils_1 = require("../../utils");
 const RejectHeader = ({ onBack }) => {
     const { close } = (0, provider_1.useWalletModal)();
     const currentWallet = (0, hooks_1.useCurrentWallet)();
-    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalHead, { title: currentWallet.option.prettyName, hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
+    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalHead, { title: currentWallet.info.prettyName, hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
 };
 exports.RejectHeader = RejectHeader;
 const RejectContent = () => {
     const currentWallet = (0, hooks_1.useCurrentWallet)();
     const walletManager = (0, hooks_1.useWalletManager)();
     const { close } = (0, provider_1.useWalletModal)();
-    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalStatus, { status: "Rejected", wallet: (0, utils_1.getWalletInfo)(currentWallet), contentHeader: "Request Rejected", contentDesc: currentWallet.errorMessage || "Connection permission is denied.", onConnect: () => walletManager.connect(currentWallet.option.name).then(close) }));
+    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalStatus, { status: "Rejected", wallet: (0, utils_1.getWalletInfo)(currentWallet), contentHeader: "Request Rejected", contentDesc: currentWallet.errorMessage || "Connection permission is denied.", onConnect: () => walletManager.connect(currentWallet.info.name).then(close) }));
 };
 exports.RejectContent = RejectContent;

package/modal/views/WalletList.js

@@ -14,24 +14,24 @@ const WalletListContent = () => {
     const walletManager = (0, hooks_1.useWalletManager)();
     const { close } = (0, provider_1.useWalletModal)();
     const wallets = walletManager.wallets.map((w) => {
-        return ({
-            name: w.option.name,
-            prettyName: w.option.prettyName,
-            logo: w.option.logo,
+        return {
+            name: w.info.name,
+            prettyName: w.info.prettyName,
+            logo: w.info.logo,
             mobileDisabled: true,
-            shape: 'list',
-            originalWallet: w
-        });
+            shape: "list",
+            originalWallet: w,
+        };
     });
     const onWalletClick = async (wallet) => {
         try {
-            await walletManager.connect(wallet.option.name);
+            await walletManager.connect(wallet.info.name);
             close();
         }
         catch (error) {
             console.log(error);
         }
     };
-    return (0, jsx_runtime_1.jsx)(react_1.ConnectModalWalletList, { wallets: wallets, onWalletItemClick: onWalletClick });
+    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalWalletList, { wallets: wallets, onWalletItemClick: onWalletClick }));
 };
 exports.WalletListContent = WalletListContent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.0.1-beta.33",
+  "version": "0.0.1-beta.36",
   "author": "cosmology-tech <developers@cosmology.zone>",
   "description": "interchain-kit wallet connector react package",
   "main": "index.js",
@@ -33,15 +33,15 @@
   "keywords": [],
   "dependencies": {
     "@chain-registry/v2-types": "^0.53.0",
-    "@interchain-kit/core": "0.0.1-beta.33",
+    "@interchain-kit/core": "0.0.1-beta.36",
     "@interchain-ui/react": "1.24.0",
-    "@interchainjs/cosmos-types": "0.0.1-beta.13",
-    "@interchainjs/injective": "0.0.1-beta.18",
+    "@interchainjs/cosmos": "^0.0.1-beta.34",
+    "@interchainjs/cosmos-types": "0.0.1-beta.17",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "interchainjs": "0.0.1-beta.19",
+    "interchainjs": "0.0.1-beta.27",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
-  "gitHead": "98e09a4c98adaec764d6aaab001de745642b4ca8"
+  "gitHead": "a9cc01ebfe784e8ce6166bf7053e0206e0ab6eb6"
 }

package/types/chain.d.ts

@@ -1,7 +1,7 @@
 import { HttpEndpoint } from '@interchainjs/types';
-import { SigningClient } from '@interchainjs/cosmos/signing-client';
 import { Chain, AssetList } from '@chain-registry/v2-types';
 import { BaseWallet, WalletState } from '@interchain-kit/core';
+import { SigningClient } from './sign-client';
 export type CosmosKitUseChainReturnType = {
     connect: () => void;
     disconnect: () => void;
@@ -22,4 +22,11 @@ export type UseChainReturnType = {
     signingClient: SigningClient;
     isLoading: boolean;
     error: unknown;
+} & CosmosKitUseChainReturnType;
+export type UseChainWalletReturnType = Omit<UseChainReturnType, 'openView' | 'closeView'>;
+export type UseInterchainClientReturnType = {
+    rpcEndpoint: string | HttpEndpoint | undefined;
+    signingClient: SigningClient | null;
+    error: string | unknown | null;
+    isLoading: boolean;
 };

package/types/index.d.ts

@@ -1 +1,2 @@
 export * from './wallet';
+export * from './sign-client';

package/types/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./wallet"), exports);
+__exportStar(require("./sign-client"), exports);

package/types/sign-client.d.ts

@@ -0,0 +1,2 @@
+import { WalletManager } from "@interchain-kit/core";
+export type SigningClient = Awaited<ReturnType<WalletManager['getSigningClient']>>;

package/types/sign-client.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/utils/wallet.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWalletInfo = void 0;
 const getWalletInfo = (wallet) => {
     return {
-        name: wallet.option.name,
-        prettyName: wallet.option.prettyName,
-        logo: wallet.option.logo,
+        name: wallet.info.name,
+        prettyName: wallet.info.prettyName,
+        logo: wallet.info.logo,
         mobileDisabled: true,
     };
 };