fix(sphere): estimation apr (#1351)

cybercongress · Dec 26, 2024 · 22e7ae8 · 22e7ae8
1 parent a4d07d1
commit 22e7ae8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/src/components/index.js b/src/components/index.js
@@ -63,7 +63,6 @@ export {
   StartStageSearchActionBar,
   ActionBarSend,
   RewardsDelegators,
-  ReDelegate,
   TransactionError,
   TextTable,
   Vitalik,

diff --git a/src/pages/Sphere/pages/containers/HeroDetails/components/Details/Details.tsx b/src/pages/Sphere/pages/containers/HeroDetails/components/Details/Details.tsx
@@ -33,7 +33,7 @@ function Col({
 }
 
 type Options = {
-  apr?: number;
+  apr?: string;
   power?: number;
   delegateAddress?: string;
   selfStake?: number;

diff --git a/src/pages/Sphere/pages/containers/HeroDetails/utils/reduceDetails.ts b/src/pages/Sphere/pages/containers/HeroDetails/utils/reduceDetails.ts
@@ -32,17 +32,19 @@ function reduceDetails(
     ? big(100).minus(self).dp(3, BigNumber.ROUND_FLOOR).toNumber()
     : undefined;
 
-  const totalVotingPower = big(bondedTokens).multipliedBy(
-    big(1).minus(validatorInfo.commission.commissionRates.rate)
-  );
+  const stakingProvisionsByItem = stakingProvisions
+    ? big(stakingProvisions).multipliedBy(
+        big(1).minus(validatorInfo.commission.commissionRates.rate)
+      )
+    : undefined;
 
   const estimatedApr =
-    bondedTokens && stakingProvisions
-      ? big(stakingProvisions)
-          .dividedBy(totalVotingPower)
+    bondedTokens && stakingProvisionsByItem
+      ? big(stakingProvisionsByItem)
+          .dividedBy(bondedTokens)
           .multipliedBy(100)
           .dp(2, BigNumber.ROUND_FLOOR)
-          .toNumber()
+          .toFixed(2)
       : undefined;
 
   return {

diff --git a/src/pages/Sphere/pages/containers/Heroes/utils/reduceValidatorData.ts b/src/pages/Sphere/pages/containers/Heroes/utils/reduceValidatorData.ts
@@ -72,13 +72,15 @@ function reduceValidatorData(data: Validator[], options: Options) {
         .dp(2, BigNumber.ROUND_FLOOR)
         .toFixed(2);
 
-      const totalVotingPower = new BigNumber(bondedTokens).multipliedBy(
-        new BigNumber(1).minus(commission.commissionRates.rate)
-      );
-
-      const estimatedApr = stakingProvisions
-        ? new BigNumber(stakingProvisions)
-            .dividedBy(totalVotingPower)
+      const stakingProvisionsByItem = stakingProvisions
+        ? new BigNumber(stakingProvisions).multipliedBy(
+            new BigNumber(1).minus(commission.commissionRates.rate)
+          )
+        : undefined;
+
+      const estimatedApr = stakingProvisionsByItem
+        ? new BigNumber(stakingProvisionsByItem)
+            .dividedBy(bondedTokens)
             .toNumber()
         : 0;