@interchain-kit/react 0.2.201 → 0.2.203

package/esm/hooks/useWalletManager.js

@@ -1,6 +1,17 @@
+import { useStore } from "zustand";
 import { useInterchainWalletContext } from "../provider";
-import { useStore } from 'zustand';
+function bindMethodsToContext(context) {
+    for (const key of Object.getOwnPropertyNames(Object.getPrototypeOf(context))) {
+        const value = context[key];
+        if (typeof value === 'function') {
+            context[key] = value.bind(context);
+        }
+    }
+}
 export const useWalletManager = () => {
-    const store = useInterchainWalletContext();
-    return useStore(store);
+    const object = useInterchainWalletContext();
+    // put useStore here to update the hook
+    const store = useStore(object.store);
+    bindMethodsToContext(object);
+    return object;
 };

package/esm/modal/modal.js

@@ -13,14 +13,19 @@ export const WalletModal = () => {
     const [selectedWallet, setSelectedWallet] = useState(null);
     const { chain, status, wallet } = useChainWallet(currentChainName, currentWalletName);
     const handleConnect = async () => {
-        if (wallet.originalWallet instanceof WCWallet) {
-            wallet.originalWallet.setOnPairingUriCreatedCallback((uri) => {
-                setQRCode(uri);
-            });
+        try {
+            if (wallet.originalWallet instanceof WCWallet) {
+                wallet.originalWallet.setOnPairingUriCreatedCallback((uri) => {
+                    setQRCode(uri);
+                });
+            }
+            await connect(selectedWallet?.info?.name, chain.chainName);
+            await getAccount(selectedWallet?.info?.name, chain.chainName);
+            setSelectedWallet(null);
+        }
+        catch (error) {
+            console.error("Failed to connect wallet:", error);
         }
-        await connect(selectedWallet?.info?.name, chain.chainName);
-        await getAccount(selectedWallet?.info?.name, chain.chainName);
-        setSelectedWallet(null);
     };
     useEffect(() => {
         if (selectedWallet && currentWalletName && currentChainName) {
@@ -58,7 +63,7 @@ export const WalletModal = () => {
         status,
         modalIsOpen,
         selectedWallet,
-        qrCode
+        qrCode,
     ]);
     const goBackList = () => setModalType("wallet-list");
     const { header, content } = useMemo(() => {

package/esm/modal/views/Connected.js

@@ -10,7 +10,6 @@ export const ConnectedHeader = ({ wallet, onBack, }) => {
 };
 export const ConnectedContent = ({ afterDisconnect, }) => {
     const { currentChainName, currentWalletName } = useWalletManager();
-    console.log({ currentChainName, currentWalletName });
     const { address, username, wallet } = useChainWallet(currentChainName, currentWalletName);
     const { close } = useWalletModal();
     if (!wallet) {

package/esm/provider.js

@@ -1,18 +1,16 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useEffect, useRef } from "react";
+import { useEffect } from "react";
 import { createContext, useContext } from "react";
 import { WalletManager, } from "@interchain-kit/core";
 import { WalletModalProvider } from "./modal";
-import { createInterchainStore } from "./store";
 const InterchainWalletContext = createContext(null);
 export const ChainProvider = ({ chains, assetLists, wallets, signerOptions, endpointOptions, children, }) => {
     // const [_, forceRender] = useState({});
     const walletManager = new WalletManager(chains, assetLists, wallets, signerOptions, endpointOptions);
-    const store = useRef(createInterchainStore(walletManager));
     useEffect(() => {
         walletManager.init();
     }, []);
-    return (_jsx(InterchainWalletContext.Provider, { value: store.current, children: _jsx(WalletModalProvider, { children: children }) }));
+    return (_jsx(InterchainWalletContext.Provider, { value: walletManager, children: _jsx(WalletModalProvider, { children: children }) }));
 };
 export const useInterchainWalletContext = () => {
     const context = useContext(InterchainWalletContext);

package/esm/store/index.js

@@ -1,4 +1,4 @@
-import { WalletState } from "@interchain-kit/core";
+import { clientNotExistError, WalletState } from "@interchain-kit/core";
 import { createStore } from "zustand";
 import { immer } from "zustand/middleware/immer";
 import { persist, createJSONStorage } from 'zustand/middleware';
@@ -32,6 +32,7 @@ export const createInterchainStore = (walletManager) => {
         });
     });
     return createStore(persist(immer((set, get) => ({
+        store: walletManager.store,
         chainWalletState,
         currentWalletName: '',
         currentChainName: '',
@@ -49,7 +50,28 @@ export const createInterchainStore = (walletManager) => {
                 draft.chainWalletState[targetIndex] = { ...draft.chainWalletState[targetIndex], ...data };
             });
         },
-        init: () => walletManager.init(),
+        init: async () => {
+            const NotExistWallets = [];
+            await Promise.all(get().wallets.map(async (wallet) => {
+                try {
+                    await wallet.init();
+                }
+                catch (error) {
+                    if (error === clientNotExistError.message) {
+                        NotExistWallets.push(wallet.info.name);
+                    }
+                }
+            }));
+            set(draft => {
+                draft.chainWalletState = draft.chainWalletState.map(cws => {
+                    if (NotExistWallets.includes(cws.walletName)) {
+                        return { ...cws, walletState: WalletState.NotExist };
+                    }
+                    return cws;
+                });
+            });
+            // return walletManager.init()
+        },
         setCurrentChainName: (chainName) => {
             set(draft => { draft.currentChainName = chainName; });
         },

package/hooks/useWalletManager.d.ts

@@ -1 +1 @@
-export declare const useWalletManager: () => import("..").InterchainStore;
+export declare const useWalletManager: () => import("@interchain-kit/core").WalletManager;

package/hooks/useWalletManager.js

@@ -1,10 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useWalletManager = void 0;
-const provider_1 = require("../provider");
 const zustand_1 = require("zustand");
+const provider_1 = require("../provider");
+function bindMethodsToContext(context) {
+    for (const key of Object.getOwnPropertyNames(Object.getPrototypeOf(context))) {
+        const value = context[key];
+        if (typeof value === 'function') {
+            context[key] = value.bind(context);
+        }
+    }
+}
 const useWalletManager = () => {
-    const store = (0, provider_1.useInterchainWalletContext)();
-    return (0, zustand_1.useStore)(store);
+    const object = (0, provider_1.useInterchainWalletContext)();
+    // put useStore here to update the hook
+    const store = (0, zustand_1.useStore)(object.store);
+    bindMethodsToContext(object);
+    return object;
 };
 exports.useWalletManager = useWalletManager;

package/modal/modal.js

@@ -16,14 +16,19 @@ const WalletModal = () => {
     const [selectedWallet, setSelectedWallet] = (0, react_1.useState)(null);
     const { chain, status, wallet } = (0, hooks_1.useChainWallet)(currentChainName, currentWalletName);
     const handleConnect = async () => {
-        if (wallet.originalWallet instanceof core_1.WCWallet) {
-            wallet.originalWallet.setOnPairingUriCreatedCallback((uri) => {
-                setQRCode(uri);
-            });
+        try {
+            if (wallet.originalWallet instanceof core_1.WCWallet) {
+                wallet.originalWallet.setOnPairingUriCreatedCallback((uri) => {
+                    setQRCode(uri);
+                });
+            }
+            await connect(selectedWallet?.info?.name, chain.chainName);
+            await getAccount(selectedWallet?.info?.name, chain.chainName);
+            setSelectedWallet(null);
+        }
+        catch (error) {
+            console.error("Failed to connect wallet:", error);
         }
-        await connect(selectedWallet?.info?.name, chain.chainName);
-        await getAccount(selectedWallet?.info?.name, chain.chainName);
-        setSelectedWallet(null);
     };
     (0, react_1.useEffect)(() => {
         if (selectedWallet && currentWalletName && currentChainName) {
@@ -61,7 +66,7 @@ const WalletModal = () => {
         status,
         modalIsOpen,
         selectedWallet,
-        qrCode
+        qrCode,
     ]);
     const goBackList = () => setModalType("wallet-list");
     const { header, content } = (0, react_1.useMemo)(() => {

package/modal/views/Connected.js

@@ -14,7 +14,6 @@ const ConnectedHeader = ({ wallet, onBack, }) => {
 exports.ConnectedHeader = ConnectedHeader;
 const ConnectedContent = ({ afterDisconnect, }) => {
     const { currentChainName, currentWalletName } = (0, hooks_1.useWalletManager)();
-    console.log({ currentChainName, currentWalletName });
     const { address, username, wallet } = (0, hooks_1.useChainWallet)(currentChainName, currentWalletName);
     const { close } = (0, provider_1.useWalletModal)();
     if (!wallet) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.2.201",
+  "version": "0.2.203",
   "author": "Hyperweb <developers@hyperweb.io>",
   "description": "interchain-kit wallet connector react package",
   "main": "index.js",
@@ -33,18 +33,18 @@
   "keywords": [],
   "dependencies": {
     "@chain-registry/v2-types": "^0.53.40",
-    "@interchain-kit/core": "0.2.201",
+    "@interchain-kit/core": "0.2.203",
     "@interchain-ui/react": "1.26.1",
-    "@interchainjs/cosmos": "1.9.3",
-    "@interchainjs/cosmos-types": "1.9.3",
+    "@interchainjs/cosmos": "1.9.12",
+    "@interchainjs/cosmos-types": "1.9.12",
     "@react-icons/all-files": "^4.1.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@walletconnect/types": "^2.17.3",
-    "interchainjs": "1.9.3",
+    "interchainjs": "1.9.12",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "zustand": "^5.0.3"
   },
-  "gitHead": "0e8792f853a2b27e74180885529070365918400b"
+  "gitHead": "26df3f33b03181c1a067e6662835982cc235c376"
 }

package/provider.d.ts

@@ -1,9 +1,6 @@
 import React from "react";
-import { BaseWallet, SignerOptions, EndpointOptions } from "@interchain-kit/core";
+import { BaseWallet, SignerOptions, EndpointOptions, WalletManager } from "@interchain-kit/core";
 import { AssetList, Chain } from "@chain-registry/v2-types";
-import { InterchainStore } from "./store";
-import { StoreApi } from "zustand";
-type InterchainWalletContextType = StoreApi<InterchainStore>;
 type InterchainWalletProviderProps = {
     chains: Chain[];
     assetLists: AssetList[];
@@ -13,5 +10,5 @@ type InterchainWalletProviderProps = {
     children: React.ReactNode;
 };
 export declare const ChainProvider: ({ chains, assetLists, wallets, signerOptions, endpointOptions, children, }: InterchainWalletProviderProps) => import("react/jsx-runtime").JSX.Element;
-export declare const useInterchainWalletContext: () => InterchainWalletContextType;
+export declare const useInterchainWalletContext: () => WalletManager;
 export {};

package/provider.js

@@ -6,16 +6,14 @@ const react_1 = require("react");
 const react_2 = require("react");
 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 [_, forceRender] = useState({});
     const walletManager = new core_1.WalletManager(chains, assetLists, wallets, signerOptions, endpointOptions);
-    const store = (0, react_1.useRef)((0, store_1.createInterchainStore)(walletManager));
     (0, react_1.useEffect)(() => {
         walletManager.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.jsx)(InterchainWalletContext.Provider, { value: walletManager, children: (0, jsx_runtime_1.jsx)(modal_1.WalletModalProvider, { children: children }) }));
 };
 exports.ChainProvider = ChainProvider;
 const useInterchainWalletContext = () => {

package/store/index.js

@@ -35,6 +35,7 @@ const createInterchainStore = (walletManager) => {
         });
     });
     return (0, zustand_1.createStore)((0, middleware_1.persist)((0, immer_1.immer)((set, get) => ({
+        store: walletManager.store,
         chainWalletState,
         currentWalletName: '',
         currentChainName: '',
@@ -52,7 +53,28 @@ const createInterchainStore = (walletManager) => {
                 draft.chainWalletState[targetIndex] = { ...draft.chainWalletState[targetIndex], ...data };
             });
         },
-        init: () => walletManager.init(),
+        init: async () => {
+            const NotExistWallets = [];
+            await Promise.all(get().wallets.map(async (wallet) => {
+                try {
+                    await wallet.init();
+                }
+                catch (error) {
+                    if (error === core_1.clientNotExistError.message) {
+                        NotExistWallets.push(wallet.info.name);
+                    }
+                }
+            }));
+            set(draft => {
+                draft.chainWalletState = draft.chainWalletState.map(cws => {
+                    if (NotExistWallets.includes(cws.walletName)) {
+                        return { ...cws, walletState: core_1.WalletState.NotExist };
+                    }
+                    return cws;
+                });
+            });
+            // return walletManager.init()
+        },
         setCurrentChainName: (chainName) => {
             set(draft => { draft.currentChainName = chainName; });
         },