@interchain-kit/react 0.3.31 → 0.3.34

package/esm/modal/modal.js

@@ -2,24 +2,26 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { ConnectedContent, ConnectedHeader, ConnectingContent, ConnectingHeader, ErrorContent, ErrorHeader, NotExistContent, NotExistHeader, QRCodeContent, QRCodeHeader, RejectContent, RejectHeader, WalletListContent, WalletListHeader, } from "./views";
 import { useMemo, useState } from "react";
 import { WalletState } from "@interchain-kit/core";
-import { ConnectModal, } from "@interchain-ui/react";
+import { ConnectModal, ThemeProvider, } from "@interchain-ui/react";
 import { useWalletManager } from "../hooks";
 import { transferToWalletUISchema } from "../utils";
-export const InterchainWalletModal = () => {
+export const InterchainWalletModal = ({ 
+// ==== Custom modal styles
+modalContainerClassName, modalContentClassName, modalChildrenClassName, modalContentStyles, modalThemeProviderProps, }) => {
     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 [walletToConnect, setWalletToConnect] = 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 walletToShow = selectedWallet || currentWallet;
-    const { account, errorMessage } = getChainWalletState(selectedWallet?.info?.name || currentWalletName, currentChainName) || {};
+    const walletToShow = walletToConnect || currentWallet;
+    const { account, errorMessage } = getChainWalletState(walletToConnect?.info?.name || currentWalletName, currentChainName) || {};
     const disconnect = () => {
         walletToShow.disconnect(chainToConnect.chainId);
     };
     const onSelectWallet = (wallet) => {
-        setSelectedWallet(wallet);
+        setWalletToConnect(wallet);
         setShouldShowList(false);
         return wallet.connect(chainToConnect.chainId);
     };
@@ -31,9 +33,9 @@ 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: 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 }));
+    return (_jsx(ThemeProvider, { ...modalThemeProviderProps, children: _jsx(WalletModalElement, { 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, modalContainerClassName: modalContainerClassName, modalContentClassName: modalContentClassName, modalChildrenClassName: modalChildrenClassName, modalContentStyles: modalContentStyles, modalThemeProviderProps: modalThemeProviderProps }) }));
 };
