@interchain-kit/react 0.3.23 → 0.3.25

package/hooks/useChain.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useChain = void 0;
-const modal_1 = require("../modal");
 const useWalletManager_1 = require("./useWalletManager");
 const core_1 = require("@interchain-kit/core");
 const useSigningClient_1 = require("./useSigningClient");
+const useWalletModal_1 = require("./useWalletModal");
 const useChain = (chainName) => {
-    const { assetLists, currentWalletName, disconnect, setCurrentChainName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount } = (0, useWalletManager_1.useWalletManager)();
+    const { assetLists, currentWalletName, disconnect, setCurrentChainName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount, getStatefulWalletByName } = (0, useWalletManager_1.useWalletManager)();
     const chain = getChainByName(chainName);
     if (!chain) {
         throw new core_1.ChainNameNotExist(chainName);
     }
     const assetList = assetLists.find(a => a.chainName === chainName);
-    const wallet = getWalletByName(currentWalletName);
+    const wallet = getStatefulWalletByName(currentWalletName);
     const chainWalletStateToShow = getChainWalletState(currentWalletName, chainName);
-    const { open, close } = (0, modal_1.useWalletModal)();
+    const { open, close } = (0, useWalletModal_1.useWalletModal)();
     const { signingClient, isLoading: isSigningClientLoading, error: signingClientError } = (0, useSigningClient_1.useSigningClient)(chainName, currentWalletName);
     return {
         //for migration cosmos kit

package/hooks/useChainWallet.js

@@ -4,9 +4,9 @@ exports.useChainWallet = void 0;
 const useWalletManager_1 = require("./useWalletManager");
 const useSigningClient_1 = require("./useSigningClient");
 const useChainWallet = (chainName, walletName) => {
-    const { assetLists, disconnect, setCurrentChainName, setCurrentWalletName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount } = (0, useWalletManager_1.useWalletManager)();
+    const { assetLists, disconnect, setCurrentChainName, setCurrentWalletName, getChainByName, getWalletByName, getChainWalletState, getChainLogoUrl, connect, getSigningClient, getRpcEndpoint, getAccount, getStatefulWalletByName } = (0, useWalletManager_1.useWalletManager)();
     const chain = getChainByName(chainName);
-    const wallet = getWalletByName(walletName);
+    const wallet = getStatefulWalletByName(walletName);
     const assetList = assetLists.find(a => a.chainName === chainName);
     const chainWalletStateToShow = getChainWalletState(walletName, chainName);
     const { signingClient, isLoading: isSigningClientLoading, error: signingClientError } = (0, useSigningClient_1.useSigningClient)(chainName, walletName);

package/hooks/useWalletModal.d.ts

@@ -0,0 +1,5 @@
+export declare const useWalletModal: () => {
+    modalIsOpen: boolean;
+    open: () => void;
+    close: () => void;
+};

package/hooks/useWalletModal.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useWalletModal = void 0;
+const useWalletManager_1 = require("./useWalletManager");
+const useWalletModal = () => {
+    const { modalIsOpen, openModal, closeModal } = (0, useWalletManager_1.useWalletManager)();
+    return {
+        modalIsOpen, open: openModal, close: closeModal
+    };
+};
+exports.useWalletModal = useWalletModal;

package/modal/index.d.ts

@@ -1,2 +1 @@
 export * from './modal';
-export * from './provider';

package/modal/index.js

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

package/modal/modal.d.ts

@@ -1,13 +1,15 @@
-import { BaseWallet, DownloadInfo } from "@interchain-kit/core";
+import { ReactElement } from "react";
+import { DownloadInfo } from "@interchain-kit/core";
 import { Wallet as InterchainUIWalletType } from "@interchain-ui/react";
-export type WalletModalProps = {
+import { StatefulWallet } from "../store/stateful-wallet";
+export type InterchainWalletModalProps = {
     shouldShowList: boolean;
     isOpen: boolean;
     walletConnectQRCodeUri: string | null;
     wallets: InterchainUIWalletType[];
     username: string;
     address: string;
-    currentWallet?: BaseWallet;
+    currentWallet?: StatefulWallet;
     isConnecting: boolean;
     isConnected: boolean;
     isRejected: boolean;
@@ -17,7 +19,7 @@ export type WalletModalProps = {
     open: () => void;
     close: () => void;
     disconnect: () => void;
-    onSelectWallet: (wallet: BaseWallet) => void;
+    onSelectWallet: (wallet: StatefulWallet) => void;
     onBack: () => void;
     onReconnect: () => void;
     getDownloadLink: (walletName: string) => DownloadInfo;
@@ -27,4 +29,15 @@ export type WalletModalProps = {
         os?: string;
     };
 };
-export declare const WalletModal: ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets, username, address, currentWallet, isConnecting, isConnected, isRejected, isDisconnected, isNotExist, errorMessage, open, close, disconnect, onSelectWallet, onBack, onReconnect, getDownloadLink, getEnv, }: WalletModalProps) => import("react/jsx-runtime").JSX.Element;
+export type WalletModalProps = {
+    isOpen: boolean;
+    wallets: StatefulWallet[];
+    currentWallet?: StatefulWallet;
+    open: () => void;
+    close: () => void;
+};
+export declare const InterchainWalletModal: () => import("react/jsx-runtime").JSX.Element;
+export declare const WalletModal: ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets, username, address, currentWallet, isConnecting, isConnected, isRejected, isDisconnected, isNotExist, errorMessage, open, close, disconnect, onSelectWallet, onBack, onReconnect, getDownloadLink, getEnv, }: InterchainWalletModalProps) => import("react/jsx-runtime").JSX.Element;
+export declare const ModalRenderer: ({ walletModal: ProvidedWalletModal, }: {
+    walletModal: (props: WalletModalProps) => ReactElement;
+}) => import("react/jsx-runtime").JSX.Element;

package/modal/modal.js

@@ -1,18 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WalletModal = void 0;
+exports.ModalRenderer = exports.WalletModal = exports.InterchainWalletModal = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const views_1 = require("./views");
 const react_1 = require("react");
+const core_1 = require("@interchain-kit/core");
 const react_2 = require("@interchain-ui/react");
+const hooks_1 = require("../hooks");
+const utils_1 = require("../utils");
+const InterchainWalletModal = () => {
+    const [shouldShowList, setShouldShowList] = (0, react_1.useState)(false);
+    const { modalIsOpen: isOpen, walletConnectQRCodeUri, wallets: statefulWallets, getChainWalletState, currentWalletName, currentChainName, openModal: open, closeModal: close, chains, setCurrentWalletName, getDownloadLink, getEnv, } = (0, hooks_1.useWalletManager)();
+    const walletsForUI = statefulWallets.map((w) => (0, utils_1.transferToWalletUISchema)(w));
+    const chainNameToConnect = currentChainName || chains[0].chainName;
+    const chainToConnect = chains.find((chain) => chain.chainName === chainNameToConnect);
+    const currentWallet = statefulWallets.find((w) => w.info.name === currentWalletName);
+    const { account, errorMessage } = getChainWalletState(currentWalletName, currentChainName) ||
+        {};
+    const disconnect = () => {
+        currentWallet.disconnect(chainToConnect.chainId);
+    };
+    const onSelectWallet = (wallet) => {
+        setShouldShowList(false);
+        return wallet.connect(chainToConnect.chainId);
+    };
+    const onBack = () => setShouldShowList(true);
+    const handleCloseModal = () => {
+        close();
+        setShouldShowList(false);
+    };
+    const onReconnect = () => {
+        currentWallet.connect(chainToConnect.chainId);
+    };
+    return ((0, jsx_runtime_1.jsx)(exports.WalletModal, { shouldShowList: shouldShowList, username: account?.username, address: account?.address, disconnect: disconnect, isOpen: isOpen, open: open, close: handleCloseModal, wallets: walletsForUI, walletConnectQRCodeUri: walletConnectQRCodeUri, currentWallet: currentWallet, isConnecting: currentWallet?.walletState === core_1.WalletState.Connecting, isConnected: currentWallet?.walletState === core_1.WalletState.Connected, isRejected: currentWallet?.walletState === core_1.WalletState.Rejected, isDisconnected: currentWallet?.walletState === core_1.WalletState.Disconnected, isNotExist: currentWallet?.walletState === core_1.WalletState.NotExist, errorMessage: errorMessage, onSelectWallet: (w) => onSelectWallet(w), onBack: () => setShouldShowList(true), onReconnect: () => onSelectWallet(currentWallet), getDownloadLink: () => getDownloadLink(currentWallet?.info.name), getEnv: getEnv }));
+};
+exports.InterchainWalletModal = InterchainWalletModal;
 const WalletModal = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets, username, address, currentWallet, isConnecting, isConnected, isRejected, isDisconnected, isNotExist, errorMessage, open, close, disconnect, onSelectWallet, onBack, onReconnect, getDownloadLink, getEnv, }) => {
     const { header, content } = (0, react_1.useMemo)(() => {
-        if (shouldShowList || isDisconnected) {
+        if (shouldShowList ||
+            (isDisconnected && currentWallet.errorMessage === "")) {
             return {
                 header: (0, jsx_runtime_1.jsx)(views_1.WalletListHeader, { close: close }),
                 content: ((0, jsx_runtime_1.jsx)(views_1.WalletListContent, { onSelectWallet: onSelectWallet, wallets: wallets })),
             };
         }
+        if (currentWallet && currentWallet.errorMessage) {
+            return {
+                header: ((0, jsx_runtime_1.jsx)(views_1.ErrorHeader, { wallet: currentWallet, close: close, onBack: onBack })),
+                content: (0, jsx_runtime_1.jsx)(views_1.ErrorContent, { wallet: currentWallet, onBack: onBack }),
+            };
+        }
         if (currentWallet &&
             walletConnectQRCodeUri &&
             currentWallet.info.name === "WalletConnect") {
@@ -61,3 +98,12 @@ const WalletModal = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets,
     return ((0, jsx_runtime_1.jsx)(react_2.ConnectModal, { isOpen: isOpen, header: header, onOpen: open, onClose: close, children: content }));
 };
 exports.WalletModal = WalletModal;
+const ModalRenderer = ({ walletModal: ProvidedWalletModal, }) => {
+    if (!ProvidedWalletModal) {
+        throw new Error(`InterchainWalletProvider: walletModal is required. Please provide a wallet modal component. or use InterchainkitWalletModal/n
+      Example: <ChainProvider chains={chains} assetLists={assetLists} wallets={wallets} walletModal={InterchainKitWalletModal} />`);
+    }
+    const { modalIsOpen, openModal, closeModal, wallets, currentWalletName } = (0, hooks_1.useWalletManager)();
+    return ((0, jsx_runtime_1.jsx)(ProvidedWalletModal, { wallets: wallets, isOpen: modalIsOpen, open: openModal, close: closeModal, currentWallet: wallets.find((w) => w.info.name === currentWalletName) }));
+};
+exports.ModalRenderer = ModalRenderer;

package/modal/provider.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useWalletModal = exports.WalletModalProvider = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
-const modal_1 = require("./modal");
 const core_1 = require("@interchain-kit/core");
 const hooks_1 = require("../hooks");
 const utils_1 = require("../utils");
+const modal_1 = require("./modal");
 const WalletModalContext = (0, react_1.createContext)(null);
 const WalletModalProvider = ({ children, }) => {
     const [modalIsOpen, setModalIsOpen] = (0, react_1.useState)(false);
@@ -30,7 +30,7 @@ const WalletModalProvider = ({ children, }) => {
         setCurrentWalletName(walletName);
         await connect(walletName, chainToConnect);
     };
-    return ((0, jsx_runtime_1.jsxs)(WalletModalContext.Provider, { value: { modalIsOpen, open, close }, children: [children, (0, jsx_runtime_1.jsx)(modal_1.WalletModal, { shouldShowList: shouldShowList, username: username, address: address, disconnect: disconnect, isOpen: modalIsOpen, open: open, close: handleCloseModal, wallets: walletsForUI, walletConnectQRCodeUri: walletConnectQRCodeUri, currentWallet: wallet, isConnecting: status === core_1.WalletState.Connecting, isConnected: status === core_1.WalletState.Connected, isRejected: status === core_1.WalletState.Rejected, isDisconnected: status === core_1.WalletState.Disconnected, isNotExist: status === core_1.WalletState.NotExist, errorMessage: message, onSelectWallet: (w) => handleConnectWallet(w.info.name), onBack: () => setShouldShowList(true), onReconnect: () => handleConnectWallet(currentWalletName), getDownloadLink: () => getDownloadLink(wallet?.info.name), getEnv: getEnv })] }));
+    return ((0, jsx_runtime_1.jsxs)(WalletModalContext.Provider, { value: { modalIsOpen, open, close }, children: [children, (0, jsx_runtime_1.jsx)(modal_1.InterchainWalletModal, { shouldShowList: shouldShowList, username: username, address: address, disconnect: disconnect, isOpen: modalIsOpen, open: open, close: handleCloseModal, wallets: walletsForUI, walletConnectQRCodeUri: walletConnectQRCodeUri, currentWallet: wallet, isConnecting: status === core_1.WalletState.Connecting, isConnected: status === core_1.WalletState.Connected, isRejected: status === core_1.WalletState.Rejected, isDisconnected: status === core_1.WalletState.Disconnected, isNotExist: status === core_1.WalletState.NotExist, errorMessage: message, onSelectWallet: (w) => handleConnectWallet(w.info.name), onBack: () => setShouldShowList(true), onReconnect: () => handleConnectWallet(currentWalletName), getDownloadLink: () => getDownloadLink(wallet?.info.name), getEnv: getEnv })] }));
 };
 exports.WalletModalProvider = WalletModalProvider;
 const useWalletModal = () => {

package/modal/views/Error.d.ts

@@ -0,0 +1,10 @@
+import { StatefulWallet } from "../../store/stateful-wallet";
+export declare const ErrorHeader: ({ wallet, close, onBack, }: {
+    wallet: StatefulWallet;
+    close: () => void;
+    onBack: () => void;
+}) => import("react/jsx-runtime").JSX.Element;
+export declare const ErrorContent: ({ wallet, onBack, }: {
+    wallet: StatefulWallet;
+    onBack: () => void;
+}) => import("react/jsx-runtime").JSX.Element;

package/modal/views/Error.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ErrorContent = exports.ErrorHeader = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("@interchain-ui/react");
+const utils_1 = require("../../utils");
+const ErrorHeader = ({ wallet, close, onBack, }) => {
+    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalHead, { title: wallet.info.prettyName, hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
+};
+exports.ErrorHeader = ErrorHeader;
+const ErrorContent = ({ wallet, onBack, }) => {
+    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalStatus, { status: "Error", wallet: (0, utils_1.getWalletInfo)(wallet), contentHeader: "Oops! Something wrong...", contentDesc: wallet.errorMessage, onChangeWallet: onBack }));
+};
+exports.ErrorContent = ErrorContent;

package/modal/views/index.d.ts

@@ -4,3 +4,4 @@ export * from './Connected';
 export * from './Reject';
 export * from './QRCode';
 export * from './NotExist';
+export * from './Error';

package/modal/views/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./Connected"), exports);
 __exportStar(require("./Reject"), exports);
 __exportStar(require("./QRCode"), exports);
 __exportStar(require("./NotExist"), exports);
+__exportStar(require("./Error"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.3.23",
+  "version": "0.3.25",
   "author": "Hyperweb <developers@hyperweb.io>",
   "description": "interchain-kit wallet connector react package",
   "main": "index.js",
@@ -34,7 +34,7 @@
   "keywords": [],
   "dependencies": {
     "@chain-registry/v2-types": "^0.53.40",
-    "@interchain-kit/core": "^0.3.23",
+    "@interchain-kit/core": "^0.3.25",
     "@interchain-ui/react": "1.26.1",
     "@interchainjs/cosmos": "1.11.9",
     "@interchainjs/cosmos-types": "1.11.9",
@@ -64,5 +64,5 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
-  "gitHead": "35337e4470a0594ba644d31be8e24c8e295296f6"
+  "gitHead": "ab25db53b8cbf93397ee7ae7a1c5a72c08120afd"
 }

package/provider.d.ts

@@ -1,6 +1,7 @@
-import React from "react";
+import React, { ReactElement } from "react";
 import { BaseWallet, SignerOptions, EndpointOptions } from "@interchain-kit/core";
 import { AssetList, Chain } from "@chain-registry/v2-types";
+import { WalletModalProps } from "./modal";
 import { InterchainStore } from "./store";
 import { StoreApi } from "zustand";
 type InterchainWalletContextType = StoreApi<InterchainStore>;
@@ -11,7 +12,8 @@ type InterchainWalletProviderProps = {
     signerOptions?: SignerOptions;
     endpointOptions?: EndpointOptions;
     children: React.ReactNode;
+    walletModal: (props: WalletModalProps) => ReactElement;
 };
-export declare const ChainProvider: ({ chains, assetLists, wallets, signerOptions, endpointOptions, children, }: InterchainWalletProviderProps) => import("react/jsx-runtime").JSX.Element;
+export declare const ChainProvider: ({ chains, assetLists, wallets, signerOptions, endpointOptions, children, walletModal: ProviderWalletModal, }: InterchainWalletProviderProps) => import("react/jsx-runtime").JSX.Element;
 export declare const useInterchainWalletContext: () => InterchainWalletContextType;
 export {};

package/provider.js

@@ -8,7 +8,7 @@ const core_1 = require("@interchain-kit/core");
 const modal_1 = require("./modal");
 const store_1 = require("./store");
 const InterchainWalletContext = (0, react_2.createContext)(null);
-const ChainProvider = ({ chains, assetLists, wallets, signerOptions, endpointOptions, children, }) => {
+const ChainProvider = ({ chains, assetLists, wallets, signerOptions, endpointOptions, children, walletModal: ProviderWalletModal, }) => {
     // const [_, forceRender] = useState({});
     const walletManager = new core_1.WalletManager(chains, assetLists, wallets, signerOptions, endpointOptions);
     const store = (0, react_1.useRef)((0, store_1.createInterchainStore)(walletManager));
@@ -16,7 +16,7 @@ const ChainProvider = ({ chains, assetLists, wallets, signerOptions, endpointOpt
         // walletManager.init();
         store.current.getState().init();
     }, []);
-    return ((0, jsx_runtime_1.jsx)(InterchainWalletContext.Provider, { value: store.current, children: (0, jsx_runtime_1.jsx)(modal_1.WalletModalProvider, { children: children }) }));
+    return ((0, jsx_runtime_1.jsxs)(InterchainWalletContext.Provider, { value: store.current, children: [children, (0, jsx_runtime_1.jsx)(modal_1.ModalRenderer, { walletModal: ProviderWalletModal })] }));
 };
 exports.ChainProvider = ChainProvider;
 const useInterchainWalletContext = () => {

package/store/stateful-wallet.d.ts

@@ -0,0 +1,21 @@
+import { BaseWallet, WalletAccount } from "@interchain-kit/core";
+import { InterchainStore } from "./store";
+import { Chain } from "@chain-registry/v2-types";
+export declare class StatefulWallet extends BaseWallet {
+    originalWallet: BaseWallet;
+    walletName: string;
+    walletSet: (arg: (draft: StatefulWallet) => void) => void;
+    walletGet: () => StatefulWallet;
+    set: (arg: (draft: InterchainStore) => void) => void;
+    get: () => InterchainStore;
+    constructor(wallet: BaseWallet, walletSet: (arg: (draft: StatefulWallet) => void) => void, walletGet: () => StatefulWallet, set: (arg: (draft: InterchainStore) => void) => void, get: () => InterchainStore);
+    getChainToConnect(chainId?: Chain["chainId"]): Chain;
+    init(): Promise<void>;
+    connect(chainId: Chain["chainId"]): Promise<void>;
+    disconnect(chainId: Chain["chainId"]): Promise<void>;
+    getAccount(chainId: Chain["chainId"]): Promise<WalletAccount>;
+    getOfflineSigner(chainId: Chain['chainId']): Promise<import("@interchainjs/types").IGenericOfflineSigner<unknown, unknown, unknown, import("@interchainjs/types").IGenericOfflineSignArgs<unknown, unknown>, import("@interchainjs/types").AccountData>>;
+    addSuggestChain(chainId: Chain["chainId"]): Promise<void>;
+    getProvider(chainId?: Chain["chainId"]): Promise<any>;
+    getChainById(chainId: Chain["chainId"]): Chain;
+}

package/store/stateful-wallet.js

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StatefulWallet = void 0;
+const core_1 = require("@interchain-kit/core");
+class StatefulWallet extends core_1.BaseWallet {
+    originalWallet;
+    walletName;
+    walletSet;
+    walletGet;
+    set;
+    get;
+    constructor(wallet, walletSet, walletGet, set, get) {
+        super(wallet.info);
+        this.originalWallet = wallet;
+        this.walletName = wallet.info.name;
+        this.walletState = core_1.WalletState.Disconnected;
+        this.errorMessage = "";
+        this.walletSet = walletSet;
+        this.walletGet = walletGet;
+        this.set = set;
+        this.get = get;
+    }
+    getChainToConnect(chainId) {
+        const { currentChainName, chains } = this.get();
+        const lastChainName = currentChainName;
+        const lastChain = chains.find((chain) => chain.chainName === lastChainName);
+        return chainId ? this.originalWallet.getChainById(chainId) : lastChain;
+    }
+    async init() {
+        return this.originalWallet.init();
+    }
+    async connect(chainId) {
+        const { get, set, walletName, walletGet, walletSet, originalWallet } = this;
+        const chainToConnect = this.getChainToConnect(chainId);
+        const state = get().getChainWalletState(walletName, chainToConnect.chainName)?.walletState;
+        if (state === core_1.WalletState.NotExist) {
+            return;
+        }
+        if (walletName === 'WalletConnect' && state === core_1.WalletState.Connected) {
+            return;
+        }
+        set(draft => {
+            draft.currentChainName = chainToConnect.chainName;
+            draft.currentWalletName = walletName;
+            draft.walletConnectQRCodeUri = '';
+        });
+        walletSet(draft => {
+            draft.walletState = core_1.WalletState.Connecting;
+        });
+        get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Connecting, errorMessage: '' });
+        try {
+            if (originalWallet instanceof core_1.WCWallet) {
+                originalWallet.setOnPairingUriCreatedCallback((uri) => {
+                    set(draft => {
+                        draft.walletConnectQRCodeUri = uri;
+                    });
+                });
+            }
+            await originalWallet.connect(chainToConnect.chainId);
+            get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Connected });
+            walletSet(draft => {
+                draft.walletState = core_1.WalletState.Connected;
+            });
+            await walletGet().getAccount(chainToConnect.chainId);
+        }
+        catch (error) {
+            if (error.message === 'Request rejected') {
+                get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Rejected, errorMessage: error.message });
+                walletSet(draft => {
+                    draft.walletState = core_1.WalletState.Rejected;
+                    draft.errorMessage = error.message;
+                });
+                return;
+            }
+            get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Disconnected, errorMessage: error.message });
+            walletSet(draft => {
+                draft.walletState = core_1.WalletState.Disconnected;
+                draft.errorMessage = error.message;
+            });
+        }
+    }
+    async disconnect(chainId) {
+        const { get, walletName, walletSet, originalWallet } = this;
+        const chainToConnect = this.getChainToConnect(chainId);
+        try {
+            await originalWallet.disconnect(chainToConnect.chainId);
+            get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Disconnected, account: null });
+            walletSet(draft => {
+                draft.walletState = core_1.WalletState.Disconnected;
+                draft.errorMessage = "";
+            });
+        }
+        catch (error) {
+        }
+    }
+    async getAccount(chainId) {
+        const chainToConnect = this.getChainToConnect(chainId);
+        const { get, walletName, originalWallet } = this;
+        try {
+            const account = await originalWallet.getAccount(chainToConnect.chainId);
+            get().updateChainWalletState(walletName, chainToConnect.chainName, { account });
+            return account;
+        }
+        catch (error) {
+            console.log(error);
+        }
+    }
+    getOfflineSigner(chainId) {
+        return this.originalWallet.getOfflineSigner(chainId);
+    }
+    addSuggestChain(chainId) {
+        return this.originalWallet.addSuggestChain(chainId);
+    }
+    getProvider(chainId) {
+        return this.originalWallet.getProvider(chainId);
+    }
+    getChainById(chainId) {
+        return this.originalWallet.getChainById(chainId);
+    }
+}
+exports.StatefulWallet = StatefulWallet;

