small enhancement

fix: Balances details (by chain) missing #111
RealToken-Community · Jan 28, 2025 · bff27c8 · bff27c8
1 parent 4eaf297
commit bff27c8
Show file tree

Hide file tree

Showing 5 changed files with 114 additions and 14 deletions.
diff --git a/src/hooks/useREG.ts b/src/hooks/useREG.ts
@@ -3,6 +3,7 @@ import { useSelector } from 'react-redux'
 
 import { Contract } from 'ethers'
 
+import { WalletType } from 'src/repositories'
 import { initializeProviders } from 'src/repositories/RpcProvider'
 import {
   selectCurrencyRates,
@@ -12,7 +13,11 @@ import {
   selectUserAddressList,
   selectUserIncludesEth,
 } from 'src/store/features/settings/settingsSelector'
-import { REGRealtoken } from 'src/store/features/wallets/walletsSelector'
+import {
+  BalanceByWalletType,
+  REGRealtoken,
+  updateBalanceValues,
+} from 'src/store/features/wallets/walletsSelector'
 import { APIRealTokenProductType } from 'src/types/APIRealToken'
 import { Currency } from 'src/types/Currencies'
 import { ERC20ABI } from 'src/utils/blockchain/abi/ERC20ABI'
@@ -64,18 +69,38 @@ const getREG = async (
     ERC20ABI,
     GnosisRpcProvider,
   )
+  const balance: BalanceByWalletType = {
+    [WalletType.Gnosis]: {
+      amount: 0,
+      value: 0,
+    },
+    [WalletType.Ethereum]: {
+      amount: 0,
+      value: 0,
+    },
+    [WalletType.RMM]: {
+      amount: 0,
+      value: 0,
+    },
+    [WalletType.LevinSwap]: {
+      amount: 0,
+      value: 0,
+    },
+  }
   let availableBalance = await getAddressesBalances(
     REG_ContractAddress,
     addressList,
     GnosisRpcProvider,
   )
+  balance[WalletType.Gnosis].amount = availableBalance
 
   if (includeETH) {
-    availableBalance += await getAddressesBalances(
+    balance[WalletType.Ethereum].amount = await getAddressesBalances(
       REG_ContractAddress,
       addressList,
       EthereumRpcProvider,
     )
+    availableBalance += balance[WalletType.Ethereum].amount
   }
 
   const regVaultAbiGetUserGlobalStateOnly =
@@ -110,6 +135,7 @@ const getREG = async (
     providers,
   )
 
+  balance[WalletType.Gnosis].amount += lockedBalance
   const totalAmount = availableBalance + lockedBalance
   const contractRegTotalSupply = await RegContract_Gnosis.totalSupply()
   const totalTokens = Number(contractRegTotalSupply) / 10 ** REGtokenDecimals
@@ -151,6 +177,10 @@ const getREG = async (
     : DEFAULT_REG_PRICE / userRate
   const value = tokenPrice * amount
   const totalInvestment = totalTokens * tokenPrice
+  // Update all balance values with token price
+  updateBalanceValues(balance, tokenPrice)
+
+  console.dir(balance)
 
   return {
     id: `${REG_asset_ID}`,
@@ -167,6 +197,7 @@ const getREG = async (
     value,
     totalInvestment,
     unitPriceCost: tokenPrice,
+    balance,
   }
 }
 

diff --git a/src/hooks/useREGVotingPower.ts b/src/hooks/useREGVotingPower.ts
@@ -3,9 +3,13 @@ import { useSelector } from 'react-redux'
 
 import { Contract } from 'ethers'
 
+import { WalletType } from 'src/repositories'
 import { initializeProviders } from 'src/repositories/RpcProvider'
 import { selectUserAddressList } from 'src/store/features/settings/settingsSelector'
-import { REGVotingPowertoken } from 'src/store/features/wallets/walletsSelector'
+import {
+  BalanceByWalletType,
+  REGVotingPowertoken,
+} from 'src/store/features/wallets/walletsSelector'
 import { APIRealTokenProductType } from 'src/types/APIRealToken'
 import { ERC20ABI } from 'src/utils/blockchain/abi/ERC20ABI'
 import {
@@ -25,12 +29,30 @@ const getRegVotingPower = async (
     ERC20ABI,
     GnosisRpcProvider,
   )
+  const balance: BalanceByWalletType = {
+    [WalletType.Gnosis]: {
+      amount: 0,
+      value: 0,
+    },
+    [WalletType.Ethereum]: {
+      amount: 0,
+      value: 0,
+    },
+    [WalletType.RMM]: {
+      amount: 0,
+      value: 0,
+    },
+    [WalletType.LevinSwap]: {
+      amount: 0,
+      value: 0,
+    },
+  }
   const totalAmount = await getAddressesBalances(
     RegVotingPower_Gnosis_ContractAddress,
     addressList,
     GnosisRpcProvider,
   )
-
+  balance[WalletType.Gnosis].amount = totalAmount
   const contractRegVotePowerTotalSupply =
     await RegVotingPowerContract.totalSupply()
   const totalTokens =
@@ -39,6 +61,7 @@ const getRegVotingPower = async (
   const tokenPrice = DEFAULT_REGVotingPower_PRICE
   const value = tokenPrice * amount
   const totalInvestment = tokenPrice * totalTokens
+  // NO need yo update all balance values: token has no value
 
   return {
     id: `${REGVotingPower_asset_ID}`,
@@ -55,6 +78,7 @@ const getRegVotingPower = async (
     value,
     totalInvestment,
     unitPriceCost: tokenPrice,
+    balance,
   }
 }
 

diff --git a/src/hooks/useRWA.ts b/src/hooks/useRWA.ts
@@ -3,6 +3,7 @@ import { useSelector } from 'react-redux'
 
 import { Contract } from 'ethers'
 
+import { WalletType } from 'src/repositories'
 import { initializeProviders } from 'src/repositories/RpcProvider'
 import {
   selectCurrencyRates,
@@ -11,7 +12,11 @@ import {
 import {
   selectUserAddressList, // selectUserIncludesEth,
 } from 'src/store/features/settings/settingsSelector'
-import { RWARealtoken } from 'src/store/features/wallets/walletsSelector'
+import {
+  BalanceByWalletType,
+  RWARealtoken,
+  updateBalanceValues,
+} from 'src/store/features/wallets/walletsSelector'
 import { APIRealTokenProductType } from 'src/types/APIRealToken'
 import { Currency } from 'src/types/Currencies'
 import { ERC20ABI } from 'src/utils/blockchain/abi/ERC20ABI'
@@ -48,11 +53,30 @@ const getRWA = async (
     ERC20ABI,
     GnosisRpcProvider,
   )
+  const balance: BalanceByWalletType = {
+    [WalletType.Gnosis]: {
+      amount: 0,
+      value: 0,
+    },
+    [WalletType.Ethereum]: {
+      amount: 0,
+      value: 0,
+    },
+    [WalletType.RMM]: {
+      amount: 0,
+      value: 0,
+    },
+    [WalletType.LevinSwap]: {
+      amount: 0,
+      value: 0,
+    },
+  }
   const totalAmount = await getAddressesBalances(
     RWA_ContractAddress,
     addressList,
     GnosisRpcProvider,
   )
+  balance[WalletType.Gnosis].amount = totalAmount
   const RwaContractTotalSupply = await contractRwa_Gnosis.totalSupply()
   const totalTokens = Number(RwaContractTotalSupply) / 10 ** RWAtokenDecimals
   const amount = totalAmount / 10 ** RWAtokenDecimals
@@ -91,6 +115,8 @@ const getRWA = async (
   const tokenPrice = (assetAveragePriceUSD ?? DEFAULT_RWA_PRICE) / userRate
   const value = tokenPrice * amount
   const totalInvestment = totalTokens * tokenPrice
+  // Update all balance values with token price
+  updateBalanceValues(balance, tokenPrice)
 
   return {
     id: `${RWA_asset_ID}`,
@@ -112,6 +138,7 @@ const getRWA = async (
       timezone_type: 3,
       timezone: 'UTC',
     },
+    balance,
   }
 }
 

diff --git a/src/store/features/wallets/walletsSelector.ts b/src/store/features/wallets/walletsSelector.ts
@@ -5,7 +5,6 @@ import _max from 'lodash/max'
 import _sumBy from 'lodash/sumBy'
 import moment from 'moment'
 
-import { AssetProductType } from 'src/components/assetsView'
 import { WalletBalances, WalletType } from 'src/repositories'
 import { UserRealTokenTransfer } from 'src/repositories/transfers/transfers.type'
 import { RootState } from 'src/store/store'
@@ -23,6 +22,14 @@ import { computeUCP } from 'src/utils/transfer/computeUCP'
 import { selectRealtokens } from '../realtokens/realtokensSelector'
 import { selectUserRentCalculation } from '../settings/settingsSelector'
 
+export type BalanceByWalletType = Record<
+  WalletType,
+  {
+    amount: number
+    value: number
+  }
+>
+
 export interface UserRealtoken extends RealToken {
   id: string
   isWhitelisted: boolean
@@ -33,13 +40,7 @@ export interface UserRealtoken extends RealToken {
   priceCost?: number
   unrealizedCapitalGain?: number
   lastChanges: string
-  balance: Record<
-    WalletType,
-    {
-      amount: number
-      value: number
-    }
-  >
+  balance: BalanceByWalletType
 }
 
 export interface OtherRealtoken {
@@ -55,6 +56,23 @@ export interface OtherRealtoken {
   imageLink: string[]
   isRmmAvailable: boolean
   unitPriceCost: number
+  balance: BalanceByWalletType
+}
+
+/**
+ * Updates all balance values with token price
+ * @param balance
+ * @param tokenPrice
+ */
+export const updateBalanceValues = (
+  balance: BalanceByWalletType,
+  tokenPrice: number,
+) => {
+  // Loop on each record
+  Object.keys(balance).forEach((key) => {
+    balance[key as WalletType].value =
+      balance[key as WalletType].amount * tokenPrice
+  })
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface

diff --git a/src/utils/blockchain/erc20Infos.ts b/src/utils/blockchain/erc20Infos.ts
@@ -9,7 +9,7 @@ const getAddressesBalances = async (
   addressList: string[],
   provider: JsonRpcProvider,
   consoleWarnOnError = false,
-) => {
+): Promise<number> => {
   let totalAmount = 0
   try {
     if (!contractAddress) {