-export const WalletModal = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets, username, address, currentWallet, isConnecting, isConnected, isRejected, isDisconnected, isNotExist, errorMessage, open, close, disconnect, onSelectWallet, onBack, onReconnect, getDownloadLink, getEnv, }) => {
+export const WalletModalElement = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets, username, address, currentWallet, isConnecting, isConnected, isRejected, isDisconnected, isNotExist, errorMessage, open, close, disconnect, onSelectWallet, onBack, onReconnect, getDownloadLink, getEnv, modalThemeProviderProps, modalContainerClassName, modalContentClassName, modalChildrenClassName, modalContentStyles, }) => {
     const { header, content } = useMemo(() => {
         if (shouldShowList ||
             (isDisconnected && currentWallet.errorMessage === "")) {
@@ -94,12 +96,11 @@ export const WalletModal = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wa
         wallets,
         isOpen,
     ]);
-    return (_jsx(ConnectModal, { isOpen: isOpen, header: header, onOpen: open, onClose: close, children: content }));
+    return (_jsx(ConnectModal, { isOpen: isOpen, header: header, onOpen: open, onClose: close, modalContainerClassName: modalContainerClassName, modalContentClassName: modalContentClassName, modalChildrenClassName: modalChildrenClassName, modalContentStyles: modalContentStyles, children: content }));
 };
 export const ModalRenderer = ({ walletModal: ProvidedWalletModal, }) => {
     if (!ProvidedWalletModal) {
-        throw new Error(`InterchainWalletProvider: walletModal is required. Please provide a wallet modal component. or use InterchainkitWalletModal/n
-      Example: <ChainProvider chains={chains} assetLists={assetLists} wallets={wallets} walletModal={InterchainKitWalletModal} />`);
+        return null;
     }
     const { modalIsOpen, openModal, closeModal, wallets, currentWalletName } = useWalletManager();
     return (_jsx(ProvidedWalletModal, { wallets: wallets, isOpen: modalIsOpen, open: openModal, close: closeModal, currentWallet: wallets.find((w) => w.info.name === currentWalletName) }));

package/esm/provider.js

@@ -13,7 +13,7 @@ export const ChainProvider = ({ chains, assetLists, wallets, signerOptions, endp
         // walletManager.init();
         store.current.getState().init();
     }, []);
-    return (_jsxs(InterchainWalletContext.Provider, { value: store.current, children: [children, _jsx(ModalRenderer, { walletModal: ProviderWalletModal })] }));
+    return (_jsxs(InterchainWalletContext.Provider, { value: store.current, children: [children, ProviderWalletModal && (_jsx(ModalRenderer, { walletModal: ProviderWalletModal }))] }));
 };
 export const useInterchainWalletContext = () => {
     const context = useContext(InterchainWalletContext);

package/esm/store/stateful-wallet.js

@@ -1,105 +1,129 @@
-import { BaseWallet, WalletState, WCWallet } from "@interchain-kit/core";
+import { BaseWallet, clientNotExistError, CosmosWallet, EthereumWallet, MultiChainWallet, WalletState, WCWallet } from "@interchain-kit/core";
 export class StatefulWallet extends BaseWallet {
     originalWallet;
     walletName;
-    walletState;
-    walletSet;
-    walletGet;
-    set;
     get;
-    constructor(wallet, walletSet, walletGet, set, get) {
+    constructor(wallet, get) {
         super(wallet.info);
         this.originalWallet = wallet;
         this.walletName = wallet.info.name;
-        this.walletState = WalletState.Disconnected;
-        this.errorMessage = "";
-        this.walletSet = walletSet;
-        this.walletGet = walletGet;
-        this.set = set;
         this.get = get;
     }
-    getChainToConnect(chainId) {
-        const { currentChainName, chains } = this.get();
-        const lastChainName = currentChainName;
-        const lastChain = chains.find((chain) => chain.chainName === lastChainName);
-        return chainId ? this.originalWallet.getChainById(chainId) : lastChain;
+    get store() {
+        return this.get();
+    }
+    get walletState() {
+        // 獲取此錢包在所有鏈上的狀態
+        const states = (this.store.chainWalletState || [])
+            .filter(cws => cws.walletName === this.walletName)
+            .map(cws => cws.walletState);
+        // If any chain is in the connected state, return connected
+        if (states.includes(WalletState.Connected)) {
+            return WalletState.Connected;
+        }
+        // 如果有任何一個鏈正在連接中，則返回連接中
+        if (states.includes(WalletState.Connecting)) {
+            return WalletState.Connecting;
+        }
+        // 如果所有鏈都是不存在狀態，則返回不存在
+        if (states.length > 0 && states.every(state => state === WalletState.NotExist)) {
+            return WalletState.NotExist;
+        }
+        // 如果有任何一個鏈是被拒絕狀態，則返回被拒絕
+        if (states.includes(WalletState.Rejected)) {
+            return WalletState.Rejected;
+        }
+        // 預設返回未連接
+        return WalletState.Disconnected;
+    }
+    get errorMessage() {
+        // 獲取此錢包在所有鏈上的錯誤訊息
+        const errors = (this.store.chainWalletState || [])
+            .filter(cws => cws.walletName === this.walletName)
+            .map(cws => cws.errorMessage)
+            .filter(error => error && error.trim() !== '');
+        // 返回第一個非空錯誤訊息，如果沒有則返回空字串
+        return errors.length > 0 ? errors[0] : '';
     }
     async init() {
-        return this.originalWallet.init();
+        try {
+            await this.originalWallet.init();
+            this.store.chains.forEach(chain => {
+                const lastChainWalletState = this.store.getChainWalletState(this.walletName, chain.chainName)?.walletState;
+                if (lastChainWalletState === WalletState.NotExist) {
+                    this.store.updateChainWalletState(this.walletName, chain.chainName, {
+                        walletState: WalletState.Disconnected,
+                        errorMessage: ''
+                    });
+                }
+            });
+        }
+        catch (error) {
+            if (error === clientNotExistError) {
+                this.store.chains.forEach(chain => {
+                    this.store.updateChainWalletState(this.walletName, chain.chainName, {
+                        walletState: WalletState.NotExist,
+                        errorMessage: clientNotExistError.message
+                    });
+                });
+            }
+        }
     }
     async connect(chainId) {
-        const { get, set, walletName, walletGet, walletSet, originalWallet } = this;
-        const chainToConnect = this.getChainToConnect(chainId);
-        const state = get().getChainWalletState(walletName, chainToConnect.chainName)?.walletState;
+        const { store, walletName, originalWallet } = this;
+        const chainToConnect = this.getChainById(chainId);
+        const state = store.getChainWalletState(walletName, chainToConnect.chainName)?.walletState;
         if (state === WalletState.NotExist) {
             return;
         }
         if (walletName === 'WalletConnect' && state === WalletState.Connected) {
             return;
         }
-        set(draft => {
-            draft.currentChainName = chainToConnect.chainName;
-            draft.currentWalletName = walletName;
-            draft.walletConnectQRCodeUri = '';
-        });
-        walletSet(draft => {
-            draft.walletState = WalletState.Connecting;
-            draft.errorMessage = '';
-        });
-        get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: WalletState.Connecting, errorMessage: '' });
+        store.setCurrentChainName(chainToConnect.chainName);
+        store.setCurrentWalletName(walletName);
+        store.setWalletConnectQRCodeUri('');
+        store.updateChainWalletState(walletName, chainToConnect.chainName, { walletState: WalletState.Connecting, errorMessage: '' });
         try {
             if (originalWallet instanceof WCWallet) {
                 originalWallet.setOnPairingUriCreatedCallback((uri) => {
-                    set(draft => {
-                        draft.walletConnectQRCodeUri = uri;
-                    });
+                    store.setWalletConnectQRCodeUri(uri);
                 });
             }
             await originalWallet.connect(chainToConnect.chainId);
-            get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: WalletState.Connected });
-            walletSet(draft => {
-                draft.walletState = WalletState.Connected;
-            });
-            await walletGet().getAccount(chainToConnect.chainId);
+            store.updateChainWalletState(walletName, chainToConnect.chainName, { walletState: WalletState.Connected });
+            await this.getAccount(chainToConnect.chainId);
         }
         catch (error) {
-            if (error.message === 'Request rejected') {
-                get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: WalletState.Rejected, errorMessage: error.message });
-                walletSet(draft => {
-                    draft.walletState = WalletState.Rejected;
-                    draft.errorMessage = error.message;
-                });
+            if (error.message.includes('rejected')) {
+                store.updateChainWalletState(walletName, chainToConnect.chainName, { walletState: WalletState.Rejected, errorMessage: error.message });
                 return;
             }
-            get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: WalletState.Disconnected, errorMessage: error.message });
-            walletSet(draft => {
-                draft.walletState = WalletState.Disconnected;
-                draft.errorMessage = error.message;
-            });
+            else {
+                store.updateChainWalletState(walletName, chainToConnect.chainName, { walletState: WalletState.Disconnected, errorMessage: error.message });
+            }
         }
     }
     async disconnect(chainId) {
-        const { get, walletName, walletSet, originalWallet } = this;
-        const chainToConnect = this.getChainToConnect(chainId);
+        const { store, walletName, originalWallet } = this;
+        const chainToConnect = this.getChainById(chainId);
         try {
-            if (this.walletGet().walletState === WalletState.Connected) {
+            if (this.walletState === WalletState.Connected) {
                 await originalWallet.disconnect(chainToConnect.chainId);
             }
-            get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: WalletState.Disconnected, account: null });
-            walletSet(draft => {
-                draft.walletState = WalletState.Disconnected;
-                draft.errorMessage = "";
-            });
+            store.updateChainWalletState(walletName, chainToConnect.chainName, { walletState: WalletState.Disconnected, account: null });
         }
         catch (error) {
         }
     }
     async getAccount(chainId) {
-        const chainToConnect = this.getChainToConnect(chainId);
-        const { get, walletName, originalWallet } = this;
+        const chainToConnect = this.getChainById(chainId);
+        const { store, walletName, originalWallet } = this;
         try {
             const account = await originalWallet.getAccount(chainToConnect.chainId);
-            get().updateChainWalletState(walletName, chainToConnect.chainName, { account });
+            store.updateChainWalletState(walletName, chainToConnect.chainName, { account });
+            if (this.originalWallet instanceof WCWallet) {
+                this.originalWallet.setAccountToRestore(account);
+            }
             return account;
         }
         catch (error) {
@@ -118,4 +142,24 @@ export class StatefulWallet extends BaseWallet {
     getChainById(chainId) {
         return this.originalWallet.getChainById(chainId);
     }
+    getWalletOfType(WalletClass) {
+        if (this.originalWallet instanceof WalletClass) {
+            return this.originalWallet;
+        }
+        if (this.originalWallet instanceof MultiChainWallet) {
+            if (WalletClass === CosmosWallet) {
+                const cosmosWallet = this.originalWallet.getWalletByChainType('cosmos');
+                if (cosmosWallet) {
+                    return cosmosWallet;
+                }
+            }
+            if (WalletClass === EthereumWallet) {
+                const ethereumWallet = this.originalWallet.getWalletByChainType('eip155');
+                if (ethereumWallet) {
+                    return ethereumWallet;
+                }
+            }
+        }
+        return undefined;
+    }
 }

package/esm/store/store.js

@@ -1,11 +1,9 @@
-import { SigningClient } from '@interchainjs/cosmos/signing-client';
-import { clientNotExistError, WalletState } from "@interchain-kit/core";
+import { 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 { dedupeAsync, restoreAccountFromLocalStorage } from '../utils';
 import { StatefulWallet } from './stateful-wallet';
-import { AminoGenericOfflineSigner, DirectGenericOfflineSigner } from '@interchainjs/cosmos/types/wallet';
 const immerSyncUp = (newWalletManager) => {
     return (draft) => {
         draft.chains = newWalletManager.chains;
@@ -25,12 +23,7 @@ export const createInterchainStore = (walletManager) => {
         currentChainName: '',
         chains: [...walletManager.chains],
         assetLists: [...walletManager.assetLists],
-        wallets: walletManager.wallets.map(wallet => {
-            const walletSet = (fn) => {
-                set((draft) => fn(draft.wallets.find(w => w.info.name === wallet.info.name)));
-            };
-            return new StatefulWallet(wallet, walletSet, () => get().wallets.find(w => w.info.name === wallet.info.name), set, get);
-        }),
+        wallets: walletManager.wallets.map(wallet => new StatefulWallet(wallet, get)),
         signerOptions: walletManager.signerOptions,
         endpointOptions: walletManager.endpointOptions,
         preferredSignTypeMap: { ...walletManager.preferredSignTypeMap },
@@ -56,28 +49,6 @@ export const createInterchainStore = (walletManager) => {
                 draft.chainWalletState[targetIndex] = { ...draft.chainWalletState[targetIndex], ...data };
             });
         },
-        createStatefulWallet: () => {
-            const wallets = walletManager.wallets.map(wallet => {
-                const walletSet = (fn) => {
-                    set((draft) => fn(draft.wallets.find(w => w.info.name === wallet.info.name)));
-                };
-                return new StatefulWallet(wallet, walletSet, () => get().wallets.find(w => w.info.name === wallet.info.name), set, get);
-            });
-            set(draft => {
-                draft.wallets = wallets;
-            });
-            const defaultWalletStates = get().chainWalletState.reduce((acc, cws) => {
-                if (acc[cws.walletName] && cws.walletState === WalletState.Connected) {
-                    return acc;
-                }
-                return { ...acc, [cws.walletName]: cws.walletState };
-            }, {});
-            set(draft => {
-                draft.wallets.forEach(wallet => {
-                    wallet.walletState = defaultWalletStates[wallet.info.name];
-                });
-            });
-        },
         init: async () => {
             const oldChainWalletStatesMap = new Map(get().chainWalletState.map(cws => [cws.walletName + cws.chainName, cws]));
             // get().createStatefulWallet()
@@ -104,42 +75,8 @@ export const createInterchainStore = (walletManager) => {
                     });
                 });
             });
