@interchain-kit/react 0.3.28 → 0.3.31

package/esm/hooks/useSigningClient.js

@@ -2,7 +2,7 @@ import { useWalletManager } from "./useWalletManager";
 import { useAsync } from "./useAsync";
 import { WalletState } from "@interchain-kit/core";
 export const useSigningClient = (chainName, walletName) => {
-    const { getSigningClient, getChainWalletState, getRpcEndpoint } = useWalletManager();
+    const { getSigningClient, getChainWalletState, getRpcEndpoint, isReady } = useWalletManager();
     const chainWalletState = getChainWalletState(walletName, chainName);
     const { data, isLoading, error } = useAsync({
         queryKey: `signing-client-${chainName}-${walletName}`,
@@ -13,7 +13,7 @@ export const useSigningClient = (chainName, walletName) => {
                 return getSigningClient(walletName, chainName);
             }
         },
-        enabled: chainWalletState?.walletState === WalletState.Connected,
+        enabled: chainWalletState?.walletState === WalletState.Connected && isReady,
         disableCache: true,
     });
     return {

package/esm/modal/modal.js

@@ -8,16 +8,18 @@ import { transferToWalletUISchema } from "../utils";
 export const InterchainWalletModal = () => {
     const [shouldShowList, setShouldShowList] = useState(false);
     const { modalIsOpen: isOpen, walletConnectQRCodeUri, wallets: statefulWallets, getChainWalletState, currentWalletName, currentChainName, openModal: open, closeModal: close, chains, setCurrentWalletName, getDownloadLink, getEnv, } = useWalletManager();
+    const [selectedWallet, setSelectedWallet] = useState(null);
     const walletsForUI = statefulWallets.map((w) => 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 walletToShow = selectedWallet || currentWallet;
+    const { account, errorMessage } = getChainWalletState(selectedWallet?.info?.name || currentWalletName, currentChainName) || {};
     const disconnect = () => {
-        currentWallet.disconnect(chainToConnect.chainId);
+        walletToShow.disconnect(chainToConnect.chainId);
     };
     const onSelectWallet = (wallet) => {
+        setSelectedWallet(wallet);
         setShouldShowList(false);
         return wallet.connect(chainToConnect.chainId);
     };
@@ -29,7 +31,7 @@ export const InterchainWalletModal = () => {
     const onReconnect = () => {
         currentWallet.connect(chainToConnect.chainId);
     };
-    return (_jsx(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 === WalletState.Connecting, isConnected: currentWallet?.walletState === WalletState.Connected, isRejected: currentWallet?.walletState === WalletState.Rejected, isDisconnected: currentWallet?.walletState === WalletState.Disconnected, isNotExist: currentWallet?.walletState === WalletState.NotExist, errorMessage: errorMessage, onSelectWallet: (w) => onSelectWallet(w), onBack: () => setShouldShowList(true), onReconnect: () => onSelectWallet(currentWallet), getDownloadLink: () => getDownloadLink(currentWallet?.info.name), getEnv: getEnv }));
+    return (_jsx(WalletModal, { shouldShowList: shouldShowList, username: account?.username, address: account?.address, disconnect: disconnect, isOpen: isOpen, open: open, close: handleCloseModal, wallets: walletsForUI, walletConnectQRCodeUri: walletConnectQRCodeUri, currentWallet: walletToShow, isConnecting: walletToShow?.walletState === WalletState.Connecting, isConnected: walletToShow?.walletState === WalletState.Connected, isRejected: walletToShow?.walletState === WalletState.Rejected, isDisconnected: walletToShow?.walletState === WalletState.Disconnected, isNotExist: walletToShow?.walletState === WalletState.NotExist, errorMessage: errorMessage, onSelectWallet: (w) => onSelectWallet(w), onBack: () => setShouldShowList(true), onReconnect: () => onSelectWallet(walletToShow), getDownloadLink: () => getDownloadLink(walletToShow?.info.name), getEnv: getEnv }));
 };
 export 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 } = useMemo(() => {
@@ -40,12 +42,6 @@ export const WalletModal = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wa
                 content: (_jsx(WalletListContent, { onSelectWallet: onSelectWallet, wallets: wallets })),
             };
         }
-        if (currentWallet && currentWallet.errorMessage) {
-            return {
-                header: (_jsx(ErrorHeader, { wallet: currentWallet, close: close, onBack: onBack })),
-                content: _jsx(ErrorContent, { wallet: currentWallet, onBack: onBack }),
-            };
-        }
         if (currentWallet &&
             walletConnectQRCodeUri &&
             currentWallet.info.name === "WalletConnect") {
@@ -66,6 +62,12 @@ export const WalletModal = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wa
                 content: (_jsx(RejectContent, { wallet: currentWallet, onReconnect: onReconnect })),
             };
         }
