chore: refactor isPermit parameters

balancer · Sep 30, 2024 · 90ec059 · 90ec059
1 parent 8db0520
commit 90ec059
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/lib/modules/pool/actions/add-liquidity/useAddLiquiditySteps.tsx b/lib/modules/pool/actions/add-liquidity/useAddLiquiditySteps.tsx
@@ -37,31 +37,34 @@ export function useAddLiquiditySteps({
     [humanAmountsIn, helpers]
   )
 
+  const isPermit2 = requiresPermit2Approval(pool)
+
   const { isLoading: isLoadingTokenApprovalSteps, steps: tokenApprovalSteps } =
     useTokenApprovalSteps({
       spenderAddress: getSpenderForAddLiquidity(pool),
       chain: pool.chain,
       approvalAmounts: inputAmounts,
       actionType: 'AddLiquidity',
-      isPermit2: requiresPermit2Approval(pool),
+      isPermit2,
     })
 
   const signPermit2Step = useSignPermit2Step({
     pool,
     humanAmountsIn,
     slippagePercent: slippage,
     queryOutput: simulationQuery.data as SdkQueryAddLiquidityOutput,
+    isPermit2,
   })
 
+  const isSignPermit2Loading = isPermit2 && !signPermit2Step
+
   const addLiquidityStep = useAddLiquidityStep({
     handler,
     humanAmountsIn,
     simulationQuery,
   })
 
-  const addSteps = requiresPermit2Approval(pool)
-    ? [signPermit2Step, addLiquidityStep]
-    : [addLiquidityStep]
+  const addSteps = isPermit2 ? [signPermit2Step, addLiquidityStep] : [addLiquidityStep]
 
   const steps = useMemo(() => {
     if (relayerMode === 'approveRelayer') {
@@ -78,11 +81,12 @@ export function useAddLiquiditySteps({
     addLiquidityStep,
     approveRelayerStep,
     signRelayerStep,
+    signPermit2Step,
     humanAmountsIn,
   ])
 
   return {
-    isLoadingSteps: isLoadingTokenApprovalSteps || isLoadingRelayerApproval,
+    isLoadingSteps: isLoadingTokenApprovalSteps || isLoadingRelayerApproval || isSignPermit2Loading,
     steps,
   }
 }
diff --git a/lib/modules/tokens/approvals/permit2/useSignPermit2Transfer.tsx b/lib/modules/tokens/approvals/permit2/useSignPermit2Transfer.tsx
@@ -24,6 +24,7 @@ export type AddLiquidityPermit2Params = {
   queryOutput?: SdkQueryAddLiquidityOutput
   slippagePercent: string
   nonces?: NoncesByTokenAddress
+  isPermit2: boolean
 }
 export function useSignPermit2Transfer({
   pool,

diff --git a/lib/modules/transactions/transaction-steps/useSignPermit2Step.tsx b/lib/modules/transactions/transaction-steps/useSignPermit2Step.tsx
@@ -12,7 +12,6 @@ import {
 import { useChainSwitch } from '../../web3/useChainSwitch'
 import { TransactionStep } from './lib'
 import { usePermit2Nonces } from '../../tokens/approvals/permit2/usePermit2Nonces'
-import { requiresPermit2Approval } from '../../pool/pool.helpers'
 import { getChainId } from '@/lib/config/app.config'
 import { SignatureState } from '../../web3/signatures/signature.helpers'
 
@@ -28,7 +27,7 @@ export function useSignPermit2Step(params: AddLiquidityPermit2Params): Transacti
     chainId: getChainId(params.pool.chain),
     tokenAddresses: params.queryOutput?.sdkQueryOutput.amountsIn.map(t => t.token.address),
     owner: userAddress,
-    enabled: requiresPermit2Approval(params.pool),
+    enabled: params.isPermit2,
   })
 
   const {