-            const NotExistWallets = [];
-            const ExistWallets = [];
-            await Promise.all(get().wallets.map(async (wallet) => {
-                try {
-                    await wallet.init();
-                    ExistWallets.push(wallet.info.name);
-                }
-                catch (error) {
-                    if (error === clientNotExistError) {
-                        NotExistWallets.push(wallet.info.name);
-                    }
-                }
-            }));
+            await Promise.all(get().wallets.map(async (wallet) => wallet.init()));
             set(draft => {
-                draft.chainWalletState = draft.chainWalletState.map(cws => {
-                    if (NotExistWallets.includes(cws.walletName)) {
-                        return { ...cws, walletState: WalletState.NotExist };
-                    }
-                    return cws;
-                });
-                draft.chainWalletState = draft.chainWalletState.map(cws => {
-                    if (ExistWallets.includes(cws.walletName)) {
-                        const newState = cws.walletState === WalletState.NotExist ? WalletState.Disconnected : cws.walletState;
-                        return { ...cws, walletState: newState };
-                    }
-                    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;
             });
         },
@@ -149,6 +86,9 @@ export const createInterchainStore = (walletManager) => {
         setCurrentWalletName: (walletName) => {
             set(draft => { draft.currentWalletName = walletName; });
         },
+        setWalletConnectQRCodeUri: (uri) => {
+            set(draft => { draft.walletConnectQRCodeUri = uri; });
+        },
         getDraftChainWalletState: (state, walletName, chainName) => {
             const targetIndex = state.chainWalletState.findIndex(cws => cws.walletName === walletName && cws.chainName === chainName);
             return state.chainWalletState[targetIndex];
@@ -237,10 +177,6 @@ export const createInterchainStore = (walletManager) => {
             }
             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);
@@ -267,29 +203,7 @@ export const createInterchainStore = (walletManager) => {
             return walletManager.getDownloadLink(walletName);
         },
         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;
+            return walletManager.getOfflineSigner(walletName, chainName);
         },
         getPreferSignType(chainName) {
             const result = walletManager.getPreferSignType(chainName);
@@ -308,11 +222,7 @@ export const createInterchainStore = (walletManager) => {
             return get().wallets.find(w => w.info.name === walletName);
         },
         async 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;
+            return walletManager.getSigningClient(walletName, chainName);
         },
         getEnv() {
             return walletManager.getEnv();
@@ -339,6 +249,12 @@ export const createInterchainStore = (walletManager) => {
                 }
                 else {
                     // console.log('interchain-kit store hydration finished')
+                    state.chainWalletState = state.chainWalletState.map(cws => {
+                        return {
+                            ...cws,
+                            account: cws.account ? restoreAccountFromLocalStorage(cws.account) : null
+                        };
+                    });
                 }
             };
         },

package/esm/utils/index.js

@@ -1,2 +1,3 @@
 export * from './wallet';
 export * from './dedupeAsync';
+export * from './restoreAccount';

package/esm/utils/restoreAccount.js

@@ -0,0 +1,8 @@
+export const restoreAccountFromLocalStorage = (walletAccount) => {
+    const pubkey = walletAccount.pubkey;
+    if (typeof pubkey === 'object') {
+        // return from localstorage need to restructure to uinit8Array
+        return { ...walletAccount, pubkey: Uint8Array.from({ ...pubkey, length: Object.keys(pubkey).length }) };
+    }
+    return walletAccount;
+};

