@0xsquid/react-hooks 3.0.27-beta.4 → 3.0.27-beta.6

package/dist/core/wallets.js

@@ -0,0 +1,421 @@
+import { ChainType } from "@0xsquid/squid-types";
+import { injected } from "@wagmi/core";
+import { coinbaseWallet, metaMask, walletConnect } from "wagmi/connectors";
+import { walletIcons } from "../assets/images/icons/wallets";
+import { WindowWalletFlag, } from "./types/wallet";
+// Define EVM wallets
+const evmWallets = [
+    {
+        name: "Trust Wallet",
+        type: ChainType.EVM,
+        connectorId: "trustwallet",
+        connectorName: "Trust Wallet",
+        windowFlag: WindowWalletFlag.TrustWallet,
+        connector: () => injected({
+            target: {
+                id: "trustwallet",
+                name: "Trust Wallet",
+                provider: window?.trustwallet,
+            },
+        }),
+        icon: walletIcons.trustwallet,
+        canSwitchWallets: false,
+        isMobile: true,
+    },
+    {
+        name: "Metamask",
+        type: ChainType.EVM,
+        connectorId: "metaMask",
+        connectorName: "MetaMask",
+        rdns: "io.metamask",
+        connector: () => metaMask({
+            dappMetadata: {
+                name: "Squid",
+                url: "https://app.squidrouter.com",
+            },
+        }),
+        icon: walletIcons.metamask,
+        windowFlag: WindowWalletFlag.MetaMask,
+        canSwitchWallets: true,
+        isMobile: true,
+    },
+    {
+        name: "XDEFI Wallet",
+        type: ChainType.EVM,
+        connectorId: "xdefi",
+        connectorName: "XDefi",
+        windowFlag: WindowWalletFlag.Xdefi,
+        connector: () => injected({
+            target: {
+                id: "xdefi",
+                name: "XDefi",
+                provider: window?.xfi?.ethereum,
+            },
+        }),
+        icon: walletIcons.xdefi,
+        canSwitchWallets: false,
+    },
+    {
+        name: "Rabby",
+        type: ChainType.EVM,
+        connectorId: "rabby",
+        rdns: "io.rabby",
+        connectorName: "Rabby",
+        windowFlag: WindowWalletFlag.Rabby,
+        connector: () => injected({
+            target: {
+                id: "rabby",
+                name: "Rabby",
+                provider: window?.rabby,
+            },
+        }),
+        icon: walletIcons.rabby,
+        canSwitchWallets: false,
+        isMobile: true,
+    },
+    {
+        name: "Browser Extension",
+        type: ChainType.EVM,
+        connectorId: "injected",
+        connectorName: "Injected",
+        windowFlag: WindowWalletFlag.Injected,
+        connector: () => injected(),
+        icon: walletIcons.injected,
+        canSwitchWallets: false,
+        isMobile: true,
+    },
+    {
+        name: "Zerion",
+        type: ChainType.EVM,
+        connectorId: "zerion",
+        connectorName: "Zerion",
+        windowFlag: WindowWalletFlag.Zerion,
+        connector: () => injected({
+            target: {
+                id: "zerion",
+                name: "Zerion",
+                provider: window?.zerionWallet,
+            },
+        }),
+        icon: walletIcons.zerion,
+        canSwitchWallets: false,
+        isMobile: true,
+    },
+    {
+        name: "Coinbase Wallet",
+        type: ChainType.EVM,
+        connectorId: "coinbaseWallet",
+        connectorName: "Coinbase Wallet",
+        windowFlag: WindowWalletFlag.Coinbase,
+        connector: () => coinbaseWallet(),
+        icon: walletIcons.coinbase,
+        canSwitchWallets: false,
+        isMobile: true,
+    },
+    {
+        name: "WalletConnect",
+        isInstalled() {
+            return false;
+        },
+        type: ChainType.EVM,
+        connectorId: "walletConnect",
+        connectorName: "WalletConnect",
+        windowFlag: WindowWalletFlag.WalletConnect,
+        connector: () => walletConnect({
+            projectId: "db6a4f6ff58e4172b2fd52f01360bc49",
+        }),
+        icon: walletIcons.walletConnect,
+        canSwitchWallets: false,
+        isMobile: true,
+    },
+    {
+        name: "Blockchain.com",
+        isInstalled() {
+            return false;
+        },
+        type: ChainType.EVM,
+        connectorId: "blockchaindotcom",
+        connectorName: "Blockchain.com",
+        windowFlag: WindowWalletFlag.BlockchainDotCom,
+        connector: () => 
+        // Blockchain.com is a mobile wallet so we can use walletConnect
+        // This is basically the same mechanism but with another icon/name
+        walletConnect({
+            projectId: "db6a4f6ff58e4172b2fd52f01360bc49",
+        }),
+        icon: walletIcons.blockchainDotCom,
+        canSwitchWallets: false,
+        isMobile: true,
+    },
+    {
+        name: "Cosmostation",
+        type: ChainType.EVM,
+        connectorId: "cosmostation",
+        connectorName: "Cosmostation",
+        windowFlag: WindowWalletFlag.CosmostationEVM,
+        connector: () => injected({
+            target: {
+                id: "cosmostation",
+                name: "Cosmostation",
+                provider: window?.cosmostation?.ethereum,
+            },
+        }),
+        icon: walletIcons.cosmostation,
+        canSwitchWallets: false,
+        isMobile: true,
+    },
+    {
+        name: "BitGet Wallet",
+        type: ChainType.EVM,
+        connectorId: "bitget",
+        connectorName: "BitGet Wallet",
+        windowFlag: WindowWalletFlag.BitGet,
+        connector: () => injected({
+            target: {
+                id: "bitget",
+                name: "BitGet Wallet",
+                provider: window?.bitkeep?.ethereum,
+            },
+        }),
+        icon: walletIcons.bitget,
+        canSwitchWallets: false,
+        isMobile: true,
+    },
+    {
+        name: "OKX Wallet",
+        type: ChainType.EVM,
+        connectorId: "okx",
+        connectorName: "okx",
+        windowFlag: WindowWalletFlag.OKX,
+        connector: () => injected({
+            target: {
+                id: "okx",
+                name: "OKX",
+                provider: window?.okxwallet,
+            },
+        }),
+        icon: walletIcons.okx,
+        canSwitchWallets: false,
+        isMobile: true,
+    },
+    {
+        name: "Coin98",
+        type: ChainType.EVM,
+        connectorId: "coin98",
+        connectorName: "Coin98",
+        windowFlag: WindowWalletFlag.Coin98,
+        connector: () => injected({
+            target: {
+                id: "coin98",
+                name: "Coin98",
+                provider: window?.coin98?.provider,
+            },
+        }),
+        icon: walletIcons.coin98,
+        canSwitchWallets: false,
+        isMobile: true,
+    },
+    {
+        name: "Defi Connect",
+        type: ChainType.EVM,
+        connectorId: "deficonnect",
+        connectorName: "Defi Connect",
+        windowFlag: WindowWalletFlag.DefiConnect,
+        connector: () => injected({
+            target: {
+                id: "deficonnect",
+                name: "Defi Connect",
+                provider: window?.deficonnectProvider,
+            },
+        }),
+        icon: walletIcons.defiConnect,
+        canSwitchWallets: false,
+        isMobile: true,
+    },
+    {
+        name: "Exodus",
+        type: ChainType.EVM,
+        connectorId: "exodus",
+        connectorName: "Exodus",
+        windowFlag: WindowWalletFlag.Exodus,
+        connector: () => injected({
+            target: {
+                id: "exodus",
+                name: "Exodus",
+                provider: window?.exodus?.ethereum,
+            },
+        }),
+        icon: walletIcons.exodus,
+        canSwitchWallets: false,
+        isMobile: true,
+    },
+    {
+        name: "Rainbow",
+        type: ChainType.EVM,
+        connectorId: "rainbow",
+        rdns: "me.rainbow",
+        connectorName: "Rainbow",
+        windowFlag: WindowWalletFlag.Rainbow,
+        connector: () => injected({
+            target: {
+                id: "rainbow",
+                name: "Rainbow",
+                provider: window?.rainbow,
+            },
+        }),
+        icon: walletIcons.rainbow,
+        isMobile: true,
+        canSwitchWallets: false,
+    },
+];
+// Define Cosmos wallets
+const cosmosWallets = [
+    {
+        name: "Keplr",
+        type: ChainType.COSMOS,
+        windowFlag: WindowWalletFlag.Keplr,
+        icon: walletIcons.keplr,
+        canSwitchWallets: false,
+        connectorId: "keplr",
+        connectorName: "Keplr",
+        isMobile: true,
+    },
+    {
+        name: "XDEFI Wallet",
+        type: ChainType.COSMOS,
+        connectorId: "xdeficosmos",
+        connectorName: "XDefi",
+        windowFlag: WindowWalletFlag.XdefiCosmos,
+        icon: walletIcons.xdefi,
+        canSwitchWallets: false,
+    },
+    {
+        name: "Leap",
+        type: ChainType.COSMOS,
+        windowFlag: WindowWalletFlag.Leap,
+        icon: walletIcons.leap,
+        canSwitchWallets: false,
+        connectorId: "leap",
+        connectorName: "Leap",
+        isMobile: true,
+    },
+    {
+        name: "Cosmostation",
+        type: ChainType.COSMOS,
+        connectorId: "cosmostationCosmos",
+        connectorName: "Cosmostation Cosmos",
+        windowFlag: WindowWalletFlag.CosmostationCosmos,
+        connector: () => injected({
+            target: {
+                id: "cosmostation",
+                name: "Cosmostation",
+                provider: window?.cosmostation?.ethereum,
+            },
+        }),
+        icon: walletIcons.cosmostation,
+        canSwitchWallets: false,
+        isMobile: true,
+    },
+    {
+        name: "Cosmos Extension",
+        isInstalled() {
+            // we need to check if the snap is installed
+            return false;
+        },
+        type: ChainType.COSMOS,
+        connectorId: "snapper",
+        connectorName: "Cosmos Extension",
+        windowFlag: WindowWalletFlag.Snapper,
+        icon: walletIcons.metamask,
+        canSwitchWallets: false,
+    },
+];
+// Merge EVM and Cosmos wallets
+export const formattedWallets = [...evmWallets, ...cosmosWallets];
+export const walletStoreLinks = {
+    leap: {
+        chrome: "https://chrome.google.com/webstore/detail/leap-cosmos-wallet/fcfcfllfndlomdhbehjjcoimbgofdncg",
+        firefox: "",
+    },
+    keplr: {
+        chrome: "https://chrome.google.com/webstore/detail/keplr/dmkamcknogkgcdfhhbddcghachkejeap",
+        firefox: "https://addons.mozilla.org/en-US/firefox/addon/keplr/?utm_source=addons.mozilla.org&utm_medium=referral&utm_content=search",
+    },
+    metaMask: {
+        chrome: "https://chrome.google.com/webstore/detail/metamask/nkbihfbeogaeaoehlefnkodbefgpgknn",
+        firefox: "https://addons.mozilla.org/en-US/firefox/addon/ether-metamask/?utm_source=addons.mozilla.org&utm_medium=referral&utm_content=search",
+    },
+    walletConnect: {
+        chrome: "",
+        firefox: "",
+    },
+    blockchaindotcom: {
+        chrome: "",
+        firefox: "",
+    },
+    coinbaseWallet: {
+        chrome: "https://chrome.google.com/webstore/detail/coinbase-wallet-extension/hnfanknocfeofbddgcijnmhnfnkdnaad",
+        firefox: "",
+    },
+    cosmostation: {
+        chrome: "https://chrome.google.com/webstore/detail/cosmostation-wallet/fpkhgmpbidmiogeglndfbkegfdlnajnf",
+        firefox: "",
+    },
+    cosmostationCosmos: {
+        chrome: "https://chrome.google.com/webstore/detail/cosmostation-wallet/fpkhgmpbidmiogeglndfbkegfdlnajnf",
+        firefox: "",
+    },
+    xdefi: {
+        chrome: "https://chrome.google.com/webstore/detail/xdefi-wallet/hmeobnfnfcmdkdcmlblgagmfpfboieaf",
+        firefox: "",
+    },
+    xdeficosmos: {
+        chrome: "https://chrome.google.com/webstore/detail/xdefi-wallet/hmeobnfnfcmdkdcmlblgagmfpfboieaf",
+        firefox: "",
+    },
+    bitget: {
+        chrome: "https://chrome.google.com/webstore/detail/bitget-wallet-formerly-bi/jiidiaalihmmhddjgbnbgdfflelocpak",
+        firefox: "",
+    },
+    trustwallet: {
+        chrome: "https://chrome.google.com/webstore/detail/trust-wallet/egjidjbpglichdcondbcbdnbeeppgdph",
+        firefox: "",
+    },
+    coin98: {
+        chrome: "https://chrome.google.com/webstore/detail/coin98-wallet/aeachknmefphepccionboohckonoeemg",
+        firefox: "",
+    },
+    rabby: {
+        chrome: "https://chrome.google.com/webstore/detail/rabby-wallet/acmacodkjbdgmoleebolmdjonilkdbch",
+        firefox: "",
+    },
+    okx: {
+        chrome: "https://chrome.google.com/webstore/detail/okx-wallet/mcohilncbfahbmgdjkbpemcciiolgcge",
+        firefox: "",
+    },
+    injected: {
+        chrome: "",
+        firefox: "",
+    },
+    zerion: {
+        chrome: "https://chrome.google.com/webstore/detail/zerion-wallet-for-web3-nf/klghhnkeealcohjjanjjdaeeggmfmlpl",
+        firefox: "",
+    },
+    deficonnect: {
+        chrome: "https://chrome.google.com/webstore/detail/cryptocom-wallet-extensio/hifafgmccdpekplomjjkcfgodnhcellj",
+        firefox: "",
+    },
+    snapper: {
+        chrome: "https://metamask.mysticlabs.xyz/",
+        firefox: "",
+    },
+    exodus: {
+        chrome: "https://chromewebstore.google.com/detail/exodus-web3-wallet/aholpfdialjgjfhomihkjbmgjidlcdno",
+        firefox: "",
+    },
+    rainbow: {
+        chrome: "https://chromewebstore.google.com/detail/rainbow/opfgelmcmbiajamepnmloijbpoleiama",
+        firefox: "https://addons.mozilla.org/en-US/firefox/addon/rainbow-extension",
+    },
+};
+//# sourceMappingURL=wallets.js.map

