Transaction Failed
+ {t('wrapError', { native: nativeSymbol, wrapped: wSymbol })} +
; quote?: Quote | null; onSwapFailed: () => void; - optimalRate?: OptimalRate; + getOptimalRate: () => OptimalRate | undefined; allowedSlippage?: number; onLiquidityHubSwapInProgress: (value: boolean) => void; inAmount?: string; @@ -156,6 +148,7 @@ const useAmounts = () => { const useParseSteps = () => { const { inCurrency, signature } = useLiquidityHubConfirmationContext(); + const { chainId } = useActiveWeb3React(); const getLogo = useGetLogoCallback(); return useCallback( @@ -171,7 +164,9 @@ const useParseSteps = () => { } if (step === Steps.APPROVE) { return { - title: `Approve ${inCurrency?.symbol} spending`, + title: `Approve ${ + wrappedCurrency(inCurrency, chainId)?.symbol + } spending`, icon: , id: Steps.APPROVE, }; @@ -185,7 +180,7 @@ const useParseSteps = () => { }; }); }, - [inCurrency, signature, getLogo], + [inCurrency, signature, getLogo, chainId], ); }; @@ -366,15 +361,15 @@ const useSwapCallback = () => { return useMutation({ mutationFn: async ({ - acceptedQuote, + quote, signature, }: { - acceptedQuote: Quote; + quote: Quote; signature: string; }) => { const txParams = await getParaswapTxParams(); - const txHash = await liquidityHub.swap(acceptedQuote, signature, { + const txHash = await liquidityHub.swap(quote, signature, { data: txParams?.data || '', to: txParams?.to, }); @@ -392,9 +387,8 @@ const useLiquidityHubSwapCallback = () => { onAcceptQuote, inCurrency, outCurrency, - getLatestQuote, + fetchLiquidityHubQuote, onLiquidityHubSwapInProgress, - quote, } = useLiquidityHubConfirmationContext(); const { mutateAsync: signCallback } = useSignEIP712Callback(); const getSteps = useGetStepsCallback(); @@ -403,7 +397,7 @@ const useLiquidityHubSwapCallback = () => { const { mutateAsync: approvalCallback } = useApproveCallback(); const onTradeSuccess = useOnTradeSuccessCallback(); const { onUserInput } = useSwapActionHandlers(); - const dispatch = useAppDispatch(); + const liquidityHubSdk = useLiquidityHubSDK(); return useMutation({ mutationFn: async ( @@ -436,29 +430,34 @@ const useLiquidityHubSwapCallback = () => { await approvalCallback(); } - const acceptedQuote = getLatestQuote() || quote; + const latestQuote = await fetchLiquidityHubQuote(); - if (!acceptedQuote) { + if (!latestQuote) { throw new Error('missing quote'); } - onAcceptQuote(acceptedQuote); + onAcceptQuote(latestQuote); updateStore({ currentStep: Steps.SWAP }); - const signature = await signCallback(acceptedQuote.permitData); + const signature = await signCallback(latestQuote.permitData); onSignature(signature); const txHash = await swapCallback({ - acceptedQuote, + quote: latestQuote, signature, }); - const transaction = await library.getTransaction(txHash); - const receipt = await transaction.wait(); + const details = await liquidityHubSdk.getTransactionDetails( + txHash, + latestQuote, + ); + + if (!details) { + throw new Error('missing transaction details'); + } + onUserInput(Field.INPUT, ''); - dispatch(updateUserBalance()); updateStore({ swapStatus: SwapStatus.SUCCESS }); - onTradeSuccess(acceptedQuote); - return receipt; + onTradeSuccess(latestQuote); } catch (error) { const isRejectedOrTimeout = isRejectedError(error) || isTimeoutError(error); @@ -502,29 +501,28 @@ const useOnTradeSuccessCallback = () => { ); } catch (error) {} }, - [liquidityHubSDK, outTokenUsdPrice, outToken, outCurrency], + [liquidityHubSDK, outTokenUsdPrice, outCurrency], ); }; const useParaswapTxParamsCallback = () => { const paraswap = useParaswap(); - const { account, chainId } = useActiveWeb3React(); + const { account } = useActiveWeb3React(); const { allowedSlippage, - optimalRate, - inCurrency, + getOptimalRate, } = useLiquidityHubConfirmationContext(); return useMutation({ mutationFn: async () => { - const inToken = wrappedCurrency(inCurrency, chainId); - if (!optimalRate || !allowedSlippage || !inToken || !account) { + const optimalRate = getOptimalRate(); + if (!optimalRate || !allowedSlippage || !account) { throw new Error('useParaswapTxParamsCallback missing args'); } try { const result = await paraswap.buildTx( { - srcToken: inToken.address, + srcToken: optimalRate.srcToken, destToken: optimalRate.destToken, srcAmount: optimalRate.srcAmount, destAmount: optimalRate.destAmount, diff --git a/src/components/Swap/orbs/LiquidityHub/hooks.ts b/src/components/Swap/orbs/LiquidityHub/hooks.ts index 45c3099f6..3e63d6479 100644 --- a/src/components/Swap/orbs/LiquidityHub/hooks.ts +++ b/src/components/Swap/orbs/LiquidityHub/hooks.ts @@ -69,8 +69,8 @@ export const useLiquidityHubQuote = ({ : wrappedCurrency(outCurrency, chainId)?.address; }, [outCurrency, isNativeCurrency, chainId]); - const queryKey = useMemo( - () => [ + const query = useQuery({ + queryKey: [ 'useLiquidityHubQuote', fromToken, toToken, @@ -78,11 +78,6 @@ export const useLiquidityHubQuote = ({ allowedSlippage, chainId, ], - [fromToken, toToken, inAmount, allowedSlippage, chainId], - ); - - const query = useQuery({ - queryKey, queryFn: async ({ signal }) => { if (!fromToken || !toToken || !inAmount || !chainId || !allowedSlippage) { throw new Error('useLiquidityHubQuote Missing required parameters'); @@ -118,15 +113,14 @@ export const useLiquidityHubQuote = ({ isSupported, }); - const queryClient = useQueryClient(); + const refetch = useCallback(async () => { + return (await query.refetch()).data; + }, [query.refetch]); - return useMemo(() => { - return { - ...query, - getLatestQuote: () => queryClient.getQueryData(queryKey), - refetch: async () => (await query.refetch()).data, - }; - }, [query, queryClient, queryKey]); + return { + ...query, + refetch, + }; }; export const useGetBetterPrice = ( @@ -147,7 +141,7 @@ export const useGetBetterPrice = ( try { if (skip) return false; setSeekingBestPrice(true); - const quote = await promiseWithTimeout(fetchLiquidityHubQuote(), 5_000); + const quote = await promiseWithTimeout(fetchLiquidityHubQuote(), 8_000); const dexMinAmountOut = subtractSlippage(allowedSlippage, dexOutAmount) || 0; return BN(quote?.userMinOutAmountWithGas || 0).gt(dexMinAmountOut); diff --git a/src/components/Swap/orbs/utils.ts b/src/components/Swap/orbs/utils.ts index b6804525e..da66649cb 100644 --- a/src/components/Swap/orbs/utils.ts +++ b/src/components/Swap/orbs/utils.ts @@ -52,7 +52,7 @@ export const isRejectedError = (error: any) => { export const isTimeoutError = (error: any) => { const message = error.message?.toLowerCase(); - return message?.includes('timeout'); + return message === 'timeout'; }; export const makeElipsisAddress = (address?: string, padding = 6): string => { diff --git a/src/constants/abis/token-locker-abi.json b/src/constants/abis/token-locker-abi.json index 97c6cde7c..45797831a 100644 --- a/src/constants/abis/token-locker-abi.json +++ b/src/constants/abis/token-locker-abi.json @@ -1322,4 +1322,4 @@ "stateMutability": "nonpayable", "type": "function" } -] \ No newline at end of file +] diff --git a/src/pages/PerpsPage/FooterOrdersTable.tsx b/src/pages/PerpsPage/FooterOrdersTable.tsx index 0861cdff2..3ff13e15b 100644 --- a/src/pages/PerpsPage/FooterOrdersTable.tsx +++ b/src/pages/PerpsPage/FooterOrdersTable.tsx @@ -61,7 +61,6 @@ const FooterOrdersTable: React.FC<{ const [o, { cancelOrder, cancelAlgoOrder, isLoading }] = useOrderStream({ symbol: token, status: orderStatus, - excludes: [AlgoOrderRootType.TP_SL, AlgoOrderRootType.POSITIONAL_TP_SL], }); const orders = o as Order[] | null;
({ + queryKey: [ 'useLiquidityHubQuote', fromToken, toToken, @@ -78,11 +78,6 @@ export const useLiquidityHubQuote = ({ allowedSlippage, chainId, ], - [fromToken, toToken, inAmount, allowedSlippage, chainId], - ); - - const query = useQuery({ - queryKey, queryFn: async ({ signal }) => { if (!fromToken || !toToken || !inAmount || !chainId || !allowedSlippage) { throw new Error('useLiquidityHubQuote Missing required parameters'); @@ -118,15 +113,14 @@ export const useLiquidityHubQuote = ({ isSupported, }); - const queryClient = useQueryClient(); + const refetch = useCallback(async () => { + return (await query.refetch()).data; + }, [query.refetch]); - return useMemo(() => { - return { - ...query, - getLatestQuote: () => queryClient.getQueryData(queryKey), - refetch: async () => (await query.refetch()).data, - }; - }, [query, queryClient, queryKey]); + return { + ...query, + refetch, + }; }; export const useGetBetterPrice = ( @@ -147,7 +141,7 @@ export const useGetBetterPrice = ( try { if (skip) return false; setSeekingBestPrice(true); - const quote = await promiseWithTimeout(fetchLiquidityHubQuote(), 5_000); + const quote = await promiseWithTimeout(fetchLiquidityHubQuote(), 8_000); const dexMinAmountOut = subtractSlippage(allowedSlippage, dexOutAmount) || 0; return BN(quote?.userMinOutAmountWithGas || 0).gt(dexMinAmountOut); diff --git a/src/components/Swap/orbs/utils.ts b/src/components/Swap/orbs/utils.ts index b6804525e..da66649cb 100644 --- a/src/components/Swap/orbs/utils.ts +++ b/src/components/Swap/orbs/utils.ts @@ -52,7 +52,7 @@ export const isRejectedError = (error: any) => { export const isTimeoutError = (error: any) => { const message = error.message?.toLowerCase(); - return message?.includes('timeout'); + return message === 'timeout'; }; export const makeElipsisAddress = (address?: string, padding = 6): string => { diff --git a/src/constants/abis/token-locker-abi.json b/src/constants/abis/token-locker-abi.json index 97c6cde7c..45797831a 100644 --- a/src/constants/abis/token-locker-abi.json +++ b/src/constants/abis/token-locker-abi.json @@ -1322,4 +1322,4 @@ "stateMutability": "nonpayable", "type": "function" } -] \ No newline at end of file +] diff --git a/src/pages/PerpsPage/FooterOrdersTable.tsx b/src/pages/PerpsPage/FooterOrdersTable.tsx index 0861cdff2..3ff13e15b 100644 --- a/src/pages/PerpsPage/FooterOrdersTable.tsx +++ b/src/pages/PerpsPage/FooterOrdersTable.tsx @@ -61,7 +61,6 @@ const FooterOrdersTable: React.FC<{ const [o, { cancelOrder, cancelAlgoOrder, isLoading }] = useOrderStream({ symbol: token, status: orderStatus, - excludes: [AlgoOrderRootType.TP_SL, AlgoOrderRootType.POSITIONAL_TP_SL], }); const orders = o as Order[] | null;
({ - queryKey, queryFn: async ({ signal }) => { if (!fromToken || !toToken || !inAmount || !chainId || !allowedSlippage) { throw new Error('useLiquidityHubQuote Missing required parameters'); @@ -118,15 +113,14 @@ export const useLiquidityHubQuote = ({ isSupported, }); - const queryClient = useQueryClient(); + const refetch = useCallback(async () => { + return (await query.refetch()).data; + }, [query.refetch]); - return useMemo(() => { - return { - ...query, - getLatestQuote: () => queryClient.getQueryData(queryKey), - refetch: async () => (await query.refetch()).data, - }; - }, [query, queryClient, queryKey]); + return { + ...query, + refetch, + }; }; export const useGetBetterPrice = ( @@ -147,7 +141,7 @@ export const useGetBetterPrice = ( try { if (skip) return false; setSeekingBestPrice(true); - const quote = await promiseWithTimeout(fetchLiquidityHubQuote(), 5_000); + const quote = await promiseWithTimeout(fetchLiquidityHubQuote(), 8_000); const dexMinAmountOut = subtractSlippage(allowedSlippage, dexOutAmount) || 0; return BN(quote?.userMinOutAmountWithGas || 0).gt(dexMinAmountOut); diff --git a/src/components/Swap/orbs/utils.ts b/src/components/Swap/orbs/utils.ts index b6804525e..da66649cb 100644 --- a/src/components/Swap/orbs/utils.ts +++ b/src/components/Swap/orbs/utils.ts @@ -52,7 +52,7 @@ export const isRejectedError = (error: any) => { export const isTimeoutError = (error: any) => { const message = error.message?.toLowerCase(); - return message?.includes('timeout'); + return message === 'timeout'; }; export const makeElipsisAddress = (address?: string, padding = 6): string => { diff --git a/src/constants/abis/token-locker-abi.json b/src/constants/abis/token-locker-abi.json index 97c6cde7c..45797831a 100644 --- a/src/constants/abis/token-locker-abi.json +++ b/src/constants/abis/token-locker-abi.json @@ -1322,4 +1322,4 @@ "stateMutability": "nonpayable", "type": "function" } -] \ No newline at end of file +] diff --git a/src/pages/PerpsPage/FooterOrdersTable.tsx b/src/pages/PerpsPage/FooterOrdersTable.tsx index 0861cdff2..3ff13e15b 100644 --- a/src/pages/PerpsPage/FooterOrdersTable.tsx +++ b/src/pages/PerpsPage/FooterOrdersTable.tsx @@ -61,7 +61,6 @@ const FooterOrdersTable: React.FC<{ const [o, { cancelOrder, cancelAlgoOrder, isLoading }] = useOrderStream({ symbol: token, status: orderStatus, - excludes: [AlgoOrderRootType.TP_SL, AlgoOrderRootType.POSITIONAL_TP_SL], }); const orders = o as Order[] | null;
(queryKey), - refetch: async () => (await query.refetch()).data, - }; - }, [query, queryClient, queryKey]); + return { + ...query, + refetch, + }; }; export const useGetBetterPrice = ( @@ -147,7 +141,7 @@ export const useGetBetterPrice = ( try { if (skip) return false; setSeekingBestPrice(true); - const quote = await promiseWithTimeout(fetchLiquidityHubQuote(), 5_000); + const quote = await promiseWithTimeout(fetchLiquidityHubQuote(), 8_000); const dexMinAmountOut = subtractSlippage(allowedSlippage, dexOutAmount) || 0; return BN(quote?.userMinOutAmountWithGas || 0).gt(dexMinAmountOut); diff --git a/src/components/Swap/orbs/utils.ts b/src/components/Swap/orbs/utils.ts index b6804525e..da66649cb 100644 --- a/src/components/Swap/orbs/utils.ts +++ b/src/components/Swap/orbs/utils.ts @@ -52,7 +52,7 @@ export const isRejectedError = (error: any) => { export const isTimeoutError = (error: any) => { const message = error.message?.toLowerCase(); - return message?.includes('timeout'); + return message === 'timeout'; }; export const makeElipsisAddress = (address?: string, padding = 6): string => { diff --git a/src/constants/abis/token-locker-abi.json b/src/constants/abis/token-locker-abi.json index 97c6cde7c..45797831a 100644 --- a/src/constants/abis/token-locker-abi.json +++ b/src/constants/abis/token-locker-abi.json @@ -1322,4 +1322,4 @@ "stateMutability": "nonpayable", "type": "function" } -] \ No newline at end of file +] diff --git a/src/pages/PerpsPage/FooterOrdersTable.tsx b/src/pages/PerpsPage/FooterOrdersTable.tsx index 0861cdff2..3ff13e15b 100644 --- a/src/pages/PerpsPage/FooterOrdersTable.tsx +++ b/src/pages/PerpsPage/FooterOrdersTable.tsx @@ -61,7 +61,6 @@ const FooterOrdersTable: React.FC<{ const [o, { cancelOrder, cancelAlgoOrder, isLoading }] = useOrderStream({ symbol: token, status: orderStatus, - excludes: [AlgoOrderRootType.TP_SL, AlgoOrderRootType.POSITIONAL_TP_SL], }); const orders = o as Order[] | null;