@interchain-kit/react 0.0.1-beta.5 → 0.0.1-beta.7

package/esm/hooks/useAccount.js

@@ -6,8 +6,10 @@ export const useAccount = (chainName, walletName) => {
     const [account, setAccount] = useState(null);
     const chain = walletManager.chains.find(c => c.chainName === chainName);
     const getAccount = async () => {
-        const account = await wallet.getAccount(chain.chainId);
-        setAccount(account);
+        if (wallet && chain && wallet.client) {
+            const account = await wallet.getAccount(chain.chainId);
+            setAccount(account);
+        }
     };
     useEffect(() => {
         if (wallet) {

package/esm/hooks/useActiveWallet.js

@@ -1,5 +1,13 @@
+import { useEffect } from "react";
 import { useWalletManager } from "./useWalletManager";
+import { useWalletModal } from "../modal";
 export const useActiveWallet = () => {
     const walletManager = useWalletManager();
+    const { open } = useWalletModal();
+    useEffect(() => {
+        if (!walletManager.activeWallet) {
+            open();
+        }
+    }, [walletManager.activeWallet]);
     return walletManager.getActiveWallet();
 };

package/esm/hooks/useChain.js

@@ -8,10 +8,9 @@ export const useChain = (chainName) => {
     const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
     const assetList = walletManager.assetLists.find((a) => a.chainName === chainName);
     const activeWallet = useActiveWallet();
-    const account = useAccount(chainName, activeWallet.option.name);
-    const interchainClient = useInterchainClient(chainName, activeWallet.option.name);
+    const account = useAccount(chainName, activeWallet?.option?.name);
+    const interchainClient = useInterchainClient(chainName, activeWallet?.option?.name);
     const { open, close } = useWalletModal();
-    const clientFactory = walletManager.createClientFactory(activeWallet, chainName);
     const cosmosKitUserChainReturnType = {
         connect: () => {
             if (activeWallet) {
@@ -22,11 +21,11 @@ export const useChain = (chainName) => {
         openView: open,
         closeView: close,
         getRpcEndpoint: () => walletManager.getRpcEndpoint(activeWallet, chainName),
-        status: activeWallet.walletState,
+        status: activeWallet?.walletState,
         username: account?.username,
-        message: activeWallet.errorMessage,
-        getSigningCosmWasmClient: () => clientFactory.then((c) => c.getSigningCosmwasmClient()),
-        getSigningStargateClient: () => clientFactory.then((c) => c.getSigningStargateClient())
+        message: activeWallet?.errorMessage,
+        getSigningCosmWasmClient: () => walletManager.createClientFactory(activeWallet, chainName).then((c) => c.getSigningCosmwasmClient()),
+        getSigningStargateClient: () => walletManager.createClientFactory(activeWallet, chainName).then((c) => c.getSigningStargateClient())
     };
     return {
         chain: chainToShow,

package/esm/hooks/useInterchainClient.js

@@ -11,34 +11,30 @@ 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 chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
     const initialize = async () => {
-        const wallet = walletManager.wallets.find((w) => w.option.name === walletName);
-        const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
-        if (!wallet) {
-            throw new Error('Wallet not found');
-        }
-        if (!chainToShow) {
-            throw new Error('Chain not found');
-        }
-        try {
-            setIsLoading(true);
-            const rpcEndpoint = await walletManager.getRpcEndpoint(wallet, chainName);
-            setRpcEndpoint(rpcEndpoint);
-            const clientFactory = await walletManager.createClientFactory(wallet, chainName);
-            const queryClient = await clientFactory.getClient();
-            setQueryClient(queryClient);
-            const signingClient = await clientFactory.getSigningClient();
-            setSigningClient(signingClient);
-            const signingStargateClient = await clientFactory.getSigningStargateClient(chainToShow.bech32Prefix);
-            setSigningStargateClient(signingStargateClient);
-            const signingCosmwasmClient = await clientFactory.getSigningCosmwasmClient();
-            setSigningCosmWasmClient(signingCosmwasmClient);
-        }
-        catch (error) {
-            setError(error);
-        }
-        finally {
-            setIsLoading(false);
+        if (wallet && chainToShow) {
+            try {
+                setIsLoading(true);
+                const rpcEndpoint = await walletManager.getRpcEndpoint(wallet, chainName);
+                setRpcEndpoint(rpcEndpoint);
+                const clientFactory = await walletManager.createClientFactory(wallet, chainName);
+                const queryClient = await clientFactory.getClient();
+                setQueryClient(queryClient);
+                const signingClient = await clientFactory.getSigningClient();
+                setSigningClient(signingClient);
+                const signingStargateClient = await clientFactory.getSigningStargateClient(chainToShow.bech32Prefix);
+                setSigningStargateClient(signingStargateClient);
+                const signingCosmwasmClient = await clientFactory.getSigningCosmwasmClient();
+                setSigningCosmWasmClient(signingCosmwasmClient);
+            }
+            catch (error) {
+                setError(error);
+            }
+            finally {
+                setIsLoading(false);
+            }
         }
     };
     useEffect(() => {

package/esm/hooks/useOfflineSigner.js

@@ -1,8 +1,15 @@
+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 [offlineSigner, setOfflineSigner] = useState(null);
+    useEffect(() => {
+        if (wallet && chainName) {
+            setOfflineSigner(walletManager.getOfflineSigner(wallet, chainName));
+        }
+    }, [wallet, chainName]);
     return {
-        offlineSigner: walletManager.getOfflineSigner(wallet, chainName),
+        offlineSigner
     };
 };

package/esm/modal/modal.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useWalletManager } from "../hooks";
+import { useWalletModal } from "./provider";
 const style = {
     position: 'absolute',
     top: '50%',
@@ -10,7 +11,8 @@ const style = {
 };
 export const WalletModal = () => {
     const walletManager = useWalletManager();
+    const { close } = useWalletModal();
     return (_jsx("ul", { style: style, children: walletManager.wallets.map(wallet => {
-            return (_jsxs("li", { children: [_jsx("span", { children: wallet.option.prettyName }), _jsx("button", { onClick: () => walletManager.connect(wallet.option.name), children: "connect" })] }));
+            return (_jsxs("li", { children: [_jsx("span", { children: wallet.option.prettyName }), _jsx("button", { onClick: () => walletManager.connect(wallet.option.name).then(close), children: "connect" })] }, wallet.option.name));
         }) }));
 };

package/hooks/useAccount.js

@@ -9,8 +9,10 @@ const useAccount = (chainName, walletName) => {
     const [account, setAccount] = (0, react_1.useState)(null);
     const chain = walletManager.chains.find(c => c.chainName === chainName);
     const getAccount = async () => {
-        const account = await wallet.getAccount(chain.chainId);
-        setAccount(account);
+        if (wallet && chain && wallet.client) {
+            const account = await wallet.getAccount(chain.chainId);
+            setAccount(account);
+        }
     };
     (0, react_1.useEffect)(() => {
         if (wallet) {

package/hooks/useActiveWallet.js

@@ -1,9 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useActiveWallet = void 0;
+const react_1 = require("react");
 const useWalletManager_1 = require("./useWalletManager");
+const modal_1 = require("../modal");
 const useActiveWallet = () => {
     const walletManager = (0, useWalletManager_1.useWalletManager)();
+    const { open } = (0, modal_1.useWalletModal)();
+    (0, react_1.useEffect)(() => {
+        if (!walletManager.activeWallet) {
+            open();
+        }
+    }, [walletManager.activeWallet]);
     return walletManager.getActiveWallet();
 };
 exports.useActiveWallet = useActiveWallet;

package/hooks/useChain.js

@@ -11,10 +11,9 @@ const useChain = (chainName) => {
     const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
     const assetList = walletManager.assetLists.find((a) => a.chainName === chainName);
     const activeWallet = (0, useActiveWallet_1.useActiveWallet)();
-    const account = (0, useAccount_1.useAccount)(chainName, activeWallet.option.name);
-    const interchainClient = (0, useInterchainClient_1.useInterchainClient)(chainName, activeWallet.option.name);
+    const account = (0, useAccount_1.useAccount)(chainName, activeWallet?.option?.name);
+    const interchainClient = (0, useInterchainClient_1.useInterchainClient)(chainName, activeWallet?.option?.name);
     const { open, close } = (0, modal_1.useWalletModal)();
-    const clientFactory = walletManager.createClientFactory(activeWallet, chainName);
     const cosmosKitUserChainReturnType = {
         connect: () => {
             if (activeWallet) {
@@ -25,11 +24,11 @@ const useChain = (chainName) => {
         openView: open,
         closeView: close,
         getRpcEndpoint: () => walletManager.getRpcEndpoint(activeWallet, chainName),
-        status: activeWallet.walletState,
+        status: activeWallet?.walletState,
         username: account?.username,
-        message: activeWallet.errorMessage,
-        getSigningCosmWasmClient: () => clientFactory.then((c) => c.getSigningCosmwasmClient()),
-        getSigningStargateClient: () => clientFactory.then((c) => c.getSigningStargateClient())
+        message: activeWallet?.errorMessage,
+        getSigningCosmWasmClient: () => walletManager.createClientFactory(activeWallet, chainName).then((c) => c.getSigningCosmwasmClient()),
+        getSigningStargateClient: () => walletManager.createClientFactory(activeWallet, chainName).then((c) => c.getSigningStargateClient())
     };
     return {
         chain: chainToShow,

package/hooks/useInterchainClient.js

@@ -14,34 +14,30 @@ 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 chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
     const initialize = async () => {
-        const wallet = walletManager.wallets.find((w) => w.option.name === walletName);
-        const chainToShow = walletManager.chains.find((c) => c.chainName === chainName);
-        if (!wallet) {
-            throw new Error('Wallet not found');
-        }
-        if (!chainToShow) {
-            throw new Error('Chain not found');
-        }
-        try {
-            setIsLoading(true);
-            const rpcEndpoint = await walletManager.getRpcEndpoint(wallet, chainName);
-            setRpcEndpoint(rpcEndpoint);
-            const clientFactory = await walletManager.createClientFactory(wallet, chainName);
-            const queryClient = await clientFactory.getClient();
-            setQueryClient(queryClient);
-            const signingClient = await clientFactory.getSigningClient();
-            setSigningClient(signingClient);
-            const signingStargateClient = await clientFactory.getSigningStargateClient(chainToShow.bech32Prefix);
-            setSigningStargateClient(signingStargateClient);
-            const signingCosmwasmClient = await clientFactory.getSigningCosmwasmClient();
-            setSigningCosmWasmClient(signingCosmwasmClient);
-        }
-        catch (error) {
-            setError(error);
-        }
-        finally {
-            setIsLoading(false);
+        if (wallet && chainToShow) {
+            try {
+                setIsLoading(true);
+                const rpcEndpoint = await walletManager.getRpcEndpoint(wallet, chainName);
+                setRpcEndpoint(rpcEndpoint);
+                const clientFactory = await walletManager.createClientFactory(wallet, chainName);
+                const queryClient = await clientFactory.getClient();
+                setQueryClient(queryClient);
+                const signingClient = await clientFactory.getSigningClient();
+                setSigningClient(signingClient);
+                const signingStargateClient = await clientFactory.getSigningStargateClient(chainToShow.bech32Prefix);
+                setSigningStargateClient(signingStargateClient);
+                const signingCosmwasmClient = await clientFactory.getSigningCosmwasmClient();
+                setSigningCosmWasmClient(signingCosmwasmClient);
+            }
+            catch (error) {
+                setError(error);
+            }
+            finally {
+                setIsLoading(false);
+            }
         }
     };
     (0, react_1.useEffect)(() => {

package/hooks/useOfflineSigner.d.ts

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

package/hooks/useOfflineSigner.js

@@ -1,12 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useOfflineSigner = void 0;
+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 [offlineSigner, setOfflineSigner] = (0, react_1.useState)(null);
+    (0, react_1.useEffect)(() => {
+        if (wallet && chainName) {
+            setOfflineSigner(walletManager.getOfflineSigner(wallet, chainName));
+        }
+    }, [wallet, chainName]);
     return {
-        offlineSigner: walletManager.getOfflineSigner(wallet, chainName),
+        offlineSigner
     };
 };
 exports.useOfflineSigner = useOfflineSigner;

package/modal/modal.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WalletModal = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const hooks_1 = require("../hooks");
+const provider_1 = require("./provider");
 const style = {
     position: 'absolute',
     top: '50%',
@@ -13,8 +14,9 @@ const style = {
 };
 const WalletModal = () => {
     const walletManager = (0, hooks_1.useWalletManager)();
+    const { close } = (0, provider_1.useWalletModal)();
     return ((0, jsx_runtime_1.jsx)("ul", { style: style, children: walletManager.wallets.map(wallet => {
-            return ((0, jsx_runtime_1.jsxs)("li", { children: [(0, jsx_runtime_1.jsx)("span", { children: wallet.option.prettyName }), (0, jsx_runtime_1.jsx)("button", { onClick: () => walletManager.connect(wallet.option.name), children: "connect" })] }));
+            return ((0, jsx_runtime_1.jsxs)("li", { children: [(0, jsx_runtime_1.jsx)("span", { children: wallet.option.prettyName }), (0, jsx_runtime_1.jsx)("button", { onClick: () => walletManager.connect(wallet.option.name).then(close), children: "connect" })] }, wallet.option.name));
         }) }));
 };
 exports.WalletModal = WalletModal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.0.1-beta.5",
+  "version": "0.0.1-beta.7",
   "author": "cosmology-tech <developers@cosmology.zone>",
   "description": "interchain-kit wallet connector react package",
   "main": "index.js",
@@ -32,11 +32,11 @@
   "keywords": [],
   "dependencies": {
     "@chain-registry/v2-types": "^0.49.6",
-    "@interchain-kit/core": "0.0.1-beta.5",
+    "@interchain-kit/core": "0.0.1-beta.7",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
-  "gitHead": "84a7448891bef2688645da8009605786267de720"
+  "gitHead": "d5bf6f92f357b1e4b01da8acef35934542f06df5"
 }