package/dist/core/wallets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wallets.js","sourceRoot":"","sources":["../../src/core/wallets.ts"],"names":[],"mappings":"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"}

package/dist/hooks/tokens/useAllConnectedWalletBalances.d.ts

@@ -1,5 +1,5 @@
 import { ChainType } from "@0xsquid/squid-types";
-export declare const useAllConnectedWalletBalances: (connectedAddresses: Record<ChainType, string | undefined>) => {
+export declare const useAllConnectedWalletBalances: () => {
     groupedBalances: {
         evm: {
             balance: string;
@@ -63,6 +63,8 @@ export declare const useAllConnectedWalletBalances: (connectedAddresses: Record<
         }[];
     };
     isInitialLoading: boolean;
+    isFetching: boolean;
+    isLoading: boolean;
     tokens: {
         balance: string;
         type: ChainType;

package/dist/hooks/tokens/useAllConnectedWalletBalances.js

@@ -1,9 +1,11 @@
 import { ChainType } from "@0xsquid/squid-types";
 import { useMemo } from "react";
 import { useSquidChains } from "../chains/useSquidChains";
+import { useWallet } from "../wallet/useWallet";
 import { useAllTokensWithBalanceForChainType } from "./useAllTokensWithBalanceForChainType";
-export const useAllConnectedWalletBalances = (connectedAddresses) => {
+export const useAllConnectedWalletBalances = () => {
     const { findChain } = useSquidChains();
+    const { connectedAddresses } = useWallet();
     const evmBalances = useAllTokensWithBalanceForChainType({
         chainType: ChainType.EVM,
         address: connectedAddresses[ChainType.EVM] ?? undefined,
@@ -34,9 +36,15 @@ export const useAllConnectedWalletBalances = (connectedAddresses) => {
         Number(cosmosBalances.totalUsdBalance), [evmBalances.totalUsdBalance, cosmosBalances.totalUsdBalance]);
     const isInitialLoading = evmBalances.tokensWithBalanceQuery.isInitialLoading ||
         cosmosBalances.tokensWithBalanceQuery.isInitialLoading;
+    const isFetching = evmBalances.tokensWithBalanceQuery.isFetching ||
+        cosmosBalances.tokensWithBalanceQuery.isFetching;
+    const isLoading = evmBalances.tokensWithBalanceQuery.isLoading ||
+        cosmosBalances.tokensWithBalanceQuery.isLoading;
     return {
         groupedBalances,
         isInitialLoading,
+        isFetching,
+        isLoading,
         tokens: allTokens,
         totalUsdBalance,
     };

package/dist/hooks/tokens/useAllConnectedWalletBalances.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAllConnectedWalletBalances.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useAllConnectedWalletBalances.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,mCAAmC,EAAE,MAAM,uCAAuC,CAAC;AAE5F,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC3C,kBAAyD,EACzD,EAAE;IACF,MAAM,EAAE,SAAS,EAAE,GAAG,cAAc,EAAE,CAAC;IACvC,MAAM,WAAW,GAAG,mCAAmC,CAAC;QACtD,SAAS,EAAE,SAAS,CAAC,GAAG;QACxB,OAAO,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,SAAS;KACxD,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,mCAAmC,CAAC;QACzD,SAAS,EAAE,SAAS,CAAC,MAAM;QAC3B,OAAO,EAAE,kBAAkB,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,SAAS;KAC3D,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,OAAO,CACvB,GAAG,EAAE,CAAC,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,EACvD,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,CAC5C,CAAC;IAEF,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE;QACnC,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAC9B,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACb,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;YACtD,IAAI,SAAS,EAAE;gBACb,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;oBACnB,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;iBACrB;gBACD,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC5B;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAyC,CAC1C,CAAC;QAEF,OAAO;YACL,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE;YAC7C,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE;YACnD,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE;SAC9C,CAAC;IACJ,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;IAE3B,MAAM,eAAe,GAAG,OAAO,CAC7B,GAAG,EAAE,CACH,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC;QACnC,MAAM,CAAC,cAAc,CAAC,eAAe,CAAC,EACxC,CAAC,WAAW,CAAC,eAAe,EAAE,cAAc,CAAC,eAAe,CAAC,CAC9D,CAAC;IAEF,MAAM,gBAAgB,GACpB,WAAW,CAAC,sBAAsB,CAAC,gBAAgB;QACnD,cAAc,CAAC,sBAAsB,CAAC,gBAAgB,CAAC;IAEzD,OAAO;QACL,eAAe;QACf,gBAAgB;QAChB,MAAM,EAAE,SAAS;QACjB,eAAe;KAChB,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"useAllConnectedWalletBalances.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useAllConnectedWalletBalances.ts"],"names":[],"mappings":"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"}

package/dist/hooks/tokens/useAllTokensWithBalanceForChainType.js

@@ -21,9 +21,10 @@ export const useAllTokensWithBalanceForChainType = ({ chainType, address, direct
         return evmTokensBalances;
     }, {
         ...queryOptions,
-        enabled: chainType === ChainType.EVM &&
+        enabled: evmTokens.length > 0 &&
+            chainType === ChainType.EVM &&
             !!address &&
-            (queryOptions?.enabled ?? true),
+            queryOptions?.enabled !== false,
     });
     const cosmosTokensQuery = useQuery(keys().allTokensBalance(address, ChainType.COSMOS), async () => {
         const addresses = await getAllKeysForSupportedCosmosChains(cosmosChains.map((c) => c.chainId), keplrTypeWallet);
@@ -35,9 +36,10 @@ export const useAllTokensWithBalanceForChainType = ({ chainType, address, direct
         return cosmosBalances;
     }, {
         ...queryOptions,
-        enabled: chainType === ChainType.COSMOS &&
+        enabled: cosmosTokens.length > 0 &&
+            chainType === ChainType.COSMOS &&
             !!address &&
-            (queryOptions?.enabled ?? true),
+            queryOptions?.enabled !== false,
     });
     const tokensWithBalanceQuery = useMemo(() => {
         let baseQuery;

package/dist/hooks/tokens/useAllTokensWithBalanceForChainType.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAllTokensWithBalanceForChainType.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useAllTokensWithBalanceForChainType.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useAllTokensWithBalanceForChainType.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useAllTokensWithBalanceForChainType.ts"],"names":[],"mappings":"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"}

package/dist/hooks/tokens/useSquidTokens.js

@@ -1,9 +1,12 @@
+import { ChainType } from "@0xsquid/squid-types";
 import { useCallback, useMemo } from "react";
 import { useConfigStore } from "../../hooks/store/useSquidStore";
 import { filterTokens, getDisabledChainsIds, sortAllTokens, } from "../../services";
+import { useSquidChains } from "../chains/useSquidChains";
 import { useSquid } from "../squid/useSquid";
 export const useSquidTokens = (direction) => {
     const { tokens: allSquidTokens = [], squidInfoQuery } = useSquid();
+    const { findChain } = useSquidChains();
     const disabledChains = useConfigStore((state) => state.config.disabledChains);
     const updatedTokens = useMemo(() => {
         let tokenArray = allSquidTokens;
@@ -33,12 +36,10 @@ export const useSquidTokens = (direction) => {
         direction,
     }), [direction, disabledChains]);
     const filteredTokensForDirection = useMemo(() => updatedTokens?.filter((token) => !disabledChainsForDirection.includes(String(token.chainId))), [updatedTokens, disabledChainsForDirection]);
-    // TODO: We'll need to have a backend attribute on tokens to know if they are EVM or Cosmos
-    // Because this works for now, but as soon as we add new chains, we'll need to have a better way to filter them
     const { evmTokens, cosmosTokens } = useMemo(() => ({
-        evmTokens: filteredTokensForDirection?.filter((t) => !isNaN(Number(t.chainId))),
-        cosmosTokens: filteredTokensForDirection?.filter((t) => isNaN(Number(t.chainId))),
-    }), [filteredTokensForDirection]);
+        evmTokens: filteredTokensForDirection?.filter((t) => findChain(t.chainId)?.chainType === ChainType.EVM),
+        cosmosTokens: filteredTokensForDirection?.filter((t) => findChain(t.chainId)?.chainType === ChainType.COSMOS),
+    }), [filteredTokensForDirection, findChain]);
     const findToken = useCallback((address, chainId) => updatedTokens?.find((t) => t.address === address && t.chainId === chainId), [updatedTokens]);
     return {
         tokens: updatedTokens,

package/dist/hooks/tokens/useSquidTokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSquidTokens.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useSquidTokens.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useSquidTokens.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useSquidTokens.ts"],"names":[],"mappings":"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"}

package/dist/hooks/tokens/useTokenHistoricalData.js

@@ -1,20 +1,21 @@
 import { useQuery } from "@tanstack/react-query";
+import { keys } from "../../core/queries/queries-keys";
 import { fetchHistoricalData, fetchTokensData, } from "../../services/external/tokenDataService";
 // Coingecko has a limit for some queries for multiple tokens, not sure what it is, but let's use 100 for now
 export const useHistoricalData = (coingeckoId, timeFrame) => {
-    return useQuery(["historicalData", coingeckoId, timeFrame], () => fetchHistoricalData(coingeckoId, timeFrame), {
+    return useQuery(keys().historicalData(coingeckoId, timeFrame), () => fetchHistoricalData(coingeckoId, timeFrame), {
         staleTime: 5 * 60 * 1000,
         enabled: !!coingeckoId,
     });
 };
 export const useTokensData = (tokens) => {
-    return useQuery(["tokensData", tokens?.map((t) => t.coingeckoId).join(",")], () => fetchTokensData(tokens), {
+    return useQuery(keys().tokensData(tokens), () => fetchTokensData(tokens), {
         staleTime: 60 * 1000,
         enabled: !!tokens && tokens.length > 0,
     });
 };
 export const useTokenData = (token) => {
-    return useQuery(["tokenData", token?.coingeckoId], () => fetchTokensData([token]).then((tokens) => tokens[0]), {
+    return useQuery(keys().tokenData(token), () => fetchTokensData([token]).then((tokens) => tokens[0]), {
         staleTime: 60 * 1000,
         enabled: !!token,
     });

package/dist/hooks/tokens/useTokenHistoricalData.js.map

@@ -1 +1 @@
-{"version":3,"file":"useTokenHistoricalData.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useTokenHistoricalData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAOjD,OAAO,EACL,mBAAmB,EACnB,eAAe,GAChB,MAAM,0CAA0C,CAAC;AAElD,6GAA6G;AAE7G,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,WAA+B,EAC/B,SAAoB,EACpB,EAAE;IACF,OAAO,QAAQ,CACb,CAAC,gBAAgB,EAAE,WAAW,EAAE,SAAS,CAAC,EAC1C,GAAG,EAAE,CAAC,mBAAmB,CAAC,WAAY,EAAE,SAAS,CAAC,EAClD;QACE,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;QACxB,OAAO,EAAE,CAAC,CAAC,WAAW;KACvB,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAsC,EAAE,EAAE;IACtE,OAAO,QAAQ,CACb,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAC3D,GAAG,EAAE,CAAC,eAAe,CAAC,MAAO,CAAC,EAC9B;QACE,SAAS,EAAE,EAAE,GAAG,IAAI;QACpB,OAAO,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;KACvC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAmC,EAAE,EAAE;IAClE,OAAO,QAAQ,CACb,CAAC,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,EACjC,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC,KAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAC3D;QACE,SAAS,EAAE,EAAE,GAAG,IAAI;QACpB,OAAO,EAAE,CAAC,CAAC,KAAK;KACjB,CACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"useTokenHistoricalData.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useTokenHistoricalData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAOvD,OAAO,EACL,mBAAmB,EACnB,eAAe,GAChB,MAAM,0CAA0C,CAAC;AAElD,6GAA6G;AAE7G,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,WAA+B,EAC/B,SAAoB,EACpB,EAAE;IACF,OAAO,QAAQ,CACb,IAAI,EAAE,CAAC,cAAc,CAAC,WAAW,EAAE,SAAS,CAAC,EAC7C,GAAG,EAAE,CAAC,mBAAmB,CAAC,WAAY,EAAE,SAAS,CAAC,EAClD;QACE,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;QACxB,OAAO,EAAE,CAAC,CAAC,WAAW;KACvB,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAsC,EAAE,EAAE;IACtE,OAAO,QAAQ,CACb,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EACzB,GAAG,EAAE,CAAC,eAAe,CAAC,MAAO,CAAC,EAC9B;QACE,SAAS,EAAE,EAAE,GAAG,IAAI;QACpB,OAAO,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;KACvC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAmC,EAAE,EAAE;IAClE,OAAO,QAAQ,CACb,IAAI,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EACvB,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC,KAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAC3D;QACE,SAAS,EAAE,EAAE,GAAG,IAAI;QACpB,OAAO,EAAE,CAAC,CAAC,KAAK;KACjB,CACF,CAAC;AACJ,CAAC,CAAC"}

package/dist/hooks/transaction/useExecuteTransaction.js

@@ -124,6 +124,9 @@ export const useExecuteTransaction = (squidRoute) => {
                 const signingClient = await getCosmosSignerClient();
                 const signerAddress = (await cosmosSigner.getAccounts())[0].address;
                 if (signerAddress && signingClient && route) {
+                    WidgetEvents.getInstance().dispatchSwapTxSignatureRequested({
+                        route,
+                    });
                     const tx = (await squid?.executeRoute({
                         signer: signingClient,
                         signerAddress,
@@ -224,6 +227,9 @@ export const useExecuteTransaction = (squidRoute) => {
     const swapQueryEvm = useMutation(async (route) => {
         await changeNetworkIfNeeded.mutateAsync();
         if (route && !!squid && evmSigner) {
+            WidgetEvents.getInstance().dispatchSwapTxSignatureRequested({
+                route,
+            });
             const txResponse = (await squid.executeRoute({
                 signer: evmSigner,
                 route,
@@ -297,6 +303,9 @@ export const useExecuteTransaction = (squidRoute) => {
                     error: errorObject,
                 },
             });
+            WidgetEvents.getInstance().dispatchSwapRouteExecutionError({
+                error: errorObject,
+            });
             if (currentTx?.transactionId &&
                 errorObject?.type === TransactionErrorType.CALL_EXCEPTION) {
                 replaceTransactionStatus(currentTx?.transactionId, currentTx?.statusResponse, TransactionStatus.ERROR);