Merge pull request #1602 from mars-protocol/develop

v2.11.1

Author: linkielink

Dockerfile

@@ -1,7 +1,7 @@
 FROM node:20-alpine as builder
 WORKDIR /app
 
-COPY package.json yarn.lock ./
+COPY package.json ./
 RUN yarn install
 COPY . .
 RUN apk --update add patch

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mars-v2-frontend",
-  "version": "2.11.0",
+  "version": "2.11.1",
   "homepage": "./",
   "private": false,
   "license": "SEE LICENSE IN LICENSE FILE",

src/api/cosmwasm-client.ts

@@ -169,7 +169,10 @@ const getRedBankQueryClient = async (chainConfig: ChainConfig) => {
   }
 }
 
-const getManagedVaultQueryClient = async (chainConfig: ChainConfig, address: string) => {
+const getManagedVaultQueryClient = async (
+  chainConfig: ChainConfig,
+  address: string,
+): Promise<MarsVaultQueryClient | null> => {
   try {
     const rpc = getUrl(chainConfig.endpoints.rpc)
     const key = rpc + address
@@ -181,24 +184,30 @@ const getManagedVaultQueryClient = async (chainConfig: ChainConfig, address: str
 
     return _managedVaultQueryClient.get(key)!
   } catch (error) {
-    setNodeError(getUrl(chainConfig.endpoints.rpc), error)
-    throw error
+    console.error(`Error creating managed vault query client for ${address}:`, error)
+    return null
   }
 }
+
 const getManagedVaultOwnerAddress = async (chainConfig: ChainConfig, address: string) => {
   try {
     const client = await getClient(getUrl(chainConfig.endpoints.rpc))
     const contractInfo = await client.getContract(address)
     return contractInfo.creator
   } catch (error) {
-    setNodeError(getUrl(chainConfig.endpoints.rpc), error)
-    throw error
+    console.error(`Error fetching owner address for vault ${address}:`, error)
+    return undefined
   }
 }
 
-const getManagedVaultDetails = async (chainConfig: ChainConfig, vaultAddress: string) => {
+const getManagedVaultDetails = async (
+  chainConfig: ChainConfig,
+  vaultAddress: string,
+): Promise<ManagedVaultSCDetailsResponse | null> => {
   try {
     const client = await getManagedVaultQueryClient(chainConfig, vaultAddress)
+    if (!client) return null
+
     const response = await client.vaultExtension({
       vault_info: {},
     })
@@ -212,13 +221,15 @@ const getManagedVaultDetails = async (chainConfig: ChainConfig, vaultAddress: st
 const getManagedVaultPnl = async (chainConfig: ChainConfig, vaultAddress: string) => {
   try {
     const client = await getManagedVaultQueryClient(chainConfig, vaultAddress)
+    if (!client) return null
+
     const response = await client.vaultExtension({
       vault_pnl: {},
     })
     return response as unknown as ManagedVaultPnlResponse
   } catch (error) {
-    setNodeError(getUrl(chainConfig.endpoints.rpc), error)
-    throw error
+    console.error(`Error fetching PnL for vault ${vaultAddress}:`, error)
+    return null
   }
 }
 
@@ -229,15 +240,17 @@ const getManagedVaultUserPosition = async (
 ) => {
   try {
     const client = await getManagedVaultQueryClient(chainConfig, vaultAddress)
+    if (!client) return null
+
     const response = await client.vaultExtension({
       user_pnl: {
         user_address: userAddress,
       },
     })
     return response as unknown as ManagedVaultUserPositionResponse
   } catch (error) {
-    setNodeError(getUrl(chainConfig.endpoints.rpc), error)
-    throw error
+    console.error(`Error fetching user position for vault ${vaultAddress}:`, error)
+    return null
   }
 }
 
@@ -247,13 +260,15 @@ const getManagedVaultPerformanceFeeState = async (
 ) => {
   try {
     const client = await getManagedVaultQueryClient(chainConfig, vaultAddress)
+    if (!client) return null
+
     const response = await client.vaultExtension({
       performance_fee_state: {},
     })
     return response as unknown as PerformanceFeeState
   } catch (error) {
-    setNodeError(getUrl(chainConfig.endpoints.rpc), error)
-    throw error
+    console.error(`Error fetching performance fee state for vault ${vaultAddress}:`, error)
+    return null
   }
 }
 
@@ -264,15 +279,17 @@ const getManagedVaultUserUnlocks = async (
 ) => {
   try {
     const client = await getManagedVaultQueryClient(chainConfig, vaultAddress)
+    if (!client) return []
+
     const response = await client.vaultExtension({
       user_unlocks: {
         user_address: userAddress,
       },
     })
     return response as unknown as UserManagedVaultUnlockResponse[]
   } catch (error) {
-    setNodeError(getUrl(chainConfig.endpoints.rpc), error)
-    throw error
+    console.error(`Error fetching user unlocks for vault ${vaultAddress}:`, error)
+    return []
   }
 }
 
@@ -284,6 +301,8 @@ const getManagedVaultAllUnlocks = async (
 ) => {
   try {
     const client = await getManagedVaultQueryClient(chainConfig, vaultAddress)
+    if (!client) return { data: [], metadata: { has_more: false } }
+
     const response = await client.vaultExtension({
       all_unlocks: {
         limit,
@@ -295,8 +314,8 @@ const getManagedVaultAllUnlocks = async (
       metadata: { has_more: boolean }
     }
   } catch (error) {
-    setNodeError(getUrl(chainConfig.endpoints.rpc), error)
-    throw error
+    console.error(`Error fetching all unlocks for vault ${vaultAddress}:`, error)
+    return { data: [], metadata: { has_more: false } }
   }
 }
 
@@ -307,13 +326,15 @@ const getManagedVaultPreviewRedeem = async (
 ) => {
   try {
     const client = await getManagedVaultQueryClient(chainConfig, vaultAddress)
+    if (!client) return null
+
     const response = await client.previewRedeem({
       amount,
     })
     return response
   } catch (error) {
-    setNodeError(getUrl(chainConfig.endpoints.rpc), error)
-    throw error
+    console.error(`Error fetching preview redeem for vault ${vaultAddress}:`, error)
+    return null
   }
 }
 
@@ -324,13 +345,15 @@ const getManagedVaultConvertToTokens = async (
 ) => {
   try {
     const client = await getManagedVaultQueryClient(chainConfig, vaultAddress)
+    if (!client) return null
+
     const response = await client.convertToAssets({
       amount,
     })
     return response
   } catch (error) {
-    setNodeError(getUrl(chainConfig.endpoints.rpc), error)
-    throw error
+    console.error(`Error fetching convert to tokens for vault ${vaultAddress}:`, error)
+    return null
   }
 }
 
@@ -341,13 +364,15 @@ const getManagedVaultConvertToShares = async (
 ) => {
   try {
     const client = await getManagedVaultQueryClient(chainConfig, vaultAddress)
+    if (!client) return null
+
     const response = await client.convertToShares({
       amount,
     })
     return response
   } catch (error) {
-    setNodeError(getUrl(chainConfig.endpoints.rpc), error)
-    throw error
+    console.error(`Error fetching convert to shares for vault ${vaultAddress}:`, error)
+    return null
   }
 }
 

src/components/Modals/FundWithdraw/WithdrawFromAccount.tsx

@@ -25,21 +25,21 @@ interface Props {
 export default function WithdrawFromAccount(props: Props) {
   const { account } = props
   const { data: assets } = useAssets()
-  const tradeEnabledAssets = useMemo(() => assets.filter((asset) => asset.isTradeEnabled), [assets])
+  const nonPoolTokens = useMemo(() => assets.filter((asset) => !asset.isPoolToken), [assets])
   const sortedBalances = useMemo(
     () =>
       mergeBNCoinArrays(account.deposits, account.lends)
-        .filter((coin) => tradeEnabledAssets.some((asset) => asset.denom === coin.denom))
+        .filter((coin) => nonPoolTokens.some((asset) => asset.denom === coin.denom))
         .sort((a, b) => {
-          const valueA = getCoinValue(a, tradeEnabledAssets)?.toNumber?.() ?? 0
-          const valueB = getCoinValue(b, tradeEnabledAssets)?.toNumber?.() ?? 0
+          const valueA = getCoinValue(a, nonPoolTokens)?.toNumber?.() ?? 0
+          const valueB = getCoinValue(b, nonPoolTokens)?.toNumber?.() ?? 0
           return valueB - valueA
         }),
-    [account.deposits, account.lends, tradeEnabledAssets],
+    [account.deposits, account.lends, nonPoolTokens],
   )
   const defaultAsset = useMemo(
-    () => tradeEnabledAssets.find(byDenom(sortedBalances[0]?.denom)) ?? tradeEnabledAssets[0],
-    [tradeEnabledAssets, sortedBalances],
+    () => nonPoolTokens.find(byDenom(sortedBalances[0]?.denom)) ?? nonPoolTokens[0],
+    [sortedBalances, nonPoolTokens],
   )
 
   const withdraw = useStore((s) => s.withdraw)

src/components/common/Select/Option.tsx

@@ -34,7 +34,7 @@ export default function Option(props: Props) {
     const balance = props.amount ?? BN_ZERO
     const marketAsset = markets.find((market) => market.asset.denom === props.denom)
 
-    if (!asset || !marketAsset) return null
+    if (!asset) return null
 
     if (props.isDisplay) {
       return (

src/components/managedVaults/table/AvailableCommunityVaults.tsx

@@ -49,22 +49,14 @@ export default function AvailableCommunityVaults() {
     return tabs
   }, [data.depositedVaults, data.ownedVaults, isLoading])
 
-  if (isLoading) {
-    return (
-      <div className='flex justify-center w-full mt-10'>
-        <CircularProgress size={50} />
-      </div>
-    )
-  }
-
   const hasNoVaults =
     !data.ownedVaults.length && !data.depositedVaults.length && !data.availableVaults.length
 
-  if (hasNoVaults) {
+  if (isLoading || hasNoVaults) {
     return (
-      <Text size='lg' className='text-center w-full p-8 text-white/60'>
-        No community vaults have been created yet
-      </Text>
+      <div className='flex justify-center w-full mt-10'>
+        <CircularProgress size={50} />
+      </div>
     )
   }
 

src/components/managedVaults/vaultDetails/index.tsx

@@ -18,10 +18,10 @@ import { useCallback, useEffect, useState } from 'react'
 
 function VaultLoadingState() {
   return (
-    <div className='flex flex-wrap justify-center w-full gap-4'>
-      <CircularProgress size={60} />
-      <Text className='w-full text-center' size='2xl'>
-        Fetching on-chain data...
+    <div className='flex flex-wrap justify-center w-full gap-4 mt-20'>
+      <CircularProgress size={40} />
+      <Text className='w-full text-center' size='xl'>
+        Fetching vault data...
       </Text>
     </div>
   )
@@ -131,8 +131,6 @@ export function VaultDetailsContent({
     return <VaultLoadingState />
   }
 
-  if (!vaultDetails) return null
-
   return (
     <>
       {activeTabIdx === 0 ? (

src/components/managedVaults/vaultDetails/performance/UserMetrics.tsx

@@ -49,7 +49,7 @@ export default function UserMetrics(props: Props) {
       showSignPrefix: true,
     },
     {
-      value: calculateROI(userVaultTokensAmount),
+      value: calculateROI(userVaultTokensAmount ?? 0),
       label: 'Your ROI',
       formatOptions: { maxDecimals: 2, minDecimals: 2, suffix: '%' },
       isProfitOrLoss: true,