@interchain-kit/react 0.3.38 → 0.3.40

package/README.md

@@ -38,9 +38,9 @@ import { keplrWallet } from "@interchain-kit/keplr-extension";
 import { ThemeProvider } from "@interchain-ui/react";
 import "@interchain-ui/react/styles";
 
-import { chain as junoChain, assetList as junoAssetList } from "@chain-registry/v2/mainnet/juno";
-import { chain as osmosisChain,assetList as osmosisAssetList } from "@chain-registry/v2/mainnet/osmosis";
-import { chain as cosmoshubChain, assetList as cosmoshubAssetList } from "@chain-registry/v2/mainnet/cosmoshub";
+import { chain as junoChain, assetList as junoAssetList } from "chain-registry/mainnet/juno";
+import { chain as osmosisChain,assetList as osmosisAssetList } from "chain-registry/mainnet/osmosis";
+import { chain as cosmoshubChain, assetList as cosmoshubAssetList } from "chain-registry/mainnet/cosmoshub";
 
 const Show = () => {
   const {address} = useChain('osmosis');
@@ -73,7 +73,7 @@ import { ChainProvider, useChain } from "@interchain-kit/react";
 import { keplrWallet } from "@interchain-kit/keplr-extension";
 import { ThemeProvider } from "@interchain-ui/react";
 import "@interchain-ui/react/styles";
-import { chains, assetLists } from '@chain-registry/v2/mainnet'
+import { chains, assetLists } from 'chain-registry/mainnet'
  
 
 const Show = () => {
@@ -116,8 +116,8 @@ console.log(address) // address for cosmoshub in keplr-extension wallet
 
 ### useChainWallet
 ```js
-import { chain as junoChain, assetList as junoAssetList } from "@chain-registry/v2/mainnet/juno";
-import { chain as stargazeChain,assetList as stargazeAssetList } from "@chain-registry/v2/mainnet/stargaze";
+import { chain as junoChain, assetList as junoAssetList } from "chain-registry/mainnet/juno";
+import { chain as stargazeChain,assetList as stargazeAssetList } from "chain-registry/mainnet/stargaze";
 import { keplrWallet } from "@interchain-kit/keplr-extension";
 import { leapWallet } from "@interchain-kit/leap-extension";
 

package/esm/hooks/useChain.js

@@ -1,5 +1,5 @@
 import { useWalletManager } from './useWalletManager';
-import { ChainNameNotExist } from '@interchain-kit/core';
+import { ChainNameNotExist, WalletState } from '@interchain-kit/core';
 import { useSigningClient } from './useSigningClient';
 import { useWalletModal } from './useWalletModal';
 export const useChain = (chainName) => {
@@ -26,7 +26,7 @@ export const useChain = (chainName) => {
         },
         closeView: close,
         getRpcEndpoint: () => getRpcEndpoint(currentWalletName, chainName),
-        status: chainWalletStateToShow?.walletState,
+        status: chainWalletStateToShow?.walletState || WalletState.Disconnected,
         username: chainWalletStateToShow?.account?.username,
         message: chainWalletStateToShow?.errorMessage,
         // new api

package/esm/modal/modal.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import "@interchain-ui/react/styles";
 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";

package/esm/store/stateful-wallet.js

@@ -1,4 +1,5 @@
 import { BaseWallet, clientNotExistError, CosmosWallet, EthereumWallet, MultiChainWallet, WalletState, WCWallet } from "@interchain-kit/core";
+import { isSameConstructor } from "../utils/isSameConstructor";
 export class StatefulWallet extends BaseWallet {
     originalWallet;
     walletName;
@@ -46,6 +47,12 @@ export class StatefulWallet extends BaseWallet {
         return errors.length > 0 ? errors[0] : '';
     }
     async init() {
+        this.originalWallet.events.on('accountChanged', async () => {
+            const chains = Array.from(this.originalWallet.chainMap.values());
+            for (const chain of chains) {
+                await this.getAccount(chain.chainId);
+            }
+        });
         try {
             await this.originalWallet.init();
             this.store.chains.forEach(chain => {
@@ -147,13 +154,13 @@ export class StatefulWallet extends BaseWallet {
             return this.originalWallet;
         }
         if (this.originalWallet instanceof MultiChainWallet) {
-            if (WalletClass === CosmosWallet) {
+            if (isSameConstructor(WalletClass, CosmosWallet)) {
                 const cosmosWallet = this.originalWallet.getWalletByChainType('cosmos');
                 if (cosmosWallet) {
                     return cosmosWallet;
                 }
             }
-            if (WalletClass === EthereumWallet) {
+            if (isSameConstructor(WalletClass, EthereumWallet)) {
                 const ethereumWallet = this.originalWallet.getWalletByChainType('eip155');
                 if (ethereumWallet) {
                     return ethereumWallet;

package/esm/utils/isSameConstructor.js

@@ -0,0 +1,17 @@
+/**
+ * Checks if the given class (ctor) is the same as or extends the target class (targetCtor).
+ * @param ctor The class to test.
+ * @param targetCtor The target class to match against.
+ * @returns True if ctor is the same as or extends targetCtor, false otherwise.
+ */
+export function isSameConstructor(ctor, targetCtor) {
+    if (ctor === targetCtor)
+        return true;
+    let proto = Object.getPrototypeOf(ctor);
+    while (proto && proto !== Function.prototype) {
+        if (proto === targetCtor)
+            return true;
+        proto = Object.getPrototypeOf(proto);
+    }
+    return false;
+}

package/hooks/useChain.js

@@ -29,7 +29,7 @@ const useChain = (chainName) => {
         },
         closeView: close,
         getRpcEndpoint: () => getRpcEndpoint(currentWalletName, chainName),
-        status: chainWalletStateToShow?.walletState,
+        status: chainWalletStateToShow?.walletState || core_1.WalletState.Disconnected,
         username: chainWalletStateToShow?.account?.username,
         message: chainWalletStateToShow?.errorMessage,
         // new api

package/modal/modal.d.ts

@@ -1,3 +1,4 @@
+import "@interchain-ui/react/styles";
 import { ReactElement } from "react";
 import { DownloadInfo } from "@interchain-kit/core";
 import { Wallet as InterchainUIWalletType, ThemeProviderProps } from "@interchain-ui/react";

package/modal/modal.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModalRenderer = exports.WalletModalElement = exports.InterchainWalletModal = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
+require("@interchain-ui/react/styles");
 const views_1 = require("./views");
 const react_1 = require("react");
 const core_1 = require("@interchain-kit/core");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interchain-kit/react",
-  "version": "0.3.38",
+  "version": "0.3.40",
   "author": "Hyperweb <developers@hyperweb.io>",
   "description": "interchain-kit wallet connector react package",
   "main": "index.js",
@@ -34,7 +34,7 @@
   "keywords": [],
   "dependencies": {
     "@chain-registry/types": "^2.0.1",
-    "@interchain-kit/core": "0.3.38",
+    "@interchain-kit/core": "0.3.40",
     "@interchain-ui/react": "1.26.1",
     "@interchainjs/cosmos": "1.11.11",
     "@interchainjs/cosmos-types": "1.11.11",
@@ -42,6 +42,7 @@
     "@react-icons/all-files": "^4.1.0",
     "@walletconnect/types": "^2.17.3",
     "interchainjs": "1.11.11",
+    "jest-transform-stub": "^2.0.0",
     "zustand": "^5.0.3"
   },
   "devDependencies": {
@@ -64,5 +65,5 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
-  "gitHead": "b0747958888e7871fe2f9792e62a1f1afda876a7"
+  "gitHead": "f81351e48dc111b25313d640da2752e87ebf8b20"
 }

package/store/stateful-wallet.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StatefulWallet = void 0;
 const core_1 = require("@interchain-kit/core");
+const isSameConstructor_1 = require("../utils/isSameConstructor");
 class StatefulWallet extends core_1.BaseWallet {
     originalWallet;
     walletName;
@@ -49,6 +50,12 @@ class StatefulWallet extends core_1.BaseWallet {
         return errors.length > 0 ? errors[0] : '';
     }
     async init() {
+        this.originalWallet.events.on('accountChanged', async () => {
+            const chains = Array.from(this.originalWallet.chainMap.values());
+            for (const chain of chains) {
+                await this.getAccount(chain.chainId);
+            }
+        });
         try {
             await this.originalWallet.init();
             this.store.chains.forEach(chain => {
@@ -150,13 +157,13 @@ class StatefulWallet extends core_1.BaseWallet {
             return this.originalWallet;
         }
         if (this.originalWallet instanceof core_1.MultiChainWallet) {
-            if (WalletClass === core_1.CosmosWallet) {
+            if ((0, isSameConstructor_1.isSameConstructor)(WalletClass, core_1.CosmosWallet)) {
                 const cosmosWallet = this.originalWallet.getWalletByChainType('cosmos');
                 if (cosmosWallet) {
                     return cosmosWallet;
                 }
             }
-            if (WalletClass === core_1.EthereumWallet) {
+            if ((0, isSameConstructor_1.isSameConstructor)(WalletClass, core_1.EthereumWallet)) {
                 const ethereumWallet = this.originalWallet.getWalletByChainType('eip155');
                 if (ethereumWallet) {
                     return ethereumWallet;

package/utils/isSameConstructor.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Checks if the given class (ctor) is the same as or extends the target class (targetCtor).
+ * @param ctor The class to test.
+ * @param targetCtor The target class to match against.
+ * @returns True if ctor is the same as or extends targetCtor, false otherwise.
+ */
+export declare function isSameConstructor(ctor: Function, targetCtor: Function): boolean;

package/utils/isSameConstructor.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSameConstructor = isSameConstructor;
+/**
+ * Checks if the given class (ctor) is the same as or extends the target class (targetCtor).
+ * @param ctor The class to test.
+ * @param targetCtor The target class to match against.
+ * @returns True if ctor is the same as or extends targetCtor, false otherwise.
+ */
+function isSameConstructor(ctor, targetCtor) {
+    if (ctor === targetCtor)
+        return true;
+    let proto = Object.getPrototypeOf(ctor);
+    while (proto && proto !== Function.prototype) {
+        if (proto === targetCtor)
+            return true;
+        proto = Object.getPrototypeOf(proto);
+    }
+    return false;
+}