force LH + fix swap flow

orbs-network · Dec 3, 2024 · c4b38a8 · c4b38a8
1 parent f996f5d
commit c4b38a8
Show file tree

Hide file tree

Showing 5 changed files with 3,493 additions and 427 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/trade/liquidity-hub/context.tsx b/src/trade/liquidity-hub/context.tsx
@@ -25,7 +25,7 @@ const initialState: State = {
   acceptedQuote: undefined,
   acceptedOptimalRate: undefined,
   liquidityHubDisabled: false,
-  forceLiquidityHub: false,
+  forceLiquidityHub: true,
   confirmationModalOpen: false,
   proceedWithLiquidityHub: false,
 };
@@ -65,6 +65,7 @@ interface ContextType {
 }
 
 const Context = createContext({} as ContextType);
+// eslint-disable-next-line react-refresh/only-export-components
 export const useLiquidityHubSwapContext = () => {
   return useContext(Context);
 };
@@ -108,7 +109,7 @@ export const LiquidityHubSwapProvider = ({
     if(chainId) {
       resetState();
     }
-  }, [chainId])
+  }, [chainId, resetState])
 
 
 

diff --git a/src/trade/liquidity-hub/useIsLiquidityHubTrade.ts b/src/trade/liquidity-hub/useIsLiquidityHubTrade.ts
@@ -6,12 +6,16 @@ import BN from "bignumber.js";
 
 export const useIsLiquidityHubTrade = () => {
   const {
-    state: { liquidityHubDisabled, proceedWithLiquidityHub },
+    state: { liquidityHubDisabled, proceedWithLiquidityHub, forceLiquidityHub },
   } = useLiquidityHubSwapContext();
   const liquidityHubQuote = useLiquidityHubQuote().data;
   const paraswapMinAmountOut = useParaswapMinAmountOut();
 
   return useMemo(() => {
+    if (forceLiquidityHub) {
+      return true;
+    }
+
     // Choose between liquidity hub and dex swap based on the min amount out
     if (proceedWithLiquidityHub) {
       return true;
@@ -21,10 +25,5 @@ export const useIsLiquidityHubTrade = () => {
     return BN(liquidityHubQuote?.minAmountOut || 0).gt(
       paraswapMinAmountOut || 0
     );
-  }, [
-    liquidityHubDisabled,
-    liquidityHubQuote?.minAmountOut,
-    paraswapMinAmountOut,
-    proceedWithLiquidityHub,
-  ]);
+  }, [forceLiquidityHub, liquidityHubDisabled, liquidityHubQuote?.minAmountOut, paraswapMinAmountOut, proceedWithLiquidityHub]);
 };
diff --git a/src/trade/liquidity-hub/useLiquidityHubSwapCallback.ts b/src/trade/liquidity-hub/useLiquidityHubSwapCallback.ts
@@ -66,7 +66,7 @@ export function useLiquidityHubSwapCallback(
         if (steps.includes(SwapSteps.Wrap)) {
           updateSwapProgressState({ currentStep: SwapSteps.Wrap });
           try {
-            liquidityHub.analytics.onWrapRequest;
+            liquidityHub.analytics.onWrapRequest();
             await wrap(quote.inAmount);
             liquidityHub.analytics.onWrapSuccess();
           } catch (error) {
@@ -88,7 +88,6 @@ export function useLiquidityHubSwapCallback(
               amount: quote.inAmount,
             });
             liquidityHub.analytics.onApprovalSuccess(txHash);
-            return txHash;
           } catch (error) {
             liquidityHub.analytics.onApprovalFailed((error as Error).message);
             throw error;
@@ -178,7 +177,7 @@ const useSign = () => {
       );
 
       const signature = await promiseWithTimeout<string>(
-        (signTypedDataAsync as any)(payload),
+        (signTypedDataAsync)(payload),
         40_000
       );