Skip to content

Fix for available staking balance when user has tokens locked in gov. #1466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobo-k2 merged 1 commit into from
May 7, 2025
Merged

Fix for available staking balance when user has tokens locked in gov. #1466

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions src/staking-v3/hooks/useVote.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ export function useVote(dapps: Ref<DappVote[]>, dappToMoveTokensFromAddress?: st
const dAppToMoveFromAddress = ref<string>(dappToMoveTokensFromAddress ?? '');
let remainingLockedTokensInitial = BigInt(0);

const locked = computed<bigint>(() => ledger?.value?.locked ?? BigInt(0));
const lockedInDappStaking = computed<bigint>(() => ledger?.value?.locked ?? BigInt(0));
const locked = computed<bigint>(() => max(lockedInDappStaking.value, lockedInDemocracy.value));

const totalStakeAmount = computed<bigint>(() =>
ethers.utils
Expand Down Expand Up @@ -70,8 +71,7 @@ export function useVote(dapps: Ref<DappVote[]>, dappToMoveTokensFromAddress?: st
? availableToMove.value
: BigInt(useableBalance.value) +
max(remainingLockedTokensInitial, BigInt(0)) +
availableToMove.value +
lockedInDemocracy.value
availableToMove.value
);

const availableToVoteDisplay = computed<bigint>(() => {
Expand All @@ -80,14 +80,8 @@ export function useVote(dapps: Ref<DappVote[]>, dappToMoveTokensFromAddress?: st
}

return remainingLockedTokens.value >= BigInt(0)
? BigInt(useableBalance.value) +
lockedInDemocracy.value +
remainingLockedTokens.value +
availableToMove.value
: BigInt(useableBalance.value) +
lockedInDemocracy.value -
abs(remainingLockedTokens.value) +
availableToMove.value;
? BigInt(useableBalance.value) + remainingLockedTokens.value + availableToMove.value
: BigInt(useableBalance.value) - abs(remainingLockedTokens.value) + availableToMove.value;
});

const amountToUnstake = computed<bigint>(() =>
Expand Down
Loading