+        if (currentWallet && currentWallet.errorMessage) {
+            return {
+                header: (_jsx(ErrorHeader, { wallet: currentWallet, close: close, onBack: onBack })),
+                content: _jsx(ErrorContent, { wallet: currentWallet, onBack: onBack }),
+            };
+        }
         if (currentWallet && isConnected) {
             return {
                 header: (_jsx(ConnectedHeader, { wallet: currentWallet, onBack: onBack, close: close })),
@@ -83,13 +85,14 @@ export const WalletModal = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wa
             content: (_jsx(WalletListContent, { onSelectWallet: onSelectWallet, wallets: wallets })),
         };
     }, [
-        currentWallet,
+        currentWallet?.info?.name,
         isConnected,
         isConnecting,
         address,
         shouldShowList,
         walletConnectQRCodeUri,
         wallets,
+        isOpen,
     ]);
     return (_jsx(ConnectModal, { isOpen: isOpen, header: header, onOpen: open, onClose: close, children: content }));
 };

package/esm/store/stateful-wallet.js

@@ -2,6 +2,7 @@ import { BaseWallet, WalletState, WCWallet } from "@interchain-kit/core";
 export class StatefulWallet extends BaseWallet {
     originalWallet;
     walletName;
+    walletState;
     walletSet;
     walletGet;
     set;
@@ -43,6 +44,7 @@ export class StatefulWallet extends BaseWallet {
         });
         walletSet(draft => {
             draft.walletState = WalletState.Connecting;
+            draft.errorMessage = '';
         });
         get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: WalletState.Connecting, errorMessage: '' });
         try {
@@ -80,7 +82,9 @@ export class StatefulWallet extends BaseWallet {
         const { get, walletName, walletSet, originalWallet } = this;
         const chainToConnect = this.getChainToConnect(chainId);
         try {
-            await originalWallet.disconnect(chainToConnect.chainId);
+            if (this.walletGet().walletState === WalletState.Connected) {
+                await originalWallet.disconnect(chainToConnect.chainId);
+            }
             get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: WalletState.Disconnected, account: null });
             walletSet(draft => {
                 draft.walletState = WalletState.Disconnected;

package/esm/store/store.js

@@ -1,9 +1,11 @@
+import { SigningClient } from '@interchainjs/cosmos/signing-client';
 import { clientNotExistError, WalletState } from "@interchain-kit/core";
 import { createStore } from "zustand";
 import { immer } from "zustand/middleware/immer";
 import { persist, createJSONStorage } from 'zustand/middleware';
 import { dedupeAsync } from '../utils';
 import { StatefulWallet } from './stateful-wallet';
+import { AminoGenericOfflineSigner, DirectGenericOfflineSigner } from '@interchainjs/cosmos/types/wallet';
 const immerSyncUp = (newWalletManager) => {
     return (draft) => {
         draft.chains = newWalletManager.chains;
@@ -129,6 +131,15 @@ export const createInterchainStore = (walletManager) => {
                     }
                     return cws;
                 });
+                draft.chainWalletState.forEach(cws => {
+                    const lastExistWallet = draft.wallets.find(w => w.info.name === cws.walletName);
+                    if (cws.walletState === WalletState.Connected && lastExistWallet.walletState !== WalletState.Connected) {
+                        lastExistWallet.walletState = WalletState.Connected;
+                    }
+                    if (cws.walletState === WalletState.NotExist) {
+                        lastExistWallet.walletState = WalletState.NotExist;
+                    }
+                });
                 draft.isReady = true;
             });
         },
