@interchain-kit/react 0.0.1-beta.58 → 0.0.1-beta.60

package/esm/hooks/useChainWallet.js

@@ -24,7 +24,7 @@ export const useChainWallet = (chainName, walletName) => {
         chain,
         assetList,
         address: chainWalletStateToShow?.account?.address,
-        wallet: new ChainWallet(wallet, () => connect(walletName, chainName), () => disconnect(walletName, chainName), () => getAccount(currentWalletName, chainName)),
+        wallet: new ChainWallet(wallet, () => connect(walletName, chainName), () => disconnect(walletName, chainName), () => getAccount(walletName, chainName)),
         rpcEndpoint: chainWalletStateToShow?.rpcEndpoint,
         getSigningClient: () => getSigningClient(walletName, chainName),
     };

package/esm/modal/modal.js

@@ -2,71 +2,94 @@ 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 { useChainWallet, useWalletManager } from "../hooks";
-import { useEffect, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { WalletState } from "@interchain-kit/core";
 import { ConnectModal } from "@interchain-ui/react";
-export const WalletModal = () => {
+const WalletModal = () => {
+    const { currentWalletName, currentChainName, wallets, connect, getAccount, setCurrentWalletName, } = useWalletManager();
     const { modalIsOpen, open, close } = useWalletModal();
-    const { currentWalletName, currentChainName, wallets, setCurrentWalletName, connect, getAccount, getWalletByName, } = useWalletManager();
-    const handleSelectWallet = async (selectedWallet) => {
-        const walletToView = wallets.find((w) => w.info.name === selectedWallet.info.name);
-        setCurrentWalletName(selectedWallet.info.name);
-        setModalView({
-            header: (_jsx(ConnectingHeader, { wallet: walletToView, onBack: gotoWalletList })),
-            content: _jsx(ConnectingContent, { wallet: walletToView }),
-        });
-        if (walletToView?.info.mode === "extension" &&
-            !walletToView.isExtensionInstalled) {
-            setModalView({
-                header: (_jsx(NotExistHeader, { wallet: walletToView, onBack: gotoWalletList })),
-                content: _jsx(NotExistContent, { wallet: walletToView }),
-            });
-            return;
-        }
-        try {
-            if (walletToView?.info.mode === "wallet-connect") {
-                walletToView.setOnPairingUriCreatedCallback(() => {
-                    setModalView({
-                        header: _jsx(QRCodeHeader, { onBack: gotoWalletList }),
-                        content: _jsx(QRCodeContent, {}),
-                    });
-                });
-                walletToView.setPairingToConnect(wallet.pairing);
-            }
-            console.log({ currentChainName });
-            await connect(selectedWallet.info.name, currentChainName);
-            await getAccount(selectedWallet.info.name, currentChainName);
-            setModalView({
-                header: (_jsx(ConnectedHeader, { wallet: walletToView, onBack: gotoWalletList })),
-                content: _jsx(ConnectedContent, {}),
-            });
-        }
-        catch (error) {
-            console.log(error);
-            setModalView({
-                header: _jsx(RejectHeader, { wallet: walletToView, onBack: gotoWalletList }),
-                content: _jsx(RejectContent, { wallet: walletToView }),
-            });
-        }
+    const [modalType, setModalType] = useState("wallet-list");
+    const [selectedWallet, setSelectedWallet] = useState(null);
+    const { chain, status, wallet } = useChainWallet(currentChainName, currentWalletName);
+    const handleConnect = async () => {
+        return connect(selectedWallet?.info?.name, chain.chainName)
+            .then(() => getAccount(selectedWallet?.info?.name, chain.chainName))
+            .then(() => setSelectedWallet(null))
+            .catch(() => { });
     };
-    const defaultModalView = {
-        header: _jsx(WalletListHeader, {}),
-        content: _jsx(WalletListContent, { onSelectWallet: handleSelectWallet }),
+    useEffect(() => {
+        if (selectedWallet && currentWalletName && currentChainName) {
+            handleConnect();
+        }
+    }, [selectedWallet]);
+    const handleSelectWallet = async (selectedWallet) => {
+        setSelectedWallet(selectedWallet);
+        setCurrentWalletName(selectedWallet?.info?.name);
     };
-    const [modalView, setModalView] = useState(defaultModalView);
-    const gotoWalletList = () => setModalView(defaultModalView);
-    const { status } = useChainWallet(currentChainName, currentWalletName);
     useEffect(() => {
-        const currentWallet = getWalletByName(currentWalletName);
-        if (modalIsOpen && status === WalletState.Connected) {
-            setModalView({
-                header: (_jsx(ConnectedHeader, { wallet: currentWallet, onBack: gotoWalletList })),
-                content: _jsx(ConnectedContent, {}),
-            });
+        if (!selectedWallet) {
+            setModalType("wallet-list");
+        }
+        if (currentWalletName && currentChainName) {
+            if (status === WalletState.Connecting) {
+                setModalType("connecting");
+            }
+            if (status === WalletState.Connected) {
+                setModalType("connected");
+            }
+            if (status === WalletState.Rejected) {
+                setModalType("reject");
+            }
+            if (status === WalletState.Disconnected) {
+                setModalType("wallet-list");
+            }
         }
-        else {
-            setModalView(defaultModalView);
+    }, [
+        currentWalletName,
+        currentChainName,
+        status,
+        modalIsOpen,
+        selectedWallet,
+    ]);
+    const goBackList = () => setModalType("wallet-list");
+    const { header, content } = useMemo(() => {
+        switch (modalType) {
+            case "wallet-list":
+                return {
+                    header: _jsx(WalletListHeader, {}),
+                    content: _jsx(WalletListContent, { onSelectWallet: handleSelectWallet }),
+                };
+            case "connecting":
+                return {
+                    header: _jsx(ConnectingHeader, { wallet: wallet, onBack: goBackList }),
+                    content: _jsx(ConnectingContent, { wallet: wallet }),
+                };
+            case "connected":
+                return {
+                    header: _jsx(ConnectedHeader, { wallet: wallet, onBack: goBackList }),
+                    content: _jsx(ConnectedContent, { afterDisconnect: goBackList }),
+                };
+            case "reject":
+                return {
+                    header: _jsx(RejectHeader, { wallet: wallet, onBack: goBackList }),
+                    content: (_jsx(RejectContent, { wallet: wallet, onReconnect: () => {
+                            setModalType("connecting");
+                            wallet.connect(chain.chainId);
+                            wallet.getAccount(chain.chainId);
+                        } })),
+                };
+            case "not-exist":
+                return {
+                    header: _jsx(NotExistHeader, { wallet: wallet, onBack: goBackList }),
+                    content: _jsx(NotExistContent, { wallet: wallet }),
+                };
+            case "qr-code":
+                return {
+                    header: _jsx(QRCodeHeader, { onBack: goBackList }),
+                    content: _jsx(QRCodeContent, {}),
+                };
         }
-    }, [modalIsOpen, status]);
-    return (_jsx(ConnectModal, { isOpen: modalIsOpen, header: modalView.header, onOpen: open, onClose: close, children: modalView.content }));
+    }, [modalType]);
+    return (_jsx(ConnectModal, { isOpen: modalIsOpen, header: header, onOpen: open, onClose: close, children: content }));
 };
+export default WalletModal;

package/esm/modal/provider.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { createContext, useContext, useState } from "react";
-import { WalletModal } from "./modal";
+import { createContext, lazy, useContext, useState } from "react";
+const WalletModal = lazy(() => import(/*webpackChunkName: "interchain-kit-modal" */ "./modal"));
 const WalletModalContext = createContext(null);
-export const WalletModalProvider = ({ children }) => {
+export const WalletModalProvider = ({ children, }) => {
     const [modalIsOpen, setModalIsOpen] = useState(false);
     const open = () => setModalIsOpen(true);
     const close = () => setModalIsOpen(false);
@@ -11,7 +11,7 @@ export const WalletModalProvider = ({ children }) => {
 export const useWalletModal = () => {
     const context = useContext(WalletModalContext);
     if (!context) {
-        throw new Error('useWalletModal must be used within a WalletModalProvider');
+        throw new Error("useWalletModal must be used within a WalletModalProvider");
     }
     return context;
 };

package/esm/modal/views/Connected.js

@@ -8,7 +8,7 @@ export const ConnectedHeader = ({ wallet, onBack, }) => {
     const { close } = useWalletModal();
     return (_jsx(ConnectModalHead, { title: wallet?.info?.prettyName || "", hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
 };
-export const ConnectedContent = () => {
+export const ConnectedContent = ({ afterDisconnect, }) => {
     const { currentChainName, currentWalletName } = useWalletManager();
     console.log({ currentChainName, currentWalletName });
     const { address, username, wallet } = useChainWallet(currentChainName, currentWalletName);
@@ -26,6 +26,6 @@ export const ConnectedContent = () => {
             address: address,
         }, onDisconnect: async () => {
             await wallet.disconnect(currentChainName);
-            close();
+            afterDisconnect();
         } }));
 };

package/esm/modal/views/Reject.js

@@ -1,14 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { ConnectModalHead, ConnectModalStatus } from "@interchain-ui/react";
 import { useWalletModal } from "../provider";
-import { useWalletManager } from "../../hooks";
 import { getWalletInfo } from "../../utils";
 export const RejectHeader = ({ wallet, onBack, }) => {
     const { close } = useWalletModal();
-    return (_jsx(ConnectModalHead, { title: wallet.info.prettyName, hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
+    return (_jsx(ConnectModalHead, { title: wallet?.info?.prettyName, hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
 };
-export const RejectContent = ({ wallet }) => {
-    const walletManager = useWalletManager();
-    const { close } = useWalletModal();
-    return (_jsx(ConnectModalStatus, { status: "Rejected", wallet: getWalletInfo(wallet), contentHeader: "Request Rejected", contentDesc: wallet.errorMessage || "Connection permission is denied.", onConnect: () => walletManager.connect(wallet.info.name, walletManager.currentChainName) }));
+export const RejectContent = ({ wallet, onReconnect, }) => {
+    return (_jsx(ConnectModalStatus, { status: "Rejected", wallet: getWalletInfo(wallet), contentHeader: "Request Rejected", contentDesc: wallet.errorMessage || "Connection permission is denied.", onConnect: onReconnect }));
 };

package/esm/store/chain-wallet.js

@@ -5,7 +5,7 @@ export class ChainWallet extends BaseWallet {
     disconnectWithState;
     getAccountWithState;
     constructor(originalWallet, connectWithState, disconnectWithState, getAccountWithState) {
-        super(originalWallet.info);
+        super(originalWallet?.info);
         this.originalWallet = originalWallet;
         this.connectWithState = connectWithState;
         this.disconnectWithState = disconnectWithState;

package/esm/store/index.js

@@ -23,7 +23,7 @@ export const createInterchainStore = (walletManager) => {
             chainWalletState.push({
                 chainName: chain.chainName,
                 walletName: wallet.info.name,
-                walletState: null,
+                walletState: WalletState.Disconnected,
                 rpcEndpoint: "",
                 errorMessage: "",
                 signerOption: undefined,
@@ -77,18 +77,18 @@ export const createInterchainStore = (walletManager) => {
                         draft.chains.push(newChain);
                         const assetList = assetLists.find(a => a.chainName === newChain.chainName);
                         draft.assetLists.push(assetList);
-                    }
-                    draft.wallets.forEach(w => {
-                        draft.chainWalletState.push({
-                            chainName: newChain.chainName,
-                            walletName: w.info.name,
-                            walletState: WalletState.Disconnected,
-                            rpcEndpoint: "",
-                            errorMessage: "",
-                            signerOption: undefined,
-                            account: undefined
+                        draft.wallets.forEach(w => {
+                            draft.chainWalletState.push({
+                                chainName: newChain.chainName,
+                                walletName: w.info.name,
+                                walletState: WalletState.Disconnected,
+                                rpcEndpoint: "",
+                                errorMessage: "",
+                                signerOption: signerOptions?.signing?.(newChain.chainName),
+                                account: undefined
+                            });
                         });
-                    });
+                    }
                     draft.signerOptionMap[newChain.chainName] = signerOptions?.signing?.(newChain.chainName);
                     draft.endpointOptionsMap[newChain.chainName] = endpointOptions?.endpoints?.[newChain.chainName];
                 });
@@ -105,7 +105,12 @@ export const createInterchainStore = (walletManager) => {
                 get().updateChainWalletState(walletName, chainName, { walletState: WalletState.Connected });
             }
             catch (error) {
+                if (error.message === 'Request rejected') {
+                    get().updateChainWalletState(walletName, chainName, { walletState: WalletState.Rejected, errorMessage: error.message });
+                    return;
+                }
                 get().updateChainWalletState(walletName, chainName, { walletState: WalletState.Disconnected, errorMessage: error.message });
+                throw error;
             }
         },
         disconnect: async (walletName, chainName) => {
@@ -122,6 +127,9 @@ export const createInterchainStore = (walletManager) => {
             return account;
         },
         getRpcEndpoint: async (walletName, chainName) => {
+            const exist = get().getChainWalletState(walletName, chainName).rpcEndpoint;
+            if (exist)
+                return exist;
             const rpcEndpoint = await walletManager.getRpcEndpoint(walletName, chainName);
             get().updateChainWalletState(walletName, chainName, { rpcEndpoint });
             return rpcEndpoint;

package/esm/utils/wallet.js

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

package/hooks/useChainWallet.js

@@ -27,7 +27,7 @@ const useChainWallet = (chainName, walletName) => {
         chain,
         assetList,
         address: chainWalletStateToShow?.account?.address,
-        wallet: new chain_wallet_1.ChainWallet(wallet, () => connect(walletName, chainName), () => disconnect(walletName, chainName), () => getAccount(currentWalletName, chainName)),
+        wallet: new chain_wallet_1.ChainWallet(wallet, () => connect(walletName, chainName), () => disconnect(walletName, chainName), () => getAccount(walletName, chainName)),
         rpcEndpoint: chainWalletStateToShow?.rpcEndpoint,
         getSigningClient: () => getSigningClient(walletName, chainName),
     };

package/modal/modal.d.ts

@@ -1 +1,2 @@
-export declare const WalletModal: () => import("react/jsx-runtime").JSX.Element;
+declare const WalletModal: () => import("react/jsx-runtime").JSX.Element;
+export default WalletModal;

package/modal/modal.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WalletModal = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const views_1 = require("./views");
 const provider_1 = require("./provider");
@@ -9,68 +8,90 @@ const react_1 = require("react");
 const core_1 = require("@interchain-kit/core");
 const react_2 = require("@interchain-ui/react");
 const WalletModal = () => {
+    const { currentWalletName, currentChainName, wallets, connect, getAccount, setCurrentWalletName, } = (0, hooks_1.useWalletManager)();
     const { modalIsOpen, open, close } = (0, provider_1.useWalletModal)();
-    const { currentWalletName, currentChainName, wallets, setCurrentWalletName, connect, getAccount, getWalletByName, } = (0, hooks_1.useWalletManager)();
-    const handleSelectWallet = async (selectedWallet) => {
-        const walletToView = wallets.find((w) => w.info.name === selectedWallet.info.name);
-        setCurrentWalletName(selectedWallet.info.name);
-        setModalView({
-            header: ((0, jsx_runtime_1.jsx)(views_1.ConnectingHeader, { wallet: walletToView, onBack: gotoWalletList })),
-            content: (0, jsx_runtime_1.jsx)(views_1.ConnectingContent, { wallet: walletToView }),
-        });
-        if (walletToView?.info.mode === "extension" &&
-            !walletToView.isExtensionInstalled) {
-            setModalView({
-                header: ((0, jsx_runtime_1.jsx)(views_1.NotExistHeader, { wallet: walletToView, onBack: gotoWalletList })),
-                content: (0, jsx_runtime_1.jsx)(views_1.NotExistContent, { wallet: walletToView }),
-            });
-            return;
-        }
-        try {
-            if (walletToView?.info.mode === "wallet-connect") {
-                walletToView.setOnPairingUriCreatedCallback(() => {
-                    setModalView({
-                        header: (0, jsx_runtime_1.jsx)(views_1.QRCodeHeader, { onBack: gotoWalletList }),
-                        content: (0, jsx_runtime_1.jsx)(views_1.QRCodeContent, {}),
-                    });
-                });
-                walletToView.setPairingToConnect(wallet.pairing);
-            }
-            console.log({ currentChainName });
-            await connect(selectedWallet.info.name, currentChainName);
-            await getAccount(selectedWallet.info.name, currentChainName);
-            setModalView({
-                header: ((0, jsx_runtime_1.jsx)(views_1.ConnectedHeader, { wallet: walletToView, 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: walletToView, onBack: gotoWalletList }),
-                content: (0, jsx_runtime_1.jsx)(views_1.RejectContent, { wallet: walletToView }),
-            });
-        }
+    const [modalType, setModalType] = (0, react_1.useState)("wallet-list");
+    const [selectedWallet, setSelectedWallet] = (0, react_1.useState)(null);
+    const { chain, status, wallet } = (0, hooks_1.useChainWallet)(currentChainName, currentWalletName);
+    const handleConnect = async () => {
+        return connect(selectedWallet?.info?.name, chain.chainName)
+            .then(() => getAccount(selectedWallet?.info?.name, chain.chainName))
+            .then(() => setSelectedWallet(null))
+            .catch(() => { });
     };
-    const defaultModalView = {
-        header: (0, jsx_runtime_1.jsx)(views_1.WalletListHeader, {}),
-        content: (0, jsx_runtime_1.jsx)(views_1.WalletListContent, { onSelectWallet: handleSelectWallet }),
+    (0, react_1.useEffect)(() => {
+        if (selectedWallet && currentWalletName && currentChainName) {
+            handleConnect();
+        }
+    }, [selectedWallet]);
+    const handleSelectWallet = async (selectedWallet) => {
+        setSelectedWallet(selectedWallet);
+        setCurrentWalletName(selectedWallet?.info?.name);
     };
-    const [modalView, setModalView] = (0, react_1.useState)(defaultModalView);
-    const gotoWalletList = () => setModalView(defaultModalView);
-    const { status } = (0, hooks_1.useChainWallet)(currentChainName, currentWalletName);
     (0, react_1.useEffect)(() => {
-        const currentWallet = getWalletByName(currentWalletName);
-        if (modalIsOpen && status === core_1.WalletState.Connected) {
-            setModalView({
-                header: ((0, jsx_runtime_1.jsx)(views_1.ConnectedHeader, { wallet: currentWallet, onBack: gotoWalletList })),
-                content: (0, jsx_runtime_1.jsx)(views_1.ConnectedContent, {}),
-            });
+        if (!selectedWallet) {
+            setModalType("wallet-list");
+        }
+        if (currentWalletName && currentChainName) {
+            if (status === core_1.WalletState.Connecting) {
+                setModalType("connecting");
+            }
+            if (status === core_1.WalletState.Connected) {
+                setModalType("connected");
+            }
+            if (status === core_1.WalletState.Rejected) {
+                setModalType("reject");
+            }
+            if (status === core_1.WalletState.Disconnected) {
+                setModalType("wallet-list");
+            }
         }
-        else {
-            setModalView(defaultModalView);
+    }, [
+        currentWalletName,
+        currentChainName,
+        status,
+        modalIsOpen,
+        selectedWallet,
+    ]);
+    const goBackList = () => setModalType("wallet-list");
+    const { header, content } = (0, react_1.useMemo)(() => {
+        switch (modalType) {
+            case "wallet-list":
+                return {
+                    header: (0, jsx_runtime_1.jsx)(views_1.WalletListHeader, {}),
+                    content: (0, jsx_runtime_1.jsx)(views_1.WalletListContent, { onSelectWallet: handleSelectWallet }),
+                };
+            case "connecting":
+                return {
+                    header: (0, jsx_runtime_1.jsx)(views_1.ConnectingHeader, { wallet: wallet, onBack: goBackList }),
+                    content: (0, jsx_runtime_1.jsx)(views_1.ConnectingContent, { wallet: wallet }),
+                };
+            case "connected":
+                return {
+                    header: (0, jsx_runtime_1.jsx)(views_1.ConnectedHeader, { wallet: wallet, onBack: goBackList }),
+                    content: (0, jsx_runtime_1.jsx)(views_1.ConnectedContent, { afterDisconnect: goBackList }),
+                };
+            case "reject":
+                return {
+                    header: (0, jsx_runtime_1.jsx)(views_1.RejectHeader, { wallet: wallet, onBack: goBackList }),
+                    content: ((0, jsx_runtime_1.jsx)(views_1.RejectContent, { wallet: wallet, onReconnect: () => {
+                            setModalType("connecting");
+                            wallet.connect(chain.chainId);
+                            wallet.getAccount(chain.chainId);
+                        } })),
+                };
+            case "not-exist":
+                return {
+                    header: (0, jsx_runtime_1.jsx)(views_1.NotExistHeader, { wallet: wallet, onBack: goBackList }),
+                    content: (0, jsx_runtime_1.jsx)(views_1.NotExistContent, { wallet: wallet }),
+                };
+            case "qr-code":
+                return {
+                    header: (0, jsx_runtime_1.jsx)(views_1.QRCodeHeader, { onBack: goBackList }),
+                    content: (0, jsx_runtime_1.jsx)(views_1.QRCodeContent, {}),
+                };
         }
-    }, [modalIsOpen, status]);
-    return ((0, jsx_runtime_1.jsx)(react_2.ConnectModal, { isOpen: modalIsOpen, header: modalView.header, onOpen: open, onClose: close, children: modalView.content }));
+    }, [modalType]);
+    return ((0, jsx_runtime_1.jsx)(react_2.ConnectModal, { isOpen: modalIsOpen, header: header, onOpen: open, onClose: close, children: content }));
 };
-exports.WalletModal = WalletModal;
+exports.default = WalletModal;

package/modal/provider.d.ts

@@ -3,7 +3,7 @@ type WalletModalContextType = {
     open: () => void;
     close: () => void;
 };
-export declare const WalletModalProvider: ({ children }: {
+export declare const WalletModalProvider: ({ children, }: {
     children: React.ReactNode;
 }) => import("react/jsx-runtime").JSX.Element;
 export declare const useWalletModal: () => WalletModalContextType;

package/modal/provider.js

@@ -1,21 +1,54 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 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 WalletModal = (0, react_1.lazy)(() => Promise.resolve().then(() => __importStar(require(/*webpackChunkName: "interchain-kit-modal" */ "./modal"))));
 const WalletModalContext = (0, react_1.createContext)(null);
-const WalletModalProvider = ({ children }) => {
+const WalletModalProvider = ({ children, }) => {
     const [modalIsOpen, setModalIsOpen] = (0, react_1.useState)(false);
     const open = () => setModalIsOpen(true);
     const close = () => setModalIsOpen(false);
-    return ((0, jsx_runtime_1.jsxs)(WalletModalContext.Provider, { value: { modalIsOpen, open, close }, children: [children, (0, jsx_runtime_1.jsx)(modal_1.WalletModal, {})] }));
+    return ((0, jsx_runtime_1.jsxs)(WalletModalContext.Provider, { value: { modalIsOpen, open, close }, children: [children, (0, jsx_runtime_1.jsx)(WalletModal, {})] }));
 };
 exports.WalletModalProvider = WalletModalProvider;
 const useWalletModal = () => {
     const context = (0, react_1.useContext)(WalletModalContext);
     if (!context) {
-        throw new Error('useWalletModal must be used within a WalletModalProvider');
+        throw new Error("useWalletModal must be used within a WalletModalProvider");
     }
     return context;
 };

package/modal/views/Connected.d.ts

@@ -3,4 +3,6 @@ export declare const ConnectedHeader: ({ wallet, onBack, }: {
     wallet: BaseWallet;
     onBack: () => void;
 }) => import("react/jsx-runtime").JSX.Element;
-export declare const ConnectedContent: () => import("react/jsx-runtime").JSX.Element;
+export declare const ConnectedContent: ({ afterDisconnect, }: {
+    afterDisconnect: () => void;
+}) => import("react/jsx-runtime").JSX.Element;

package/modal/views/Connected.js

@@ -12,7 +12,7 @@ const ConnectedHeader = ({ wallet, onBack, }) => {
     return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalHead, { title: wallet?.info?.prettyName || "", hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
 };
 exports.ConnectedHeader = ConnectedHeader;
-const ConnectedContent = () => {
+const ConnectedContent = ({ afterDisconnect, }) => {
     const { currentChainName, currentWalletName } = (0, hooks_1.useWalletManager)();
     console.log({ currentChainName, currentWalletName });
     const { address, username, wallet } = (0, hooks_1.useChainWallet)(currentChainName, currentWalletName);
@@ -30,7 +30,7 @@ const ConnectedContent = () => {
             address: address,
         }, onDisconnect: async () => {
             await wallet.disconnect(currentChainName);
-            close();
+            afterDisconnect();
         } }));
 };
 exports.ConnectedContent = ConnectedContent;

package/modal/views/Reject.d.ts

@@ -3,6 +3,7 @@ export declare const RejectHeader: ({ wallet, onBack, }: {
     wallet: BaseWallet;
     onBack: () => void;
 }) => import("react/jsx-runtime").JSX.Element;
-export declare const RejectContent: ({ wallet }: {
+export declare const RejectContent: ({ wallet, onReconnect, }: {
     wallet: BaseWallet;
+    onReconnect: () => void;
 }) => import("react/jsx-runtime").JSX.Element;

package/modal/views/Reject.js

@@ -4,16 +4,13 @@ exports.RejectContent = exports.RejectHeader = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("@interchain-ui/react");
 const provider_1 = require("../provider");
-const hooks_1 = require("../../hooks");
 const utils_1 = require("../../utils");
 const RejectHeader = ({ wallet, onBack, }) => {
     const { close } = (0, provider_1.useWalletModal)();
-    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalHead, { title: wallet.info.prettyName, hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
+    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalHead, { title: wallet?.info?.prettyName, hasBackButton: true, onClose: close, onBack: onBack, closeButtonProps: { onClick: close } }));
 };
 exports.RejectHeader = RejectHeader;
-const RejectContent = ({ wallet }) => {
-    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)(wallet), contentHeader: "Request Rejected", contentDesc: wallet.errorMessage || "Connection permission is denied.", onConnect: () => walletManager.connect(wallet.info.name, walletManager.currentChainName) }));
+const RejectContent = ({ wallet, onReconnect, }) => {
+    return ((0, jsx_runtime_1.jsx)(react_1.ConnectModalStatus, { status: "Rejected", wallet: (0, utils_1.getWalletInfo)(wallet), contentHeader: "Request Rejected", contentDesc: wallet.errorMessage || "Connection permission is denied.", onConnect: onReconnect }));
 };
 exports.RejectContent = RejectContent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.0.1-beta.58",
+  "version": "0.0.1-beta.60",
   "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.58",
+    "@interchain-kit/core": "0.0.1-beta.60",
     "@interchain-ui/react": "1.26.1",
     "@interchainjs/cosmos": "1.6.3",
     "@interchainjs/cosmos-types": "1.6.3",
@@ -46,5 +46,5 @@
     "react-dom": "^18.3.1",
     "zustand": "^5.0.3"
   },
-  "gitHead": "3e181eabfedf82ee9321d10cf0d46d63a348da31"
+  "gitHead": "33f4215216b28d8aab9453421c7c89436b11c8df"
 }

package/store/chain-wallet.js

@@ -8,7 +8,7 @@ class ChainWallet extends core_1.BaseWallet {
     disconnectWithState;
     getAccountWithState;
     constructor(originalWallet, connectWithState, disconnectWithState, getAccountWithState) {
-        super(originalWallet.info);
+        super(originalWallet?.info);
         this.originalWallet = originalWallet;
         this.connectWithState = connectWithState;
         this.disconnectWithState = disconnectWithState;

package/store/index.js

@@ -26,7 +26,7 @@ const createInterchainStore = (walletManager) => {
             chainWalletState.push({
                 chainName: chain.chainName,
                 walletName: wallet.info.name,
-                walletState: null,
+                walletState: core_1.WalletState.Disconnected,
                 rpcEndpoint: "",
                 errorMessage: "",
                 signerOption: undefined,
@@ -80,18 +80,18 @@ const createInterchainStore = (walletManager) => {
                         draft.chains.push(newChain);
                         const assetList = assetLists.find(a => a.chainName === newChain.chainName);
                         draft.assetLists.push(assetList);
-                    }
-                    draft.wallets.forEach(w => {
-                        draft.chainWalletState.push({
-                            chainName: newChain.chainName,
-                            walletName: w.info.name,
-                            walletState: core_1.WalletState.Disconnected,
-                            rpcEndpoint: "",
-                            errorMessage: "",
-                            signerOption: undefined,
-                            account: undefined
+                        draft.wallets.forEach(w => {
+                            draft.chainWalletState.push({
+                                chainName: newChain.chainName,
+                                walletName: w.info.name,
+                                walletState: core_1.WalletState.Disconnected,
+                                rpcEndpoint: "",
+                                errorMessage: "",
+                                signerOption: signerOptions?.signing?.(newChain.chainName),
+                                account: undefined
+                            });
                         });
-                    });
+                    }
                     draft.signerOptionMap[newChain.chainName] = signerOptions?.signing?.(newChain.chainName);
                     draft.endpointOptionsMap[newChain.chainName] = endpointOptions?.endpoints?.[newChain.chainName];
                 });
@@ -108,7 +108,12 @@ const createInterchainStore = (walletManager) => {
                 get().updateChainWalletState(walletName, chainName, { walletState: core_1.WalletState.Connected });
             }
             catch (error) {
+                if (error.message === 'Request rejected') {
+                    get().updateChainWalletState(walletName, chainName, { walletState: core_1.WalletState.Rejected, errorMessage: error.message });
+                    return;
+                }
                 get().updateChainWalletState(walletName, chainName, { walletState: core_1.WalletState.Disconnected, errorMessage: error.message });
+                throw error;
             }
         },
         disconnect: async (walletName, chainName) => {
@@ -125,6 +130,9 @@ const createInterchainStore = (walletManager) => {
             return account;
         },
         getRpcEndpoint: async (walletName, chainName) => {
+            const exist = get().getChainWalletState(walletName, chainName).rpcEndpoint;
+            if (exist)
+                return exist;
             const rpcEndpoint = await walletManager.getRpcEndpoint(walletName, chainName);
             get().updateChainWalletState(walletName, chainName, { rpcEndpoint });
             return rpcEndpoint;

package/utils/wallet.js

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