fix: getLegacyFarmConfig

pancakeswap · Oct 17, 2024 · 0505126 · 0505126
1 parent f7bb9b9
commit 0505126
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/apps/web/src/state/farmsV4/state/utils.ts b/apps/web/src/state/farmsV4/state/utils.ts
@@ -16,7 +16,6 @@ export const parseFarmPools = async (
   options: { isFarming?: boolean } = {},
 ): Promise<PoolInfo[]> => {
   const fetchFarmConfig = await fetchAllUniversalFarms()
-  console.log('sss', fetchFarmConfig)
 
   return data.map((pool) => {
     let stableSwapAddress: Address | undefined

diff --git a/packages/farms/src/getLegacyFarmConfig.ts b/packages/farms/src/getLegacyFarmConfig.ts
@@ -2,6 +2,7 @@ import { ChainId, getChainName } from '@pancakeswap/chains'
 import { getStableSwapPools } from '@pancakeswap/stable-swap-sdk'
 import { isAddressEqual } from 'viem'
 import { supportedChainIdV4 } from './const'
+import { fetchUniversalFarms } from './fetchUniversalFarms'
 import { SerializedFarmConfig, SerializedFarmPublicData, UniversalFarmConfig } from './types'
 
 /**
@@ -12,18 +13,18 @@ export async function getLegacyFarmConfig(chainId?: ChainId): Promise<Serialized
     const chainName = getChainName(chainId)
     try {
       const config = await import(`./farms/${chainName}.ts`)
-      let universalConfig: UniversalFarmConfig[] = config.default
+      let universalConfig: UniversalFarmConfig[] = await fetchUniversalFarms(chainId)
       // eslint-disable-next-line prefer-destructuring
       const legacyFarmConfig: SerializedFarmConfig[] = config.legacyFarmConfig
       if (legacyFarmConfig && legacyFarmConfig.length > 0) {
-        universalConfig = universalConfig.filter((f) => {
+        universalConfig = universalConfig?.filter((f) => {
           return !!f.pid && !legacyFarmConfig.some((legacy) => isAddressEqual(legacy.lpAddress, f.lpAddress))
         })
       }
 
       const transformedFarmConfig: SerializedFarmConfig[] = universalConfig
-        .filter((f) => f.pid && (f.protocol === 'v2' || f.protocol === 'stable'))
-        .map((farm) => {
+        ?.filter((f) => f.pid && (f.protocol === 'v2' || f.protocol === 'stable'))
+        ?.map((farm) => {
           const stablePair =
             farm.protocol === 'stable'
               ? getStableSwapPools(chainId).find((s) => {