@0xsquid/react-hooks 6.4.1-beta.3 → 6.4.1-beta.4

package/dist/hooks/transaction/send/useSendTransactionGas.js

@@ -0,0 +1,67 @@
+import { ChainType } from "@0xsquid/squid-types";
+import { useQuery } from "@tanstack/react-query";
+import { Interface } from "ethers";
+import { erc20Abi } from "viem";
+import { getClient } from "../../../core/client";
+import { getFeeRate } from "../../../core/connectors/bitcoin/helpers";
+import { nativeEvmTokenAddress } from "../../../core/constants";
+import { keys } from "../../../core/queries/queries-keys";
+export function useSendTransactionGas({ chain, token, }) {
+    return useQuery({
+        queryKey: keys().sendTransactionGas(chain?.chainId, token?.address),
+        queryFn: async () => {
+            if (!chain || !token)
+                throw new Error("Missing params");
+            switch (chain.chainType) {
+                case ChainType.EVM: {
+                    const client = await getClient(chain);
+                    const feeData = await client.getFeeData();
+                    if (!feeData.maxFeePerGas)
+                        return BigInt(0);
+                    const dummyAddress = "0x1111111111111111111111111111111111111111";
+                    if (token.address.toLowerCase() === nativeEvmTokenAddress.toLowerCase()) {
+                        const gas = await client.estimateGas({
+                            from: dummyAddress,
+                            to: dummyAddress,
+                            value: 1,
+                            chainId: chain.chainId,
+                        });
+                        return gas * feeData.maxFeePerGas;
+                    }
+                    const erc20Interface = new Interface(erc20Abi);
+                    const data = erc20Interface.encodeFunctionData("transfer", [
+                        dummyAddress,
+                        1,
+                    ]);
+                    const gas = await client.estimateGas({
+                        from: dummyAddress,
+                        to: token.address,
+                        data,
+                        chainId: chain.chainId,
+                    });
+                    return gas * feeData.maxFeePerGas;
+                }
+                case ChainType.COSMOS: {
+                    // TODO: get gas estimation from backend
+                    return BigInt(0);
+                }
+                case ChainType.SOLANA: {
+                    // TODO: get gas estimation from backend
+                    return BigInt(5000);
+                }
+                case ChainType.BTC: {
+                    const feeRate = await getFeeRate();
+                    // average vBytes for a segwit tx (2 inputs, 2 outputs)
+                    const vBytes = 378;
+                    const feeSats = feeRate * vBytes;
+                    // TODO: get gas estimation from backend?
+                    return BigInt(feeSats);
+                }
+                default:
+                    throw new Error(`Gas estimation not implemented for chain type ${chain.chainType}`);
+            }
+        },
+        enabled: !!chain && !!token,
+    });
+}
+//# sourceMappingURL=useSendTransactionGas.js.map

package/dist/hooks/transaction/send/useSendTransactionGas.js.map

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

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

@@ -1,4 +1,35 @@
-import { StatusResponse } from "@0xsquid/squid-types";
-export declare const useAllTransactionsStatus: ({ enabled }: {
+import { SendTransactionStatus } from "../../core/types/transaction";
+export declare const useAllTransactionsStatus: ({ enabled, }: {
     enabled: boolean;
-}) => import("@tanstack/react-query").UseQueryResult<StatusResponse[], unknown>;
+}) => {
+    isLoading: boolean;
+    isError: boolean;
+    data: ((import("@0xsquid/squid-types").ApiBasicResponse & {
+        id: string;
+        status: string;
+        gasStatus: string;
+        isGMPTransaction?: boolean | undefined;
+        axelarTransactionUrl: string;
+        fromChain?: {
+            transactionId: string;
+            blockNumber: string;
+            callEventStatus: string;
+            callEventLog: any[];
+            chainData?: any;
+            transactionUrl?: string | undefined;
+            destinationAddress?: string | undefined;
+        } | undefined;
+        toChain?: {
+            transactionId: string;
+            blockNumber: string;
+            callEventStatus: string;
+            callEventLog: any[];
+            chainData?: any;
+            transactionUrl?: string | undefined;
+            destinationAddress?: string | undefined;
+        } | undefined;
+        timeSpent?: {} | Record<string, number> | undefined;
+        squidTransactionStatus?: import("@0xsquid/squid-types").SquidTransactionStatus | undefined;
+        routeStatus?: any[] | undefined;
+    } & SendTransactionStatus) | undefined)[];
+};