package/modal/modal.d.ts

@@ -1,8 +1,23 @@
 import { ReactElement } from "react";
 import { DownloadInfo } from "@interchain-kit/core";
-import { Wallet as InterchainUIWalletType } from "@interchain-ui/react";
+import { Wallet as InterchainUIWalletType, ThemeProviderProps } from "@interchain-ui/react";
 import { StatefulWallet } from "../store/stateful-wallet";
+export type WalletModalProps = {
+    isOpen: boolean;
+    wallets: StatefulWallet[];
+    currentWallet?: StatefulWallet;
+    open: () => void;
+    close: () => void;
+};
 export type InterchainWalletModalProps = {
+    modalContainerClassName?: string;
+    modalContentClassName?: string;
+    modalChildrenClassName?: string;
+    modalContentStyles?: React.CSSProperties;
+    modalThemeProviderProps?: ThemeProviderProps;
+};
+export declare const InterchainWalletModal: ({ modalContainerClassName, modalContentClassName, modalChildrenClassName, modalContentStyles, modalThemeProviderProps, }: InterchainWalletModalProps) => import("react/jsx-runtime").JSX.Element;
+export type WalletModalElementProps = {
     shouldShowList: boolean;
     isOpen: boolean;
     walletConnectQRCodeUri: string | null;
@@ -28,16 +43,13 @@ export type InterchainWalletModalProps = {
         device?: string;
         os?: string;
     };
+    modalThemeProviderProps?: ThemeProviderProps;
+    modalContainerClassName?: string;
+    modalContentClassName?: string;
+    modalChildrenClassName?: string;
+    modalContentStyles?: React.CSSProperties;
 };
-export type WalletModalProps = {
-    isOpen: boolean;
-    wallets: StatefulWallet[];
-    currentWallet?: StatefulWallet;
-    open: () => void;
-    close: () => void;
-};
-export declare const InterchainWalletModal: () => import("react/jsx-runtime").JSX.Element;
-export declare const WalletModal: ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets, username, address, currentWallet, isConnecting, isConnected, isRejected, isDisconnected, isNotExist, errorMessage, open, close, disconnect, onSelectWallet, onBack, onReconnect, getDownloadLink, getEnv, }: InterchainWalletModalProps) => import("react/jsx-runtime").JSX.Element;
+export declare const WalletModalElement: ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets, username, address, currentWallet, isConnecting, isConnected, isRejected, isDisconnected, isNotExist, errorMessage, open, close, disconnect, onSelectWallet, onBack, onReconnect, getDownloadLink, getEnv, modalThemeProviderProps, modalContainerClassName, modalContentClassName, modalChildrenClassName, modalContentStyles, }: WalletModalElementProps) => import("react/jsx-runtime").JSX.Element;
 export declare const ModalRenderer: ({ walletModal: ProvidedWalletModal, }: {
     walletModal: (props: WalletModalProps) => ReactElement;
 }) => import("react/jsx-runtime").JSX.Element;

package/modal/modal.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModalRenderer = exports.WalletModal = exports.InterchainWalletModal = void 0;
+exports.ModalRenderer = exports.WalletModalElement = exports.InterchainWalletModal = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const views_1 = require("./views");
 const react_1 = require("react");
@@ -8,21 +8,23 @@ const core_1 = require("@interchain-kit/core");
 const react_2 = require("@interchain-ui/react");
 const hooks_1 = require("../hooks");
 const utils_1 = require("../utils");
-const InterchainWalletModal = () => {
+const InterchainWalletModal = ({ 
+// ==== Custom modal styles
+modalContainerClassName, modalContentClassName, modalChildrenClassName, modalContentStyles, modalThemeProviderProps, }) => {
     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 [walletToConnect, setWalletToConnect] = (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 walletToShow = selectedWallet || currentWallet;
-    const { account, errorMessage } = getChainWalletState(selectedWallet?.info?.name || currentWalletName, currentChainName) || {};
+    const walletToShow = walletToConnect || currentWallet;
+    const { account, errorMessage } = getChainWalletState(walletToConnect?.info?.name || currentWalletName, currentChainName) || {};
     const disconnect = () => {
         walletToShow.disconnect(chainToConnect.chainId);
     };
     const onSelectWallet = (wallet) => {
-        setSelectedWallet(wallet);
+        setWalletToConnect(wallet);
         setShouldShowList(false);
         return wallet.connect(chainToConnect.chainId);
     };
@@ -34,10 +36,10 @@ 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: 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 }));
+    return ((0, jsx_runtime_1.jsx)(react_2.ThemeProvider, { ...modalThemeProviderProps, children: (0, jsx_runtime_1.jsx)(exports.WalletModalElement, { 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, modalContainerClassName: modalContainerClassName, modalContentClassName: modalContentClassName, modalChildrenClassName: modalChildrenClassName, modalContentStyles: modalContentStyles, modalThemeProviderProps: modalThemeProviderProps }) }));
 };
 exports.InterchainWalletModal = InterchainWalletModal;
