fix: count both defi & asset balances (#8545)

shapeshift · Jan 13, 2025 · 8a3bbbb · 8a3bbbb
1 parent c1bde24
commit 8a3bbbb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 33 deletions.
diff --git a/src/components/ChainDropdown/ChainDropdown.tsx b/src/components/ChainDropdown/ChainDropdown.tsx
@@ -18,7 +18,7 @@ import { GridIcon } from 'components/Icons/GridIcon'
 import { bnOrZero } from 'lib/bignumber/bignumber'
 import {
   selectPortfolioTotalBalanceByChainIdIncludeStaking,
-  selectPortfolioTotalUserCurrencyBalanceExcludeEarnDupes,
+  selectPortfolioTotalUserCurrencyBalance,
 } from 'state/slices/selectors'
 import { useAppSelector } from 'state/store'
 
@@ -46,9 +46,7 @@ export const ChainDropdown: React.FC<ChainDropdownProps> = ({
   buttonProps,
   ...menuProps
 }) => {
-  const totalPortfolioUserCurrencyBalance = useAppSelector(
-    selectPortfolioTotalUserCurrencyBalanceExcludeEarnDupes,
-  )
+  const totalPortfolioUserCurrencyBalance = useAppSelector(selectPortfolioTotalUserCurrencyBalance)
   const fiatBalanceByChainId = useAppSelector(selectPortfolioTotalBalanceByChainIdIncludeStaking)
 
   const translate = useTranslate()

diff --git a/src/pages/Dashboard/components/DashboardChart.tsx b/src/pages/Dashboard/components/DashboardChart.tsx
@@ -24,7 +24,7 @@ import {
   selectChartTimeframe,
   selectIsPortfolioLoading,
   selectPortfolioAssetIds,
-  selectPortfolioTotalUserCurrencyBalanceExcludeEarnDupes,
+  selectPortfolioTotalUserCurrencyBalance,
 } from 'state/slices/selectors'
 import { useAppDispatch, useAppSelector } from 'state/store'
 
@@ -63,9 +63,7 @@ export const DashboardChart = () => {
 
   const assetIds = useAppSelector(selectPortfolioAssetIds)
 
-  const portfolioTotalUserCurrencyBalance = useAppSelector(
-    selectPortfolioTotalUserCurrencyBalanceExcludeEarnDupes,
-  )
+  const portfolioTotalUserCurrencyBalance = useAppSelector(selectPortfolioTotalUserCurrencyBalance)
   const loading = useAppSelector(selectIsPortfolioLoading)
   const isLoaded = !loading
 

diff --git a/src/pages/Dashboard/components/DashboardHeader/WalletBalance.tsx b/src/pages/Dashboard/components/DashboardHeader/WalletBalance.tsx
@@ -11,7 +11,7 @@ import {
   selectClaimableRewards,
   selectEarnBalancesUserCurrencyAmountFull,
   selectIsPortfolioLoading,
-  selectPortfolioTotalUserCurrencyBalanceExcludeEarnDupes,
+  selectPortfolioTotalUserCurrencyBalance,
 } from 'state/slices/selectors'
 import { useAppSelector } from 'state/store'
 
@@ -41,7 +41,7 @@ export const WalletBalance: React.FC<WalletBalanceProps> = memo(
       selectEarnBalancesUserCurrencyAmountFull,
     ).toFixed()
     const portfolioTotalUserCurrencyBalance = useAppSelector(
-      selectPortfolioTotalUserCurrencyBalanceExcludeEarnDupes,
+      selectPortfolioTotalUserCurrencyBalance,
     )
     const netWorth = useMemo(
       () =>

diff --git a/src/state/slices/portfolioSlice/selectors.ts b/src/state/slices/portfolioSlice/selectors.ts
@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit'
 import type { AccountId, AssetId, ChainId } from '@shapeshiftoss/caip'
-import { FEE_ASSET_IDS, foxyAssetId, fromAccountId, fromAssetId } from '@shapeshiftoss/caip'
+import { FEE_ASSET_IDS, fromAccountId, fromAssetId } from '@shapeshiftoss/caip'
 import type {
   AccountMetadata,
   AccountMetadataById,
@@ -207,28 +207,6 @@ export const selectPortfolioTotalUserCurrencyBalance = createSelector(
       .toFixed(2),
 )
 
-export const selectPortfolioTotalUserCurrencyBalanceExcludeEarnDupes = createSelector(
-  selectPortfolioUserCurrencyBalances,
-  selectGetReadOnlyOpportunities,
-  (portfolioUserCurrencyBalances, readOnlyOpportunities): string => {
-    const readOnlyOpportunitiesDuplicates = Object.values(
-      readOnlyOpportunities.data?.opportunities ?? {},
-    ).map(opportunity => opportunity.assetId)
-    // ETH/FOX LP token, FOXy, and other held tokens can be both portfolio assets, but also part of DeFi opportunities
-    // With the current architecture (having them both as portfolio assets and earn opportunities), we have to remove these two some place or another
-    // This obviously won't scale as we support more LP tokens, but for now, this at least gives this deduction a sane home we can grep with `dupes` or `duplicates`
-    const portfolioEarnAssetIdsDuplicates = [foxEthLpAssetId, foxyAssetId].concat(
-      readOnlyOpportunitiesDuplicates,
-    )
-    return Object.entries(portfolioUserCurrencyBalances)
-      .reduce<BN>((acc, [assetId, assetUserCurrencyBalance]) => {
-        if (portfolioEarnAssetIdsDuplicates.includes(assetId)) return acc
-        return acc.plus(bnOrZero(assetUserCurrencyBalance))
-      }, bn(0))
-      .toFixed(2)
-  },
-)
-
 export const selectPortfolioUserCurrencyBalanceByAssetId = createCachedSelector(
   selectPortfolioUserCurrencyBalances,
   selectAssetIdParamFromFilter,