package/dist/hooks/transaction/useAllTransactionsStatus.js

@@ -1,70 +1,139 @@
-import { useQuery } from "@tanstack/react-query";
+import { useQueries } from "@tanstack/react-query";
 import { keys } from "../../core/queries/queries-keys";
-import { TransactionStatus } from "../../core/types/transaction";
-import { fetchTransactionStatus, getTransactionEndStatus, } from "../../services";
+import { HistoryTxType } from "../../core/types/history";
+// import {
+//   FiatToCryptoProvider,
+//   OnRampTransactionStatus,
+// } from "../../core/types/onramps/onramp";
+import { fetchSwapTransactionStatus, getSendTxStatusRefetchInterval, getSwapTxStatusRefetchInterval, getTransactionEndStatus, } from "../../services";
+import { getSendTransactionStatus } from "../../services/internal/sendTransactionStatus";
+import { useSquidChains } from "../chains/useSquidChains";
+// import {
+//   FINAL_TRANSACTION_STATUSES,
+//   TX_STATUS_CONSTANTS,
+// } from "../onramp/useFiatToCrypto";
+import { SendTransactionStatus } from "../../core/types/transaction";
+import { useHistoryStore } from "../store/useHistoryStore";
 import { useConfigStore, useTransactionStore } from "../store/useSquidStore";
 import { useHistory } from "../user/useHistory";