package/store/store.d.ts

@@ -1,6 +1,7 @@
 import { AssetList, Chain } from "@chain-registry/v2-types";
-import { BaseWallet, EndpointOptions, SignerOptions, WalletAccount, WalletManager, WalletState } from "@interchain-kit/core";
+import { EndpointOptions, SignerOptions, WalletAccount, WalletManager, WalletState } from "@interchain-kit/core";
 import { HttpEndpoint } from '@interchainjs/types';
+import { StatefulWallet } from './stateful-wallet';
 export type ChainWalletState = {
     chainName: string;
     walletName: string;
@@ -14,19 +15,23 @@ export interface InterchainStore extends WalletManager {
     currentWalletName: string;
     currentChainName: string;
     walletConnectQRCodeUri: string;
+    isReady: boolean;
+    wallets: StatefulWallet[];
+    modalIsOpen: boolean;
+    openModal: () => void;
+    closeModal: () => void;
     setCurrentChainName: (chainName: string) => void;
     setCurrentWalletName: (walletName: string) => void;
     getDraftChainWalletState: (state: InterchainStore, walletName: string, chainName: string) => ChainWalletState;
     getChainWalletState: (walletName: string, chainName: string) => ChainWalletState | undefined;
     updateChainWalletState: (walletName: string, chainName: string, data: Partial<ChainWalletState>) => void;
-    updateWalletState: (walletName: string, data: Partial<ChainWalletState>) => void;
-    isReady: boolean;
     createStatefulWallet: () => void;
+    getStatefulWalletByName: (walletName: string) => StatefulWallet | undefined;
 }
 export type InterchainStoreData = {
     chains: Chain[];
     assetLists: AssetList[];
-    wallets: BaseWallet[];
+    wallets: StatefulWallet[];
     signerOptions: SignerOptions;
     endpointOptions: EndpointOptions;
 };