@lifi/widget 3.21.3 → 3.22.0

package/dist/esm/hooks/useExplorer.js

@@ -6,48 +6,43 @@ const sanitiseBaseUrl = (baseUrl) => baseUrl.trim().replace(/\/+$/, '');
 export const useExplorer = () => {
     const { explorerUrls } = useWidgetConfig();
     const { getChainById } = useAvailableChains();
-    const getBaseUrl = (chain) => {
-        const baseUrl = explorerUrls?.[chain.id]
-            ? explorerUrls[chain.id][0]
-            : chain.metamask.blockExplorerUrls[0];
-        return sanitiseBaseUrl(baseUrl);
+    const getExplorerConfig = (chain) => {
+        const resolvedChain = Number.isFinite(chain)
+            ? getChainById(chain)
+            : chain;
+        const explorerUrl = (resolvedChain
+            ? (explorerUrls?.[resolvedChain.id]?.[0] ??
+                resolvedChain.metamask.blockExplorerUrls[0])
+            : explorerUrls?.internal?.[0]) || lifiExplorerUrl;
+        const url = typeof explorerUrl === 'string' ? explorerUrl : explorerUrl.url;
+        const defaultTxPath = resolvedChain?.id === ChainId.SUI ? 'txblock' : 'tx';
+        const defaultAddressPath = resolvedChain?.id === ChainId.SUI ? 'coin' : 'address';
+        const txPath = typeof explorerUrl === 'string'
+            ? defaultTxPath
+            : explorerUrl.txPath || defaultTxPath;
+        const addressPath = typeof explorerUrl === 'string'
+            ? defaultAddressPath
+            : explorerUrl.addressPath || defaultAddressPath;
+        return {
+            url: sanitiseBaseUrl(url),
+            txPath,
+            addressPath,
+        };
     };
-    const resolveChain = (chain) => Number.isFinite(chain) ? getChainById(chain) : chain;
     const getTransactionLink = ({ txHash, txLink, chain, }) => {
         if (!txHash && txLink) {
             return txLink;
         }
-        if (!chain) {
-            const baseUrl = explorerUrls?.internal?.[0]
-                ? sanitiseBaseUrl(explorerUrls?.internal[0])
-                : lifiExplorerUrl;
-            return `${baseUrl}/tx/${txHash}`;
-        }
-        const resolvedChain = resolveChain(chain);
-        const txPathSegment = resolvedChain?.id === ChainId.SUI ? 'txblock' : 'tx';
-        return `${resolvedChain ? getBaseUrl(resolvedChain) : lifiExplorerUrl}/${txPathSegment}/${txHash}`;
+        const config = getExplorerConfig(chain);
+        return `${config.url}/${config.txPath}/${txHash}`;
     };
     const getAddressLink = (address, chain) => {
-        if (!chain) {
-            const baseUrl = explorerUrls?.internal?.[0]
-                ? sanitiseBaseUrl(explorerUrls?.internal[0])
-                : lifiExplorerUrl;
-            return `${baseUrl}/address/${address}`;
-        }
-        const resolvedChain = resolveChain(chain);
-        return `${resolvedChain ? getBaseUrl(resolvedChain) : lifiExplorerUrl}/address/${address}`;
-    };
-    const getTokenAddressLink = (address, chain) => {
-        const link = getAddressLink(address, chain);
-        if (chain === ChainId.SUI || chain?.id === ChainId.SUI) {
-            return link.replace('address', 'coin');
-        }
-        return link;
+        const config = getExplorerConfig(chain);
+        return `${config.url}/${config.addressPath}/${address}`;
     };
     return {
         getTransactionLink,
         getAddressLink,
-        getTokenAddressLink,
     };
 };
 //# sourceMappingURL=useExplorer.js.map

package/dist/esm/hooks/useExplorer.js.map

@@ -1 +1 @@
-{"version":3,"file":"useExplorer.js","sourceRoot":"","sources":["../../../src/hooks/useExplorer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useExplorer.js","sourceRoot":"","sources":["../../../src/hooks/useExplorer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAA;AAE/E,MAAM,eAAe,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAa/E,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,EAAE,CAAA;IAC1C,MAAM,EAAE,YAAY,EAAE,GAAG,kBAAkB,EAAE,CAAA;IAE7C,MAAM,iBAAiB,GAAG,CAAC,KAAsB,EAAE,EAAE;QACnD,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC1C,CAAC,CAAC,YAAY,CAAC,KAAe,CAAC;YAC/B,CAAC,CAAE,KAAe,CAAA;QAEpB,MAAM,WAAW,GACf,CAAC,aAAa;YACZ,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBACtC,aAAa,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAC9C,CAAC,CAAC,YAAY,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,eAAe,CAAA;QAErD,MAAM,GAAG,GAAG,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAA;QAE3E,MAAM,aAAa,GAAG,aAAa,EAAE,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAA;QAC1E,MAAM,kBAAkB,GACtB,aAAa,EAAE,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAA;QACxD,MAAM,MAAM,GACV,OAAO,WAAW,KAAK,QAAQ;YAC7B,CAAC,CAAC,aAAa;YACf,CAAC,CAAC,WAAW,CAAC,MAAM,IAAI,aAAa,CAAA;QACzC,MAAM,WAAW,GACf,OAAO,WAAW,KAAK,QAAQ;YAC7B,CAAC,CAAC,kBAAkB;YACpB,CAAC,CAAC,WAAW,CAAC,WAAW,IAAI,kBAAkB,CAAA;QAEnD,OAAO;YACL,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC;YACzB,MAAM;YACN,WAAW;SACZ,CAAA;IACH,CAAC,CAAA;IAED,MAAM,kBAAkB,GAAG,CAAC,EAC1B,MAAM,EACN,MAAM,EACN,KAAK,GACgB,EAAE,EAAE;QACzB,IAAI,CAAC,MAAM,IAAI,MAAM,EAAE,CAAC;YACtB,OAAO,MAAM,CAAA;QACf,CAAC;QAED,MAAM,MAAM,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAA;QACvC,OAAO,GAAG,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,EAAE,CAAA;IACnD,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,CAAC,OAAe,EAAE,KAAsB,EAAE,EAAE;QACjE,MAAM,MAAM,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAA;QACvC,OAAO,GAAG,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,WAAW,IAAI,OAAO,EAAE,CAAA;IACzD,CAAC,CAAA;IAED,OAAO;QACL,kBAAkB;QAClB,cAAc;KACf,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/hooks/useFromTokenSufficiency.js

@@ -1,13 +1,16 @@
 import { useAccount } from '@lifi/wallet-management';
 import { keepPreviousData, useQuery } from '@tanstack/react-query';
 import { parseUnits } from 'viem';
+import { useWidgetConfig } from '../providers/WidgetProvider/WidgetProvider.js';
 import { useFieldValues } from '../stores/form/useFieldValues.js';
 import { isRouteDone } from '../stores/routes/utils.js';
+import { getQueryKey } from '../utils/queries.js';
 import { useTokenAddressBalance } from './useTokenAddressBalance.js';
 import { getTokenBalancesWithRetry } from './useTokenBalance.js';
 const refetchInterval = 30000;
 export const useFromTokenSufficiency = (route) => {
     const [fromChainId, fromTokenAddress, fromAmount] = useFieldValues('fromChain', 'fromToken', 'fromAmount');
+    const { keyPrefix } = useWidgetConfig();
     let chainId = fromChainId;
     let tokenAddress = fromTokenAddress;
     if (route) {
@@ -18,7 +21,7 @@ export const useFromTokenSufficiency = (route) => {
     const { account } = useAccount({ chainType: chain?.chainType });
     const { data: insufficientFromToken, isLoading } = useQuery({
         queryKey: [
-            'from-token-sufficiency-check',
+            getQueryKey('from-token-sufficiency-check', keyPrefix),
             account.address,
             chainId,
             tokenAddress,

package/dist/esm/hooks/useFromTokenSufficiency.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFromTokenSufficiency.js","sourceRoot":"","sources":["../../../src/hooks/useFromTokenSufficiency.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAA;AAEhE,MAAM,eAAe,GAAG,KAAM,CAAA;AAE9B,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,KAAqB,EAAE,EAAE;IAC/D,MAAM,CAAC,WAAW,EAAE,gBAAgB,EAAE,UAAU,CAAC,GAAG,cAAc,CAChE,WAAW,EACX,WAAW,EACX,YAAY,CACb,CAAA;IAED,IAAI,OAAO,GAAG,WAAW,CAAA;IACzB,IAAI,YAAY,GAAG,gBAAgB,CAAA;IACnC,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,CAAA;QACjC,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,CAAA;IACxC,CAAC;IAED,MAAM,EACJ,KAAK,EACL,KAAK,EACL,SAAS,EAAE,4BAA4B,GACxC,GAAG,sBAAsB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;IAEjD,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAA;IAE/D,MAAM,EAAE,IAAI,EAAE,qBAAqB,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC;QAC1D,QAAQ,EAAE;YACR,8BAA8B;YAC9B,OAAO,CAAC,OAAO;YACf,OAAO;YACP,YAAY;YACZ,KAAK,EAAE,EAAE,IAAI,UAAU;SACf;QACV,OAAO,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,cAAc,CAAC,EAAE,EAAE,EAAE;YAClD,IAAI,CAAC,cAAc,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC9B,OAAM;YACR,CAAC;YACD,MAAM,gBAAgB,GAAG,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;YAC/D,IAAI,mBAAmB,GAAG,KAAK,CAAC,MAAM,IAAI,EAAE,CAAA;YAE5C,IAAI,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjC,MAAM,iBAAiB,GAAG,mBAAmB,GAAG,gBAAgB,CAAA;gBAChE,OAAO,iBAAiB,CAAA;YAC1B,CAAC;YAED,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CACtC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,MAAM,CAC9D,CAAC,CAAC,CAAC,EAAE,MAAM,CAAA;YAEZ,IACE,KAAK,CAAC,OAAO,KAAK,aAAa,CAAC,SAAS,CAAC,OAAO;gBACjD,KAAK,CAAC,OAAO,KAAK,aAAa,CAAC,SAAS,CAAC,OAAO;gBACjD,mBAAmB,GAAG,CAAC,EACvB,CAAC;gBACD,MAAM,iBAAiB,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,mBAAmB,CAAA;gBACxE,OAAO,iBAAiB,CAAA;YAC1B,CAAC;YAED,MAAM,aAAa,GAAG,MAAM,yBAAyB,CAAC,cAAc,EAAE;gBACpE,aAAa,CAAC,SAAS;aACxB,CAAC,CAAA;YAEF,mBAAmB,GAAG,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAA;YACtD,MAAM,iBAAiB,GACrB,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,mBAAmB,CAAA;YACxD,OAAO,iBAAiB,CAAA;QAC1B,CAAC;QAED,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,IAAI,KAAK,IAAI,CAAC,4BAA4B,CAAC;QAC3E,eAAe;QACf,SAAS,EAAE,eAAe;QAC1B,eAAe,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS;KAChE,CAAC,CAAA;IAEF,OAAO;QACL,qBAAqB;QACrB,SAAS;KACV,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"useFromTokenSufficiency.js","sourceRoot":"","sources":["../../../src/hooks/useFromTokenSufficiency.ts"],"names":[],"mappings":"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"}

package/dist/esm/hooks/useGasRecommendation.js

@@ -1,16 +1,24 @@
 import { getGasRecommendation } from '@lifi/sdk';
 import { useQuery } from '@tanstack/react-query';
+import { useWidgetConfig } from '../providers/WidgetProvider/WidgetProvider.js';
+import { getQueryKey } from '../utils/queries.js';
 import { useAvailableChains } from './useAvailableChains.js';
 const refetchInterval = 60000;
 export const useGasRecommendation = (toChainId, fromChain, fromToken) => {
     const { chains } = useAvailableChains();
+    const { keyPrefix } = useWidgetConfig();
     const checkRecommendationLiFuel = Boolean(toChainId) &&
         Boolean(fromChain) &&
         Boolean(fromToken) &&
         Boolean(chains?.length);
     const checkRecommendationMaxButton = Boolean(toChainId) && !fromChain && !fromToken && Boolean(chains?.length);
     return useQuery({
-        queryKey: ['gas-recommendation', toChainId, fromChain, fromToken],
+        queryKey: [
+            getQueryKey('gas-recommendation', keyPrefix),
+            toChainId,
+            fromChain,
+            fromToken,
+        ],
         queryFn: async ({ queryKey: [_, toChainId, fromChain, fromToken], signal, }) => {
             if (!chains?.some((chain) => chain.id === toChainId)) {
                 return null;

package/dist/esm/hooks/useGasRecommendation.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGasRecommendation.js","sourceRoot":"","sources":["../../../src/hooks/useGasRecommendation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAE5D,MAAM,eAAe,GAAG,KAAM,CAAA;AAE9B,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,SAAmB,EACnB,SAAmB,EACnB,SAAkB,EAClB,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,kBAAkB,EAAE,CAAA;IAEvC,MAAM,yBAAyB,GAC7B,OAAO,CAAC,SAAS,CAAC;QAClB,OAAO,CAAC,SAAS,CAAC;QAClB,OAAO,CAAC,SAAS,CAAC;QAClB,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAEzB,MAAM,4BAA4B,GAChC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAE3E,OAAO,QAAQ,CAAC;QACd,QAAQ,EAAE,CAAC,oBAAoB,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC;QACjE,OAAO,EAAE,KAAK,EAAE,EACd,QAAQ,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EAC9C,MAAM,GACP,EAAE,EAAE;YACH,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE,CAAC;gBACrD,OAAO,IAAI,CAAA;YACb,CAAC;YACD,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAClD;gBACE,OAAO,EAAE,SAAoB;gBAC7B,SAAS,EAAE,SAAoB;gBAC/B,SAAS,EAAE,SAAmB;aAC/B,EACD,EAAE,MAAM,EAAE,CACX,CAAA;YACD,OAAO,iBAAiB,CAAA;QAC1B,CAAC;QACD,OAAO,EAAE,yBAAyB,IAAI,4BAA4B;QAClE,eAAe;QACf,SAAS,EAAE,eAAe;KAC3B,CAAC,CAAA;AACJ,CAAC,CAAA"}
+{"version":3,"file":"useGasRecommendation.js","sourceRoot":"","sources":["../../../src/hooks/useGasRecommendation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAA;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAE5D,MAAM,eAAe,GAAG,KAAM,CAAA;AAE9B,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,SAAmB,EACnB,SAAmB,EACnB,SAAkB,EAClB,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,kBAAkB,EAAE,CAAA;IACvC,MAAM,EAAE,SAAS,EAAE,GAAG,eAAe,EAAE,CAAA;IAEvC,MAAM,yBAAyB,GAC7B,OAAO,CAAC,SAAS,CAAC;QAClB,OAAO,CAAC,SAAS,CAAC;QAClB,OAAO,CAAC,SAAS,CAAC;QAClB,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAEzB,MAAM,4BAA4B,GAChC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAE3E,OAAO,QAAQ,CAAC;QACd,QAAQ,EAAE;YACR,WAAW,CAAC,oBAAoB,EAAE,SAAS,CAAC;YAC5C,SAAS;YACT,SAAS;YACT,SAAS;SACV;QACD,OAAO,EAAE,KAAK,EAAE,EACd,QAAQ,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EAC9C,MAAM,GACP,EAAE,EAAE;YACH,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE,CAAC;gBACrD,OAAO,IAAI,CAAA;YACb,CAAC;YACD,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAClD;gBACE,OAAO,EAAE,SAAoB;gBAC7B,SAAS,EAAE,SAAoB;gBAC/B,SAAS,EAAE,SAAmB;aAC/B,EACD,EAAE,MAAM,EAAE,CACX,CAAA;YACD,OAAO,iBAAiB,CAAA;QAC1B,CAAC;QACD,OAAO,EAAE,yBAAyB,IAAI,4BAA4B;QAClE,eAAe;QACf,SAAS,EAAE,eAAe;KAC3B,CAAC,CAAA;AACJ,CAAC,CAAA"}

package/dist/esm/hooks/useGasSufficiency.js

@@ -1,37 +1,61 @@
-import { isRelayerStep } from '@lifi/sdk';
+import { ChainType, isRelayerStep } from '@lifi/sdk';
 import { useAccount } from '@lifi/wallet-management';
 import { useQuery } from '@tanstack/react-query';
+import { useMemo } from 'react';
+import { useWidgetConfig } from '../providers/WidgetProvider/WidgetProvider.js';
+import { getQueryKey } from '../utils/queries.js';
 import { useAvailableChains } from './useAvailableChains.js';
 import { useIsContractAddress } from './useIsContractAddress.js';
 import { getTokenBalancesWithRetry } from './useTokenBalance.js';
 const refetchInterval = 30000;
 export const useGasSufficiency = (route) => {
     const { getChainById } = useAvailableChains();
-    const { account } = useAccount({
-        chainType: getChainById(route?.fromChainId)?.chainType,
+    const { account: EVMAccount, accounts } = useAccount({
+        chainType: ChainType.EVM,
     });
-    const { isContractAddress, isLoading: isContractAddressLoading } = useIsContractAddress(account.address, route?.fromChainId, account.chainType);
+    const { keyPrefix } = useWidgetConfig();
+    const { relevantAccounts, relevantAccountsQueryKey } = useMemo(() => {
+        const chainTypes = route?.steps.reduce((acc, step) => {
+            const chainType = getChainById(step.action.fromChainId)?.chainType;
+            if (chainType) {
+                acc.add(chainType);
+            }
+            return acc;
+        }, new Set());
+        const relevantAccounts = accounts.filter((account) => account.isConnected &&
+            account.address &&
+            chainTypes?.has(account.chainType));
+        return {
+            relevantAccounts,
+            relevantAccountsQueryKey: relevantAccounts
+                .map((account) => account.address)
+                .join(','),
+        };
+    }, [accounts, route?.steps, getChainById]);
+    const { isContractAddress, isLoading: isContractAddressLoading } = useIsContractAddress(EVMAccount.address, route?.fromChainId, EVMAccount.chainType);
     const { data: insufficientGas, isLoading } = useQuery({
         queryKey: [
-            'gas-sufficiency-check',
-            account.address,
+            getQueryKey('gas-sufficiency-check', keyPrefix),
+            relevantAccountsQueryKey,
             route?.id,
             isContractAddress,
         ],
-        queryFn: async ({ queryKey: [, accountAddress] }) => {
+        queryFn: async () => {
             if (!route) {
                 return;
             }
-            // If we have a relayer step with a permit (EIP-2612) for the from token, we don't need to check for gas sufficiency
-            if (isRelayerStep(route.steps[0]) &&
-                route.steps[0].typedData.some((t) => t.primaryType === 'Permit')) {
+            // Filter out steps that are relayer steps or have primaryType 'Permit' or 'Order'
+            const filteredSteps = route.steps.filter((step) => !isRelayerStep(step) &&
+                !step.typedData?.some((t) => t.primaryType === 'Permit' || t.primaryType === 'Order'));
+            // If all steps are filtered out, we don't need to check for gas sufficiency
+            if (!filteredSteps.length) {
                 return;
             }
             // We assume that LI.Fuel protocol always refuels the destination chain
             const hasRefuelStep = route.steps
                 .flatMap((step) => step.includedSteps)
                 .some((includedStep) => includedStep.tool === 'gasZip');
-            const gasCosts = route.steps
+            const gasCosts = filteredSteps
                 .filter((step) => !step.execution || step.execution.status !== 'DONE')
                 .reduce((groupedGasCosts, step) => {
                 // We need to avoid destination chain step sufficiency check if we have LI.Fuel protocol sub-step
@@ -44,6 +68,7 @@ export const useGasSufficiency = (route) => {
                             ? groupedGasCosts[token.chainId].gasAmount + gasCostAmount
                             : gasCostAmount,
                         token,
+                        chain: getChainById(token.chainId),
                     };
                 }
                 // Add fees paid in native tokens to gas sufficiency check (included: false)
@@ -56,6 +81,7 @@ export const useGasSufficiency = (route) => {
                             ? groupedGasCosts[token.chainId].gasAmount + feeCostAmount
                             : feeCostAmount,
                         token,
+                        chain: getChainById(token.chainId),
                     };
                 }
                 return groupedGasCosts;
@@ -66,12 +92,20 @@ export const useGasSufficiency = (route) => {
                 gasCosts[route.fromChainId].tokenAmount =
                     gasCosts[route.fromChainId]?.gasAmount + BigInt(route.fromAmount);
             }
-            const tokenBalances = await getTokenBalancesWithRetry(accountAddress, Object.values(gasCosts).map((item) => item.token));
+            const gasCostsValues = Object.values(gasCosts);
+            const balanceChecks = await Promise.allSettled(relevantAccounts.map((account) => {
+                const relevantTokens = gasCostsValues
+                    .filter((gasCost) => gasCost.chain?.chainType === account.chainType)
+                    .map((item) => item.token);
+                return getTokenBalancesWithRetry(account.address, relevantTokens);
+            }));
+            const tokenBalances = balanceChecks
+                .filter((result) => result.status === 'fulfilled' && Boolean(result.value))
+                .flatMap((result) => result.value);
             if (!tokenBalances?.length) {
                 return;
             }
-            ;
-            [route.fromChainId, route.toChainId].forEach((chainId) => {
+            Object.keys(gasCosts).forEach((chainId) => {
                 if (gasCosts[chainId]) {
                     const gasTokenBalance = tokenBalances?.find((t) => t.chainId === gasCosts[chainId].token.chainId &&
                         t.address === gasCosts[chainId].token.address)?.amount ?? 0n;
@@ -87,7 +121,7 @@ export const useGasSufficiency = (route) => {
                         ...gasCosts[chainId],
                         insufficient,
                         insufficientAmount,
-                        chain: insufficient ? getChainById(chainId) : undefined,
+                        chain: insufficient ? getChainById(Number(chainId)) : undefined,
                     };
                 }
             });
@@ -96,7 +130,7 @@ export const useGasSufficiency = (route) => {
         },
         enabled: Boolean(!isContractAddress &&
             !isContractAddressLoading &&
-            account.address &&
+            relevantAccounts.length > 0 &&
             route),
         refetchInterval,
         staleTime: refetchInterval,

package/dist/esm/hooks/useGasSufficiency.js.map

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

package/dist/esm/hooks/useIsBatchingSupported.js

@@ -1,9 +1,16 @@
 import { ChainType, isBatchingSupported } from '@lifi/sdk';
 import { useQuery } from '@tanstack/react-query';
+import { useWidgetConfig } from '../providers/WidgetProvider/WidgetProvider.js';
+import { getQueryKey } from '../utils/queries.js';
 export function useIsBatchingSupported(chain, address) {
+    const { keyPrefix } = useWidgetConfig();
     const enabled = Boolean(chain && chain.chainType === ChainType.EVM && !!address);
     const { data, isLoading } = useQuery({
-        queryKey: ['isBatchingSupported', chain?.id, address],
+        queryKey: [
+            getQueryKey('isBatchingSupported', keyPrefix),
+            chain?.id,
+            address,
+        ],
         queryFn: () => {
             return isBatchingSupported({ chainId: chain.id });
         },

package/dist/esm/hooks/useIsBatchingSupported.js.map

@@ -1 +1 @@
-{"version":3,"file":"useIsBatchingSupported.js","sourceRoot":"","sources":["../../../src/hooks/useIsBatchingSupported.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAA;AAE1D,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAEhD,MAAM,UAAU,sBAAsB,CACpC,KAAqB,EACrB,OAAgB;IAEhB,MAAM,OAAO,GAAG,OAAO,CACrB,KAAK,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,CACxD,CAAA;IACD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC;QACnC,QAAQ,EAAE,CAAC,qBAAqB,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC;QACrD,OAAO,EAAE,GAAG,EAAE;YACZ,OAAO,mBAAmB,CAAC,EAAE,OAAO,EAAE,KAAM,CAAC,EAAE,EAAE,CAAC,CAAA;QACpD,CAAC;QACD,OAAO;QACP,SAAS,EAAE,OAAS;QACpB,KAAK,EAAE,KAAK;KACb,CAAC,CAAA;IAEF,OAAO;QACL,mBAAmB,EAAE,IAAI;QACzB,0BAA0B,EAAE,OAAO,IAAI,SAAS;KACjD,CAAA;AACH,CAAC"}
+{"version":3,"file":"useIsBatchingSupported.js","sourceRoot":"","sources":["../../../src/hooks/useIsBatchingSupported.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAA;AAE1D,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAA;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEjD,MAAM,UAAU,sBAAsB,CACpC,KAAqB,EACrB,OAAgB;IAEhB,MAAM,EAAE,SAAS,EAAE,GAAG,eAAe,EAAE,CAAA;IAEvC,MAAM,OAAO,GAAG,OAAO,CACrB,KAAK,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,CACxD,CAAA;IACD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC;QACnC,QAAQ,EAAE;YACR,WAAW,CAAC,qBAAqB,EAAE,SAAS,CAAC;YAC7C,KAAK,EAAE,EAAE;YACT,OAAO;SACR;QACD,OAAO,EAAE,GAAG,EAAE;YACZ,OAAO,mBAAmB,CAAC,EAAE,OAAO,EAAE,KAAM,CAAC,EAAE,EAAE,CAAC,CAAA;QACpD,CAAC;QACD,OAAO;QACP,SAAS,EAAE,OAAS;QACpB,KAAK,EAAE,KAAK;KACb,CAAC,CAAA;IAEF,OAAO;QACL,mBAAmB,EAAE,IAAI;QACzB,0BAA0B,EAAE,OAAO,IAAI,SAAS;KACjD,CAAA;AACH,CAAC"}

package/dist/esm/hooks/useIsContractAddress.js

@@ -7,7 +7,7 @@ export const useIsContractAddress = (address, chainId, chainType) => {
         query: {
             refetchInterval: 300000,
             staleTime: 300000,
-            enabled: Boolean(chainType === ChainType.EVM && chainId),
+            enabled: chainType === ChainType.EVM && !!chainId && !!address,
         },
     });
     return {

package/dist/esm/hooks/useIsContractAddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"useIsContractAddress.js","sourceRoot":"","sources":["../../../src/hooks/useIsContractAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAErC,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAEnC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,OAAgB,EAChB,OAAgB,EAChB,SAAqB,EAMrB,EAAE;IACF,MAAM,EACJ,IAAI,EAAE,YAAY,EAClB,SAAS,EACT,SAAS,GACV,GAAG,WAAW,CAAC;QACd,OAAO,EAAE,OAAkB;QAC3B,OAAO,EAAE,OAAO;QAChB,KAAK,EAAE;YACL,eAAe,EAAE,MAAO;YACxB,SAAS,EAAE,MAAO;YAClB,OAAO,EAAE,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,GAAG,IAAI,OAAO,CAAC;SACzD;KACF,CAAC,CAAA;IAEF,OAAO;QACL,iBAAiB,EAAE,CAAC,CAAC,YAAY;QACjC,YAAY;QACZ,SAAS;QACT,SAAS;KACV,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"useIsContractAddress.js","sourceRoot":"","sources":["../../../src/hooks/useIsContractAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAErC,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAEnC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,OAAgB,EAChB,OAAgB,EAChB,SAAqB,EAMrB,EAAE;IACF,MAAM,EACJ,IAAI,EAAE,YAAY,EAClB,SAAS,EACT,SAAS,GACV,GAAG,WAAW,CAAC;QACd,OAAO,EAAE,OAAkB;QAC3B,OAAO,EAAE,OAAO;QAChB,KAAK,EAAE;YACL,eAAe,EAAE,MAAO;YACxB,SAAS,EAAE,MAAO;YAClB,OAAO,EAAE,SAAS,KAAK,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO;SAC/D;KACF,CAAC,CAAA;IAEF,OAAO;QACL,iBAAiB,EAAE,CAAC,CAAC,YAAY;QACjC,YAAY;QACZ,SAAS;QACT,SAAS;KACV,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/hooks/useRouteExecution.js

@@ -3,14 +3,17 @@ import { useAccount } from '@lifi/wallet-management';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { useCallback, useEffect, useRef } from 'react';
 import { shallow } from 'zustand/shallow';
+import { useWidgetConfig } from '../providers/WidgetProvider/WidgetProvider.js';
 import { useRouteExecutionStore, useRouteExecutionStoreContext, } from '../stores/routes/RouteExecutionStore.js';
 import { getUpdatedProcess, isRouteActive, isRouteDone, isRouteFailed, } from '../stores/routes/utils.js';
 import { WidgetEvent } from '../types/events.js';
+import { getQueryKey } from '../utils/queries.js';
 import { useWidgetEvents } from './useWidgetEvents.js';
 export const useRouteExecution = ({ routeId, executeInBackground, onAcceptExchangeRateUpdate, }) => {
     const queryClient = useQueryClient();
     const { account } = useAccount();
     const resumedAfterMount = useRef(false);
+    const { keyPrefix } = useWidgetConfig();
     const emitter = useWidgetEvents();
     const routeExecutionStoreContext = useRouteExecutionStoreContext();
     const routeExecution = useRouteExecutionStore((state) => state.routes[routeId]);
@@ -43,16 +46,16 @@ export const useRouteExecution = ({ routeId, executeInBackground, onAcceptExchan
         if (executionCompleted || executionFailed) {
             const invalidateKeys = [
                 [
-                    'token-balances',
+                    getQueryKey('token-balances', keyPrefix),
                     clonedUpdatedRoute.fromAddress,
                     clonedUpdatedRoute.fromChainId,
                 ],
                 [
-                    'token-balances',
+                    getQueryKey('token-balances', keyPrefix),
                     clonedUpdatedRoute.toAddress,
                     clonedUpdatedRoute.toChainId,
                 ],
-                ['transaction-history'],
+                [getQueryKey('transaction-history', keyPrefix)],
             ];
             for (const key of invalidateKeys) {
                 queryClient.invalidateQueries({
@@ -80,7 +83,10 @@ export const useRouteExecution = ({ routeId, executeInBackground, onAcceptExchan
             if (!routeExecution?.route) {
                 throw new Error('Execution route not found.');
             }
-            queryClient.removeQueries({ queryKey: ['routes'], exact: false });
+            queryClient.removeQueries({
+                queryKey: [getQueryKey('routes', keyPrefix)],
+                exact: false,
+            });
             return executeRoute(routeExecution.route, {
                 updateRouteHook,
                 acceptExchangeRateUpdateHook,

package/dist/esm/hooks/useRouteExecution.js.map

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

package/dist/esm/hooks/useRouteRequiredAccountConnection.d.ts

@@ -0,0 +1,10 @@
+import type { ExtendedChain, Route } from '@lifi/sdk';
+export declare const useRouteRequiredAccountConnection: (route?: Route, chain?: ExtendedChain) => {
+    connected: boolean;
+    missingChain?: undefined;
+    missingAccountAddress?: undefined;
+} | {
+    connected: boolean;
+    missingChain: ExtendedChain;
+    missingAccountAddress: string | undefined;
+};

package/dist/esm/hooks/useRouteRequiredAccountConnection.js

@@ -0,0 +1,45 @@
+import { useAccount } from '@lifi/wallet-management';
+import { useMemo } from 'react';
+import { useFieldValues } from '../stores/form/useFieldValues.js';
+import { useChain } from './useChain.js';
+export const useRouteRequiredAccountConnection = (route, chain) => {
+    const { account, accounts } = useAccount({ chainType: chain?.chainType });
+    const [toAddress] = useFieldValues('toAddress');
+    const { getChainById } = useChain();
+    return useMemo(() => {
+        if (!route?.steps.length) {
+            return {
+                connected: account.isConnected,
+            };
+        }
+        const connectedChainTypes = new Map(accounts
+            .filter((account) => account.isConnected && account.address)
+            .map((account) => [account.chainType, account]));
+        if (!connectedChainTypes.size) {
+            return {
+                connected: false,
+            };
+        }
+        for (const step of route.steps) {
+            const chain = getChainById(step.action.fromChainId);
+            if (!chain) {
+                continue;
+            }
+            const connectedAccount = connectedChainTypes.get(chain.chainType);
+            const isToAddressSatisfied = toAddress
+                ? connectedAccount?.address === step.action.fromAddress
+                : true;
+            if (!connectedAccount || !isToAddressSatisfied) {
+                return {
+                    connected: false,
+                    missingChain: chain,
+                    missingAccountAddress: !isToAddressSatisfied
+                        ? step.action.fromAddress
+                        : undefined,
+                };
+            }
+        }
+        return { connected: true };
+    }, [account.isConnected, route, accounts, getChainById, toAddress]);
+};
+//# sourceMappingURL=useRouteRequiredAccountConnection.js.map

package/dist/esm/hooks/useRouteRequiredAccountConnection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRouteRequiredAccountConnection.js","sourceRoot":"","sources":["../../../src/hooks/useRouteRequiredAccountConnection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAExC,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAC/C,KAAa,EACb,KAAqB,EACrB,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAA;IACzE,MAAM,CAAC,SAAS,CAAC,GAAG,cAAc,CAAC,WAAW,CAAC,CAAA;IAC/C,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,EAAE,CAAA;IAEnC,OAAO,OAAO,CAAC,GAAG,EAAE;QAClB,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;YACzB,OAAO;gBACL,SAAS,EAAE,OAAO,CAAC,WAAW;aAC/B,CAAA;QACH,CAAC;QAED,MAAM,mBAAmB,GAAG,IAAI,GAAG,CACjC,QAAQ;aACL,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;aAC3D,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAClD,CAAA;QAED,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;YAC9B,OAAO;gBACL,SAAS,EAAE,KAAK;aACjB,CAAA;QACH,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YACnD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,SAAQ;YACV,CAAC;YAED,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;YACjE,MAAM,oBAAoB,GAAG,SAAS;gBACpC,CAAC,CAAC,gBAAgB,EAAE,OAAO,KAAK,IAAI,CAAC,MAAM,CAAC,WAAW;gBACvD,CAAC,CAAC,IAAI,CAAA;YAER,IAAI,CAAC,gBAAgB,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC/C,OAAO;oBACL,SAAS,EAAE,KAAK;oBAChB,YAAY,EAAE,KAAK;oBACnB,qBAAqB,EAAE,CAAC,oBAAoB;wBAC1C,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW;wBACzB,CAAC,CAAC,SAAS;iBACd,CAAA;YACH,CAAC;QACH,CAAC;QAED,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAA;IAC5B,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC,CAAA;AACrE,CAAC,CAAA"}

package/dist/esm/hooks/useRoutes.d.ts

@@ -12,7 +12,7 @@ export declare const useRoutes: ({ observableRoute }?: RoutesProps) => {
     refetch: (options?: import("@tanstack/react-query").RefetchOptions) => Promise<import("@tanstack/react-query").QueryObserverResult<Route[] | undefined, Error>>;
     fromChain: import("@lifi/sdk").ExtendedChain | undefined;
     toChain: import("@lifi/sdk").ExtendedChain | undefined;
-    queryKey: readonly ["routes", string | undefined, number, string, string, string | undefined, number, string, string, import("@lifi/sdk").ContractCall[] | undefined, string | undefined, boolean, string[], string[], string[] | undefined, string[] | undefined, "RECOMMENDED" | "FASTEST" | "CHEAPEST" | "SAFEST" | undefined, import("../index.js").WidgetSubvariant | undefined, boolean | undefined, boolean, string | undefined, number | undefined, boolean, string | undefined];
+    queryKey: readonly [string, string | undefined, number, string, string, string | undefined, number, string, string, import("@lifi/sdk").ContractCall[] | undefined, string | undefined, boolean, string[], string[], string[] | undefined, string[] | undefined, "RECOMMENDED" | "FASTEST" | "CHEAPEST" | "SAFEST" | undefined, import("../index.js").WidgetSubvariant | undefined, boolean | undefined, boolean, string | undefined, number | undefined, boolean, string | undefined];
     setReviewableRoute: (route: Route) => void;
 };
 export {};

package/dist/esm/hooks/useRoutes.js

@@ -10,6 +10,7 @@ import { useSettings } from '../stores/settings/useSettings.js';
 import { defaultSlippage } from '../stores/settings/useSettingsStore.js';
 import { WidgetEvent } from '../types/events.js';
 import { getChainTypeFromAddress } from '../utils/chainType.js';
+import { getQueryKey } from '../utils/queries.js';
 import { useChain } from './useChain.js';
 import { useDebouncedWatch } from './useDebouncedWatch.js';
 import { useGasRefuel } from './useGasRefuel.js';
@@ -19,7 +20,7 @@ import { useToken } from './useToken.js';
 import { useWidgetEvents } from './useWidgetEvents.js';
 const refetchTime = 60000;
 export const useRoutes = ({ observableRoute } = {}) => {
-    const { subvariant, sdkConfig, contractTool, bridges, exchanges, fee, feeConfig, useRelayerRoutes, } = useWidgetConfig();
+    const { subvariant, sdkConfig, contractTool, bridges, exchanges, fee, feeConfig, useRelayerRoutes, keyPrefix, } = useWidgetConfig();
     const setExecutableRoute = useSetExecutableRoute();
     const queryClient = useQueryClient();
     const emitter = useWidgetEvents();
@@ -72,7 +73,7 @@ export const useRoutes = ({ observableRoute } = {}) => {
         !isBatchingSupportedLoading;
     // Some values should be strictly typed and isEnabled ensures that
     const queryKey = [
-        'routes',
+        getQueryKey('routes', keyPrefix),
         account.address,
         fromChain?.id,
         fromToken?.address,
@@ -265,7 +266,13 @@ export const useRoutes = ({ observableRoute } = {}) => {
                 // Update local tokens cache to keep priceUSD in sync
                 const { fromToken, toToken } = routesResult.routes[0];
                 [fromToken, toToken].forEach((token) => {
-                    queryClient.setQueriesData({ queryKey: ['token-balances', fromAddress, token.chainId] }, (data) => {
+                    queryClient.setQueriesData({
+                        queryKey: [
+                            getQueryKey('token-balances', keyPrefix),
+                            fromAddress,
+                            token.chainId,
+                        ],
+                    }, (data) => {
                         if (data) {
                             const clonedData = [...data];
                             const index = clonedData.findIndex((dataToken) => dataToken.address === token.address);
@@ -319,7 +326,9 @@ export const useRoutes = ({ observableRoute } = {}) => {
     });
     const setReviewableRoute = (route) => {
         const queryDataKey = queryKey.toSpliced(queryKey.length - 1, 1, route.id);
-        queryClient.setQueryData(queryDataKey, { routes: [route] }, { updatedAt: dataUpdatedAt || Date.now() });
+        queryClient.setQueryData(queryDataKey, [route], {
+            updatedAt: dataUpdatedAt || Date.now(),
+        });
         setExecutableRoute(route);
     };
     return {