refactor: move 'loan exists' logic out of fetchLoanDetails

0xAlunara · 0xAlunara · commit 94a39213288b · 2025-11-07T19:28:32.000+01:00
diff --git a/apps/main/src/llamalend/queries/loan-exists.ts b/apps/main/src/llamalend/queries/loan-exists.ts
@@ -7,6 +7,7 @@ export const {
   useQuery: useLoanExists,
   refetchQuery: refetchLoanExists,
   getQueryData: getLoanExists,
+  invalidate: invalidateLoanExists,
 } = queryFactory({
   queryKey: (params: UserMarketParams) => [...rootKeys.userMarket(params), 'loan-exists'] as const,
   queryFn: async ({ marketId, userAddress }: UserMarketQuery) => {
diff --git a/apps/main/src/loan/components/PageLoanManage/LoanDecrease/index.tsx b/apps/main/src/loan/components/PageLoanManage/LoanDecrease/index.tsx
@@ -1,5 +1,6 @@
 import { ReactNode, useCallback, useEffect, useRef, useState } from 'react'
 import { useAccount } from 'wagmi'
+import { refetchLoanExists } from '@/llamalend/queries/loan-exists'
 import AlertFormError from '@/loan/components/AlertFormError'
 import AlertFormWarning from '@/loan/components/AlertFormWarning'
 import DetailInfoBorrowRate from '@/loan/components/DetailInfoBorrowRate'
@@ -148,7 +149,13 @@ const LoanDecrease = ({ curve, llamma, llammaId, params, rChainId }: Props) => {
       const resp = await fetchStepDecrease(payloadActiveKey, curve, llamma, formValues)
 
       if (isSubscribed.current && resp && resp.hash && resp.activeKey === activeKey) {
-        const txInfoBarMessage = resp.loanExists
+        const loanExists = await refetchLoanExists({
+          chainId,
+          marketId: llammaId,
+          userAddress,
+        })
+
+        const txInfoBarMessage = loanExists
           ? t`Transaction complete`
           : t`Transaction complete. This loan is payoff and will no longer be manageable.`
 
@@ -157,7 +164,7 @@ const LoanDecrease = ({ curve, llamma, llammaId, params, rChainId }: Props) => {
             description={txInfoBarMessage}
             txHash={scanTxPath(networks[rChainId], resp.hash)}
             onClose={() => {
-              if (resp.loanExists) {
+              if (loanExists) {
                 reset(false, true)
               } else {
                 push(getCollateralListPathname(params))
@@ -168,7 +175,7 @@ const LoanDecrease = ({ curve, llamma, llammaId, params, rChainId }: Props) => {
       }
       notification?.dismiss()
     },
-    [activeKey, fetchStepDecrease, push, params, rChainId, reset],
+    [fetchStepDecrease, activeKey, chainId, llammaId, userAddress, rChainId, reset, push, params],
   )
 
   const getSteps = useCallback(
diff --git a/apps/main/src/loan/components/PageLoanManage/LoanDeleverage/index.tsx b/apps/main/src/loan/components/PageLoanManage/LoanDeleverage/index.tsx
@@ -1,6 +1,7 @@
 import { ReactNode, useCallback, useEffect, useRef, useState } from 'react'
 import { styled } from 'styled-components'
 import { useAccount } from 'wagmi'
+import { refetchLoanExists } from '@/llamalend/queries/loan-exists'
 import AlertFormError from '@/loan/components/AlertFormError'
 import AlertFormWarning from '@/loan/components/AlertFormWarning'
 import DetailInfoBorrowRate from '@/loan/components/DetailInfoBorrowRate'
@@ -135,7 +136,13 @@ const LoanDeleverage = ({
       const resp = await fetchStepRepay(payloadActiveKey, curve, llamma, formValues, maxSlippage)
 
       if (isSubscribed.current && resp && resp.hash && resp.activeKey === activeKey) {
-        const txInfoBarMessage = resp.loanExists
+        const loanExists = await refetchLoanExists({
+          chainId,
+          marketId: llammaId,
+          userAddress,
+        })
+
+        const txInfoBarMessage = loanExists
           ? t`Transaction complete`
           : t`Transaction complete. This loan is paid-off and will no longer be manageable.`
 
@@ -144,7 +151,7 @@ const LoanDeleverage = ({
             description={txInfoBarMessage}
             txHash={scanTxPath(networks[rChainId], resp.hash)}
             onClose={() => {
-              if (resp.loanExists) {
+              if (loanExists) {
                 updateFormValues({}, '', true)
               } else {
                 push(getCollateralListPathname(params))
@@ -155,7 +162,18 @@ const LoanDeleverage = ({
       }
       if (typeof dismiss === 'function') dismiss()
     },
-    [activeKey, collateralName, fetchStepRepay, push, params, rChainId, updateFormValues],
+    [
+      collateralName,
+      fetchStepRepay,
+      activeKey,
+      chainId,
+      llammaId,
+      userAddress,
+      rChainId,
+      updateFormValues,
+      push,
+      params,
+    ],
   )
 
   const getSteps = useCallback(
diff --git a/apps/main/src/loan/components/PageLoanManage/LoanLiquidate/index.tsx b/apps/main/src/loan/components/PageLoanManage/LoanLiquidate/index.tsx
@@ -1,6 +1,7 @@
 import { ReactNode, useCallback, useEffect, useRef, useState } from 'react'
 import { styled } from 'styled-components'
 import { useAccount } from 'wagmi'
+import { refetchLoanExists } from '@/llamalend/queries/loan-exists'
 import AlertFormError from '@/loan/components/AlertFormError'
 import AlertFormWarning from '@/loan/components/AlertFormWarning'
 import DetailInfoEstimateGas from '@/loan/components/DetailInfoEstimateGas'
@@ -126,8 +127,13 @@ const LoanLiquidate = ({ curve, llamma, llammaId, params, rChainId }: Props) =>
             const notification = notify(notifyMessage, 'pending')
 
             const resp = await fetchStepLiquidate(curve, llamma, liquidationAmt, maxSlippage)
+            const loanExists = await refetchLoanExists({
+              chainId,
+              marketId: llammaId,
+              userAddress,
+            })
 
-            if (isSubscribed.current && resp && resp.hash && !resp.loanExists) {
+            if (isSubscribed.current && resp && resp.hash && !loanExists) {
               const TxDescription = (
                 <>
                   <Trans>
@@ -161,7 +167,7 @@ const LoanLiquidate = ({ curve, llamma, llammaId, params, rChainId }: Props) =>
 
       return stepsKey.map((k) => stepsObj[k])
     },
-    [fetchStepApprove, fetchStepLiquidate, params, reset],
+    [fetchStepApprove, fetchStepLiquidate, llammaId, params, reset, userAddress],
   )
 
   // onMount
diff --git a/apps/main/src/loan/components/PageLoanManage/Page.tsx b/apps/main/src/loan/components/PageLoanManage/Page.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react'
+import { useEffect } from 'react'
 import { styled } from 'styled-components'
 import { Address } from 'viem'
 import { useAccount } from 'wagmi'
@@ -56,10 +56,7 @@ const Page = () => {
   const setChartExpanded = useStore((state) => state.ohlcCharts.setChartExpanded)
   const { provider, connect: connectWallet } = useWallet()
 
-  const [loaded, setLoaded] = useState(false)
-
   const isValidRouterParams = !!rChainId && !!rCollateralId && !!rFormType
-  const isReady = !!curve?.signerAddress && !!market
 
   const marketDetails = useMarketDetails({ chainId: rChainId, llamma: market, llammaId: marketId })
   const positionDetails = useLoanPositionDetails({
@@ -89,27 +86,24 @@ const Page = () => {
   })
 
   useEffect(() => {
-    if (isHydrated && curve && rCollateralId && market) {
-      void (async () => {
-        const fetchedLoanDetails = await fetchLoanDetails(curve, market)
-        if (!fetchedLoanDetails.loanExists) {
-          push(getLoanCreatePathname(params, rCollateralId))
-        }
-        setLoaded(true)
-      })()
+    if (curve && market) {
+      if (loanExists === false) {
+        push(getLoanCreatePathname(params, rCollateralId))
+      } else {
+        void fetchLoanDetails(curve, market)
+      }
     }
-  }, [isReady, isHydrated, rFormType, curve, rCollateralId, market, fetchLoanDetails, push, params])
+  }, [curve, fetchLoanDetails, loanExists, market, params, push, rCollateralId])
 
   //  redirect if form is deleverage but no deleverage option
   useEffect(() => {
     if (market && rFormType === 'deleverage' && !hasDeleverage(market)) {
       push(getLoanCreatePathname(params, market.id))
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [loaded, rFormType, market])
+  }, [rFormType, market, push, params])
 
   usePageVisibleInterval(() => {
-    if (curve?.signerAddress && market && loanExists) {
+    if (curve && market && loanExists) {
       void fetchLoanDetails(curve, market)
     }
   }, REFRESH_INTERVAL['1m'])
diff --git a/apps/main/src/loan/store/createLoanCollateralDecreaseSlice.ts b/apps/main/src/loan/store/createLoanCollateralDecreaseSlice.ts
@@ -1,5 +1,6 @@
 import lodash from 'lodash'
 import type { StoreApi } from 'zustand'
+import { invalidateLoanExists } from '@/llamalend/queries/loan-exists'
 import type { FormStatus, FormValues } from '@/loan/components/PageLoanManage/CollateralDecrease/types'
 import type { FormDetailInfo, FormEstGas } from '@/loan/components/PageLoanManage/types'
 import {
@@ -168,10 +169,13 @@ const createLoanCollateralDecrease = (set: StoreApi<State>['setState'], get: Sto
       // update user events api
       void getUserMarketCollateralEvents(wallet?.account?.address, networks[chainId].id, llamma.controller, resp.hash)
       void get()[sliceKey].fetchMaxRemovable(chainId, llamma)
-      const { loanExists } = await get().loans.fetchLoanDetails(curve, llamma)
-      if (!loanExists) {
-        invalidateUserLoanDetails({ chainId, marketId: llamma.id, userAddress: wallet?.account?.address })
-      }
+
+      await get().loans.fetchLoanDetails(curve, llamma)
+
+      const queryParams = { chainId, marketId: llamma.id, userAddress: wallet?.account?.address }
+      invalidateLoanExists(queryParams)
+      invalidateUserLoanDetails(queryParams)
+
       if (resp.activeKey === get()[sliceKey].activeKey) {
         get()[sliceKey].setStateByKeys({
           detailInfo: {},
diff --git a/apps/main/src/loan/store/createLoanCollateralIncreaseSlice.ts b/apps/main/src/loan/store/createLoanCollateralIncreaseSlice.ts
@@ -1,5 +1,6 @@
 import lodash from 'lodash'
 import type { StoreApi } from 'zustand'
+import { invalidateLoanExists } from '@/llamalend/queries/loan-exists'
 import type { FormStatus, FormValues } from '@/loan/components/PageLoanManage/CollateralIncrease/types'
 import type { FormDetailInfo, FormEstGas } from '@/loan/components/PageLoanManage/types'
 import {
@@ -47,7 +48,7 @@ export type LoanCollateralIncreaseSlice = {
       curve: LlamaApi,
       llamma: Llamma,
       formValues: FormValues,
-    ): Promise<{ activeKey: string; error: string; hash: string; loanExists: boolean } | undefined>
+    ): Promise<{ activeKey: string; error: string; hash: string } | undefined>
 
     // steps helper
     setStateByActiveKey<T>(key: StateKey, activeKey: string, value: T): void
@@ -186,12 +187,11 @@ const createLoanCollateralIncrease = (set: StoreApi<State>['setState'], get: Sto
       // update user events api
       void getUserMarketCollateralEvents(wallet?.account?.address, networks[chainId].id, llamma.controller, resp.hash)
       if (activeKey === get()[sliceKey].activeKey) {
-        // re-fetch loan info
-        const { loanExists } = await get().loans.fetchLoanDetails(curve, llamma)
+        await get().loans.fetchLoanDetails(curve, llamma)
 
-        if (!loanExists) {
-          invalidateUserLoanDetails({ chainId, marketId: llamma.id, userAddress: wallet?.account?.address })
-        }
+        const queryParams = { chainId, marketId: llamma.id, userAddress: wallet?.account?.address }
+        invalidateLoanExists(queryParams)
+        invalidateUserLoanDetails(queryParams)
 
         get()[sliceKey].setStateByKeys({
           detailInfo: {},
@@ -206,7 +206,7 @@ const createLoanCollateralIncrease = (set: StoreApi<State>['setState'], get: Sto
           },
         })
 
-        return { ...resp, loanExists }
+        return resp
       }
     },
 
diff --git a/apps/main/src/loan/store/createLoanCreateSlice.ts b/apps/main/src/loan/store/createLoanCreateSlice.ts
@@ -1,6 +1,6 @@
 import lodash from 'lodash'
 import type { StoreApi } from 'zustand'
-import { refetchLoanExists } from '@/llamalend/queries/loan-exists'
+import { invalidateLoanExists, refetchLoanExists } from '@/llamalend/queries/loan-exists'
 import type {
   FormDetailInfoLeverage,
   FormStatus,
@@ -431,11 +431,11 @@ const createLoanCreate = (set: StoreApi<State>['setState'], get: StoreApi<State>
             liqRangesMapper: {},
           })
 
-          // re-fetch loan info
-          const { loanExists } = await get().loans.fetchLoanDetails(curve, llamma)
-          if (!loanExists) {
-            invalidateUserLoanDetails({ chainId, marketId: llamma.id, userAddress: wallet?.account?.address })
-          }
+          await get().loans.fetchLoanDetails(curve, llamma)
+
+          const queryParams = { chainId, marketId: llamma.id, userAddress: wallet?.account?.address }
+          invalidateLoanExists(queryParams)
+          invalidateUserLoanDetails(queryParams)
 
           // reset form values
           const updatedFormValues = DEFAULT_FORM_VALUES
@@ -453,7 +453,7 @@ const createLoanCreate = (set: StoreApi<State>['setState'], get: StoreApi<State>
             maxRecv: {},
           })
 
-          return { ...resp, loanExists }
+          return resp
         }
       }
     },
diff --git a/apps/main/src/loan/store/createLoanDecreaseSlice.ts b/apps/main/src/loan/store/createLoanDecreaseSlice.ts
@@ -1,6 +1,7 @@
 import lodash from 'lodash'
 import { zeroAddress } from 'viem'
 import type { StoreApi } from 'zustand'
+import { invalidateLoanExists } from '@/llamalend/queries/loan-exists'
 import type { FormStatus, FormValues } from '@/loan/components/PageLoanManage/LoanDecrease/types'
 import type { FormDetailInfo, FormEstGas } from '@/loan/components/PageLoanManage/types'
 import {
@@ -48,7 +49,7 @@ export type LoanDecreaseSlice = {
       curve: LlamaApi,
       llamma: Llamma,
       formValues: FormValues,
-    ): Promise<{ activeKey: string; error: string; hash: string; loanExists: boolean } | undefined>
+    ): Promise<{ activeKey: string; error: string; hash: string } | undefined>
 
     // steps helper
     setStateByActiveKey<T>(key: StateKey, activeKey: string, value: T): void
@@ -215,12 +216,11 @@ const createLoanDecrease = (set: StoreApi<State>['setState'], get: StoreApi<Stat
       // update user events api
       void getUserMarketCollateralEvents(wallet?.account?.address, networks[chainId].id, llamma.controller, resp.hash)
       if (activeKey === get()[sliceKey].activeKey) {
-        // re-fetch loan info
-        const { loanExists } = await get().loans.fetchLoanDetails(curve, llamma)
+        await get().loans.fetchLoanDetails(curve, llamma)
 
-        if (!loanExists) {
-          invalidateUserLoanDetails({ chainId, marketId: llamma.id, userAddress: wallet?.account?.address })
-        }
+        const queryParams = { chainId, marketId: llamma.id, userAddress: wallet?.account?.address }
+        invalidateLoanExists(queryParams)
+        invalidateUserLoanDetails(queryParams)
 
         get()[sliceKey].setStateByKey('formStatus', {
           ...get()[sliceKey].formStatus,
@@ -236,7 +236,7 @@ const createLoanDecrease = (set: StoreApi<State>['setState'], get: StoreApi<Stat
           formValues: DEFAULT_FORM_VALUES,
         })
 
-        return { ...resp, loanExists }
+        return resp
       }
     },
 
diff --git a/apps/main/src/loan/store/createLoanDeleverageSlice.ts b/apps/main/src/loan/store/createLoanDeleverageSlice.ts
@@ -1,5 +1,6 @@
 import lodash from 'lodash'
 import type { StoreApi } from 'zustand'
+import { invalidateLoanExists } from '@/llamalend/queries/loan-exists'
 import type { FormDetailInfo, FormStatus, FormValues } from '@/loan/components/PageLoanManage/LoanDeleverage/types'
 import {
   DEFAULT_DETAIL_INFO,
@@ -35,7 +36,7 @@ export type LoanDeleverageSlice = {
     fetchDetailInfo(activeKey: string, curve: LlamaApi, llamma: Llamma, formValues: FormValues, maxSlippage: string, userState: UserLoanDetails['userState']): Promise<FormDetailInfo>
     setFormValues(llammaId: string, curve: LlamaApi | null, llamma: Llamma | null, formValues: Partial<FormValues>, maxSlippage: string, isFullReset?: boolean): Promise<void>
     fetchEstGas(activeKey: string, chainId: ChainId, llamma: Llamma, formValues: FormValues, maxSlippage: string): Promise<void>
-    fetchStepRepay(activeKey: string, curve: LlamaApi, llamma: Llamma, formValues: FormValues, maxSlippage: string): Promise<{ activeKey: string; error: string; hash: string; loanExists: boolean } | undefined>
+    fetchStepRepay(activeKey: string, curve: LlamaApi, llamma: Llamma, formValues: FormValues, maxSlippage: string): Promise<{ activeKey: string; error: string; hash: string; } | undefined>
     setStateByActiveKey<T>(key: StateKey, activeKey: string, value: T): void
     setStateByKey<T>(key: StateKey, value: T): void
     setStateByKeys(SliceState: Partial<SliceState>): void
@@ -169,20 +170,17 @@ const createLoanDeleverageSlice = (
       // update user events api
       void getUserMarketCollateralEvents(wallet?.account?.address, networks[chainId].id, llamma.controller, resp.hash)
       if (resp.activeKey === get()[sliceKey].activeKey) {
-        let loanExists = true
         const cFormStatus = cloneDeep(DEFAULT_FORM_STATUS)
         cFormStatus.isApproved = get()[sliceKey].formStatus.isApproved
 
         if (resp.error) {
           get()[sliceKey].setStateByKey('formStatus', cloneDeep({ ...cFormStatus, error: resp.error }))
         } else {
-          // re-fetch loan info
-          const respLoanDetails = await get().loans.fetchLoanDetails(curve, llamma)
-          loanExists = respLoanDetails.loanExists
+          await get().loans.fetchLoanDetails(curve, llamma)
 
-          if (!loanExists) {
-            invalidateUserLoanDetails({ chainId, marketId: llamma.id, userAddress: wallet?.account?.address })
-          }
+          const queryParams = { chainId, marketId: llamma.id, userAddress: wallet?.account?.address }
+          invalidateLoanExists(queryParams)
+          invalidateUserLoanDetails(queryParams)
 
           get()[sliceKey].setStateByKeys({
             formValues: DEFAULT_FORM_VALUES,
@@ -192,7 +190,7 @@ const createLoanDeleverageSlice = (
           })
         }
 
-        return { ...resp, loanExists }
+        return resp
       }
     },
 
diff --git a/apps/main/src/loan/store/createLoanIncreaseSlice.ts b/apps/main/src/loan/store/createLoanIncreaseSlice.ts
diff --git a/apps/main/src/loan/store/createLoanLiquidate.ts b/apps/main/src/loan/store/createLoanLiquidate.ts
diff --git a/apps/main/src/loan/store/createLoansSlice.ts b/apps/main/src/loan/store/createLoansSlice.ts
