@0xsquid/react-hooks 3.0.27-beta.1 → 3.0.27-beta.10

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,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAEvD,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,gBAAgB,GAAG,mCAAmC,CAAC;QAC3D,SAAS,EAAE,SAAS,CAAC,GAAG;QACxB,OAAO,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,SAAS;KACxD,CAAC,CAAC;IAEH,MAAM,mBAAmB,GAAG,mCAAmC,CAAC;QAC9D,SAAS,EAAE,SAAS,CAAC,MAAM;QAC3B,OAAO,EAAE,kBAAkB,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,SAAS;KAC3D,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,QAAQ,CAC/B,IAAI,EAAE,CAAC,0BAA0B,CAC/B,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,MAAM,CACtC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,IAAI,CACxC,CACF,EACD,KAAK,IAAI,EAAE;QACT,OAAO;YACL,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAC7C,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,SAAS,KAAK,SAAS,CAAC,GAAG,CACjE;YACD,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,CACnD,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,SAAS,KAAK,SAAS,CAAC,MAAM,CACpE;YACD,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE;SACpB,CAAC;IACJ,CAAC,EACD;QACE,OAAO,EACL,gBAAgB,CAAC,sBAAsB,CAAC,SAAS;YACjD,mBAAmB,CAAC,sBAAsB,CAAC,SAAS;KACvD,CACF,CAAC;IAEF,OAAO;QACL,gBAAgB;QAChB,MAAM,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,GAAG,mBAAmB,CAAC,MAAM,CAAC;QACnE,eAAe,EACb,MAAM,CAAC,gBAAgB,CAAC,eAAe,CAAC;YACxC,MAAM,CAAC,mBAAmB,CAAC,eAAe,CAAC;KAC9C,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/useNativeBalance.js

@@ -63,7 +63,16 @@ export const useNativeBalance = (chain) => {
         nativeCosmosToken,
         nativeCosmosBalance,
     ]);
-    const isLoading = chain?.chainType === ChainType.EVM ? isEvmLoading : isCosmosLoading;
+    const isLoading = useMemo(() => {
+        switch (chain?.chainType) {
+            case ChainType.EVM:
+                return isEvmLoading;
+            case ChainType.COSMOS:
+                return isCosmosLoading;
+            default:
+                return false;
+        }
+    }, [chain?.chainType, isEvmLoading, isCosmosLoading]);
     const nativeBalanceFormatted = nativeBalance &&
         formatBNToReadable(nativeBalance.value, nativeBalance.decimals);
     return { nativeBalance, nativeBalanceFormatted, isLoading };

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

