Merge pull request #1292 from curvefi/fix/market-url

fix: mint market links

Author: DanielSchiavini

apps/main/src/llamalend/entities/llama-markets.ts

@@ -1,3 +1,4 @@
+import { countBy } from 'lodash'
 import { ethAddress } from 'viem'
 import { Chain } from '@curvefi/prices-api'
 import { recordValues } from '@curvefi/prices-api/objects.util'
@@ -257,19 +258,13 @@ const convertMintMarket = (
 
 /**
  * Creates a function that counts the number of markets for each collateral token.
- * This is used to create unique names for markets with the same collateral token, used in the URL.
- * The order is expected to be by market creation date, so the first market will have count 1, the second 2, etc.
- * The backend is hardcoded to return markets in the order of creation, so this should work correctly.
+ * Numbers are added to the first items (e.g., first ETH gets 3, second gets 2, last gets 1).
  * @returns A function that takes a MintMarket and returns the count of markets for the collateral token.
  */
-function createCountMarket() {
-  const marketCountByCollateral = new Map<string, number>()
-  return ({ collateralToken }: MintMarket) => {
-    const [symbol] = getCollateral(collateralToken)
-    const count = (marketCountByCollateral.get(symbol) ?? 0) + 1
-    marketCountByCollateral.set(symbol, count)
-    return count
-  }
+function createCountMarket(data: MintMarket[] | undefined = []) {
+  const getName = ({ collateralToken }: MintMarket) => getCollateral(collateralToken)[0]
+  const marketCountByCollateral = countBy(data, getName)
+  return (m: MintMarket) => marketCountByCollateral[getName(m)]--
 }
 
 /**
@@ -303,7 +298,7 @@ export const useLlamaMarkets = (userAddress?: Address, enabled = true) =>
       const userBorrows = new Set(recordValues(userLendingVaults.data ?? {}).flat())
       const userMints = new Set(recordValues(userMintMarkets.data ?? {}).flat())
       const userSupplied = new Set(recordValues(userSuppliedMarkets.data ?? {}).flat())
-      const countMarket = createCountMarket()
+      const countMarket = createCountMarket(mintMarkets.data)
 
       // only render table when both lending and mint markets are ready, however show one of them if the other is in error
       const showData = (lendingVaults.data && mintMarkets.data) || lendingVaults.isError || mintMarkets.isError

packages/prices-api/src/crvusd/api.ts

@@ -18,7 +18,7 @@ export async function getMarkets(
   return resp.data.map(Parsers.parseMarket)
 }
 
-/** Retrieve all markets across all chains, sorted by date of creation. */
+/** Retrieve all markets across all chains, sorted by date of creation descending. */
 export async function getAllMarkets(
   params: {
     page?: number

packages/prices-api/src/crvusd/models.ts

@@ -26,6 +26,7 @@ export type Market = {
     pending: number
     collected: number
   }
+  created_at: Date
 }
 
 export type Snapshot = {

packages/prices-api/src/crvusd/parsers.ts

@@ -29,6 +29,7 @@ export const parseMarket = (x: Responses.GetMarketsResponse['data'][number]): Mo
     pending: x.pending_fees,
     collected: x.collected_fees,
   },
+  created_at: new Date(x.created_at),
 })
 
 export const parseAllMarkets = (resp: Responses.GetAllMarketsResponse) =>

packages/prices-api/src/crvusd/responses.ts

@@ -25,6 +25,7 @@ export type GetMarketsResponse = {
       address: Address
       rebasing_yield: number | null
     }
+    created_at: string
   }[]
   count: number
 }