fix: query validation

Author: DanielSchiavini

apps/main/src/llamalend/features/borrow/components/CreateLoanForm.tsx

@@ -68,7 +68,6 @@ export const CreateLoanForm = <ChainId extends IChainId>({
     creationError,
     txHash,
     formErrors,
-    tooMuchDebt,
     isApproved,
   } = useCreateLoanForm({ market, network, preset, onCreated })
   const setRange = useCallback((range: number) => form.setValue('range', range, setValueOptions), [form])
@@ -84,7 +83,6 @@ export const CreateLoanForm = <ChainId extends IChainId>({
           values={values}
           collateralToken={collateralToken}
           borrowToken={borrowToken}
-          tooMuchDebt={tooMuchDebt}
           networks={networks}
           onSlippageChange={(value) => form.setValue('slippage', value, setValueOptions)}
         />

apps/main/src/llamalend/features/borrow/components/CreateLoanInfoAccordion.tsx

@@ -25,28 +25,25 @@ export const CreateLoanInfoAccordion = <ChainId extends IChainId>({
   values: { range, slippage, leverageEnabled },
   collateralToken,
   borrowToken,
-  tooMuchDebt,
   networks,
   onSlippageChange,
 }: {
   params: BorrowFormQueryParams<ChainId>
   values: BorrowForm
   collateralToken: Token | undefined
   borrowToken: Token | undefined
-  tooMuchDebt: boolean
   networks: NetworkDict<ChainId>
   onSlippageChange: (newSlippage: Decimal) => void
 }) => {
   const [isOpen, , , toggle] = useSwitch(false)
-
   return (
     <LoanInfoAccordion
       isOpen={isOpen}
       toggle={toggle}
       range={range}
-      health={useCreateLoanHealth(params, !tooMuchDebt)}
-      bands={useCreateLoanBands(params, isOpen && !tooMuchDebt)}
-      prices={useCreateLoanPrices(params, isOpen && !tooMuchDebt)}
+      health={useCreateLoanHealth(params)}
+      bands={useCreateLoanBands(params, isOpen)}
+      prices={useCreateLoanPrices(params, isOpen)}
       prevRates={useMarketRates(params, isOpen)}
       rates={useMarketFutureRates(params, isOpen)}
       loanToValue={useLoanToValue(
@@ -57,11 +54,11 @@ export const CreateLoanInfoAccordion = <ChainId extends IChainId>({
         },
         isOpen,
       )}
-      gas={useCreateLoanEstimateGas(networks, params, isOpen && !tooMuchDebt)}
+      gas={useCreateLoanEstimateGas(networks, params, isOpen)}
       leverage={{
         enabled: leverageEnabled,
         expectedCollateral: useCreateLoanExpectedCollateral(params, isOpen && leverageEnabled),
-        maxReceive: useCreateLoanMaxReceive(params, isOpen && leverageEnabled && !tooMuchDebt),
+        maxReceive: useCreateLoanMaxReceive(params, isOpen && leverageEnabled),
         priceImpact: useCreateLoanPriceImpact(params, isOpen && leverageEnabled),
         slippage,
         onSlippageChange,

apps/main/src/llamalend/features/borrow/hooks/useCreateLoanForm.tsx

@@ -83,7 +83,6 @@ export function useCreateLoanForm<ChainId extends LlamaChainId>({
     creationError,
     txHash: data?.hash,
     isApproved: useBorrowCreateLoanIsApproved(params),
-    tooMuchDebt: !!form.formState.errors['maxDebt'],
     formErrors: useFormErrors(form.formState),
   }
 }

apps/main/src/llamalend/queries/create-loan/borrow-create-loan-approved.query.ts

@@ -27,5 +27,5 @@ export const { useQuery: useBorrowCreateLoanIsApproved, fetchQuery: fetchBorrowC
       : await market.createLoanIsApproved(userCollateral)
   },
   staleTime: '1m',
-  validationSuite: borrowQueryValidationSuite,
+  validationSuite: borrowQueryValidationSuite({ debtRequired: false }), // doesn't use debt or maxDebt
 })

apps/main/src/llamalend/queries/create-loan/create-loan-approve-estimate-gas.query.ts

@@ -36,7 +36,7 @@ const { useQuery: useCreateLoanApproveEstimateGas } = queryFactory({
           ? await market.leverageV2.estimateGas.createLoanApprove(userCollateral, userBorrowed)
           : await market.leverage.estimateGas.createLoanApprove(userCollateral)
   },
-  validationSuite: borrowQueryValidationSuite,
+  validationSuite: borrowQueryValidationSuite({ debtRequired: false }), // doesn't use debt or maxDebt
   dependencies: (params) => [createLoanMaxReceiveKey(params)],
 })
 

apps/main/src/llamalend/queries/create-loan/create-loan-bands.query.ts

@@ -45,7 +45,7 @@ export const { useQuery: useCreateLoanBands } = queryFactory({
       : market.createLoanBands(userCollateral, debt, range)
   },
   staleTime: '1m',
-  validationSuite: borrowQueryValidationSuite,
+  validationSuite: borrowQueryValidationSuite(), // requires debt and maxDebt
   dependencies: (params) => [
     createLoanMaxReceiveKey(params),
     ...(params.leverageEnabled ? [createLoanExpectedCollateralQueryKey(params)] : []),

apps/main/src/llamalend/queries/create-loan/create-loan-expected-collateral.query.ts

@@ -79,5 +79,5 @@ export const { useQuery: useCreateLoanExpectedCollateral, queryKey: createLoanEx
       return convertNumbers({ userCollateral, leverage, totalCollateral: collateral })
     },
     staleTime: '1m',
-    validationSuite: borrowQueryValidationSuite,
+    validationSuite: borrowQueryValidationSuite(), // requires debt and maxDebt
   })

apps/main/src/llamalend/queries/create-loan/create-loan-health.query.ts

@@ -47,7 +47,7 @@ export const { useQuery: useCreateLoanHealth } = queryFactory({
     )!
   },
   staleTime: '1m',
-  validationSuite: borrowQueryValidationSuite,
+  validationSuite: borrowQueryValidationSuite(), // requires debt and maxDebt
   dependencies: (params) => [
     createLoanMaxReceiveKey(params),
     ...(params.leverageEnabled ? [createLoanExpectedCollateralQueryKey(params)] : []),

apps/main/src/llamalend/queries/create-loan/create-loan-price-impact.query.ts

@@ -30,6 +30,6 @@ export const { useQuery: useCreateLoanPriceImpact } = queryFactory({
         : +(await market.leverage.priceImpact(userCollateral, debt))
   },
   staleTime: '1m',
-  validationSuite: borrowQueryValidationSuite,
+  validationSuite: borrowQueryValidationSuite(), // requires debt and maxDebt
   dependencies: (params) => [createLoanExpectedCollateralQueryKey(params)],
 })

apps/main/src/llamalend/queries/create-loan/create-loan-prices.query.ts

@@ -3,12 +3,12 @@ import { LendMarketTemplate } from '@curvefi/llamalend-api/lib/lendMarkets'
 import { type FieldsOf } from '@ui-kit/lib'
 import { queryFactory, rootKeys } from '@ui-kit/lib/model'
 import { Decimal } from '@ui-kit/utils'
-import type { BorrowFormQuery } from '../../features/borrow/types'
+import type { BorrowForm, BorrowFormQuery } from '../../features/borrow/types'
 import { borrowQueryValidationSuite } from '../validation/borrow.validation'
 import { createLoanExpectedCollateralQueryKey } from './create-loan-expected-collateral.query'
 import { createLoanMaxReceiveKey } from './create-loan-max-receive.query'
 
-type BorrowPricesReceiveQuery = BorrowFormQuery
+type BorrowPricesReceiveQuery = BorrowFormQuery & Pick<BorrowForm, 'maxDebt'>
 type BorrowPricesReceiveParams = FieldsOf<BorrowPricesReceiveQuery>
 
 type BorrowPricesResult = [Decimal, Decimal]
@@ -23,6 +23,7 @@ export const { useQuery: useCreateLoanPrices } = queryFactory({
     debt = '0',
     leverageEnabled,
     range,
+    maxDebt,
   }: BorrowPricesReceiveParams) =>
     [
       ...rootKeys.market({ chainId, marketId }),
@@ -32,6 +33,7 @@ export const { useQuery: useCreateLoanPrices } = queryFactory({
       { debt },
       { leverageEnabled },
       { range },
+      { maxDebt },
     ] as const,
   queryFn: async ({
     marketId,
@@ -51,7 +53,7 @@ export const { useQuery: useCreateLoanPrices } = queryFactory({
           : convertNumbers(await market.leverage.createLoanPrices(userCollateral, debt, range))
   },
   staleTime: '1m',
-  validationSuite: borrowQueryValidationSuite,
+  validationSuite: borrowQueryValidationSuite(), // requires debt and maxDebt
   dependencies: (params) => [
     createLoanMaxReceiveKey(params),
     ...(params.leverageEnabled ? [createLoanExpectedCollateralQueryKey(params)] : []),