@@ -1 +1 @@
-{"version":3,"file":"useNativeBalance.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useNativeBalance.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useNativeBalance.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useNativeBalance.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":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EACL,YAAY,EACZ,oBAAoB,EACpB,aAAa,GACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,SAAyB,EAAE,EAAE;IAC1D,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,EAAE,EAAE,cAAc,EAAE,GAAG,QAAQ,EAAE,CAAC;IACnE,MAAM,cAAc,GAAG,cAAc,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAE9E,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE;QACjC,IAAI,UAAU,GAAG,cAAc,CAAC;QAChC,IACE,cAAc,CAAC,SAAS;YACxB,cAAc,EAAE,IAAI;YACpB,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,EACxC;YACA,UAAU,GAAG,cAAc,EAAE,IAAI,EAAE,MAAM,CAAC;SAC3C;QACD,OAAO,YAAY,CAAC;YAClB,MAAM,EAAE,UAAU;YAClB,MAAM,EAAE;gBACN,cAAc;aACf;YACD,SAAS;SACV,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACzB,CAAC,EAAE;QACD,cAAc,CAAC,SAAS;QACxB,cAAc,CAAC,IAAI;QACnB,cAAc;QACd,cAAc;QACd,SAAS;KACV,CAAC,CAAC;IAEH,MAAM,0BAA0B,GAAG,OAAO,CACxC,GAAG,EAAE,CACH,oBAAoB,CAAC;QACnB,MAAM,EAAE;YACN,cAAc;SACf;QACD,SAAS;KACV,CAAC,EACJ,CAAC,SAAS,EAAE,cAAc,CAAC,CAC5B,CAAC;IAEF,MAAM,0BAA0B,GAAG,OAAO,CACxC,GAAG,EAAE,CACH,aAAa,EAAE,MAAM,CACnB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,0BAA0B,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CACvE,EACH,CAAC,aAAa,EAAE,0BAA0B,CAAC,CAC5C,CAAC;IAEF,2FAA2F;IAC3F,+GAA+G;IAC/G,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,OAAO,CACzC,GAAG,EAAE,CAAC,CAAC;QACL,SAAS,EAAE,0BAA0B,EAAE,MAAM,CAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CACjC;QACD,YAAY,EAAE,0BAA0B,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACrD,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CACzB;KACF,CAAC,EACF,CAAC,0BAA0B,CAAC,CAC7B,CAAC;IAEF,MAAM,SAAS,GAAG,WAAW,CAC3B,CAAC,OAAe,EAAE,OAAe,EAAE,EAAE,CACnC,aAAa,EAAE,IAAI,CACjB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,OAAO,IAAI,CAAC,CAAC,OAAO,KAAK,OAAO,CACtD,EACH,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,OAAO;QACL,MAAM,EAAE,aAAa;QACrB,SAAS;QACT,YAAY;QACZ,SAAS;QACT,iBAAiB,EAAE;YACjB,eAAe,EAAE,KAAK;YACtB,SAAS,EAAE,GAAG;YACd,cAAc,EAAE,KAAK;YACrB,cAAc,EAAE,IAAI;YACpB,IAAI,EAAE;gBACJ,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE;gBAC7B,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE;aAC9B;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"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);

package/dist/hooks/transaction/useExecuteTransaction.js.map

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

package/dist/hooks/transaction/useSingleTransaction.d.ts

@@ -1,7 +1,7 @@
 import { TransactionStatus } from "../../core/types/transaction";
 import { SimplifiedTransactionHistory } from "../store/useHistoryStore";
 export declare const useSingleTransaction: ({ transaction, retry, refetchOnWindowFocus, enabled, }: {
-    transaction?: Pick<SimplifiedTransactionHistory, "status" | "transactionId" | "fromChain" | "toChain" | "fromAddress" | "isCCTP"> | undefined;
+    transaction?: Pick<SimplifiedTransactionHistory, "transactionId" | "status" | "fromChain" | "toChain" | "fromAddress" | "isCCTP"> | undefined;
     retry?: number | undefined;
     refetchOnWindowFocus?: boolean | "always" | undefined;
     enabled?: boolean | undefined;

package/dist/hooks/wallet/useMultiChainWallet.d.ts

@@ -1,10 +1,23 @@
 import type { ChainData } from "@0xsquid/squid-types";
-import type { FullAddressData } from "../../core/types/wallet";
+import { ChainType } from "@0xsquid/squid-types";
 export declare const useMultiChainWallet: (chain: ChainData | undefined) => {
     changeNetworkIfNeeded: import("@tanstack/react-query").UseMutationResult<boolean, any, void, unknown>;
-    networkConnected: boolean | undefined;
+    networkConnected: boolean;
     networkConnectedOnRightChain: boolean;
-    connectedAddress: FullAddressData;
+    connectedAddress: {
+        address?: undefined;
+        formatted?: undefined;
+        ens?: undefined;
+    } | {
+        address: string | undefined;
+        formatted: string;
+        ens: import("../..").EnsData | undefined;
+    } | {
+        address: string | undefined;
+        formatted: string;
+        ens?: undefined;
+    };
     connectedEvmChain: ChainData | undefined;
-    evmAddress: `0x${string}` | undefined;
+    evmAddress: string | undefined;
+    isChainTypeConnected: (chainType: ChainType) => boolean;
 };

package/dist/hooks/wallet/useMultiChainWallet.js

@@ -1,30 +1,33 @@
 import { ChainType } from "@0xsquid/squid-types";
 import { useMutation } from "@tanstack/react-query";
-import { useMemo } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { UserRejectedRequestError } from "viem";
 import { useAccount, useSwitchChain } from "wagmi";
+import { useCosmosContext } from "../../core/providers/CosmosProvider";
 import { addEthereumChain, formatHash, isEvmChainNotSupportedError, } from "../../services/internal/walletService";
 import { useSquidChains } from "../chains/useSquidChains";
 import { useEnsDataForAddress } from "./useEns";
 import { useWallet } from "./useWallet";
 export const useMultiChainWallet = (chain) => {
-    const { evmAddress, connectedAddresses, isEvmConnected, cosmosIsConnected } = useWallet();
-    const { chain: currentEvmChain, connector } = useAccount();
+    const { connectedAddresses, connectedWalletsByChainType } = useWallet();
+    const { chain: currentEvmChain, connector: evmConnector } = useAccount();
     const { chains } = useSquidChains();
+    const { getCosmosAddressForChain } = useCosmosContext();
     const { switchChainAsync } = useSwitchChain();
+    const evmAddress = useMemo(() => connectedAddresses[ChainType.EVM], [connectedAddresses]);
     const evmEnsData = useEnsDataForAddress({
         address: evmAddress,
         options: {
             enabled: chain?.chainType === ChainType.EVM,
         },
     });
+    const [cosmosAddress, setCosmosAddress] = useState(undefined);
     /**
      * Get connected address, depends on chainType
      */
     const connectedAddress = useMemo(() => {
-        if (!chain) {
+        if (!chain)
             return {};
-        }
         switch (chain.chainType) {
             case ChainType.EVM:
                 return {
@@ -37,16 +40,18 @@ export const useMultiChainWallet = (chain) => {
                 };
             case ChainType.COSMOS:
                 return {
-                    address: connectedAddresses[ChainType.COSMOS],
-                    formatted: formatHash({
-                        hash: connectedAddresses[ChainType.COSMOS],
-                        chainType: chain.chainType,
-                    }),
+                    address: cosmosAddress,
+                    formatted: cosmosAddress
+                        ? formatHash({
+                            hash: cosmosAddress,
+                            chainType: chain.chainType,
+                        })
+                        : "",
                 };
             default:
                 return {};
         }
-    }, [chain, evmAddress, connectedAddresses, evmEnsData.data]);
+    }, [chain, evmAddress, evmEnsData.data, cosmosAddress]);
     /**
      * Change current network for desired chain
      */
@@ -70,8 +75,8 @@ export const useMultiChainWallet = (chain) => {
             if (error instanceof UserRejectedRequestError) {
                 return;
             }
-            if (isEvmChainNotSupportedError(error) && chain && connector) {
-                const provider = await connector.getProvider();
+            if (isEvmChainNotSupportedError(error) && chain && evmConnector) {
+                const provider = await evmConnector.getProvider();
                 addEthereumChain({
                     chain: chain,
                     provider,
@@ -79,6 +84,10 @@ export const useMultiChainWallet = (chain) => {
             }
         },
     });
+    const isChainTypeConnected = useCallback((chainType) => {
+        const connectedWallet = connectedWalletsByChainType[chainType];
+        return !!connectedWallet?.wallet && !!connectedWallet?.address;
+    }, [connectedWalletsByChainType]);
     /**
      * Handle multiple chains
      */
@@ -87,13 +96,18 @@ export const useMultiChainWallet = (chain) => {
             return false;
         switch (chain.chainType) {
             case ChainType.EVM:
-                return isEvmConnected;
+                return isChainTypeConnected(ChainType.EVM);
             case ChainType.COSMOS:
-                return cosmosIsConnected;
+                return isChainTypeConnected(ChainType.COSMOS);
             default:
                 return false;
         }
-    }, [isEvmConnected, chain, cosmosIsConnected]);
+    }, [chain, isChainTypeConnected]);
+    useEffect(() => {
+        if (chain?.chainType === ChainType.COSMOS && networkConnected) {
+            getCosmosAddressForChain(chain.chainId).then(setCosmosAddress);
+        }
+    }, [chain, getCosmosAddressForChain, networkConnected]);
     const connectedEvmChain = useMemo(() => {
         if (!currentEvmChain)
             return undefined;
@@ -108,14 +122,15 @@ export const useMultiChainWallet = (chain) => {
             // tenderly validation based on rpc
             if (currentEvmChain?.rpcUrls?.default?.http?.length &&
                 currentEvmChain?.rpcUrls?.default?.http[0].includes("tenderly")) {
-                return (isEvmConnected &&
+                return (isChainTypeConnected(ChainType.EVM) &&
                     currentEvmChain?.rpcUrls?.default?.http[0].toLowerCase() ===
                         chain.rpc.toLowerCase());
             }
-            return isEvmConnected && currentEvmChain?.id.toString() === chain.chainId;
+            return (isChainTypeConnected(ChainType.EVM) &&
+                currentEvmChain?.id.toString() === chain.chainId);
         }
         return true;
-    }, [isEvmConnected, currentEvmChain, chain]);
+    }, [isChainTypeConnected, currentEvmChain, chain]);
     return {
         changeNetworkIfNeeded,
         networkConnected,
@@ -123,6 +138,7 @@ export const useMultiChainWallet = (chain) => {
         connectedAddress,
         connectedEvmChain,
         evmAddress,
+        isChainTypeConnected,
     };
 };
 //# sourceMappingURL=useMultiChainWallet.js.map

package/dist/hooks/wallet/useMultiChainWallet.js.map

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

package/dist/hooks/wallet/useWallet.d.ts

@@ -1,21 +1,21 @@
 import type { ChainData } from "@0xsquid/squid-types";
 import { ChainType } from "@0xsquid/squid-types";
 import type { Wallet } from "../../core/types/wallet";
+export declare const useEvmWalletListener: () => void;
 export declare const useWallet: () => {
     wallets: Wallet[];
-    connectedWallets: Record<ChainType, {
+    connectedWallets: Wallet[];
+    connectedWalletsByChainType: Record<ChainType, {
         wallet: Wallet | undefined;
         address: string | undefined;
     }>;
+    connectedAddresses: Record<ChainType, string | undefined>;
+    connectingWallet: Wallet | undefined;
+    changeWallet: () => Promise<void>;
+    disconnectWallet: (chainType: ChainType) => Promise<void>;
     connectWallet: import("@tanstack/react-query").UseMutateAsyncFunction<boolean, unknown, {
         wallet: Wallet;
         chain?: ChainData | undefined;
     }, unknown>;
-    disconnectWallet: (chainType: ChainType) => Promise<void>;
-    isEvmConnected: boolean;
-    cosmosIsConnected: boolean | undefined;
-    connectedAddresses: Record<ChainType, string | undefined>;
-    connectingWallet: Wallet | undefined;
-    changeWallet: () => Promise<void>;
-    evmAddress: `0x${string}` | undefined;
+    isWalletConnected: (wallet: Wallet) => boolean;
 };

package/dist/hooks/wallet/useWallet.js

@@ -1,21 +1,43 @@
 import { ChainType } from "@0xsquid/squid-types";
 import { useMutation } from "@tanstack/react-query";
+import { useCallback, useEffect, useMemo } from "react";
 import { useAccount, useConnect, useDisconnect, useWalletClient } from "wagmi";
+import { CHAIN_IDS } from "../../core/constants";
 import { useCosmosContext } from "../../core/providers/CosmosProvider";
 import { connectWalletByType, findWalletByWagmiConnector, redirectExtensionStoreIfNotInstalled, } from "../../services/internal/walletService";
-import { CHAIN_IDS } from "../../core/constants";
 import { useSquidChains } from "../chains/useSquidChains";
 import { useWalletStore } from "../store/useWalletStore";
 import { useWallets } from "./useWallets";
-import { useEffect } from "react";
+export const useEvmWalletListener = () => {
+    const { address, connector, isConnected, isConnecting } = useAccount();
+    const { wallets } = useWallets();
+    const { setConnectedWallet } = useWalletStore();
+    useEffect(() => {
+        if (isConnected && address && connector && !isConnecting) {
+            const wallet = findWalletByWagmiConnector(wallets, connector);
+            setConnectedWallet(ChainType.EVM, wallet, address);
+        }
+        else {
+            setConnectedWallet(ChainType.EVM, undefined, undefined);
+        }
+    }, [
+        isConnected,
+        address,
+        connector,
+        setConnectedWallet,
+        wallets,
+        isConnecting,
+    ]);
+};
 export const useWallet = () => {
     const { wallets } = useWallets();
-    const { connector: activeConnector, isConnected: isEvmConnected } = useAccount();
+    const { connector: activeEvmConnector } = useAccount();
     const { disconnectAsync: disconnectEvm } = useDisconnect();
-    const { isConnected: cosmosIsConnected, connectCosmos, cosmosConnectedWallet, } = useCosmosContext();
-    const { connectAsync } = useConnect();
+    const { connectCosmos, cosmosConnectedWallet } = useCosmosContext();
+    const { connectAsync: connectEvmAsync } = useConnect();
     const { findChain } = useSquidChains();
-    const { connectedWallets, connectingWallet, setConnectedWallet, setConnectingWallet, disconnectWallet: storeDisconnectWallet, getConnectedAddresses, } = useWalletStore();
+    useEvmWalletListener();
+    const { connectedWalletsByChainType, connectingWallet, setConnectedWallet, setConnectingWallet, disconnectWallet: storeDisconnectWallet, } = useWalletStore();
     const getBaseChain = (wallet, chain) => {
         if (chain)
             return chain;
@@ -35,8 +57,8 @@ export const useWallet = () => {
             const baseChain = getBaseChain(wallet, chain);
             try {
                 const result = await connectWalletByType(wallet, baseChain, {
-                    connectAsync,
-                    activeConnector,
+                    connectEvmAsync,
+                    activeEvmConnector,
                     connectCosmos,
                     cosmosConnectedWallet,
                 });
@@ -55,15 +77,22 @@ export const useWallet = () => {
         },
     });
     const disconnectWallet = async (chainType) => {
-        switch (chainType) {
-            case ChainType.EVM:
-                await disconnectEvm();
-                break;
-            case ChainType.COSMOS:
-                // TODO: Implement cosmos disconnect
-                break;
+        try {
+            switch (chainType) {
+                case ChainType.EVM:
+                    await disconnectEvm();
+                    break;
+                case ChainType.COSMOS:
+                    // TODO: Implement cosmos disconnect
+                    break;
+            }
+        }
+        catch (error) {
+            console.debug(`Failed to disconnect ${chainType} wallet:`, error);
+        }
+        finally {
+            storeDisconnectWallet(chainType);
         }
-        storeDisconnectWallet(chainType);
     };
     const { data: walletClient } = useWalletClient();
     const changeWallet = async () => {
@@ -81,23 +110,31 @@ export const useWallet = () => {
             console.error("Failed to change wallet", error);
         }
     };
-    const { address: evmAddress, connector } = useAccount();
-    useEffect(() => {
-        if (evmAddress && connector) {
-            setConnectedWallet(ChainType.EVM, findWalletByWagmiConnector(wallets, connector), evmAddress);
-        }
-    }, [evmAddress, connector, setConnectedWallet, wallets]);
+    const connectedAddresses = useMemo(() => {
+        return Object.fromEntries(Object.entries(connectedWalletsByChainType).map(([key, value]) => [
+            key,
+            value.address,
+        ]));
+    }, [connectedWalletsByChainType]);
+    const isWalletConnected = useCallback((wallet) => {
+        const connectedWallet = connectedWalletsByChainType[wallet.type];
+        return connectedWallet?.wallet?.connectorId === wallet.connectorId;
+    }, [connectedWalletsByChainType]);
+    const connectedWallets = useMemo(() => {
+        return Object.values(connectedWalletsByChainType)
+            .map((c) => c.wallet)
+            .filter((w) => w !== null && w !== undefined);
+    }, [connectedWalletsByChainType]);
     return {
         wallets,
         connectedWallets,
-        connectWallet: connectWalletMutation.mutateAsync,
-        disconnectWallet,
-        isEvmConnected,
-        cosmosIsConnected,
-        connectedAddresses: getConnectedAddresses(),
+        connectedWalletsByChainType,
+        connectedAddresses,
         connectingWallet,
         changeWallet,
-        evmAddress,
+        disconnectWallet,
+        connectWallet: connectWalletMutation.mutateAsync,
+        isWalletConnected,
     };
 };
 //# sourceMappingURL=useWallet.js.map