fix(earn): Show correct pool amount when LP to deposit is not 1:1

valora-inc · Oct 1, 2024 · 2c0a9e5 · 2c0a9e5
1 parent 04bb249
commit 2c0a9e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/earn/EarnPoolInfoScreen.tsx b/src/earn/EarnPoolInfoScreen.tsx
@@ -153,14 +153,14 @@ function DepositAndEarningsCard({
   onInfoIconPress: () => void
 }) {
   const { t } = useTranslation()
-  const { balance } = earnPosition
+  const { balance, priceUsd, pricePerShare } = earnPosition
   const { earningItems, depositTokenId, cantSeparateCompoundedInterest } = earnPosition.dataProps
   const depositTokenInfo = useTokenInfo(depositTokenId)
   const localCurrencySymbol = useSelector(getLocalCurrencySymbol)
   const localCurrencyExchangeRate = useSelector(usdToLocalCurrencyRateSelector)
 
   // Deposit items used to calculate the total balance and total deposited
-  const depositBalanceInUsd = depositTokenInfo?.priceUsd?.multipliedBy(balance)
+  const depositBalanceInUsd = new BigNumber(priceUsd).multipliedBy(balance)
   const depositBalanceInLocalCurrency = new BigNumber(localCurrencyExchangeRate ?? 0).multipliedBy(
     depositBalanceInUsd ?? 0
   )
@@ -190,7 +190,7 @@ function DepositAndEarningsCard({
   ])
 
   const totalDepositBalanceInCrypto = useMemo(() => {
-    return new BigNumber(balance).minus(
+    return new BigNumber(balance).multipliedBy(new BigNumber(pricePerShare[0]) ?? 1).minus(
       earningItems
         .filter((item) => item.includedInPoolBalance)
         .reduce((acc, item) => {
@@ -202,7 +202,7 @@ function DepositAndEarningsCard({
           )
         }, new BigNumber(0))
     )
-  }, [balance, earningItems, earningItemsTokenInfo, depositTokenInfo])
+  }, [balance, pricePerShare, earningItems, earningItemsTokenInfo, depositTokenInfo])
 
   const totalDepositBalanceInLocalCurrency =
     useDollarsToLocalAmount(
@@ -328,10 +328,7 @@ function TvlCard({
   const localCurrencySymbol = useSelector(getLocalCurrencySymbol)
   const { t } = useTranslation()
   const tvl = earnPosition.dataProps.tvl
-  const priceUsd = earnPosition.priceUsd
-  const tvlInFiat = useDollarsToLocalAmount(
-    tvl ? new BigNumber(tvl).times(new BigNumber(priceUsd)) : null
-  )
+  const tvlInFiat = useDollarsToLocalAmount(tvl ?? null)
   const tvlString = useMemo(() => {
     return `${localCurrencySymbol}${tvlInFiat ? formatValueToDisplay(tvlInFiat) : '--'}`
   }, [localCurrencySymbol, tvlInFiat])

diff --git a/src/earn/PoolCard.tsx b/src/earn/PoolCard.tsx
@@ -75,9 +75,7 @@ export default function PoolCard({
     [localCurrencySymbol, poolBalanceInFiat, rewardAmountInFiat]
   )
 
-  const tvlInFiat = useDollarsToLocalAmount(
-    tvl ? new BigNumber(tvl).times(new BigNumber(priceUsd)) : null
-  )
+  const tvlInFiat = useDollarsToLocalAmount(tvl ?? null)
   const tvlString = useMemo(() => {
     return `${localCurrencySymbol}${tvlInFiat ? formatValueToDisplay(tvlInFiat) : '--'}`
   }, [localCurrencySymbol, tvlInFiat])