Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions src/components/assets/NativeAssetList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,8 @@ export default defineComponent({
const store = useStore();
const isLoading = computed<boolean>(() => store.getters['general/isLoading']);
const selectedAddress = computed(() => store.getters['general/selectedAddress']);
const { balance, accountData, isLoadingBalance } = useBalance(selectedAddress);
const { balance, accountData, isLoadingBalance, lockedInDemocracy } =
useBalance(selectedAddress);
const { numEvmDeposit } = useEvmDeposit();
const { currentNetworkName, nativeTokenSymbol, isSupportAuTransfer } = useNetworkInfo();
const { faucetBalRequirement } = useFaucet();
Expand Down Expand Up @@ -404,7 +405,6 @@ export default defineComponent({
// Memo: `vesting ` -> there has been inputted 1 space here
const vesting = accountDataRef.locks.find((it) => u8aToString(it.id) === 'vesting ');
const dappStake = accountDataRef.locks.find((it) => u8aToString(it.id) === 'dapstake');
const democracy = accountDataRef.locks.find((it) => u8aToString(it.id) === 'democrac');
const reserved = accountDataRef.reserved;

if (vesting) {
Expand All @@ -424,8 +424,10 @@ export default defineComponent({
reservedTtl.value = Number(ethers.utils.formatEther(amount));
}

if (democracy) {
lockInDemocracy.value = Number(ethers.utils.formatEther(democracy.amount.toString()));
if (lockedInDemocracy.value) {
lockInDemocracy.value = Number(
ethers.utils.formatEther(lockedInDemocracy.value.toString())
);
}
});

Expand Down
10 changes: 8 additions & 2 deletions src/hooks/useBalance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ETHEREUM_EXTENSION } from 'src/modules/account';
import { VoidFn } from '@polkadot/api/types';
import { BalanceLockTo212 } from '@polkadot/types/interfaces';
import { PalletBalancesBalanceLock, PalletVestingVestingInfo } from 'src/v2/models';
import { BN } from '@polkadot/util';
import { BN, u8aToString } from '@polkadot/util';
import { $api, $web3 } from 'boot/api';
import { SystemAccount } from 'src/modules/account';
import { useStore } from 'src/store';
Expand Down Expand Up @@ -167,6 +167,12 @@ export function useBalance(addressRef: Ref<string>) {
const useableBalance = computed(() => {
return accountData.value?.getUsableFeeBalance().toString() || '0';
});
const lockedInDemocracy = computed(() => {
const lock = accountData.value?.locks.find((it) => u8aToString(it.id) === 'democrac');

return lock ? lock.amount.toBigInt() : BigInt(0);
});

const isLoadingBalance = ref<boolean>(true);

const { balanceRef, accountDataRef, isLoadingAccount } = useCall(addressRef);
Expand Down Expand Up @@ -196,7 +202,7 @@ export function useBalance(addressRef: Ref<string>) {
{ immediate: true }
);

return { balance, accountData, useableBalance, isLoadingBalance };
return { balance, accountData, useableBalance, isLoadingBalance, lockedInDemocracy };
}

export class AccountData {
Expand Down
15 changes: 11 additions & 4 deletions src/staking-v3/hooks/useVote.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useDappStakingNavigation } from './useDappStakingNavigation';

export function useVote(dapps: Ref<DappVote[]>, dappToMoveTokensFromAddress?: string) {
const { currentAccount } = useAccount();
const { useableBalance } = useBalance(currentAccount);
const { useableBalance, lockedInDemocracy } = useBalance(currentAccount);
const {
ledger,
totalStake,
Expand Down Expand Up @@ -70,7 +70,8 @@ export function useVote(dapps: Ref<DappVote[]>, dappToMoveTokensFromAddress?: st
? availableToMove.value
: BigInt(useableBalance.value) +
max(remainingLockedTokensInitial, BigInt(0)) +
availableToMove.value
availableToMove.value +
lockedInDemocracy.value
);

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

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

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