@@ -224,6 +235,14 @@ export const createInterchainStore = (walletManager) => {
             if (!chain) {
                 throw new Error(`Chain ${chainName} not found`);
             }
+            const existedAccount = get().chainWalletState.find(cws => cws.walletName === walletName && cws.chainName === chainName)?.account;
+            if (existedAccount) {
+                if (typeof existedAccount.pubkey === 'object') {
+                    // return from localstorage need to restructure to uinit8Array
+                    return { ...existedAccount, pubkey: Uint8Array.from({ ...existedAccount.pubkey, length: Object.keys(existedAccount.pubkey).length }) };
+                }
+                return existedAccount;
+            }
             return wallet.getAccount(chain.chainId);
         },
         getRpcEndpoint: async (walletName, chainName) => {
@@ -247,17 +266,39 @@ export const createInterchainStore = (walletManager) => {
         getDownloadLink(walletName) {
             return walletManager.getDownloadLink(walletName);
         },
-        getOfflineSigner(walletName, chainName) {
-            return walletManager.getOfflineSigner(walletName, chainName);
+        async getOfflineSigner(walletName, chainName) {
+            const chain = get().chains.find(c => c.chainName === chainName);
+            const wallet = get().getStatefulWalletByName(walletName);
+            const walletToUse = wallet.originalWallet;
+            console.log(await get().getAccount(walletName, chainName));
+            const preferSignType = get().getPreferSignType(chainName);
+            let offlineSigner;
+            if (preferSignType === 'amino') {
+                offlineSigner = new AminoGenericOfflineSigner({
+                    getAccounts: async () => [await get().getAccount(walletName, chainName)],
+                    signAmino(signerAddress, signDoc) {
+                        return walletToUse.signAmino(chain.chainId, signerAddress, signDoc, walletToUse.defaultSignOptions);
+                    },
+                });
+            }
+            else if (preferSignType === 'direct') {
+                offlineSigner = new DirectGenericOfflineSigner({
+                    getAccounts: async () => [await get().getAccount(walletName, chainName)],
+                    signDirect(signerAddress, signDoc) {
+                        return walletToUse.signDirect(chain.chainId, signerAddress, signDoc, walletToUse.defaultSignOptions);
+                    }
+                });
+            }
+            return offlineSigner;
         },
         getPreferSignType(chainName) {
             const result = walletManager.getPreferSignType(chainName);
-            set(immerSyncUp(walletManager));
+            // set(immerSyncUp(walletManager))
             return result;
         },
         getSignerOptions(chainName) {
             const result = walletManager.getSignerOptions(chainName);
-            set(immerSyncUp(walletManager));
+            // set(immerSyncUp(walletManager))
             return result;
         },
         getWalletByName(walletName) {
@@ -267,7 +308,11 @@ export const createInterchainStore = (walletManager) => {
             return get().wallets.find(w => w.info.name === walletName);
         },
         async getSigningClient(walletName, chainName) {
-            return walletManager.getSigningClient(walletName, chainName);
+            const chainWalletState = get().getChainWalletState(walletName, chainName);
+            const signerOptions = await get().getSignerOptions(chainName);
+            const offlineSigner = await get().getOfflineSigner(walletName, chainName);
+            const signingClient = await SigningClient.connectWithSigner(chainWalletState.rpcEndpoint, offlineSigner, signerOptions);
+            return signingClient;
         },
         getEnv() {
             return walletManager.getEnv();

package/hooks/useSigningClient.js

@@ -5,7 +5,7 @@ const useWalletManager_1 = require("./useWalletManager");
 const useAsync_1 = require("./useAsync");
 const core_1 = require("@interchain-kit/core");
 const useSigningClient = (chainName, walletName) => {
-    const { getSigningClient, getChainWalletState, getRpcEndpoint } = (0, useWalletManager_1.useWalletManager)();
+    const { getSigningClient, getChainWalletState, getRpcEndpoint, isReady } = (0, useWalletManager_1.useWalletManager)();
     const chainWalletState = getChainWalletState(walletName, chainName);
     const { data, isLoading, error } = (0, useAsync_1.useAsync)({
         queryKey: `signing-client-${chainName}-${walletName}`,
@@ -16,7 +16,7 @@ const useSigningClient = (chainName, walletName) => {
                 return getSigningClient(walletName, chainName);
             }
         },
-        enabled: chainWalletState?.walletState === core_1.WalletState.Connected,
+        enabled: chainWalletState?.walletState === core_1.WalletState.Connected && isReady,
         disableCache: true,
     });
     return {

package/modal/modal.js

@@ -11,16 +11,18 @@ 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 [selectedWallet, setSelectedWallet] = (0, react_1.useState)(null);
     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 walletToShow = selectedWallet || currentWallet;
+    const { account, errorMessage } = getChainWalletState(selectedWallet?.info?.name || currentWalletName, currentChainName) || {};
     const disconnect = () => {
-        currentWallet.disconnect(chainToConnect.chainId);
+        walletToShow.disconnect(chainToConnect.chainId);
     };
     const onSelectWallet = (wallet) => {
+        setSelectedWallet(wallet);
         setShouldShowList(false);
         return wallet.connect(chainToConnect.chainId);
     };
@@ -32,7 +34,7 @@ const InterchainWalletModal = () => {
     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 }));
+    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: walletToShow, isConnecting: walletToShow?.walletState === core_1.WalletState.Connecting, isConnected: walletToShow?.walletState === core_1.WalletState.Connected, isRejected: walletToShow?.walletState === core_1.WalletState.Rejected, isDisconnected: walletToShow?.walletState === core_1.WalletState.Disconnected, isNotExist: walletToShow?.walletState === core_1.WalletState.NotExist, errorMessage: errorMessage, onSelectWallet: (w) => onSelectWallet(w), onBack: () => setShouldShowList(true), onReconnect: () => onSelectWallet(walletToShow), getDownloadLink: () => getDownloadLink(walletToShow?.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, }) => {
@@ -44,12 +46,6 @@ const WalletModal = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets,
                 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") {
@@ -70,6 +66,12 @@ const WalletModal = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets,
                 content: ((0, jsx_runtime_1.jsx)(views_1.RejectContent, { wallet: currentWallet, onReconnect: onReconnect })),
             };
         }
+        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 && isConnected) {
             return {
                 header: ((0, jsx_runtime_1.jsx)(views_1.ConnectedHeader, { wallet: currentWallet, onBack: onBack, close: close })),
@@ -87,13 +89,14 @@ const WalletModal = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets,
             content: ((0, jsx_runtime_1.jsx)(views_1.WalletListContent, { onSelectWallet: onSelectWallet, wallets: wallets })),
         };
     }, [
-        currentWallet,
+        currentWallet?.info?.name,
         isConnected,
         isConnecting,
         address,
         shouldShowList,
         walletConnectQRCodeUri,
         wallets,
+        isOpen,
     ]);
     return ((0, jsx_runtime_1.jsx)(react_2.ConnectModal, { isOpen: isOpen, header: header, onOpen: open, onClose: close, children: content }));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.3.28",
