@0xsquid/react-hooks 8.0.4 → 8.0.6

package/dist/core/queries/queries-keys.d.ts

@@ -1,7 +1,6 @@
 import { ChainType, RouteResponse } from "@0xsquid/squid-types";
 import { HistoryTransaction } from "../../core/types/history";
 import { AppConfig, SlippageOption } from "../types/config";
-import { ApprovalType } from "../types/evm";
 import { SwapDirection } from "../types/swap";
 import { Timeframe, TokenWithBalance } from "../types/tokens";
 export declare enum QueryKeys {
@@ -57,7 +56,7 @@ export declare const keys: () => {
     fiatToCryptoStatus: (transactionId?: string) => (string | undefined)[];
     sendTransactionStatus: (txHash: string | undefined, chainId: string | undefined) => (string | undefined)[];
     allTransactionsStatus: (transactions: HistoryTransaction[] | undefined) => string[];
-    routeApproved: (routeData: RouteResponse["route"] | undefined, allowanceInWei: bigint | undefined, approvalType: ApprovalType | null) => (string | null | undefined)[];
+    routeApproved: (routeData: RouteResponse["route"] | undefined, allowanceInWei: bigint | undefined) => (string | undefined)[];
     sendTransactionGas: (chainId: string | undefined, tokenAddress: string | undefined, from: string | undefined) => (string | undefined)[];
     ensData: (address?: string) => (string | undefined)[];
     ensSearch: (query?: string) => (string | undefined)[];

package/dist/core/types/evm.d.ts

@@ -1,3 +1,2 @@
 import { Connector as WagmiConnector } from "wagmi";
 export type EvmConnector = WagmiConnector;
-export type ApprovalType = "erc20" | "ics20";

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

@@ -1,21 +1,15 @@
+import { SquidDataType } from "@0xsquid/squid-types";
 interface Erc20AllowanceParams {
     tokenAddress: string | undefined;
     ownerAddress: string | undefined;
     spenderAddress: string | undefined;
     amount: bigint | undefined;
     chainId: number | undefined;
+    transactionType: SquidDataType | undefined;
     enabled?: boolean;
 }
-export declare const useErc20Allowance: ({ tokenAddress, ownerAddress, spenderAddress, amount, chainId, enabled, }: Erc20AllowanceParams) => {
+export declare const useErc20Allowance: ({ tokenAddress, ownerAddress, spenderAddress, amount, chainId, transactionType, enabled, }: Erc20AllowanceParams) => {
     hasAllowance: boolean;
-    error: Error;
-    isNativeToken?: undefined;
-    query?: undefined;
-    allowanceInWei?: undefined;
-} | {
-    hasAllowance: boolean;
-    isNativeToken: boolean;
-    error?: undefined;
     query?: undefined;
     allowanceInWei?: undefined;
 } | {
@@ -156,7 +150,5 @@ export declare const useErc20Allowance: ({ tokenAddress, ownerAddress, spenderAd
     }], "allowance", readonly [`0x${string}`, `0x${string}`], bigint>;
     hasAllowance: boolean;
     allowanceInWei: bigint;
-    error?: undefined;
-    isNativeToken?: undefined;
 };
 export {};

package/dist/{index-B402hKhN.js → index-Bbnh4iOc.js}

@@ -22249,7 +22249,7 @@ const keys = () => ({
     // ============
     // Approval
     // ============
-    routeApproved: (routeData, allowanceInWei, approvalType) => [
+    routeApproved: (routeData, allowanceInWei) => [
         ...keys().transactions(),
         QueryKeys.RouteApproved,
         routeData?.params.fromAddress,
@@ -22257,7 +22257,6 @@ const keys = () => ({
         routeData?.params.fromToken,
         routeData?.params.fromAmount,
         allowanceInWei?.toString(),
-        approvalType,
     ],
     sendTransactionGas: (chainId, tokenAddress, from) => [
         QueryKeys.All,
@@ -23064,7 +23063,7 @@ const filterViewableTokens = (tokens, config, direction) => {
 };
 const getSecretNetworkBalances = async (chainData, cosmosAddress, squidTokens, keplrTypeWallet) => {
     const squidSecretTokens = squidTokens.filter((t) => t.chainId === CHAIN_IDS.SECRET);
-    const { fetchAllSecretBalances } = await import('./secretService-CV_qKM-f.js');
+    const { fetchAllSecretBalances } = await import('./secretService-Bt57DxoX.js');
     return fetchAllSecretBalances(chainData, cosmosAddress, squidSecretTokens, keplrTypeWallet);
 };
 function getTokenAssetsKey(token) {
@@ -26240,7 +26239,7 @@ function useStellarWallets() {
                 return;
             try {
                 const { allowAllModules: initializeAllModules } = await import('@creit.tech/stellar-wallets-kit');
-                const { formatStellarWallet } = await import('./stellarService.client-BK4en2TV.js');
+                const { formatStellarWallet } = await import('./stellarService.client-BHe6Jfr-.js');
                 const modules = initializeAllModules();
                 const promises = modules.map(async (module) => {
                     const isAvailable = await module.isAvailable();
@@ -31505,11 +31504,12 @@ var ics20Abi = [
 	}
 ];
 
-const useErc20Allowance = ({ tokenAddress, ownerAddress, spenderAddress, amount = BigInt(0), chainId, enabled = true, }) => {
+const useErc20Allowance = ({ tokenAddress, ownerAddress, spenderAddress, amount = BigInt(0), chainId, transactionType, enabled = true, }) => {
     const parsedTokenAddress = parseEvmAddress(tokenAddress);
     const parsedOwnerAddress = parseEvmAddress(ownerAddress);
     const parsedSpenderAddress = parseEvmAddress(spenderAddress);
     const isNativeToken = parsedTokenAddress?.toLowerCase() === nativeEvmTokenAddress.toLowerCase();
+    const isDepositAddressTx = transactionType === SquidDataType.DepositAddressCalldata;
     const result = useReadContract({
         abi: erc20Abi,
         address: parsedTokenAddress ?? undefined,
@@ -31523,17 +31523,16 @@ const useErc20Allowance = ({ tokenAddress, ownerAddress, spenderAddress, amount
                 Boolean(parsedTokenAddress &&
                     parsedOwnerAddress &&
                     parsedSpenderAddress &&
-                    !isNativeToken),
+                    !isNativeToken &&
+                    !isDepositAddressTx),
         },
     });
     if (!parsedTokenAddress || !parsedOwnerAddress || !parsedSpenderAddress) {
-        return {
-            hasAllowance: false,
-            error: new Error("Invalid or missing address"),
-        };
+        return { hasAllowance: false };
     }
-    if (isNativeToken) {
-        return { hasAllowance: true, isNativeToken: true };
+    // Native tokens and deposit address transactions don't need approval
+    if (isNativeToken || isDepositAddressTx) {
+        return { hasAllowance: true };
     }
     const allowanceInWei = result.data ?? BigInt(0);
     const hasAllowance = allowanceInWei >= amount;
@@ -31601,26 +31600,8 @@ const useApproval = ({ squidRoute, }) => {
     const isSrcChainEvmos = isEvmosChain(fromChain);
     const isSagaSameChainSwap = isSameChain &&
         fromChain?.chainId.toString() === CHAIN_IDS.SAGA_EVM.toString();
-    const approvalType = useMemo(() => {
-        if (squidRoute?.transactionRequest?.type ===
-            SquidDataType.DepositAddressCalldata) {
-            // No approvals needed for deposit address calls
-            return null;
-        }
-        if (isSrcChainEvmos && !isSagaSameChainSwap) {
-            // Use ICS20 for Evmos chains, except for SagaEVM same-chain swaps
-            return "ics20";
-        }
-        else {
-            return "erc20";
-        }
-    }, [
-        isSagaSameChainSwap,
-        isSrcChainEvmos,
-        squidRoute?.transactionRequest?.type,
-    ]);
-    const useIcs20 = approvalType === "ics20";
-    const useErc20 = approvalType === "erc20";
+    // Use ICS20 for Evmos chains, except for SagaEVM same-chain swaps
+    const useIcs20 = isSrcChainEvmos && !isSagaSameChainSwap;
     const { hasAllowance: hasErc20Allowance, query: erc20AllowanceQuery, allowanceInWei: erc20AllowanceInWei, } = useErc20Allowance({
         tokenAddress: fromToken?.address,
         ownerAddress: sourceUserAddress,
@@ -31628,7 +31609,8 @@ const useApproval = ({ squidRoute, }) => {
             ?.target,
         amount: BigInt(squidRoute?.params.fromAmount ?? "0"),
         chainId: Number(fromChain?.chainId),
-        enabled: useErc20,
+        transactionType: squidRoute?.transactionRequest?.type,
+        enabled: !useIcs20,
     });
     const { hasAllowance: hasIcs20Allowance, query: ics20AllowanceQuery, allowanceInWei: ics20AllowanceInWei, } = useIcs20Allowance({
         ownerAddress: sourceUserAddress,
@@ -31647,10 +31629,7 @@ const useApproval = ({ squidRoute, }) => {
      * On Error: Showing the error message if any
      * @returns {boolean} approved
      */
-    const routeApproved = useQuery(keys().routeApproved(squidRoute, allowanceInWei, approvalType), async () => {
-        if (approvalType === null) {
-            return true;
-        }
+    const routeApproved = useQuery(keys().routeApproved(squidRoute, allowanceInWei), async () => {
         // Approval is only needed for EVM chains
         if (getChainType(squidRoute?.params.fromChain) === ChainType.EVM) {
             return hasAllowance;
@@ -31659,8 +31638,8 @@ const useApproval = ({ squidRoute, }) => {
     }, {
         enabled: !!squidRoute &&
             !!sourceUserAddress &&
-            ((!allowanceQuery?.isLoading && allowanceQuery?.isFetched) ||
-                approvalType === null),
+            !allowanceQuery?.isLoading &&
+            allowanceQuery?.isFetched,
     });
     // USDT has a very specific way of handling approvals
     // ```
@@ -31750,9 +31729,6 @@ const useApproval = ({ squidRoute, }) => {
      */
     const approveRoute = useMutation(async () => {
         try {
-            if (approvalType === null) {
-                return true;
-            }
             if (fromToken?.address === nativeEvmTokenAddress) {
                 return true;
             }
@@ -36428,4 +36404,4 @@ const SquidProvider = ({ children, config, placeholder, }) => {
 };
 
 export { useNativeBalance as $, AxelarStatusResponseType as A, useAddressBookStore as B, CHAIN_IDS as C, DEFAULT_LOCALE as D, useAssetsColorsStore as E, useFavoriteTokensStore as F, useHistoryStore as G, HistoryTxType as H, useSendTransactionStore as I, useConfigStore as J, useSquidStore as K, useSwapRoutePersistStore as L, useTransactionStore as M, ConnectingWalletStatus as N, useWalletStore as O, useDepositAddress as P, useSwap as Q, useAllConnectedWalletBalances as R, SquidStatusErrorType as S, TransactionErrorType as T, useAllTokensWithBalanceForChainType as U, useCosmosBalance as V, WindowWalletFlag as W, XamanXrplNetwork as X, useEvmBalance as Y, useMultiChainBalance as Z, useMultipleTokenPrices as _, chainTypeToZeroAddressMap as a, findToken as a$, useNativeTokenForChain as a0, useSingleTokenPrice as a1, useSquidTokens as a2, useHistoricalData as a3, useTokensData as a4, useEstimateSendTransaction as a5, useSendTransaction as a6, useSendTransactionGas as a7, useAllTransactionsStatus as a8, useApproval as a9, useGetFiatQuote as aA, useGetOnRampConfig as aB, useExecuteFiatQuote as aC, useFiatOnRampTxStatus as aD, useFiatTransactions as aE, useCurrencyDetails as aF, useCountryDetails as aG, useAvailableQuotes as aH, useRecommendedQuote as aI, useGetOnrampPaymentTypes as aJ, useSuggestedFiatAmounts as aK, SquidProvider as aL, EnsService as aM, getXummClient as aN, isXamanXAppContext as aO, getQueryHeaders as aP, getStatusCode as aQ, is404Error as aR, assetsBaseUrl as aS, shareSubgraphId as aT, sortTokensBySharedSubgraphIds as aU, getSupportedChainIdsForDirection as aV, filterChains as aW, filterTokens as aX, getTokenImage as aY, getNewSwapParamsFromInput as aZ, sortAllTokens as a_, useEstimate as aa, useEstimatePriceImpact as ab, useExecuteTransaction as ac, useGetRoute as ad, useGetRouteWrapper as ae, useRouteWarnings as af, useSendTransactionStatus as ag, useSwapTransactionStatus as ah, useAvatar as ai, useHistory as aj, useUserParams as ak, useDebouncedValue as al, useAddToken as am, useAutoConnect as an, useEnsDataForAddress as ao, useEnsSearch as ap, useGnosisContext as aq, useIsSameAddressAndGnosisContext as ar, useIntegratorContext as as, useMultiChainWallet as at, useSigner as au, useWallet as av, useWallets as aw, useXrplTrustLine as ax, TX_STATUS_CONSTANTS as ay, FINAL_TRANSACTION_STATUSES as az, destinationAddressResetValue as b, filterSolanaWallets as b$, findNativeToken as b0, normalizeIbcAddress as b1, groupTokensBySymbol as b2, groupTokensByChainId as b3, filterViewableTokens as b4, getSecretNetworkBalances as b5, getTokenAssetsKey as b6, fetchAssetsColors as b7, initializeSquidWithAssetsColors as b8, isEmptyObject as b9, isSwapRouteError as bA, isStatusError as bB, createQuoteRequestParamsHash as bC, WidgetEvents as bD, EvmNetworkNotSupportedErrorCode as bE, addEthereumChain as bF, parseEvmAddress as bG, formatEvmWallet as bH, filterWagmiConnector as bI, waitForReceiptWithRetry as bJ, getUserCountry as bK, getCountryData as bL, getCurrencyData as bM, adaptiveRound as bN, getSuggestedAmountsForCurrency as bO, parseToBigInt as bP, roundNumericValue as bQ, formatUnitsRounded as bR, formatTokenAmount as bS, formatUsdAmount as bT, trimExtraDecimals as bU, getNumericValue as bV, cleanAmount as bW, convertTokenAmountToUSD as bX, convertUSDToTokenAmount as bY, calculateTotal24hChange as bZ, searchTokens as b_, normalizeTokenSymbol as ba, areTokenSymbolsCompatible as bb, isEvmosChain as bc, getConfigWithDefaults as bd, randomIntFromInterval as be, getTokensForChain as bf, getFirstAvailableChainId as bg, fetchHighestBalanceToken as bh, getInitialOrDefaultTokenAddressForChain as bi, getInitialTokenAddressForChain as bj, filterTokensForDestination as bk, getInitialChainIdFromConfig as bl, getCosmosKey as bm, getKeysSettled as bn, getAllKeysForSupportedCosmosChains as bo, isCosmosAddressValid as bp, getCosmosSigningClient as bq, getCosmosChainInfosObject as br, connectCosmosWallet as bs, isFallbackAddressNeeded as bt, suggestChainOrThrow as bu, normalizeError as bv, transactionErrorCode as bw, isUserRejectionError as bx, getTransactionError as by, handleTransactionErrorEvents as bz, chainTypeToNativeTokenAddressMap as c, isSolanaAddressValid as c0, executeSolanaSwap as c1, executeSolanaTransfer as c2, formatTransactionHistoryDate as c3, getAxelarExplorerTxUrl as c4, getSourceExplorerTxUrl as c5, getMainExplorerUrl as c6, formatDistance as c7, formatSeconds as c8, formatSwapTxStatusResponseForStorage as c9, getDefaultChain as cA, sortWallets as cB, areSameAddress as cC, sortAddressBook as cD, calculateTotalUsdBalanceUSD as cE, addTokenToWallet as cF, isEvmChainNotSupportedError as cG, getWalletSupportedChainTypes as cH, getConnectorForChainType as cI, walletSupportsChainType as cJ, connectWallet as cK, cancelConnectWallet as cL, isProblematicConnector as cM, mergeWallets as cN, isXionSmartContractAddress as cO, isXrplAddressValid as cP, buildXrplTrustSetTx as cQ, getXrplNetwork as cR, parseXrplPaymentTx as cS, simplifyRouteAction as ca, fetchSwapTransactionStatus as cb, compareTransactionIds as cc, isCoralBridgeAction as cd, sleep as ce, isDepositRoute as cf, isChainflipBridgeTransaction as cg, getHistoryTransactionId as ch, getStepStatuses as ci, getHalfSuccessState as cj, getStepsInfos as ck, getSwapTxStatusRefetchInterval as cl, getSendTxStatusRefetchInterval as cm, chainflipMultihopBridgeType as cn, getBridgeType as co, getTransactionStatus as cp, getTransactionEndStatus as cq, isHistoryTransactionPending as cr, isHistoryTransactionFailed as cs, isHistoryTransactionWarning as ct, isHistoryTransactionEnded as cu, formatHash as cv, isWalletAddressValid as cw, redirectToExtensionsStore as cx, accessProperty as cy, populateWallets as cz, definedInWindow as d, fallbackAddressResetValue as e, formatBNToReadable as f, nativeCosmosTokenAddress as g, nativeEvmTokenAddress as h, nativeSolanaTokenAddress as i, nativeStellarTokenAddress as j, nativeSuiTokenAddress as k, nativeXrplTokenAddress as l, CosmosProvider as m, nativeBitcoinTokenAddress as n, SendTransactionStatus as o, TransactionStatus as p, useTrackSearchEmpty as q, useSquidChains as r, useClient as s, useCosmosForChain as t, useCosmosContext as u, useKeyboardNavigation as v, walletIconBaseUrl as w, useSquidQueryClient as x, useSquid as y, useStellarAccountActivation as z };
-//# sourceMappingURL=index-B402hKhN.js.map
+//# sourceMappingURL=index-Bbnh4iOc.js.map