Merge branch 'main' of github.com:curvefi/curve-frontend into refactor/merge-lend-routes

Author: DanielSchiavini

apps/main/src/dex/store/createUserBalancesSlice.ts

@@ -4,7 +4,7 @@ import type { Config } from 'wagmi'
 import { StoreApi } from 'zustand'
 import type { State } from '@/dex/store/useStore'
 import { CurveApi, UserBalancesMapper } from '@/dex/types/main.types'
-import { fetchTokenBalance } from '@ui-kit/queries/token-balance.query'
+import { fetchTokenBalance } from '@ui-kit/hooks/useTokenBalance'
 import { fetchNetworks } from '../entities/networks'
 
 type StateKey = keyof typeof DEFAULT_STATE

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

@@ -1,7 +1,7 @@
 import { useEffect } from 'react'
 import type { UseFormReturn } from 'react-hook-form'
 import { type Address } from 'viem'
-import { useTokenBalance } from '@ui-kit/queries/token-balance.query'
+import { useTokenBalance } from '@ui-kit/hooks/useTokenBalance'
 import { Decimal } from '@ui-kit/utils'
 import { useCreateLoanMaxReceive } from '../../../queries/create-loan/create-loan-max-receive.query'
 import { useMarketMaxLeverage } from '../../../queries/market-max-leverage.query'

apps/main/src/llamalend/queries/market-list/llama-markets.ts

@@ -319,11 +319,7 @@ const convertMintMarket = (
     },
     type: LlamaMarketType.Mint,
     deprecatedMessage: DEPRECATED_LLAMAS[chain]?.[llamma] ?? null,
-    url: getInternalUrl(
-      'crvusd',
-      chain,
-      `${CRVUSD_ROUTES.PAGE_MARKETS}/${name}/${hasBorrow ? 'manage/loan' : 'create'}`,
-    ),
+    url: getInternalUrl('crvusd', chain, `${CRVUSD_ROUTES.PAGE_MARKETS}/${name}`),
     isFavorite: favoriteMarkets.has(llamma),
     rewards: [...(campaigns[address.toLowerCase()] ?? []), ...(campaigns[llamma.toLowerCase()] ?? [])],
     leverage,

apps/main/src/llamalend/widgets/manage-loan/LoanFormTokenInput.tsx

@@ -6,7 +6,7 @@ import { setValueOptions } from '@/llamalend/features/borrow/react-form.utils'
 import type { LlamaNetwork } from '@/llamalend/llamalend.types'
 import type { INetworkName } from '@curvefi/llamalend-api/lib/interfaces'
 import type { PartialRecord } from '@curvefi/prices-api/objects.util'
-import { useTokenBalance } from '@ui-kit/queries/token-balance.query'
+import { useTokenBalance } from '@ui-kit/hooks/useTokenBalance'
 import { HelperMessage, LargeTokenInput } from '@ui-kit/shared/ui/LargeTokenInput'
 import { TokenLabel } from '@ui-kit/shared/ui/TokenLabel'
 import type { Query } from '@ui-kit/types/util'

apps/main/src/loan/components/ChartBandBalances/index.tsx

@@ -17,7 +17,7 @@ import { styled } from 'styled-components'
 import ChartBandBalancesSettings from '@/loan/components/ChartBandBalances/ChartBandBalancesSettings'
 import type { BrushStartEndIndex } from '@/loan/components/ChartBandBalances/types'
 import ChartTooltip, { TipContent, TipIcon, TipTitle } from '@/loan/components/ChartTooltip'
-import type { PageLoanManageProps } from '@/loan/components/PageLoanManage/types'
+import type { ManageLoanProps } from '@/loan/components/PageMintMarket/types'
 import useStore from '@/loan/store/useStore'
 import { BandsBalancesData } from '@/loan/types/loan.types'
 import { getTokenName } from '@/loan/utils/utilsLoan'
@@ -26,7 +26,7 @@ import Spinner, { SpinnerWrapper } from '@ui/Spinner'
 import { BN, FORMAT_OPTIONS, formatNumber } from '@ui/utils'
 import { t } from '@ui-kit/lib/i18n'
 
-interface Props extends Pick<PageLoanManageProps, 'llamma'> {
+interface Props extends Pick<ManageLoanProps, 'market'> {
   brushIndex: BrushStartEndIndex
   data: BandsBalancesData[]
   oraclePrice: string | undefined
@@ -38,7 +38,7 @@ interface Props extends Pick<PageLoanManageProps, 'llamma'> {
 
 const ChartBandBalances = ({
   brushIndex,
-  llamma,
+  market: llamma,
   data,
   oraclePrice,
   oraclePriceBand,

apps/main/src/loan/components/ChartUserBands.tsx

@@ -79,7 +79,7 @@ const ChartUserBands = ({
     <ChartBandBalances
       brushIndex={brushIndex}
       data={chartBandBalancesData}
-      llamma={llamma}
+      market={llamma}
       oraclePrice={oraclePrice}
       oraclePriceBand={oraclePriceBand}
       showLiquidationIndicator={!!userLiquidationBand}

apps/main/src/loan/components/LoanInfoLlamma/components/DetailsBandsChart.tsx

@@ -70,7 +70,7 @@ const DetailsBandsChart = ({
 
   return (
     <ChartBandBalances
-      llamma={llamma}
+      market={llamma}
       brushIndex={brushIndex}
       data={parsedChartBandBalancesData}
       oraclePrice={oraclePrice}