-const WalletModal = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets, username, address, currentWallet, isConnecting, isConnected, isRejected, isDisconnected, isNotExist, errorMessage, open, close, disconnect, onSelectWallet, onBack, onReconnect, getDownloadLink, getEnv, }) => {
+const WalletModalElement = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets, username, address, currentWallet, isConnecting, isConnected, isRejected, isDisconnected, isNotExist, errorMessage, open, close, disconnect, onSelectWallet, onBack, onReconnect, getDownloadLink, getEnv, modalThemeProviderProps, modalContainerClassName, modalContentClassName, modalChildrenClassName, modalContentStyles, }) => {
     const { header, content } = (0, react_1.useMemo)(() => {
         if (shouldShowList ||
             (isDisconnected && currentWallet.errorMessage === "")) {
@@ -98,13 +100,12 @@ const WalletModal = ({ shouldShowList, isOpen, walletConnectQRCodeUri, wallets,
         wallets,
         isOpen,
     ]);
-    return ((0, jsx_runtime_1.jsx)(react_2.ConnectModal, { isOpen: isOpen, header: header, onOpen: open, onClose: close, children: content }));
+    return ((0, jsx_runtime_1.jsx)(react_2.ConnectModal, { isOpen: isOpen, header: header, onOpen: open, onClose: close, modalContainerClassName: modalContainerClassName, modalContentClassName: modalContentClassName, modalChildrenClassName: modalChildrenClassName, modalContentStyles: modalContentStyles, children: content }));
 };
-exports.WalletModal = WalletModal;
+exports.WalletModalElement = WalletModalElement;
 const ModalRenderer = ({ walletModal: ProvidedWalletModal, }) => {
     if (!ProvidedWalletModal) {
-        throw new Error(`InterchainWalletProvider: walletModal is required. Please provide a wallet modal component. or use InterchainkitWalletModal/n
-      Example: <ChainProvider chains={chains} assetLists={assetLists} wallets={wallets} walletModal={InterchainKitWalletModal} />`);
+        return null;
     }
     const { modalIsOpen, openModal, closeModal, wallets, currentWalletName } = (0, hooks_1.useWalletManager)();
     return ((0, jsx_runtime_1.jsx)(ProvidedWalletModal, { wallets: wallets, isOpen: modalIsOpen, open: openModal, close: closeModal, currentWallet: wallets.find((w) => w.info.name === currentWalletName) }));

package/modal/views/NotExist.d.ts

@@ -1,11 +1,12 @@
-import { BaseWallet, DownloadInfo } from "@interchain-kit/core";
+import { DownloadInfo } from "@interchain-kit/core";
+import { StatefulWallet } from "../../store/stateful-wallet";
 export declare const NotExistHeader: ({ wallet, close, onBack, }: {
-    wallet: BaseWallet;
+    wallet: StatefulWallet;
     close: () => void;
     onBack: () => void;
 }) => import("react/jsx-runtime").JSX.Element;
 export declare const NotExistContent: ({ wallet, getDownloadLink, getEnv, }: {
-    wallet: BaseWallet;
+    wallet: StatefulWallet;
     getDownloadLink: (walletName: string) => DownloadInfo;
     getEnv: () => {
         browser?: string;

package/modal/views/Reject.d.ts

@@ -1,10 +1,10 @@
-import { BaseWallet } from "@interchain-kit/core";
+import { StatefulWallet } from "../../store/stateful-wallet";
 export declare const RejectHeader: ({ wallet, close, onBack, }: {
-    wallet: BaseWallet;
+    wallet: StatefulWallet;
     close: () => void;
     onBack: () => void;
 }) => import("react/jsx-runtime").JSX.Element;
 export declare const RejectContent: ({ wallet, onReconnect, }: {
-    wallet: BaseWallet;
+    wallet: StatefulWallet;
     onReconnect: () => void;
 }) => import("react/jsx-runtime").JSX.Element;

package/package.json

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

package/provider.d.ts

@@ -12,7 +12,7 @@ type InterchainWalletProviderProps = {
     signerOptions?: SignerOptions;
     endpointOptions?: EndpointOptions;
     children: React.ReactNode;
-    walletModal: (props: WalletModalProps) => ReactElement;
+    walletModal?: (props: WalletModalProps) => ReactElement;
 };
 export declare const ChainProvider: ({ chains, assetLists, wallets, signerOptions, endpointOptions, children, walletModal: ProviderWalletModal, }: InterchainWalletProviderProps) => import("react/jsx-runtime").JSX.Element;
 export declare const useInterchainWalletContext: () => InterchainWalletContextType;

package/provider.js

@@ -16,7 +16,7 @@ const ChainProvider = ({ chains, assetLists, wallets, signerOptions, endpointOpt
         // walletManager.init();
         store.current.getState().init();
     }, []);
-    return ((0, jsx_runtime_1.jsxs)(InterchainWalletContext.Provider, { value: store.current, children: [children, (0, jsx_runtime_1.jsx)(modal_1.ModalRenderer, { walletModal: ProviderWalletModal })] }));
+    return ((0, jsx_runtime_1.jsxs)(InterchainWalletContext.Provider, { value: store.current, children: [children, ProviderWalletModal && ((0, jsx_runtime_1.jsx)(modal_1.ModalRenderer, { walletModal: ProviderWalletModal }))] }));
 };
 exports.ChainProvider = ChainProvider;
 const useInterchainWalletContext = () => {

package/store/stateful-wallet.d.ts

@@ -4,13 +4,11 @@ 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;
     get: () => InterchainStore;
-    constructor(wallet: BaseWallet, walletSet: (arg: (draft: StatefulWallet) => void) => void, walletGet: () => StatefulWallet, set: (arg: (draft: InterchainStore) => void) => void, get: () => InterchainStore);
-    getChainToConnect(chainId?: Chain["chainId"]): Chain;
+    constructor(wallet: BaseWallet, get: () => InterchainStore);
+    get store(): InterchainStore;
+    get walletState(): WalletState;
+    get errorMessage(): string;
     init(): Promise<void>;
     connect(chainId: Chain["chainId"]): Promise<void>;
     disconnect(chainId: Chain["chainId"]): Promise<void>;
@@ -19,4 +17,5 @@ export declare class StatefulWallet extends BaseWallet {
     addSuggestChain(chainId: Chain["chainId"]): Promise<void>;
     getProvider(chainId?: Chain["chainId"]): Promise<any>;
     getChainById(chainId: Chain["chainId"]): Chain;
+    getWalletOfType<T>(WalletClass: new (...args: any[]) => T): T | undefined;
 }

package/store/stateful-wallet.js

@@ -5,104 +5,128 @@ const core_1 = require("@interchain-kit/core");
 class StatefulWallet extends core_1.BaseWallet {
     originalWallet;
     walletName;
-    walletState;
-    walletSet;
-    walletGet;
-    set;
     get;
-    constructor(wallet, walletSet, walletGet, set, get) {
+    constructor(wallet, get) {
         super(wallet.info);
         this.originalWallet = wallet;
         this.walletName = wallet.info.name;
-        this.walletState = core_1.WalletState.Disconnected;
-        this.errorMessage = "";
-        this.walletSet = walletSet;
-        this.walletGet = walletGet;
-        this.set = set;
         this.get = get;
     }
-    getChainToConnect(chainId) {
-        const { currentChainName, chains } = this.get();
-        const lastChainName = currentChainName;
-        const lastChain = chains.find((chain) => chain.chainName === lastChainName);
-        return chainId ? this.originalWallet.getChainById(chainId) : lastChain;
+    get store() {
+        return this.get();
+    }
+    get walletState() {
+        // 獲取此錢包在所有鏈上的狀態
+        const states = (this.store.chainWalletState || [])
+            .filter(cws => cws.walletName === this.walletName)
+            .map(cws => cws.walletState);
+        // If any chain is in the connected state, return connected
+        if (states.includes(core_1.WalletState.Connected)) {
+            return core_1.WalletState.Connected;
+        }
+        // 如果有任何一個鏈正在連接中，則返回連接中
+        if (states.includes(core_1.WalletState.Connecting)) {
+            return core_1.WalletState.Connecting;
+        }
+        // 如果所有鏈都是不存在狀態，則返回不存在
+        if (states.length > 0 && states.every(state => state === core_1.WalletState.NotExist)) {
+            return core_1.WalletState.NotExist;
+        }
+        // 如果有任何一個鏈是被拒絕狀態，則返回被拒絕
+        if (states.includes(core_1.WalletState.Rejected)) {
+            return core_1.WalletState.Rejected;
+        }
+        // 預設返回未連接
+        return core_1.WalletState.Disconnected;
+    }
+    get errorMessage() {
+        // 獲取此錢包在所有鏈上的錯誤訊息
+        const errors = (this.store.chainWalletState || [])
+            .filter(cws => cws.walletName === this.walletName)
+            .map(cws => cws.errorMessage)
+            .filter(error => error && error.trim() !== '');
+        // 返回第一個非空錯誤訊息，如果沒有則返回空字串
+        return errors.length > 0 ? errors[0] : '';
     }
     async init() {
-        return this.originalWallet.init();
+        try {
+            await this.originalWallet.init();
+            this.store.chains.forEach(chain => {
+                const lastChainWalletState = this.store.getChainWalletState(this.walletName, chain.chainName)?.walletState;
+                if (lastChainWalletState === core_1.WalletState.NotExist) {
+                    this.store.updateChainWalletState(this.walletName, chain.chainName, {
+                        walletState: core_1.WalletState.Disconnected,
+                        errorMessage: ''
+                    });
+                }
+            });
+        }
+        catch (error) {
+            if (error === core_1.clientNotExistError) {
+                this.store.chains.forEach(chain => {
+                    this.store.updateChainWalletState(this.walletName, chain.chainName, {
+                        walletState: core_1.WalletState.NotExist,
+                        errorMessage: core_1.clientNotExistError.message
+                    });
+                });
+            }
+        }
     }
     async connect(chainId) {
-        const { get, set, walletName, walletGet, walletSet, originalWallet } = this;
-        const chainToConnect = this.getChainToConnect(chainId);
-        const state = get().getChainWalletState(walletName, chainToConnect.chainName)?.walletState;
+        const { store, walletName, originalWallet } = this;
+        const chainToConnect = this.getChainById(chainId);
+        const state = store.getChainWalletState(walletName, chainToConnect.chainName)?.walletState;
         if (state === core_1.WalletState.NotExist) {
             return;
         }
         if (walletName === 'WalletConnect' && state === core_1.WalletState.Connected) {
             return;
         }
-        set(draft => {
-            draft.currentChainName = chainToConnect.chainName;
-            draft.currentWalletName = walletName;
-            draft.walletConnectQRCodeUri = '';
-        });
-        walletSet(draft => {
-            draft.walletState = core_1.WalletState.Connecting;
-            draft.errorMessage = '';
-        });
-        get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Connecting, errorMessage: '' });
+        store.setCurrentChainName(chainToConnect.chainName);
+        store.setCurrentWalletName(walletName);
+        store.setWalletConnectQRCodeUri('');
+        store.updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Connecting, errorMessage: '' });
         try {
             if (originalWallet instanceof core_1.WCWallet) {
                 originalWallet.setOnPairingUriCreatedCallback((uri) => {
-                    set(draft => {
-                        draft.walletConnectQRCodeUri = uri;
-                    });
+                    store.setWalletConnectQRCodeUri(uri);
                 });
             }
             await originalWallet.connect(chainToConnect.chainId);
-            get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Connected });
-            walletSet(draft => {
-                draft.walletState = core_1.WalletState.Connected;
-            });
-            await walletGet().getAccount(chainToConnect.chainId);
+            store.updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Connected });
+            await this.getAccount(chainToConnect.chainId);
         }
         catch (error) {
-            if (error.message === 'Request rejected') {
-                get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Rejected, errorMessage: error.message });
-                walletSet(draft => {
-                    draft.walletState = core_1.WalletState.Rejected;
-                    draft.errorMessage = error.message;
-                });
+            if (error.message.includes('rejected')) {
+                store.updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Rejected, errorMessage: error.message });
                 return;
             }
-            get().updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Disconnected, errorMessage: error.message });
-            walletSet(draft => {
-                draft.walletState = core_1.WalletState.Disconnected;
-                draft.errorMessage = error.message;
-            });
+            else {
+                store.updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Disconnected, errorMessage: error.message });
+            }
         }
     }
     async disconnect(chainId) {
-        const { get, walletName, walletSet, originalWallet } = this;
-        const chainToConnect = this.getChainToConnect(chainId);
+        const { store, walletName, originalWallet } = this;
+        const chainToConnect = this.getChainById(chainId);
         try {
-            if (this.walletGet().walletState === core_1.WalletState.Connected) {
+            if (this.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;
-                draft.errorMessage = "";
-            });
+            store.updateChainWalletState(walletName, chainToConnect.chainName, { walletState: core_1.WalletState.Disconnected, account: null });
         }
         catch (error) {
         }
     }
     async getAccount(chainId) {
-        const chainToConnect = this.getChainToConnect(chainId);
-        const { get, walletName, originalWallet } = this;
+        const chainToConnect = this.getChainById(chainId);
+        const { store, walletName, originalWallet } = this;
         try {
             const account = await originalWallet.getAccount(chainToConnect.chainId);
-            get().updateChainWalletState(walletName, chainToConnect.chainName, { account });
+            store.updateChainWalletState(walletName, chainToConnect.chainName, { account });
+            if (this.originalWallet instanceof core_1.WCWallet) {
+                this.originalWallet.setAccountToRestore(account);
+            }
             return account;
         }
         catch (error) {
@@ -121,5 +145,25 @@ class StatefulWallet extends core_1.BaseWallet {
     getChainById(chainId) {
         return this.originalWallet.getChainById(chainId);
     }
+    getWalletOfType(WalletClass) {
+        if (this.originalWallet instanceof WalletClass) {
+            return this.originalWallet;
+        }
+        if (this.originalWallet instanceof core_1.MultiChainWallet) {
+            if (WalletClass === core_1.CosmosWallet) {
+                const cosmosWallet = this.originalWallet.getWalletByChainType('cosmos');
+                if (cosmosWallet) {
+                    return cosmosWallet;
+                }
+            }
+            if (WalletClass === core_1.EthereumWallet) {
+                const ethereumWallet = this.originalWallet.getWalletByChainType('eip155');
+                if (ethereumWallet) {
+                    return ethereumWallet;
+                }
+            }
+        }
+        return undefined;
+    }
 }
 exports.StatefulWallet = StatefulWallet;

package/store/store.d.ts

@@ -25,8 +25,8 @@ export interface InterchainStore extends WalletManager {
     getDraftChainWalletState: (state: InterchainStore, walletName: string, chainName: string) => ChainWalletState;
     getChainWalletState: (walletName: string, chainName: string) => ChainWalletState | undefined;
     updateChainWalletState: (walletName: string, chainName: string, data: Partial<ChainWalletState>) => void;
-    createStatefulWallet: () => void;
     getStatefulWalletByName: (walletName: string) => StatefulWallet | undefined;
+    setWalletConnectQRCodeUri: (uri: string) => void;
 }
 export type InterchainStoreData = {
     chains: Chain[];

package/store/store.js

@@ -1,14 +1,12 @@
 "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;
@@ -28,12 +26,7 @@ const createInterchainStore = (walletManager) => {
         currentChainName: '',
         chains: [...walletManager.chains],
         assetLists: [...walletManager.assetLists],
-        wallets: walletManager.wallets.map(wallet => {
-            const walletSet = (fn) => {
-                set((draft) => fn(draft.wallets.find(w => w.info.name === wallet.info.name)));
-            };
-            return new stateful_wallet_1.StatefulWallet(wallet, walletSet, () => get().wallets.find(w => w.info.name === wallet.info.name), set, get);
-        }),
+        wallets: walletManager.wallets.map(wallet => new stateful_wallet_1.StatefulWallet(wallet, get)),
         signerOptions: walletManager.signerOptions,
         endpointOptions: walletManager.endpointOptions,
         preferredSignTypeMap: { ...walletManager.preferredSignTypeMap },
@@ -59,28 +52,6 @@ const createInterchainStore = (walletManager) => {
                 draft.chainWalletState[targetIndex] = { ...draft.chainWalletState[targetIndex], ...data };
             });
         },
-        createStatefulWallet: () => {
-            const wallets = walletManager.wallets.map(wallet => {
-                const walletSet = (fn) => {
-                    set((draft) => fn(draft.wallets.find(w => w.info.name === wallet.info.name)));
-                };
-                return new stateful_wallet_1.StatefulWallet(wallet, walletSet, () => get().wallets.find(w => w.info.name === wallet.info.name), set, get);
-            });
-            set(draft => {
-                draft.wallets = wallets;
-            });
-            const defaultWalletStates = get().chainWalletState.reduce((acc, cws) => {
-                if (acc[cws.walletName] && cws.walletState === core_1.WalletState.Connected) {
-                    return acc;
-                }
-                return { ...acc, [cws.walletName]: cws.walletState };
-            }, {});
-            set(draft => {
-                draft.wallets.forEach(wallet => {
-                    wallet.walletState = defaultWalletStates[wallet.info.name];
-                });
-            });
-        },
         init: async () => {
             const oldChainWalletStatesMap = new Map(get().chainWalletState.map(cws => [cws.walletName + cws.chainName, cws]));
             // get().createStatefulWallet()
@@ -107,42 +78,8 @@ const createInterchainStore = (walletManager) => {
                     });
                 });
             });
