fix: update usage after owm refactor

curvefi · Oct 8, 2024 · 1980bae · 1980bae
1 parent f3f657b
commit 1980bae
Show file tree

Hide file tree

Showing 29 changed files with 174 additions and 188 deletions.
diff --git a/apps/lend/src/components/DetailInfoHealth.tsx b/apps/lend/src/components/DetailInfoHealth.tsx
@@ -44,7 +44,7 @@ const DetailInfoHealth = ({
   loading: boolean
   setHealthMode: React.Dispatch<React.SetStateAction<HealthMode>>
 }) => {
-  const owmData = useOneWayMarket(rChainId, rOwmId)?.data
+  const market = useOneWayMarket(rChainId, rOwmId)?.data
   const oraclePriceBand = useStore((state) => state.markets.pricesMapper[rChainId]?.[rOwmId]?.prices?.oraclePriceBand)
   const userLoanDetails = useStore((state) => state.user.loansDetailsMapper[userActiveKey]?.details)
 
@@ -58,7 +58,7 @@ const DetailInfoHealth = ({
     if (typeof oraclePriceBand === 'number' && healthFull) {
       setHealthMode(
         getHealthMode(
-          owmData,
+          market,
           oraclePriceBand,
           amount,
           bands,
@@ -79,7 +79,7 @@ const DetailInfoHealth = ({
     formType,
     healthFull,
     newHealthModeColorKey,
-    owmData,
+    market,
     setHealthMode,
   ])
 
@@ -88,10 +88,10 @@ const DetailInfoHealth = ({
     if (typeof oraclePriceBand === 'number' && userLoanDetails) {
       const { healthFull, bands } = userLoanDetails
       setCurrentHealthMode(
-        getHealthMode(owmData, oraclePriceBand, amount, bands, formType, healthFull, '', newHealthModeColorKey)
+        getHealthMode(market, oraclePriceBand, amount, bands, formType, healthFull, '', newHealthModeColorKey)
       )
     }
-  }, [oraclePriceBand, amount, formType, newHealthModeColorKey, owmData, userLoanDetails])
+  }, [oraclePriceBand, amount, formType, newHealthModeColorKey, market, userLoanDetails])
 
   const healthPercent = useMemo(() => {
     if (healthMode.percent) {
@@ -153,7 +153,7 @@ export default DetailInfoHealth
 // 1. If health(full=true) < loan_discount, user is at risk to go from healthy mode to soft liquidation mode (green —> orange).
 // 2. If health(full=false) < liquidation_discount , user is at risk to go from soft liquidation mode to hard liquidation mode (orange —> red).
 export function getHealthMode(
-  owmData: OneWayMarketTemplate | undefined,
+  market: OneWayMarketTemplate | undefined,
   oraclePriceBand: number | null,
   amount: string,
   bands: [number, number] | number[],
@@ -179,7 +179,7 @@ export function getHealthMode(
         message = t`You are still close to soft liquidation.`
       } else if (newColorKey === 'close_to_liquidation') {
         const formattedAmount = formatNumber(amount)
-        const borrowedToken = owmData?.borrowed_token?.symbol
+        const borrowedToken = market?.borrowed_token?.symbol
         if (formType === 'collateral-decrease') {
           message = t`Removing ${formattedAmount} collateral, will put you close to soft liquidation.`
         } else if (formType === 'create-loan') {

diff --git a/apps/lend/src/components/DetailsMarket/components/DetailsLoan.tsx b/apps/lend/src/components/DetailsMarket/components/DetailsLoan.tsx
@@ -20,14 +20,14 @@ import ChartOhlcWrapper from '@/components/ChartOhlcWrapper'
 import ListInfoItem, { ListInfoItems, ListInfoItemsWrapper } from '@/ui/ListInfo'
 
 const DetailsLoan = ({ type, ...pageProps }: PageContentProps & { type: MarketListType }) => {
-  const { rChainId, rOwmId, owmDataCachedOrApi, borrowed_token, collateral_token, titleMapper, userActiveKey } =
+  const { rChainId, rOwmId, market, titleMapper, userActiveKey } =
     pageProps
   const chartExpanded = useStore((state) => state.ohlcCharts.chartExpanded)
 
   const cellProps = {
     rChainId,
     rOwmId,
-    owmDataCachedOrApi,
+    market,
     size: 'md' as const,
   }
 
@@ -73,18 +73,15 @@ const DetailsLoan = ({ type, ...pageProps }: PageContentProps & { type: MarketLi
         <DetailsLoanChartBalances
           rChainId={rChainId}
           rOwmId={rOwmId}
-          borrowed_token={borrowed_token}
-          collateral_token={collateral_token}
+          market={market}
         />
       </ContentWrapper>
 
       <Wrapper>
         <ContentWrapper paddingTop>
           <DetailsContracts
             rChainId={rChainId}
-            owmDataCachedOrApi={owmDataCachedOrApi}
-            borrowed_token={borrowed_token}
-            collateral_token={collateral_token}
+            market={market}
             type={type}
           />
         </ContentWrapper>

diff --git a/apps/lend/src/components/DetailsMarket/components/DetailsSupply.tsx b/apps/lend/src/components/DetailsMarket/components/DetailsSupply.tsx
@@ -16,12 +16,12 @@ import ListInfoItem, { ListInfoItems, ListInfoItemsWrapper } from '@/ui/ListInfo
 import MarketParameters from '@/components/DetailsMarket/components/MarketParameters'
 
 const DetailsSupply = ({ type, ...pageProps }: PageContentProps & { type: MarketListType }) => {
-  const { rChainId, rOwmId, owmDataCachedOrApi, borrowed_token, collateral_token, titleMapper } = pageProps
+  const { rChainId, rOwmId, market, titleMapper } = pageProps
 
   const cellProps = {
     rChainId,
     rOwmId,
-    owmDataCachedOrApi,
+    market,
     size: 'md' as const,
   }
 
@@ -63,9 +63,7 @@ const DetailsSupply = ({ type, ...pageProps }: PageContentProps & { type: Market
           <div>
             <DetailsContracts
               rChainId={rChainId}
-              owmDataCachedOrApi={owmDataCachedOrApi}
-              borrowed_token={borrowed_token}
-              collateral_token={collateral_token}
+              market={market}
               type={type}
             />
           </div>

diff --git a/apps/lend/src/components/DetailsUser/components/DetailsUserLoan.tsx b/apps/lend/src/components/DetailsUser/components/DetailsUserLoan.tsx
@@ -24,7 +24,7 @@ import ChartOhlcWrapper from '@/components/ChartOhlcWrapper'
 import ListInfoItem, { ListInfoItems, ListInfoItemsWrapper } from '@/ui/ListInfo'
 
 const DetailsUserLoan = (pageProps: PageContentProps) => {
-  const { rChainId, rOwmId, api, owmDataCachedOrApi, titleMapper, userActiveKey } = pageProps
+  const { rChainId, rOwmId, api, market, titleMapper, userActiveKey } = pageProps
 
   const isAdvanceMode = useStore((state) => state.isAdvanceMode)
   const loanExistsResp = useStore((state) => state.user.loansExistsMapper[userActiveKey])
@@ -43,7 +43,7 @@ const DetailsUserLoan = (pageProps: PageContentProps) => {
     rChainId,
     rOwmId,
     isBold: true,
-    owmDataCachedOrApi,
+    market: market!,
     userActiveKey,
     size: 'md' as const,
   }
@@ -83,20 +83,17 @@ const DetailsUserLoan = (pageProps: PageContentProps) => {
 
           <ContentWrapper paddingTop isBorderBottom>
             <StatsWrapper>
-              <CellUserMain {...pageProps} type="borrow" />
+              <CellUserMain {...pageProps} market={market!} type="borrow" />
 
               {/* stats */}
               <ListInfoItemsWrapper>
                 {contents.map((groupedContents, idx) => (
                   <ListInfoItems key={`contents${idx}`}>
-                    {groupedContents.map(({ titleKey, content, show, ...props }, idx) => {
-                      if (!_showContent(show)) return null
-                      return (
-                        <ListInfoItem key={`content${idx}`} {...titleMapper[titleKey]}>
-                          {content}
-                        </ListInfoItem>
-                      )
-                    })}
+                    {groupedContents.filter(({show}) => _showContent(show)).map(({ titleKey, content }, idx) => (
+                      <ListInfoItem key={`content${idx}`} {...titleMapper[titleKey]}>
+                        {content}
+                      </ListInfoItem>
+                    ))}
                   </ListInfoItems>
                 ))}
               </ListInfoItemsWrapper>

diff --git a/apps/lend/src/components/DetailsUser/components/DetailsUserLoanAlertSoftLiquidation.tsx b/apps/lend/src/components/DetailsUser/components/DetailsUserLoanAlertSoftLiquidation.tsx
@@ -8,7 +8,8 @@ import AlertBox from '@/ui/AlertBox'
 import Box from '@/ui/Box'
 import ExternalLink from '@/ui/Link/ExternalLink'
 
-const DetailsUserLoanAlertSoftLiquidation = ({ borrowed_token, collateral_token, userActiveKey }: PageContentProps) => {
+const DetailsUserLoanAlertSoftLiquidation = ({ market, userActiveKey }: PageContentProps) => {
+  const {borrowed_token, collateral_token} = market ?? {}
   const userLoanDetails = useStore((state) => state.user.loansDetailsMapper[userActiveKey])
 
   // TODO handle error

diff --git a/apps/lend/src/components/DetailsUser/components/DetailsUserSupply.tsx b/apps/lend/src/components/DetailsUser/components/DetailsUserSupply.tsx
@@ -14,7 +14,7 @@ import DetailsUserSupplyStakedUnstaked from '@/components/DetailsUser/components
 import ListInfoItem, { ListInfoItems, ListInfoItemsWrapper } from '@/ui/ListInfo'
 
 const DetailsUserSupply = (pageProps: PageContentProps) => {
-  const { rChainId, rOwmId, api, userActiveKey, owmDataCachedOrApi, titleMapper } = pageProps
+  const { rChainId, rOwmId, api, userActiveKey, market, titleMapper } = pageProps
 
   const userBalancesResp = useStore((state) => state.user.marketsBalancesMapper[userActiveKey])
 
@@ -28,7 +28,7 @@ const DetailsUserSupply = (pageProps: PageContentProps) => {
     rChainId,
     rOwmId,
     isBold: true,
-    owmDataCachedOrApi,
+    market,
     userActiveKey,
     size: 'md' as const,
   }
@@ -50,7 +50,7 @@ const DetailsUserSupply = (pageProps: PageContentProps) => {
       ) : foundVaultShares ? (
         <ContentWrapper paddingTop>
           <Wrapper>
-            <CellUserMain {...pageProps} type="supply" />
+            <CellUserMain {...pageProps} market={market!} type="supply" />
 
             {/* stats */}
             <ListInfoItemsWrapper>

diff --git a/apps/lend/src/components/PageLoanCreate/LoanFormCreate/components/DetailInfo.tsx b/apps/lend/src/components/PageLoanCreate/LoanFormCreate/components/DetailInfo.tsx
@@ -1,5 +1,5 @@
 import type { LiqRangeSliderIdx } from '@/store/types'
-import type { DetailInfoCompProps, DetailInfoCompAdditionalProps } from '@/components/PageLoanCreate/types'
+import type { DetailInfoCompAdditionalProps, DetailInfoCompProps } from '@/components/PageLoanCreate/types'
 
 import React, { useMemo } from 'react'
 
@@ -10,11 +10,9 @@ import DetailInfoNonLeverage from '@/components/PageLoanCreate/LoanFormCreate/co
 import DetailInfoLeverage from '@/components/PageLoanCreate/LoanFormCreate/components/DetailInfoLeverage'
 
 const DetailInfoComp = ({ isLeverage, ...props }: PageContentProps & DetailInfoCompProps & { isLeverage: boolean }) => {
-  const { api, owmData, steps, updateFormValues } = props
+  const { api, market, steps, updateFormValues } = props
 
   const { signerAddress } = api ?? {}
-  const { owm } = owmData ?? {}
-
   const activeKeyLiqRange = useStore((state) => state.loanCreate.activeKeyLiqRange)
   const formValues = useStore((state) => state.loanCreate.formValues)
   const isEditLiqRange = useStore((state) => state.loanCreate.isEditLiqRange)
@@ -26,12 +24,12 @@ const DetailInfoComp = ({ isLeverage, ...props }: PageContentProps & DetailInfoC
   const selectedLiqRange = useMemo(() => {
     if (formValues.n && liqRanges) {
       return liqRanges[formValues.n]
-    } else if (owm) {
-      return { n: owm.defaultBands } as LiqRangeSliderIdx
+    } else if (market) {
+      return { n: market.defaultBands } as LiqRangeSliderIdx
     } else {
       return undefined
     }
-  }, [formValues.n, liqRanges, owm])
+  }, [formValues.n, liqRanges, market])
 
   const handleLiqRangesEdit = () => {
     const showEditLiqRange = !isEditLiqRange

diff --git a/apps/lend/src/components/PageLoanCreate/LoanFormCreate/components/DetailInfoLeverage.tsx b/apps/lend/src/components/PageLoanCreate/LoanFormCreate/components/DetailInfoLeverage.tsx
@@ -27,10 +27,8 @@ const DetailInfoLeverage = ({
   api,
   healthMode,
   isLoaded,
-  owm,
+  market,
   steps,
-  borrowed_token,
-  collateral_token,
   userActiveKey,
   handleSelLiqRange,
   selectedLiqRange,
@@ -49,7 +47,7 @@ const DetailInfoLeverage = ({
   const maxSlippage = useStore((state) => state.maxSlippage)
 
   const { signerAddress } = api ?? {}
-  const { minBands, maxBands } = owm ?? {}
+  const { minBands, maxBands, borrowed_token, collateral_token } = market ?? {}
   const { expectedCollateral, routes } = detailInfo ?? {}
   const { userBorrowed, debt } = formValues
   const { symbol: collateralSymbol = '' } = collateral_token ?? {}

diff --git a/apps/lend/src/components/PageLoanCreate/LoanFormCreate/components/DetailInfoNonLeverage.tsx b/apps/lend/src/components/PageLoanCreate/LoanFormCreate/components/DetailInfoNonLeverage.tsx
@@ -17,11 +17,9 @@ const DetailInfoNonLeverage = ({
   rChainId,
   rOwmId,
   api,
-  borrowed_token,
-  collateral_token,
   healthMode,
   isLoaded,
-  owm,
+  market,
   steps,
   userActiveKey,
   handleSelLiqRange,
@@ -39,6 +37,7 @@ const DetailInfoNonLeverage = ({
   const liqRanges = useStore((state) => state.loanCreate.liqRanges[activeKeyLiqRange])
 
   const { signerAddress } = api ?? {}
+  const { borrowed_token, collateral_token } = market ?? {}
 
   const loading = !isLoaded || typeof detailInfo === 'undefined'
 
@@ -60,8 +59,8 @@ const DetailInfoNonLeverage = ({
           <DetailInfoLiqRangeEdit
             {...detailInfo}
             liqRanges={liqRanges}
-            maxBands={owm?.maxBands}
-            minBands={owm?.minBands}
+            maxBands={market?.maxBands}
+            minBands={market?.minBands}
             selectedLiqRange={selectedLiqRange}
             showEditLiqRange={isEditLiqRange}
             handleSelLiqRange={handleSelLiqRange}
@@ -79,7 +78,7 @@ const DetailInfoNonLeverage = ({
         setHealthMode={setHealthMode}
         userActiveKey={userActiveKey}
       />
-      <DetailInfoRate isBorrow rChainId={rChainId} rOwmId={rOwmId} futureRates={detailInfo?.futureRates} />
+      <DetailInfoRate isBorrow={true} rChainId={rChainId} rOwmId={rOwmId} futureRates={detailInfo?.futureRates} />
       {isAdvanceMode && (
         <DetailInfoLTV
           loading={loading}