Refactor yield calculations and update token details

src/components/lock/LockOverview.tsx

@@ -11,9 +11,12 @@ import StakeCard from '../cards/StakeCard'
 import StakeOverviewWrapper from '../elements/stakeCommon/StakeOverviewWrapper'
 import { calculateEstimatedYieldPerWeek } from '@/data/LockConstants'
 import { useGetIqPriceQuery } from '@/services/iqPrice'
+import config from '@/config'
 
 const LockOverview = () => {
-  const { totalHiiqSupply, userTotalIQLocked } = useLockOverview()
+  const { totalHiiqSupply, userTotalIQLocked } = useLockOverview(
+    config.treasuryHiIQAddress,
+  )
   const { tvl } = useErc20()
   const [holders, setHolders] = useState(0)
   const [averageLockTime, setAverageLockTime] = useState(0)

src/components/lock/RewardCalculator.tsx

@@ -62,12 +62,7 @@ const RewardCalculator = ({
   useEffect(() => {
     if (years && inputIQ) {
       // TODO: review calculation APR needs to be calculated w generated HiIQ not w inputIQ
-      const userReward = calculateStakeReward(
-        totalHiiqSupply,
-        inputIQ,
-        years,
-        years,
-      )
+      const userReward = calculateStakeReward(totalHiiqSupply, inputIQ, years)
       setExpectedReward(userReward)
     } else {
       setExpectedReward(0)

src/data/LockConstants.tsx

@@ -24,7 +24,7 @@ export const YEARLY_EMISSION = DAILY_EMISSION * 365
 export const WEEKLY_EMISSION = DAILY_EMISSION * 7
 
 export const calculateEstimatedYieldPerWeek = () => {
-  return WEEKLY_EMISSION // 21M IQ per week (3M * 7)
+  return WEEKLY_EMISSION
 }
 
 export const calculateUserPoolRewardOverTheYear = (

src/utils/LockOverviewUtils.ts

@@ -15,16 +15,9 @@ export const calculateStakeReward = (
   years: number,
 ) => {
   const yearsLocked = years || YEARS_LOCK
-
-  // Calculate base HiIQ (including lock multiplier)
   const baseHiIQ = amountLocked + amountLocked * 3 * (yearsLocked / 4)
-
-  // Calculate pool share
   const userPoolShare = baseHiIQ / (totalHiiq + baseHiIQ)
-
-  // Calculate total rewards over the period
   const totalPoolReward = YEARLY_EMISSION * userPoolShare * yearsLocked
-
   return baseHiIQ + totalPoolReward
 }
 
@@ -36,17 +29,9 @@ export const calculateAPR = (
   if (!totalLockedIq || !totalHiiq) return 0
 
   const amountLocked = totalLockedIq > 0 ? totalLockedIq : 1000000
-
-  // Calculate base HiIQ with lock multiplier
   const baseHiIQ = amountLocked + amountLocked * 3 * (years / 4)
-
-  // Calculate share of the pool
   const poolShare = baseHiIQ / (totalHiiq + baseHiIQ)
-
-  // Calculate yearly rewards
   const yearlyRewards = YEARLY_EMISSION * poolShare
-
-  // Calculate APR
   return (yearlyRewards / amountLocked) * 100
 }