Total stake calculation fix

AstarNetwork · Nov 29, 2023 · 481b476 · 481b476
1 parent 32af376
commit 481b476
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/src/staking-v3/components/my-staking/Staking.vue b/src/staking-v3/components/my-staking/Staking.vue
@@ -3,7 +3,7 @@
     <div class="wrapper--header">
       <div>{{ $t('common.staking') }}</div>
       <div class="total--rewards">
-        <token-balance-native :balance="totalUserStake?.toString() ?? '0'" />
+        <token-balance-native :balance="totalStake.toString() ?? '0'" />
       </div>
     </div>
     <tab-component
@@ -37,7 +37,7 @@ export default defineComponent({
   },
   setup() {
     const { t } = useI18n();
-    const { ledger, rewards, stakerInfo, totalUserStake } = useDappStaking();
+    const { ledger, rewards, stakerInfo, totalStake } = useDappStaking();
     const currentTabIndex = ref<number>(0);
 
     const tabs = computed<TabDefinition[]>(() => [
@@ -50,7 +50,7 @@ export default defineComponent({
       () => (rewards?.value?.staker ?? BigInt(0)) + (rewards?.value?.bonus ?? BigInt(0))
     );
 
-    return { currentTabIndex, totalStakerRewards, stakerInfo, tabs, totalUserStake };
+    return { currentTabIndex, totalStakerRewards, stakerInfo, tabs, totalStake };
   },
 });
 </script>

diff --git a/src/staking-v3/hooks/useDappStaking.ts b/src/staking-v3/hooks/useDappStaking.ts
@@ -78,17 +78,8 @@ export function useDappStaking() {
     () => store.getters['stakingV3/getStakeInfo']
   );
 
-  const totalUserStake = computed<bigint>(() => {
-    let result = BigInt(0);
-
-    if (ledger.value?.stakedFuture) {
-      return ledger.value.stakedFuture.voting + ledger.value.stakedFuture.buildAndEarn;
-    } else if (ledger.value?.staked) {
-      return ledger.value.staked.voting + ledger.value.staked.buildAndEarn;
-    }
-
-    return result;
-  });
+  const isCurrentPeriod = (period: number): boolean =>
+    protocolState.value?.periodInfo.number === period;
 
   const hasStakerRewards = computed<boolean>(() => !!rewards.value?.staker);
   const hasDappRewards = computed<boolean>(() => !!rewards.value?.dApp);
@@ -100,17 +91,11 @@ export function useDappStaking() {
   const totalStake = computed<bigint>(() => {
     let result = BigInt(0);
 
-    if (
-      ledger.value?.stakedFuture &&
-      ledger.value.stakedFuture.period === protocolState.value?.periodInfo.number
-    ) {
+    if (ledger.value?.stakedFuture && isCurrentPeriod(ledger.value.stakedFuture.period)) {
       result += !isRewardOrStakeExpired(ledger.value.stakedFuture.period)
         ? ledger.value.stakedFuture.voting + ledger.value.stakedFuture.buildAndEarn
         : BigInt(0);
-    } else if (
-      ledger.value &&
-      ledger.value.staked.period === protocolState.value?.periodInfo.number
-    ) {
+    } else if (ledger.value && isCurrentPeriod(ledger.value.staked.period)) {
       result += !isRewardOrStakeExpired(ledger.value.staked.period)
         ? ledger.value.staked.voting + ledger.value.staked.buildAndEarn
         : BigInt(0);
@@ -365,7 +350,7 @@ export function useDappStaking() {
     dAppTiers,
     isVotingPeriod,
     stakerInfo,
-    totalUserStake,
+    isCurrentPeriod,
     stake,
     unstake,
     claimStakerRewards,