+  "version": "0.3.31",
   "author": "Hyperweb <developers@hyperweb.io>",
   "description": "interchain-kit wallet connector react package",
   "main": "index.js",
@@ -34,14 +34,14 @@
   "keywords": [],
   "dependencies": {
     "@chain-registry/v2-types": "^0.53.40",
-    "@interchain-kit/core": "^0.3.28",
+    "@interchain-kit/core": "^0.3.31",
     "@interchain-ui/react": "1.26.1",
-    "@interchainjs/cosmos": "1.11.9",
-    "@interchainjs/cosmos-types": "1.11.9",
-    "@interchainjs/types": "1.11.9",
+    "@interchainjs/cosmos": "1.11.11",
+    "@interchainjs/cosmos-types": "1.11.11",
+    "@interchainjs/types": "1.11.11",
     "@react-icons/all-files": "^4.1.0",
     "@walletconnect/types": "^2.17.3",
-    "interchainjs": "1.11.9",
+    "interchainjs": "1.11.11",
     "zustand": "^5.0.3"
   },
   "devDependencies": {
@@ -64,5 +64,5 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
-  "gitHead": "20ab0e3fffc347793017ee422b7f4a2544943724"
+  "gitHead": "ec8719da721263a2b3f1474aa106ce0da2425bf6"
 }