-            const NotExistWallets = [];
-            const ExistWallets = [];
-            await Promise.all(get().wallets.map(async (wallet) => {
-                try {
-                    await wallet.init();
-                    ExistWallets.push(wallet.info.name);
-                }
-                catch (error) {
-                    if (error === core_1.clientNotExistError) {
-                        NotExistWallets.push(wallet.info.name);
-                    }
-                }
-            }));
+            await Promise.all(get().wallets.map(async (wallet) => wallet.init()));
             set(draft => {
-                draft.chainWalletState = draft.chainWalletState.map(cws => {
-                    if (NotExistWallets.includes(cws.walletName)) {
-                        return { ...cws, walletState: core_1.WalletState.NotExist };
-                    }
-                    return cws;
-                });
-                draft.chainWalletState = draft.chainWalletState.map(cws => {
-                    if (ExistWallets.includes(cws.walletName)) {
-                        const newState = cws.walletState === core_1.WalletState.NotExist ? core_1.WalletState.Disconnected : cws.walletState;
-                        return { ...cws, walletState: newState };
-                    }
-                    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;
             });
         },
@@ -152,6 +89,9 @@ const createInterchainStore = (walletManager) => {
         setCurrentWalletName: (walletName) => {
             set(draft => { draft.currentWalletName = walletName; });
         },
+        setWalletConnectQRCodeUri: (uri) => {
+            set(draft => { draft.walletConnectQRCodeUri = uri; });
+        },
         getDraftChainWalletState: (state, walletName, chainName) => {
             const targetIndex = state.chainWalletState.findIndex(cws => cws.walletName === walletName && cws.chainName === chainName);
             return state.chainWalletState[targetIndex];
@@ -240,10 +180,6 @@ const createInterchainStore = (walletManager) => {
             }
             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);
@@ -270,29 +206,7 @@ const createInterchainStore = (walletManager) => {
             return walletManager.getDownloadLink(walletName);
         },
         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;
+            return walletManager.getOfflineSigner(walletName, chainName);
         },
         getPreferSignType(chainName) {
             const result = walletManager.getPreferSignType(chainName);
@@ -311,11 +225,7 @@ const createInterchainStore = (walletManager) => {
             return get().wallets.find(w => w.info.name === walletName);
         },
         async 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;
+            return walletManager.getSigningClient(walletName, chainName);
         },
         getEnv() {
             return walletManager.getEnv();
@@ -342,6 +252,12 @@ const createInterchainStore = (walletManager) => {
                 }
                 else {
                     // console.log('interchain-kit store hydration finished')
+                    state.chainWalletState = state.chainWalletState.map(cws => {
+                        return {
+                            ...cws,
+                            account: cws.account ? (0, utils_1.restoreAccountFromLocalStorage)(cws.account) : null
+                        };
+                    });
                 }
             };
         },

