Merge pull request #3 from QuickSwap/hotfix/swap-slippage

fix hook to update swap slippage
QuickSwap · Mar 22, 2024 · e16f8e3 · e16f8e3
2 parents a4d5fd7 + cb35856
commit e16f8e3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/state/swap/hooks.ts b/src/state/swap/hooks.ts
@@ -185,7 +185,10 @@ export function useDerivedSwapInfo(): {
   const { account, chainId } = useActiveWeb3React();
   const chainIdToUse = chainId ?? ChainId.MATIC;
   const parsedQuery = useParsedQueryString();
-  const swapType = parsedQuery ? parsedQuery.swapIndex : undefined;
+  const swapType = parsedQuery?.swapIndex;
+  const swapSlippage = parsedQuery?.slippage
+    ? (parsedQuery?.slippage as string)
+    : undefined;
 
   const {
     independentField,
@@ -282,7 +285,7 @@ export function useDerivedSwapInfo(): {
       stableCoins && stableCoins.length > 0
         ? stableCoins.map((token) => token.address.toLowerCase())
         : [];
-    if (!slippageManuallySet) {
+    if (!swapSlippage && !slippageManuallySet) {
       if (
         inputCurrencyId &&
         outputCurrencyId &&
@@ -300,6 +303,7 @@ export function useDerivedSwapInfo(): {
     setUserSlippageTolerance,
     chainIdToUse,
     slippageManuallySet,
+    swapSlippage,
   ]);
 
   return {

diff --git a/src/state/swap/v3/hooks.ts b/src/state/swap/v3/hooks.ts
@@ -249,13 +249,17 @@ export function useDerivedSwapInfo(): {
     inputError = `Insufficient ${amountIn.currency.symbol} balance`;
   }
 
+  const parsedQs = useParsedQueryString();
+  const swapSlippage = parsedQs?.slippage
+    ? (parsedQs?.slippage as string)
+    : undefined;
   useEffect(() => {
     const stableCoins = GlobalData.stableCoins[chainIdToUse];
     const stableCoinAddresses =
       stableCoins && stableCoins.length > 0
         ? stableCoins.map((token) => token.address.toLowerCase())
         : [];
-    if (!slippageManuallySet) {
+    if (!swapSlippage && !slippageManuallySet) {
       if (
         inputCurrencyId &&
         outputCurrencyId &&
@@ -273,6 +277,7 @@ export function useDerivedSwapInfo(): {
     setUserSlippageTolerance,
     chainIdToUse,
     slippageManuallySet,
+    swapSlippage,
   ]);
 
   return {