From cb476383a40a9efd86d13dcc9ae7ff2bf8b8c84a Mon Sep 17 00:00:00 2001
From: Bobo <bobo.kovacevic@gmail.com>
Date: Tue, 1 Oct 2024 08:40:56 +0200
Subject: [PATCH] Release hotfix to main (#1394)

* Remove Age of Chronos promotion (#1386)

* Fetch block time from chain (#1384)

* Fetch block time to store

* Apr calculation fix

* Type fix

* PR comments fix and code cleanup

* Fix/selected dapp index (#1387)

* Voting wizard search bug fix

* Keep selected dApps while switching categories

* APR calculation fix to use block time for a given block (#1389)

* APR calculation fix to use block time for a given block

* Small fix

* Fix for re-staking on unregistered dApps (#1392)
---
 .../components/ClaimAndRestakeButton.vue      | 33 +++++++++++++++----
 .../components/my-staking/MyStaking.vue       |  2 +-
 src/staking-v3/hooks/useDappStaking.ts        |  8 ++---
 src/staking-v3/hooks/useVote.ts               |  2 +-
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/staking-v3/components/ClaimAndRestakeButton.vue b/src/staking-v3/components/ClaimAndRestakeButton.vue
index 9bbb6149d..37e8a0381 100644
--- a/src/staking-v3/components/ClaimAndRestakeButton.vue
+++ b/src/staking-v3/components/ClaimAndRestakeButton.vue
@@ -19,8 +19,8 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from 'vue';
 import ModalRestake from './vote/re-stake/ModalRestake.vue';
-import { useDappStaking, useVote } from '../hooks';
-import { ClaimType } from '../logic';
+import { useDappStaking, useVote, useDapps } from '../hooks';
+import { ClaimType, type SingularStakingInfo } from '../logic';
 
 export default defineComponent({
   components: {
@@ -53,22 +53,41 @@ export default defineComponent({
       claimStakerAndBonusRewards,
     } = useDappStaking();
     const { vote } = useVote(ref([]));
+    const { getDapp } = useDapps();
     const showRestakeModal = ref<boolean>(false);
 
+    // Staker info containing registered dApps only.
+    // Rewards can't be re-staked for unregistered dApps.
+    const stakerInfoRegisteredDapps =
+      computed<Map<string, SingularStakingInfo>>(() => {
+        const result = new Map<string, SingularStakingInfo>();
+
+        stakerInfo.value.forEach((value, key) => {
+          const dapp = getDapp(key);
+          if (dapp) {
+            result.set(key, value);
+          }
+        });
+
+        return result;
+      });
+
     const amountToClaim = computed<bigint>(() => {
       if (props.claimType === ClaimType.Staker) {
         return rewards.value.staker.amount;
-      } else if (props.claimType === ClaimType.Bonus) {
+      }
+
+      if (props.claimType === ClaimType.Bonus) {
         return rewards.value.bonus;
-      } else {
-        return totalStakerRewards.value;
       }
+
+      return totalStakerRewards.value;
     });
 
     const setShowRestakeModal = async (value: boolean) => {
       // Idea is to restake proportionally to already staked dApps.
       // At the beginning of a period all stakes are reset so user will be able to claim rewards only.
-      if (value && stakerInfo.value.size === 0) {
+      if (value && stakerInfoRegisteredDapps.value.size === 0) {
         await handleRestakeConfirm(false);
       } else {
         showRestakeModal.value = value;
@@ -76,7 +95,7 @@ export default defineComponent({
     };
 
     const handleRestakeConfirm = async (restake: boolean): Promise<void> => {
-      if (restake && stakerInfo.value.size > 0) {
+      if (restake && stakerInfoRegisteredDapps.value.size > 0) {
         await vote(restake);
       } else {
         if (props.claimType === ClaimType.Staker) {
diff --git a/src/staking-v3/components/my-staking/MyStaking.vue b/src/staking-v3/components/my-staking/MyStaking.vue
index 80c9abbf9..5682204a2 100644
--- a/src/staking-v3/components/my-staking/MyStaking.vue
+++ b/src/staking-v3/components/my-staking/MyStaking.vue
@@ -206,7 +206,7 @@ export default defineComponent({
       formatPeriod,
     } = useDappStaking();
 
-    const bonus = ref<BigInt>(BigInt(0));
+    const bonus = ref<bigint>(BigInt(0));
     const { getEstimatedBonus } = useAprV3({ isWatch: false });
 
     const { navigateToVote } = useDappStakingNavigation();
diff --git a/src/staking-v3/hooks/useDappStaking.ts b/src/staking-v3/hooks/useDappStaking.ts
index e4ddfd027..4127dad5f 100644
--- a/src/staking-v3/hooks/useDappStaking.ts
+++ b/src/staking-v3/hooks/useDappStaking.ts
@@ -192,7 +192,7 @@ export function useDappStaking() {
     );
     const staker = await stakingService.getStakerRewards(currentAccount.value);
     const bonus = await stakingService.getBonusRewards(currentAccount.value);
-    store.commit('stakingV3/setRewards', { ...rewards.value, staker, bonus });
+    store.commit('stakingV3/setRewards', { ...rewards.value, staker, bonus: bonus.amount });
     getCurrentEraInfo();
     fetchStakeAmountsToStore();
     await fetchStakerInfoToStore();
@@ -214,7 +214,7 @@ export function useDappStaking() {
       stakingService.getBonusRewards(currentAccount.value),
       stakingService.getDappRewards(dappAddress),
     ]);
-    store.commit('stakingV3/setRewards', { ...rewards.value, staker, bonus, dApp });
+    store.commit('stakingV3/setRewards', { ...rewards.value, staker, bonus: bonus.amount, dApp });
     fetchStakerInfoToStore();
     getCurrentEraInfo();
     fetchStakeAmountsToStore();
@@ -272,7 +272,7 @@ export function useDappStaking() {
       t('stakingV3.claimBonusRewardSuccess')
     );
     const bonus = await stakingService.getBonusRewards(currentAccount.value);
-    store.commit('stakingV3/setRewards', { ...rewards.value, bonus });
+    store.commit('stakingV3/setRewards', { ...rewards.value, bonus: bonus.amount });
   };
 
   const claimDappRewards = async (contractAddress: string): Promise<void> => {
@@ -303,7 +303,7 @@ export function useDappStaking() {
     );
     const staker = await stakingService.getStakerRewards(currentAccount.value);
     const bonus = await stakingService.getBonusRewards(currentAccount.value);
-    store.commit('stakingV3/setRewards', { ...rewards.value, staker, bonus });
+    store.commit('stakingV3/setRewards', { ...rewards.value, staker, bonus: bonus.amount });
   };
 
   const withdraw = async (): Promise<void> => {
diff --git a/src/staking-v3/hooks/useVote.ts b/src/staking-v3/hooks/useVote.ts
index c58f6987b..32fed4af3 100644
--- a/src/staking-v3/hooks/useVote.ts
+++ b/src/staking-v3/hooks/useVote.ts
@@ -1,5 +1,5 @@
 import { Ref, computed, ref, watch } from 'vue';
-import { CombinedDappInfo, DappStakeInfo, DappVote } from '../logic';
+import type { CombinedDappInfo, DappStakeInfo, DappVote } from '../logic';
 import { ethers } from 'ethers';
 import { useAccount, useBalance } from 'src/hooks';
 import { useDappStaking } from './useDappStaking';