package/store/stateful-wallet.d.ts

@@ -1,9 +1,10 @@
-import { BaseWallet, WalletAccount } from "@interchain-kit/core";
+import { BaseWallet, WalletAccount, WalletState } 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;
+    walletState: WalletState;
     walletSet: (arg: (draft: StatefulWallet) => void) => void;
     walletGet: () => StatefulWallet;
     set: (arg: (draft: InterchainStore) => void) => void;

package/store/stateful-wallet.js

@@ -5,6 +5,7 @@ const core_1 = require("@interchain-kit/core");
 class StatefulWallet extends core_1.BaseWallet {
     originalWallet;
     walletName;
+    walletState;
     walletSet;
     walletGet;
     set;
@@ -46,6 +47,7 @@ class StatefulWallet extends core_1.BaseWallet {
         });
         walletSet(draft => {
             draft.walletState = core_1.WalletState.Connecting;
+            draft.errorMessage = '';
         });
         get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Connecting, errorMessage: '' });
         try {
@@ -83,7 +85,9 @@ class StatefulWallet extends core_1.BaseWallet {
         const { get, walletName, walletSet, originalWallet } = this;
         const chainToConnect = this.getChainToConnect(chainId);
         try {
-            await originalWallet.disconnect(chainToConnect.chainId);
+            if (this.walletGet().walletState === core_1.WalletState.Connected) {
+                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;

package/store/store.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createInterchainStore = void 0;
+const signing_client_1 = require("@interchainjs/cosmos/signing-client");
 const core_1 = require("@interchain-kit/core");
 const zustand_1 = require("zustand");
 const immer_1 = require("zustand/middleware/immer");
 const middleware_1 = require("zustand/middleware");
 const utils_1 = require("../utils");
 const stateful_wallet_1 = require("./stateful-wallet");
+const wallet_1 = require("@interchainjs/cosmos/types/wallet");
 const immerSyncUp = (newWalletManager) => {
     return (draft) => {
         draft.chains = newWalletManager.chains;
@@ -132,6 +134,15 @@ const createInterchainStore = (walletManager) => {
                     }
                     return cws;
                 });
+                draft.chainWalletState.forEach(cws => {
+                    const lastExistWallet = draft.wallets.find(w => w.info.name === cws.walletName);
+                    if (cws.walletState === core_1.WalletState.Connected && lastExistWallet.walletState !== core_1.WalletState.Connected) {
+                        lastExistWallet.walletState = core_1.WalletState.Connected;
+                    }
+                    if (cws.walletState === core_1.WalletState.NotExist) {
+                        lastExistWallet.walletState = core_1.WalletState.NotExist;
+                    }
+                });
                 draft.isReady = true;
             });
         },
@@ -227,6 +238,14 @@ const createInterchainStore = (walletManager) => {
             if (!chain) {
                 throw new Error(`Chain ${chainName} not found`);
             }
+            const existedAccount = get().chainWalletState.find(cws => cws.walletName === walletName && cws.chainName === chainName)?.account;
+            if (existedAccount) {
+                if (typeof existedAccount.pubkey === 'object') {
+                    // return from localstorage need to restructure to uinit8Array
+                    return { ...existedAccount, pubkey: Uint8Array.from({ ...existedAccount.pubkey, length: Object.keys(existedAccount.pubkey).length }) };
+                }
+                return existedAccount;
+            }
             return wallet.getAccount(chain.chainId);
         },
         getRpcEndpoint: async (walletName, chainName) => {
@@ -250,17 +269,39 @@ const createInterchainStore = (walletManager) => {
         getDownloadLink(walletName) {
             return walletManager.getDownloadLink(walletName);
         },
-        getOfflineSigner(walletName, chainName) {
-            return walletManager.getOfflineSigner(walletName, chainName);
+        async getOfflineSigner(walletName, chainName) {
+            const chain = get().chains.find(c => c.chainName === chainName);
+            const wallet = get().getStatefulWalletByName(walletName);
+            const walletToUse = wallet.originalWallet;
+            console.log(await get().getAccount(walletName, chainName));
+            const preferSignType = get().getPreferSignType(chainName);
+            let offlineSigner;
+            if (preferSignType === 'amino') {
+                offlineSigner = new wallet_1.AminoGenericOfflineSigner({
+                    getAccounts: async () => [await get().getAccount(walletName, chainName)],
+                    signAmino(signerAddress, signDoc) {
+                        return walletToUse.signAmino(chain.chainId, signerAddress, signDoc, walletToUse.defaultSignOptions);
+                    },
+                });
+            }
+            else if (preferSignType === 'direct') {
+                offlineSigner = new wallet_1.DirectGenericOfflineSigner({
+                    getAccounts: async () => [await get().getAccount(walletName, chainName)],
+                    signDirect(signerAddress, signDoc) {
+                        return walletToUse.signDirect(chain.chainId, signerAddress, signDoc, walletToUse.defaultSignOptions);
+                    }
+                });
+            }
+            return offlineSigner;
         },
         getPreferSignType(chainName) {
             const result = walletManager.getPreferSignType(chainName);
-            set(immerSyncUp(walletManager));
+            // set(immerSyncUp(walletManager))
             return result;
         },
         getSignerOptions(chainName) {
             const result = walletManager.getSignerOptions(chainName);
-            set(immerSyncUp(walletManager));
+            // set(immerSyncUp(walletManager))
             return result;
         },
         getWalletByName(walletName) {
@@ -270,7 +311,11 @@ const createInterchainStore = (walletManager) => {
             return get().wallets.find(w => w.info.name === walletName);
         },
         async getSigningClient(walletName, chainName) {
-            return walletManager.getSigningClient(walletName, chainName);
+            const chainWalletState = get().getChainWalletState(walletName, chainName);
+            const signerOptions = await get().getSignerOptions(chainName);
+            const offlineSigner = await get().getOfflineSigner(walletName, chainName);
+            const signingClient = await signing_client_1.SigningClient.connectWithSigner(chainWalletState.rpcEndpoint, offlineSigner, signerOptions);
+            return signingClient;
         },
         getEnv() {
             return walletManager.getEnv();

package/utils/wallet.d.ts

@@ -15,7 +15,6 @@ export declare const transferToWalletUISchema: (w: BaseWallet) => {
         session: import("@walletconnect/types").SessionTypes.Struct;
         info: import("@interchain-kit/core").Wallet;
         errorMessage: string;
-        walletState: import("@interchain-kit/core").WalletState;
         events: import("events")<import("@interchain-kit/core").WalletEvents>;
         chainMap: Map<import("@chain-registry/v2-types").Chain["chainId"], import("@chain-registry/v2-types").Chain>;
         assetLists: import("@chain-registry/v2-types").AssetList[];