package/utils/index.d.ts

@@ -1,2 +1,3 @@
 export * from './wallet';
 export * from './dedupeAsync';
+export * from './restoreAccount';

package/utils/index.js

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

package/utils/restoreAccount.d.ts

@@ -0,0 +1,2 @@
+import { WalletAccount } from "@interchain-kit/core";
+export declare const restoreAccountFromLocalStorage: (walletAccount: WalletAccount) => WalletAccount;

package/utils/restoreAccount.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.restoreAccountFromLocalStorage = void 0;
+const restoreAccountFromLocalStorage = (walletAccount) => {
+    const pubkey = walletAccount.pubkey;
+    if (typeof pubkey === 'object') {
+        // return from localstorage need to restructure to uinit8Array
+        return { ...walletAccount, pubkey: Uint8Array.from({ ...pubkey, length: Object.keys(pubkey).length }) };
+    }
+    return walletAccount;
+};
+exports.restoreAccountFromLocalStorage = restoreAccountFromLocalStorage;

package/utils/wallet.d.ts

@@ -14,7 +14,6 @@ export declare const transferToWalletUISchema: (w: BaseWallet) => {
     originalWallet: {
         session: import("@walletconnect/types").SessionTypes.Struct;
         info: import("@interchain-kit/core").Wallet;
-        errorMessage: string;
         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[];

package/esm/modal/provider.js

@@ -1,38 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { createContext, useContext, useEffect, useRef, useState } from "react";
-import { WalletState } from "@interchain-kit/core";
-import { useChainWallet, useWalletManager } from "../hooks";
-import { transferToWalletUISchema } from "../utils";
-import { InterchainWalletModal } from "./modal";
-const WalletModalContext = createContext(null);
-export const WalletModalProvider = ({ children, }) => {
-    const [modalIsOpen, setModalIsOpen] = useState(false);
-    const open = () => setModalIsOpen(true);
-    const close = () => setModalIsOpen(false);
-    const { chains, wallets, setCurrentWalletName, currentChainName, currentWalletName, walletConnectQRCodeUri, getDownloadLink, getEnv, connect, getAccount, } = useWalletManager();
-    const { wallet, status, disconnect, username, address, message } = useChainWallet(currentChainName || chains[0].chainName, currentWalletName);
-    const [shouldShowList, setShouldShowList] = useState(!(currentChainName && currentWalletName));
-    const walletsForUI = wallets.map(transferToWalletUISchema);
-    const handleCloseModal = () => {
-        close();
-        setShouldShowList(false);
-    };
-    const currentChainNameRef = useRef("");
-    useEffect(() => {
-        currentChainNameRef.current = currentChainName;
-    }, [currentChainName]);
-    const handleConnectWallet = async (walletName) => {
-        const chainToConnect = currentChainNameRef.current || chains[0].chainName;
-        setShouldShowList(false);
-        setCurrentWalletName(walletName);
-        await connect(walletName, chainToConnect);
-    };
-    return (_jsxs(WalletModalContext.Provider, { value: { modalIsOpen, open, close }, children: [children, _jsx(InterchainWalletModal, { shouldShowList: shouldShowList, username: username, address: address, disconnect: disconnect, isOpen: modalIsOpen, open: open, close: handleCloseModal, wallets: walletsForUI, walletConnectQRCodeUri: walletConnectQRCodeUri, currentWallet: wallet, isConnecting: status === WalletState.Connecting, isConnected: status === WalletState.Connected, isRejected: status === WalletState.Rejected, isDisconnected: status === WalletState.Disconnected, isNotExist: status === WalletState.NotExist, errorMessage: message, onSelectWallet: (w) => handleConnectWallet(w.info.name), onBack: () => setShouldShowList(true), onReconnect: () => handleConnectWallet(currentWalletName), getDownloadLink: () => getDownloadLink(wallet?.info.name), getEnv: getEnv })] }));
-};
-export const useWalletModal = () => {
-    const context = useContext(WalletModalContext);
-    if (!context) {
-        throw new Error("useWalletModal must be used within a WalletModalProvider");
-    }
-    return context;
-};

package/modal/provider.d.ts

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

package/modal/provider.js

@@ -1,43 +0,0 @@
-"use strict";
-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 core_1 = require("@interchain-kit/core");
-const hooks_1 = require("../hooks");
-const utils_1 = require("../utils");
-const modal_1 = require("./modal");
-const WalletModalContext = (0, react_1.createContext)(null);
-const WalletModalProvider = ({ children, }) => {
-    const [modalIsOpen, setModalIsOpen] = (0, react_1.useState)(false);
-    const open = () => setModalIsOpen(true);
-    const close = () => setModalIsOpen(false);
-    const { chains, wallets, setCurrentWalletName, currentChainName, currentWalletName, walletConnectQRCodeUri, getDownloadLink, getEnv, connect, getAccount, } = (0, hooks_1.useWalletManager)();
-    const { wallet, status, disconnect, username, address, message } = (0, hooks_1.useChainWallet)(currentChainName || chains[0].chainName, currentWalletName);
-    const [shouldShowList, setShouldShowList] = (0, react_1.useState)(!(currentChainName && currentWalletName));
-    const walletsForUI = wallets.map(utils_1.transferToWalletUISchema);
-    const handleCloseModal = () => {
-        close();
-        setShouldShowList(false);
-    };
-    const currentChainNameRef = (0, react_1.useRef)("");
-    (0, react_1.useEffect)(() => {
-        currentChainNameRef.current = currentChainName;
-    }, [currentChainName]);
-    const handleConnectWallet = async (walletName) => {
-        const chainToConnect = currentChainNameRef.current || chains[0].chainName;
-        setShouldShowList(false);
-        setCurrentWalletName(walletName);
-        await connect(walletName, chainToConnect);
-    };
-    return ((0, jsx_runtime_1.jsxs)(WalletModalContext.Provider, { value: { modalIsOpen, open, close }, children: [children, (0, jsx_runtime_1.jsx)(modal_1.InterchainWalletModal, { shouldShowList: shouldShowList, username: username, address: address, disconnect: disconnect, isOpen: modalIsOpen, open: open, close: handleCloseModal, wallets: walletsForUI, walletConnectQRCodeUri: walletConnectQRCodeUri, currentWallet: wallet, isConnecting: status === core_1.WalletState.Connecting, isConnected: status === core_1.WalletState.Connected, isRejected: status === core_1.WalletState.Rejected, isDisconnected: status === core_1.WalletState.Disconnected, isNotExist: status === core_1.WalletState.NotExist, errorMessage: message, onSelectWallet: (w) => handleConnectWallet(w.info.name), onBack: () => setShouldShowList(true), onReconnect: () => handleConnectWallet(currentWalletName), getDownloadLink: () => getDownloadLink(wallet?.info.name), getEnv: getEnv })] }));
-};
-exports.WalletModalProvider = WalletModalProvider;
-const useWalletModal = () => {
-    const context = (0, react_1.useContext)(WalletModalContext);
-    if (!context) {
-        throw new Error("useWalletModal must be used within a WalletModalProvider");
-    }
-    return context;
-};
-exports.useWalletModal = useWalletModal;