Merge pull request #299 from wildcat-finance/develop

d1ll0n · web-flow · commit 7bc6ce4962e5 · 2026-05-29T15:04:31.000-07:00
fix(mobile): market header row clipping
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "@types/humanize-duration": "^3.27.4",
     "@types/react-scroll": "^1.8.10",
     "@types/redux-mock-store": "^1.0.6",
-    "@wildcatfi/wildcat-sdk": "^3.0.65-beta",
+    "@wildcatfi/wildcat-sdk": "3.1.4-beta",
     "base64-arraybuffer": "^1.0.2",
     "classnames": "^2.5.1",
     "dayjs": "^1.11.10",
diff --git a/src/app/[locale]/borrower/edit-policy/hooks/useSubmitUpdates.ts b/src/app/[locale]/borrower/edit-policy/hooks/useSubmitUpdates.ts
@@ -5,6 +5,7 @@ import {
   FixedTermHooks,
   HooksInstance,
   OpenTermHooks,
+  PeriodicTermHooks,
 } from "@wildcatfi/wildcat-sdk/dist/access"
 
 import { toastRequest, ToastRequestConfig } from "@/components/Toasts"
@@ -66,7 +67,8 @@ export function useSubmitUpdates(policy?: HooksInstance | MarketController) {
         console.log(addLenders)
         if (
           policy instanceof OpenTermHooks ||
-          policy instanceof FixedTermHooks
+          policy instanceof FixedTermHooks ||
+          policy instanceof PeriodicTermHooks
         ) {
           console.log(`adding lenders to v2 policy`)
           const tx = policy.populateAddLenders(
@@ -101,7 +103,8 @@ export function useSubmitUpdates(policy?: HooksInstance | MarketController) {
         console.log(`policy address: ${policy.contract.address}`)
         if (
           policy instanceof OpenTermHooks ||
-          policy instanceof FixedTermHooks
+          policy instanceof FixedTermHooks ||
+          policy instanceof PeriodicTermHooks
         ) {
           const tx = policy.populateBlockLenders(removeLenders)
           txs.push({
diff --git a/src/app/[locale]/borrower/hooks/getMaketsHooks/useGetBorrowerMarkets.ts b/src/app/[locale]/borrower/hooks/getMaketsHooks/useGetBorrowerMarkets.ts
@@ -18,6 +18,7 @@ import { useEthersProvider } from "@/hooks/useEthersSigner"
 import { useSelectedNetwork } from "@/hooks/useSelectedNetwork"
 import { EXCLUDED_MARKETS_FILTER } from "@/utils/constants"
 import { combineFilters } from "@/utils/filters"
+import { isFrontendVisibleMarket } from "@/utils/marketType"
 
 import { GetMarketsProps } from "./interface"
 
@@ -63,7 +64,11 @@ export function useGetBorrowerMarketsQuery({
   async function getBorrowerMarkets() {
     try {
       const subgraphMarkets = await queryBorrowerMarkets()
-      return updateMarkets(subgraphMarkets, provider, network)
+      return updateMarkets(
+        subgraphMarkets.filter(isFrontendVisibleMarket),
+        provider,
+        network,
+      )
     } catch (error) {
       console.log("Error fetching borrower markets", error)
       throw error
diff --git a/src/app/[locale]/borrower/hooks/getMaketsHooks/useGetOthersMarkets.ts b/src/app/[locale]/borrower/hooks/getMaketsHooks/useGetOthersMarkets.ts
@@ -18,6 +18,7 @@ import { useSelectedNetwork } from "@/hooks/useSelectedNetwork"
 import { useSubgraphClient } from "@/providers/SubgraphProvider"
 import { EXCLUDED_MARKETS_FILTER } from "@/utils/constants"
 import { combineFilters } from "@/utils/filters"
+import { isFrontendVisibleMarket } from "@/utils/marketType"
 
 import { GetMarketsProps } from "./interface"
 
@@ -52,7 +53,11 @@ export function useGetOthersMarketsQuery({
 
   async function getAllMarkets() {
     const subgraphMarkets = await queryAllMarkets()
-    return updateMarkets(subgraphMarkets, provider, network)
+    return updateMarkets(
+      subgraphMarkets.filter(isFrontendVisibleMarket),
+      provider,
+      network,
+    )
   }
 
   return useQuery({
diff --git a/src/app/[locale]/borrower/market/[address]/components/Modals/ForceBuyBackModal/index.tsx b/src/app/[locale]/borrower/market/[address]/components/Modals/ForceBuyBackModal/index.tsx
@@ -72,9 +72,13 @@ export const ForceBuyBackModal = ({
     : marketAccount.market.underlyingToken.parseAmount(0)
 
   const showForm = !(isPending || showSuccessPopup || showErrorPopup)
+  const allowForceBuyBacks =
+    market.hooksConfig && "allowForceBuyBacks" in market.hooksConfig
+      ? market.hooksConfig.allowForceBuyBacks
+      : false
 
   const disableForceBuyBack =
-    !market.hooksConfig?.allowForceBuyBacks ||
+    !allowForceBuyBacks ||
     market.willBeDelinquent ||
     market.isDelinquent ||
     buyBackAmount.gt(marketAccount.underlyingBalance)
diff --git a/src/app/[locale]/borrower/policy/hooks/useSubmitUpdates.ts b/src/app/[locale]/borrower/policy/hooks/useSubmitUpdates.ts
@@ -5,6 +5,7 @@ import {
   FixedTermHooks,
   HooksInstance,
   OpenTermHooks,
+  PeriodicTermHooks,
 } from "@wildcatfi/wildcat-sdk/dist/access"
 
 import { QueryKeys } from "@/config/query-keys"
@@ -56,7 +57,9 @@ export function useSubmitUpdates(policy?: HooksInstance | MarketController) {
       if (addLenders?.length) {
         const tx =
           // eslint-disable-next-line no-nested-ternary
-          policy instanceof OpenTermHooks || policy instanceof FixedTermHooks
+          policy instanceof OpenTermHooks ||
+          policy instanceof FixedTermHooks ||
+          policy instanceof PeriodicTermHooks
             ? policy.populateAddLenders(
                 addLenders.map((lender) => ({ lender })),
               )
@@ -73,7 +76,9 @@ export function useSubmitUpdates(policy?: HooksInstance | MarketController) {
       if (removeLenders?.length) {
         const tx =
           // eslint-disable-next-line no-nested-ternary
-          policy instanceof OpenTermHooks || policy instanceof FixedTermHooks
+          policy instanceof OpenTermHooks ||
+          policy instanceof FixedTermHooks ||
+          policy instanceof PeriodicTermHooks
             ? policy.populateBlockLenders(removeLenders)
             : marketsToUpdate?.length
               ? policy.populateDeauthorizeLendersAndUpdateMarkets(
diff --git a/src/app/[locale]/globals.css b/src/app/[locale]/globals.css
@@ -2,3 +2,9 @@ body {
     margin: 0;
     padding: 0;
 }
+
+@media (max-width: 1000px) {
+    html {
+        scroll-padding-top: 64px;
+    }
+}
diff --git a/src/app/[locale]/lender/hooks/useLendersMarkets.ts b/src/app/[locale]/lender/hooks/useLendersMarkets.ts
@@ -25,6 +25,7 @@ import { useEthersProvider } from "@/hooks/useEthersSigner"
 import { useSubgraphClient } from "@/providers/SubgraphProvider"
 import { EXCLUDED_MARKETS_FILTER, TOKENS_ADDRESSES } from "@/utils/constants"
 import { combineFilters } from "@/utils/filters"
+import { isFrontendVisibleMarket } from "@/utils/marketType"
 import { TwoStepQueryHookResult } from "@/utils/types"
 
 export type LenderMarketsQueryProps =
@@ -94,12 +95,15 @@ export function useLendersMarkets(
         marketFilter: filter,
       },
     )
-    lenderAccounts.sort(
+    const visibleAccounts = lenderAccounts.filter(({ market }) =>
+      isFrontendVisibleMarket(market),
+    )
+    visibleAccounts.sort(
       (a, b) =>
         (b.market.deployedEvent?.blockNumber ?? 0) -
         (a.market.deployedEvent?.blockNumber ?? 0),
     )
-    return lenderAccounts
+    return visibleAccounts
   }
 
   const {
diff --git a/src/app/api/market/get/route.ts b/src/app/api/market/get/route.ts
@@ -5,8 +5,8 @@ import {
   NormalizedCacheObject,
 } from "@apollo/client"
 import { SubgraphUrls } from "@wildcatfi/wildcat-sdk"
+import { getMarketDocumentForChain } from "@wildcatfi/wildcat-sdk/dist/gql"
 import {
-  GetMarketDocument,
   SubgraphGetMarketQuery,
   SubgraphGetMarketQueryVariables,
 } from "@wildcatfi/wildcat-sdk/dist/gql/graphql"
@@ -55,7 +55,7 @@ async function fetchMarketFromChain(
     SubgraphGetMarketQuery,
     SubgraphGetMarketQueryVariables
   >({
-    query: GetMarketDocument,
+    query: getMarketDocumentForChain(chainId),
     variables: { market: addressLower },
     fetchPolicy: "network-only",
   })
diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx
@@ -104,7 +104,9 @@ export default function Header() {
 
   return (
     <>
-      {isMobile && <Box sx={{ width: "100%", height: "64px" }} />}
+      {isMobile && (
+        <Box sx={{ width: "100%", height: "64px", flexShrink: 0 }} />
+      )}
 
       <Box sx={contentContainer(theme)}>
         <Link
diff --git a/src/components/MarketParameters/index.tsx b/src/components/MarketParameters/index.tsx
@@ -322,7 +322,7 @@ export const MarketParameters = ({
   }
   let earlyClosure: "yes" | "no" | "na" = "no"
   if (hooksConfig) {
-    if (hooksConfig.kind === HooksKind.OpenTerm) {
+    if (hooksConfig.kind !== HooksKind.FixedTerm) {
       earlyClosure = "na"
     } else if (hooksConfig.allowClosureBeforeTerm) {
       earlyClosure = "yes"
@@ -334,7 +334,7 @@ export const MarketParameters = ({
   }
   let earlyMaturity: "yes" | "no" | "na" = "no"
   if (hooksConfig) {
-    if (hooksConfig.kind === HooksKind.OpenTerm) {
+    if (hooksConfig.kind !== HooksKind.FixedTerm) {
       earlyMaturity = "na"
     } else if (hooksConfig.allowTermReduction) {
       earlyMaturity = "yes"
diff --git a/src/lib/mla.ts b/src/lib/mla.ts
@@ -306,7 +306,10 @@ const getMarketParams = (market: Market): MlaBorrowerFields["market"] => {
       hooksConfig?.kind === HooksKind.FixedTerm
         ? hooksConfig.allowTermReduction
         : undefined,
-    allowForceBuyBack: hooksConfig?.allowForceBuyBacks,
+    allowForceBuyBack:
+      hooksConfig && "allowForceBuyBacks" in hooksConfig
+        ? hooksConfig.allowForceBuyBacks
+        : undefined,
   }
 }
 
diff --git a/src/utils/comparators.ts b/src/utils/comparators.ts
@@ -5,15 +5,22 @@ import { MarketStatus } from "@/utils/marketStatus"
 export const typeComparator = (
   v1:
     | { kind: HooksKind.FixedTerm; fixedPeriod: number }
-    | { kind: HooksKind.Unknown | HooksKind.OpenTerm; fixedPeriod?: undefined },
+    | {
+        kind: HooksKind.Unknown | HooksKind.OpenTerm | HooksKind.PeriodicTerm
+        fixedPeriod?: undefined
+      },
   v2:
     | { kind: HooksKind.FixedTerm; fixedPeriod: number }
-    | { kind: HooksKind.Unknown | HooksKind.OpenTerm; fixedPeriod?: undefined },
+    | {
+        kind: HooksKind.Unknown | HooksKind.OpenTerm | HooksKind.PeriodicTerm
+        fixedPeriod?: undefined
+      },
 ) => {
   const order: { [key in HooksKind]: number } = {
     [HooksKind.FixedTerm]: 0,
     [HooksKind.OpenTerm]: 1,
     [HooksKind.Unknown]: 2,
+    [HooksKind.PeriodicTerm]: 3,
   }
 
   if (order[v1.kind] !== order[v2.kind]) {
diff --git a/src/utils/errors.ts b/src/utils/errors.ts
@@ -53,6 +53,7 @@ export const SDK_ERRORS_MAPPING: SDKErrorsMapping = {
     InsufficientBalance:
       "You don't have enough of the market token in your wallet",
     MarketInClosedTerm: "Market is in closed term",
+    WithdrawalWindowClosed: "Market is not in a withdrawal window",
     RequiresAccess: "Lender lacks the necessary credentials to withdraw",
   },
 
@@ -80,5 +81,9 @@ export const SDK_ERRORS_MAPPING: SDKErrorsMapping = {
       "Liquid reserves of the market insufficient for increased reserve ratio",
     DecreaseDuringFixedTerm:
       "Market is in fixed term, APR can only be increased",
+    AprReductionNotProposed: "APR reduction has not been proposed",
+    AprChangeDoesNotMatchProposal: "APR change does not match proposal",
+    AprChangeNotReady: "APR change is not ready",
+    UnpaidWithdrawalsExist: "There are unpaid withdrawal batches",
   },
 }
diff --git a/src/utils/marketType.ts b/src/utils/marketType.ts
@@ -31,3 +31,9 @@ export const getMarketTypeChip = (market: Market) => {
     kind,
   }
 }
+
+// temporary: tolerate periodic market data without exposing periodic ux.
+export const isFrontendVisibleMarket = (market: Market) =>
+  market.version !== MarketVersion.V2 ||
+  (market.hooksKind !== HooksKind.PeriodicTerm &&
+    market.hooksConfig?.kind !== HooksKind.PeriodicTerm)
