calculateTokenProportions calculation fix (#107)

airswap · Oct 5, 2023 · a616302 · a616302
1 parent d6bc307
commit a616302
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/features/staking/PieBar.tsx b/src/features/staking/PieBar.tsx
@@ -39,7 +39,7 @@ export const PieBar = () => {
       color: "text-gray-500",
       bg: null,
       var: unstaked,
-      text: "Not staked",
+      text: "not staked",
     },
   ];
 
@@ -53,7 +53,7 @@ export const PieBar = () => {
           <BsCircleFill className={`text-${stakable.color} `} size={14} />
         </div>
         <span className="font-medium font-mono">{stakable.var}</span>
-        <span className="text-gray-400 relative -top-0.5">
+        <span className="content-end text-gray-400 relative -top-0.5">
           &nbsp; {stakable.text}
         </span>
       </div>

diff --git a/src/features/staking/utils/calculateTokenProportions.ts b/src/features/staking/utils/calculateTokenProportions.ts
@@ -13,7 +13,7 @@ export const calculateTokenProportions = ({
   staked: number;
   unstaked: number;
 }): PercentObject => {
-  const totalBalance = unstakable + staked + unstaked;
+  const totalBalance = staked + unstaked;
 
   if (totalBalance === 0) {
     return {
@@ -23,9 +23,15 @@ export const calculateTokenProportions = ({
     };
   }
 
+  const unstakablePercent = (unstakable / totalBalance) * 100;
+
+  const stakedTotalPercent = 100 - unstakablePercent;
+  const stakedPercent = (staked / stakedTotalPercent) * 100;
+  const unstakedPercent = (unstaked / stakedTotalPercent) * 100;
+
   return {
-    unstakablePercent: (unstakable / totalBalance) * 100,
-    stakedPercent: (staked / totalBalance) * 100,
-    unstakedPercent: (unstaked / totalBalance) * 100,
+    unstakablePercent,
+    stakedPercent,
+    unstakedPercent,
   };
 };