From c7b52f985e129ef51023020ee5987dca7baad4e2 Mon Sep 17 00:00:00 2001
From: Bobo <bobo.kovacevic@gmail.com>
Date: Thu, 1 Feb 2024 09:55:05 +0100
Subject: [PATCH] Move tokens - available balance fix (#1160)

* Handle removal of unregistered dApps from a node storage (#1155)

* Handle removal of unregistered dApps from a note storage

* Map dapp id

* Move available balance fix
---
 src/i18n/en-US/index.ts                          | 2 +-
 src/staking-v3/components/Vote.vue               | 9 ++++++---
 src/staking-v3/components/my-staking/MyDapps.vue | 5 +++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index ce6284efe..0cba4cd43 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -870,7 +870,7 @@ export default {
       overview: 'Overview',
     },
     unregisteredDappInfo:
-      'This project has been unregistered. Claim action is required and your funds will be returned.',
+      'This project has been unregistered but If you are currently entitled to Bonus you will be entitled to it as well as basic rewards as long as you do not move/unstake the fund during this Period. Unstake if you still want to (it has {days} days unlocking period).',
     voteSuccess: 'You successfully voted on {number} dApp(s). All pending rewards are claimed.',
     unbondSuccess: 'You successfully unbonded from {dapp}.',
     unbondFromUnregisteredSuccess: 'You successfully unbonded from unregistered dApp {dapp}.',
diff --git a/src/staking-v3/components/Vote.vue b/src/staking-v3/components/Vote.vue
index ccfca862e..93fdb38d0 100644
--- a/src/staking-v3/components/Vote.vue
+++ b/src/staking-v3/components/Vote.vue
@@ -222,13 +222,16 @@ export default defineComponent({
     });
 
     const availableToVote = computed<bigint>(
-      () => BigInt(useableBalance.value) + max(remainLockedTokenInitial, BigInt(0))
+      () =>
+        BigInt(useableBalance.value) +
+        max(remainLockedTokenInitial, BigInt(0)) +
+        availableToMove.value
     );
 
     const availableToVoteDisplay = computed<bigint>(() =>
       remainLockedToken.value >= BigInt(0)
-        ? BigInt(useableBalance.value) + remainLockedToken.value
-        : BigInt(useableBalance.value) - abs(remainLockedToken.value)
+        ? BigInt(useableBalance.value) + remainLockedToken.value + availableToMove.value
+        : BigInt(useableBalance.value) - abs(remainLockedToken.value) + availableToMove.value
     );
 
     const amountToUnstake = computed<bigint>(() =>
diff --git a/src/staking-v3/components/my-staking/MyDapps.vue b/src/staking-v3/components/my-staking/MyDapps.vue
index 601f22751..5b2aafe0d 100644
--- a/src/staking-v3/components/my-staking/MyDapps.vue
+++ b/src/staking-v3/components/my-staking/MyDapps.vue
@@ -34,7 +34,7 @@
       <div v-if="!isRegistered(key)" class="warning--unregistered-dapp">
         <astar-icon-warning size="20" />
         <span class="text--unregistered-dapp">
-          {{ $t('stakingV3.unregisteredDappInfo') }}
+          {{ $t('stakingV3.unregisteredDappInfo', { days: constants?.unlockingPeriod ?? '--' }) }}
         </span>
         <astar-button
           class="btn--unregistered-dapp"
@@ -75,7 +75,7 @@ export default defineComponent({
   setup() {
     const { getDapp } = useDapps();
     const { navigateToVote, navigateToMove } = useDappStakingNavigation();
-    const { unstake, unstakeFromUnregistered } = useDappStaking();
+    const { unstake, unstakeFromUnregistered, constants } = useDappStaking();
 
     const dappToUnbond = ref<CombinedDappInfo | undefined>();
     const showModalUnbond = ref<boolean>(false);
@@ -115,6 +115,7 @@ export default defineComponent({
       dappToUnbond,
       width,
       screenSize,
+      constants,
       setShowModalUnbond,
       getDappName,
       getStakedAmount,