-export const useAllTransactionsStatus = ({ enabled }) => {
-    const { replaceTransactionStatus, pendingTransactions } = useHistory();
+export const useAllTransactionsStatus = ({ enabled,
+// fiatToCryptoProvider,
+ }) => {
+    const { pendingTransactions, replaceSwapTransactionStatus } = useHistory();
+    const replaceTransactionStatus = useHistoryStore((state) => state.replaceTransactionStatus);
     const config = useConfigStore((state) => state.config);
     const requestId = useTransactionStore((state) => state.currentRequestId);
-    return useQuery({
-        queryKey: keys().allTransactionsStatus(pendingTransactions),
-        queryFn: async () => {
-            try {
-                if (config.apiUrl) {
-                    const apiUrl = config.apiUrl;
-                    const promiseResults = await Promise.allSettled(pendingTransactions.map((transaction) => fetchTransactionStatus({
-                        transaction: {
-                            ...transaction,
-                            transactionId: transaction.transactionIdForStatus ??
-                                transaction.transactionId,
-                        },
-                        integratorId: config.integratorId,
-                        currentRequestId: requestId,
-                        apiUrl,
-                    })));
-                    const results = promiseResults.map((result) => result.status === "fulfilled" ? result.value : undefined);
-                    return Array.isArray(results)
-                        ? results.filter((result) => result != null)
-                        : [];
-                }
-                return [];
+    const { findChain } = useSquidChains();
+    const statusQueries = pendingTransactions.map(({ txType, data }) => {
+        switch (txType) {
+            case HistoryTxType.SWAP: {
+                return {
+                    queryKey: keys().swapTransactionStatus(data.transactionId),
+                    queryFn: async () => {
+                        return fetchSwapTransactionStatus({
+                            transaction: {
+                                ...data,
+                                transactionId: data.transactionIdForStatus ?? data.transactionId,
+                            },
+                            apiUrl: config.apiUrl,
+                            integratorId: config.integratorId,
+                            currentRequestId: requestId,
+                        });
+                    },
+                    enabled: true,
+                    retry: 4,
+                    retryDelay: getSwapTxStatusRefetchInterval(data),
+                    refetchInterval: 5000,
+                    onSuccess: (statusResponse) => {
+                        if (!statusResponse)
+                            return;
+                        const endStatus = getTransactionEndStatus({
+                            statusResponse,
+                        });
+                        if (!endStatus)
+                            return;
+                        replaceSwapTransactionStatus({
+                            transactionId: data.transactionId,
+                            statusResponse,
+                            status: endStatus,
+                        });
+                    },
+                };
             }
-            catch (error) {
-                return [];
-            }
-        },
-        onSuccess: (statusResponses) => {
-            if (Array.isArray(statusResponses)) {
-                statusResponses.forEach((statusResponse) => {
-                    const endStatus = getTransactionEndStatus({ statusResponse });
-                    if (endStatus) {
-                        const transaction = pendingTransactions.find((tx) => tx.transactionIdForStatus === statusResponse.id ||
-                            tx.transactionId === statusResponse.id ||
-                            tx.transactionId === statusResponse.fromChain?.transactionId);
-                        replaceTransactionStatus(
-                        // Use the original transactionId for storage, but looked up using transactionIdForStatus
-                        transaction?.transactionId ??
-                            statusResponse.fromChain?.transactionId ??
-                            statusResponse.id, statusResponse, endStatus);
-                    }
-                });
-            }
-        },
-        refetchInterval: (data) => {
-            if (Array.isArray(data) && data.length > 0) {
-                const someTxPending = data.some((tx) => tx.status === TransactionStatus.INITIAL_LOADING ||
-                    tx.status === TransactionStatus.PENDING ||
-                    tx.status === TransactionStatus.ONGOING);
-                return someTxPending ? 5000 : false;
-            }
-            return false;
-        },
-        retryDelay: 5000,
-        retry: 4,
-        refetchOnWindowFocus: true,
-        enabled: enabled && pendingTransactions.length > 0,
+            case HistoryTxType.BUY:
+                // TODO: enable fiat on ramp tx status
+                return {};
+            // return {
+            //   queryFn: () =>
+            //     fiatToCryptoProvider.getTransactionStatus(
+            //       tx.orderId,
+            //       tx.toAddress
+            //     ),
+            //   queryKey: keys().fiatToCryptoStatus(tx.orderId),
+            //   retry: TX_STATUS_CONSTANTS.RETRY_COUNT,
+            //   retryDelay: TX_STATUS_CONSTANTS.RETRY_DELAY,
+            //   refetchInterval: (
+            //     data: OnRampTransactionStatus | undefined
+            //   ) => {
+            //     if (
+            //       data?.status &&
+            //       FINAL_TRANSACTION_STATUSES.includes(data.status)
+            //     ) {
+            //       return false;
+            //     }
+            //     return TX_STATUS_CONSTANTS.REFETCH_INTERVAL;
+            //   },
+            //   onSuccess: (data: OnRampTransactionStatus) => {
+            //     replaceTransactionStatus({
+            //       orderId: tx.orderId,
+            //       status: data.status,
+            //       transactionHash: data.transactionHash,
+            //       txType: HistoryTxType.BUY,
+            //     });
+            //   },
+            //   onError: () => {
+            //     replaceTransactionStatus({
+            //       txType: HistoryTxType.BUY,
+            //       orderId: tx.orderId,
+            //       status: "failed",
+            //       transactionHash: undefined,
+            //     });
+            //   },
+            //   enabled: true,
+            // };
+            case HistoryTxType.SEND:
+                return {
+                    queryKey: keys().sendTransactionStatus(data.hash, data.token.chainId),
+                    queryFn: async () => {
+                        const chain = findChain(data.token.chainId);
+                        if (!chain) {
+                            throw new Error(`Could not find chain ${data.token.chainId} for tx status`);
+                        }
+                        return getSendTransactionStatus({
+                            chain,
+                            txHash: data.hash,
+                        });
+                    },
+                    refetchInterval: getSendTxStatusRefetchInterval(data.token.type),
+                    onSuccess: (status) => {
+                        if (status !== SendTransactionStatus.ONGOING) {
+                            replaceTransactionStatus({
+                                txType: HistoryTxType.SEND,
+                                status,
+                                hash: data.hash,
+                            });
+                        }
+                    },
+                };
+        }
+    });
+    const queries = useQueries({
+        queries: enabled && config.apiUrl ? statusQueries : [],
     });
+    return {
+        isLoading: queries.some((q) => q.isLoading),
+        isError: queries.some((q) => q.isError),
+        data: queries.map((q) => q.data).filter(Boolean),
+    };
 };
 //# sourceMappingURL=useAllTransactionsStatus.js.map

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

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

package/dist/hooks/transaction/useApproval.js

@@ -18,10 +18,10 @@ export const useApproval = ({ squidRoute, }) => {
     const publicClient = usePublicClient();
     const queryClient = useQueryClient();
     const squid = useSquidStore((state) => state.squid);
-    const { evmSigner } = useSigner();
+    const { fromChain, fromToken, fromPrice } = useSwap();
+    const { evmSigner } = useSigner({ chain: fromChain });
     const { connector: activeConnector } = useAccount();
     const { getChainType } = useSquidChains();
-    const { fromChain, fromToken, fromPrice } = useSwap();
     const { switchChainAsync } = useSwitchChain();
     const { connectedAddress: { address: sourceUserAddress }, } = useMultiChainWallet(fromChain);
     const isSrcChainEvmos = isEvmosChain(fromChain);

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

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

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

@@ -47,7 +47,7 @@ export declare const useEstimate: (squidRoute?: RouteResponse["route"]) => {
     minAmountValueWarnMsg: string | undefined;
     estimatedRouteDuration: {
         seconds: number;
-        format: (sTemplate?: string, mTemplate?: string, hTemplate?: string) => string;
+        format: (sTemplate?: string | undefined, mTemplate?: string | undefined, hTemplate?: string | undefined) => string;
     };
 };
 export {};

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

@@ -6,7 +6,7 @@ export declare const useExecuteTransaction: (squidRoute?: RouteResponse["route"]
     fromPrice: string | undefined;
     toChain: import("@0xsquid/squid-types").ChainData | undefined;
     fromChain: import("@0xsquid/squid-types").ChainData | undefined;
-    signerReady: boolean;
     isLoading: boolean;
     error: unknown;
+    isSignerReady: boolean;
 };

package/dist/hooks/transaction/useExecuteTransaction.js

@@ -19,16 +19,19 @@ import { useGnosisContext } from "../../hooks/wallet/useGnosisContext";
 import { useMultiChainWallet } from "../../hooks/wallet/useMultiChainWallet";
 import { executeSolanaSwap, executeSolanaTransfer, getCosmosSigningClient, getTransactionError, handleTransactionErrorEvents, isProblematicConnector, } from "../../services";
 import { WidgetEvents } from "../../services/internal/eventService";
-import { useSolana } from "../solana/useSolana";
+import { useSolanaConnection } from "../solana/useSolana";
 import { useDepositAddressStore } from "../store/useDepositAddressStore";
 import { useSquidTokens } from "../tokens/useSquidTokens";
 import { useHistory } from "../user/useHistory";
 import { useSigner } from "../wallet/useSigner";
 import { useWallet } from "../wallet/useWallet";
 export const useExecuteTransaction = (squidRoute) => {
-    const { evmSigner, isEvmSignerReady, cosmosSigner, solanaSigner, bitcoinSigner, isSolanaSignerReady, } = useSigner();
+    const { fromChain, toChain, fromToken, toToken, isSameChain } = useSwap();
+    const { evmSigner, cosmosSigner, solanaSigner, bitcoinSigner, isSignerReady, } = useSigner({
+        chain: fromChain,
+    });
     const { findToken } = useSquidTokens();
-    const { connection } = useSolana();
+    const solanaConnection = useSolanaConnection();
     const { findChain } = useSquidChains();
     const queryClient = useQueryClient();
     const { connectedWalletsByChainType } = useWallet();
@@ -37,35 +40,14 @@ export const useExecuteTransaction = (squidRoute) => {
     const setTransactionStoreState = useTransactionStore((state) => state.setTransactionState);
     const fromPrice = useTransactionStore((state) => state.fromPrice);
     const { connector: activeConnector } = useAccount();
-    const { fromChain, toChain, fromToken, toToken, isSameChain } = useSwap();
     const { getGnosisTransactionHash } = useGnosisContext();
-    const { addTransaction, replaceTransactionStatus, replaceNonceTx } = useHistory();
+    const { addSwapTransaction, replaceSwapTransactionNonce, replaceSwapTransactionStatus, } = useHistory();
     const { connectedAddress: { address: sourceUserAddress }, changeNetworkIfNeeded, } = useMultiChainWallet(fromChain);
     const connectedSourceWallet = useMemo(() => {
         return fromChain?.chainType
             ? connectedWalletsByChainType[fromChain.chainType]
             : undefined;
     }, [fromChain?.chainType, connectedWalletsByChainType]);
-    const signerReady = useMemo(() => {
-        if (!fromChain?.chainType)
-            return false;
-        switch (fromChain.chainType) {
-            case ChainType.EVM:
-                return isEvmSignerReady;
-            case ChainType.COSMOS:
-                return cosmosSigner !== undefined;
-            case ChainType.BTC:
-                return bitcoinSigner !== undefined;
-            case ChainType.SOLANA:
-                return isSolanaSignerReady;
-        }
-    }, [
-        fromChain?.chainType,
-        isEvmSignerReady,
-        cosmosSigner,
-        bitcoinSigner,
-        isSolanaSignerReady,
-    ]);
     /**
      * Set the transaction state in the store
      * This is useful to access the latest transaction from any hook
@@ -112,7 +94,6 @@ export const useExecuteTransaction = (squidRoute) => {
     }, [cosmosSigner, fromChain]);
     const resetQueriesAfterTxSigned = () => {
         queryClient.refetchQueries(getPrefixKey(QueryKeys.Balance));
-        queryClient.refetchQueries(getPrefixKey(QueryKeys.NativeBalanceBigNumber));
         queryClient.invalidateQueries(getPrefixKey(QueryKeys.Transaction));
     };
     const dispatchSignatureRequestEvent = useCallback((route) => {
@@ -170,7 +151,7 @@ export const useExecuteTransaction = (squidRoute) => {
                         id,
                     });
                     if (txParams) {
-                        addTransaction({
+                        addSwapTransaction({
                             ...txParams,
                             params: route.params,
                             estimate: route.estimate,
@@ -208,7 +189,7 @@ export const useExecuteTransaction = (squidRoute) => {
                     id,
                 });
                 if (txParams) {
-                    replaceNonceTx(newNonce, sourceUserAddress, {
+                    replaceSwapTransactionNonce(newNonce, sourceUserAddress, {
                         ...txParams,
                         params: route.params,
                         estimate: route.estimate,
@@ -239,7 +220,7 @@ export const useExecuteTransaction = (squidRoute) => {
         else {
             throw error;
         }
-    }, [replaceNonceTx, setTransactionState, sourceUserAddress]);
+    }, [replaceSwapTransactionNonce, setTransactionState, sourceUserAddress]);
     const swapQueryEvm = useMutation(async ({ id, route }) => {
         await changeNetworkIfNeeded.mutateAsync();
         if (!route || !squid || !evmSigner) {
@@ -272,7 +253,7 @@ export const useExecuteTransaction = (squidRoute) => {
                 id,
             });
             if (txParams) {
-                addTransaction({
+                addSwapTransaction({
                     ...txParams,
                     params: route.params,
                     estimate: route.estimate,
@@ -323,7 +304,7 @@ export const useExecuteTransaction = (squidRoute) => {
                     amount: BigInt(route.params.fromAmount),
                     target: depositData.depositAddress,
                     signer: solanaSigner,
-                    connection,
+                    connection: solanaConnection,
                     sourceToken: findToken(route.params.fromToken, route?.params?.fromChain),
                     onSigned: (txHash) => {
                         WidgetEvents.getInstance().dispatchSwapExecuteCall(route, txHash);
@@ -337,7 +318,7 @@ export const useExecuteTransaction = (squidRoute) => {
                             id,
                         });
                         if (txParams) {
-                            addTransaction({
+                            addSwapTransaction({
                                 ...txParams,
                                 params: route.params,
                                 estimate: route.estimate,
@@ -350,7 +331,7 @@ export const useExecuteTransaction = (squidRoute) => {
             const signature = await executeSolanaSwap({
                 route,
                 signer: solanaSigner,
-                connection,
+                connection: solanaConnection,
                 onSigned: (txHash) => {
                     WidgetEvents.getInstance().dispatchSwapExecuteCall(route, txHash);
                     const txParams = setTransactionState({
@@ -363,7 +344,7 @@ export const useExecuteTransaction = (squidRoute) => {
                         id,
                     });
                     if (txParams) {
-                        addTransaction({
+                        addSwapTransaction({
                             ...txParams,
                             params: route.params,
                             estimate: route.estimate,
@@ -391,14 +372,22 @@ export const useExecuteTransaction = (squidRoute) => {
             });
             if (currentTx?.transactionId &&
                 errorObject.type === TransactionErrorType.CALL_EXCEPTION) {
-                replaceTransactionStatus(currentTx.transactionId, currentTx.statusResponse, TransactionStatus.ERROR);
+                replaceSwapTransactionStatus({
+                    transactionId: currentTx.transactionId,
+                    statusResponse: currentTx.statusResponse,
+                    status: TransactionStatus.ERROR,
+                });
             }
         },
         onSuccess: (_data, variables) => {
             const currentTx = getTransaction(variables.id);
             queryClient.invalidateQueries(getPrefixKey(QueryKeys.Balances));
             if (isSameChain && currentTx?.transactionId) {
-                replaceTransactionStatus(currentTx.transactionId, currentTx.statusResponse, TransactionStatus.SUCCESS);
+                replaceSwapTransactionStatus({
+                    transactionId: currentTx.transactionId,
+                    statusResponse: currentTx.statusResponse,
+                    status: TransactionStatus.SUCCESS,
+                });
             }
             setTransactionStoreState(variables.id, {
                 ...currentTx,
@@ -441,7 +430,7 @@ export const useExecuteTransaction = (squidRoute) => {
                     id,
                 });
                 if (txParams) {
-                    addTransaction({
+                    addSwapTransaction({
                         ...txParams,
                         params: route.params,
                         estimate: route.estimate,
@@ -457,7 +446,11 @@ export const useExecuteTransaction = (squidRoute) => {
         const currentTx = getTransaction(id);
         queryClient.invalidateQueries(getPrefixKey(QueryKeys.Balances));
         if (isSameChain && currentTx?.transactionId) {
-            replaceTransactionStatus(currentTx.transactionId, currentTx.statusResponse, TransactionStatus.SUCCESS);
+            replaceSwapTransactionStatus({
+                transactionId: currentTx.transactionId,
+                statusResponse: currentTx.statusResponse,
+                status: TransactionStatus.SUCCESS,
+            });
         }
         setTransactionStoreState(id, {
             ...currentTx,
@@ -470,7 +463,7 @@ export const useExecuteTransaction = (squidRoute) => {
         getTransaction,
         isSameChain,
         queryClient,
-        replaceTransactionStatus,
+        replaceSwapTransactionStatus,
         setTransactionStoreState,
     ]);
     const handleTransactionError = useCallback((error, id) => {
@@ -490,9 +483,13 @@ export const useExecuteTransaction = (squidRoute) => {
         });
         if (currentTx?.transactionId &&
             errorObject.type === TransactionErrorType.CALL_EXCEPTION) {
-            replaceTransactionStatus(currentTx?.transactionId, currentTx?.statusResponse, TransactionStatus.ERROR);
+            replaceSwapTransactionStatus({
+                transactionId: currentTx?.transactionId,
+                statusResponse: currentTx?.statusResponse,
+                status: TransactionStatus.ERROR,
+            });
         }
-    }, [getTransaction, replaceTransactionStatus, setTransactionStoreState]);
+    }, [getTransaction, replaceSwapTransactionStatus, setTransactionStoreState]);
     const swapQuery = useMutation(async ({ id }) => {
         if (!squidRoute)
             throw new Error("route is required");
@@ -540,7 +537,7 @@ export const useExecuteTransaction = (squidRoute) => {
             dispatchPreSwapEvent(squidRoute);
         }
         return swapQuery.mutate({ id: transactionId });
-    }, [swapQuery, squidRoute, dispatchPreSwapEvent]);
+    }, [swapQuery.mutate, squidRoute, dispatchPreSwapEvent]);
     return {
         executeSwap,
         fromToken,
@@ -548,9 +545,9 @@ export const useExecuteTransaction = (squidRoute) => {
         fromPrice,
         toChain,
         fromChain,
-        signerReady,
         isLoading: swapQuery.isLoading,
         error: swapQuery.error,
+        isSignerReady,
     };
 };
 //# sourceMappingURL=useExecuteTransaction.js.map