Merge pull request #1173 from mars-protocol/develop

v2.7.3

package.json

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

src/api/hls/getHlsFarms.ts

@@ -54,7 +54,5 @@ export default async function getHlsFarms(
     }
   })
 
-  //TODO: uncomment this line
-  //return hlsFarms
-  return []
+  return hlsFarms
 }

src/components/hls/Farm/Table/Columns/Name.tsx

@@ -3,7 +3,6 @@ import AssetImage from 'components/common/assets/AssetImage'
 import DoubleLogo from 'components/common/DoubleLogo'
 import Text from 'components/common/Text'
 import { BN_ZERO } from 'constants/math'
-import useCurrentAccount from 'hooks/accounts/useCurrentAccount'
 import useAsset from 'hooks/assets/useAsset'
 import usePoolAssets from 'hooks/assets/usePoolAssets'
 import { useMemo } from 'react'
@@ -18,11 +17,11 @@ export const NAME_META = {
 
 interface Props {
   farm: AstroLp | DepositedAstroLp
+  account?: Account
 }
 
 export default function Name(props: Props) {
-  const { farm } = props
-  const account = useCurrentAccount()
+  const { farm, account } = props
   const primaryAsset = useAsset(farm.denoms.primary)
   const poolAssets = usePoolAssets()
   const poolAsset = poolAssets.find(byDenom(farm.denoms.lp))

src/components/hls/Farm/Table/Columns/useActiveHlsFarmsColumns.tsx

@@ -20,7 +20,9 @@ export default function useActiveHlsFarmsColumns(assets: Asset[]) {
     return [
       {
         ...NAME_META,
-        cell: ({ row }) => <Name farm={row.original.farm as DepositedAstroLp} />,
+        cell: ({ row }) => (
+          <Name farm={row.original.farm as DepositedAstroLp} account={row.original.account} />
+        ),
       },
       { ...ACCOUNT_META, cell: ({ row }) => <Account account={row.original.account} /> },
       {

src/components/trade/TradeChart/DataFeed.ts

@@ -32,10 +32,6 @@ export const datafeed = {
         '720',
         'D',
         '1D',
-        'W',
-        '1W',
-        'M',
-        '1M',
       ] as ResolutionString[],
       supports_marks: true,
       supports_timescale_marks: false,

src/utils/accounts.ts

@@ -116,14 +116,15 @@ export const calculateAccountApr = (
   const debtsValue = calculateAccountValue('debts', account, assets)
   const perpsValue = calculateAccountValue('perps', account, assets)
   const stakedAstroLpsValue = calculateAccountValue('stakedAstroLps', account, assets)
-  const totalValue = depositValue
+
+  const totalDenominatorValue = depositValue
     .plus(lendsValue)
     .plus(vaultsValue)
     .plus(perpsValue)
     .plus(stakedAstroLpsValue)
-  const totalNetValue = totalValue.minus(debtsValue)
+    .plus(debtsValue.abs())
 
-  if (totalNetValue.isLessThanOrEqualTo(0)) return BN_ZERO
+  if (totalDenominatorValue.isLessThanOrEqualTo(0)) return BN_ZERO
   const { vaults, lends, debts, deposits, stakedAstroLps } = account
 
   let totalDepositsInterestValue = BN_ZERO
@@ -164,6 +165,7 @@ export const calculateAccountApr = (
       .multipliedBy(price)
       .multipliedBy(convertApyToApr(apy, 365))
       .dividedBy(100)
+
     totalLendsInterestValue = totalLendsInterestValue.plus(positionInterest)
   })
 
@@ -172,6 +174,7 @@ export const calculateAccountApr = (
     if (!apr) return
     const lockedValue = vault.values.primary.plus(vault.values.secondary)
     const positionInterest = lockedValue.multipliedBy(apr).dividedBy(100)
+
     totalVaultsInterestValue = totalVaultsInterestValue.plus(positionInterest)
   })
 
@@ -199,16 +202,19 @@ export const calculateAccountApr = (
     const farmApr = farm.apr ?? 0
     const farmValue = getCoinValue(stakedAstroLp, assets)
     const positionInterest = farmValue.multipliedBy(farmApr).dividedBy(100)
+
     totalAstroStakedLpsValue = totalAstroStakedLpsValue.plus(positionInterest)
   })
 
   const totalInterestValue = totalLendsInterestValue
     .plus(totalVaultsInterestValue)
-    .minus(totalDebtInterestValue)
     .plus(totalDepositsInterestValue)
     .plus(totalAstroStakedLpsValue)
+    .minus(totalDebtInterestValue)
+
+  if (totalInterestValue.isEqualTo(0)) return BN_ZERO
 
-  return totalInterestValue.dividedBy(totalNetValue).times(100)
+  return totalInterestValue.dividedBy(totalDenominatorValue).times(100)
 }
 
 export function calculateAccountLeverage(account: Account, assets: Asset[]) {