fix: adjust voting balance

Author: Nick-1979

packages/extension-polkagate/src/fullscreen/governance/delegate/partial/AlreadyLockedTooltipText.tsx

@@ -1,26 +1,27 @@
-// Copyright 2019-2024 @polkadot/extension-polkagate authors & contributors
+// Copyright 2019-2025 @polkadot/extension-polkagate authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-// @ts-nocheck
 
 /* eslint-disable react/jsx-max-props-per-line */
+// @ts-nocheck
 
-import type { DeriveBalancesAll } from '@polkadot/api-derive/types';
+import type { BalancesInfo } from '@polkadot/extension-polkagate/util/types';
+import type { BN } from '@polkadot/util';
+import type { Lock } from '../../../../hooks/useAccountLocks';
 
-import { Grid, Skeleton, Typography } from '@mui/material';
+import { Grid, Typography } from '@mui/material';
 import React from 'react';
 
-import { BN, BN_MAX_INTEGER } from '@polkadot/util';
+import { BN_MAX_INTEGER } from '@polkadot/util';
 
 import { useCurrentBlockNumber, useDecimal, useToken, useTranslation } from '../../../../hooks';
-import { Lock } from '../../../../hooks/useAccountLocks';
 import { amountToHuman, remainingTime } from '../../../../util/utils';
 
 interface Props {
   address: string | undefined;
   accountLocks: Lock[] | undefined
 }
 
-export function getAlreadyLockedValue(allBalances: DeriveBalancesAll | undefined): BN | undefined {
+export function getAlreadyLockedValue (allBalances: BalancesInfo | undefined): BN | undefined {
   const LOCKS_ORDERED = ['pyconvot', 'democrac', 'phrelect'];
   const sortedLocks = allBalances?.lockedBreakdown
     // first sort by amount, so greatest value first
@@ -30,6 +31,7 @@ export function getAlreadyLockedValue(allBalances: DeriveBalancesAll | undefined
     // then sort by the type of lock (we try to find relevant)
     .sort((a, b): number => {
       if (!a.id.eq(b.id)) {
+        // eslint-disable-next-line @typescript-eslint/prefer-for-of
         for (let i = 0; i < LOCKS_ORDERED.length; i++) {
           const lockName = LOCKS_ORDERED[i];
 
@@ -48,7 +50,7 @@ export function getAlreadyLockedValue(allBalances: DeriveBalancesAll | undefined
   return sortedLocks?.[0] || allBalances?.lockedBalance;
 }
 
-function AlreadyLockedTooltipText({ accountLocks, address }: Props): React.ReactElement {
+function AlreadyLockedTooltipText ({ accountLocks, address }: Props): React.ReactElement {
   const { t } = useTranslation();
   const currentBlock = useCurrentBlockNumber(address);
   const token = useToken(address);
@@ -80,7 +82,7 @@ function AlreadyLockedTooltipText({ accountLocks, address }: Props): React.React
         {currentBlock && accountLocks?.map((lock, index) => (
           <React.Fragment key={index}>
             <Grid item xs={2.5}>
-              {lock.refId.toNumber()}
+              {lock.refId?.toNumber()}
             </Grid>
             <Grid item xs={3.6}>
               {amountToHuman(lock.total, decimal)} {token}

packages/extension-polkagate/src/fullscreen/manageIdentity/Review.tsx

@@ -1,4 +1,4 @@
-// Copyright 2019-2024 @polkadot/extension-polkagate authors & contributors
+// Copyright 2019-2025 @polkadot/extension-polkagate authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 /* eslint-disable react/jsx-max-props-per-line */
@@ -76,7 +76,7 @@ export default function Review ({ address, api, chain, depositToPay, depositValu
 
   useEffect(() => {
     formatted && api?.derive.balances?.all(formatted).then((b) => {
-      setBalances(b as BalancesInfo);
+      setBalances(b as unknown as BalancesInfo);
     });
   }, [api, formatted]);
 

packages/extension-polkagate/src/hooks/useNativeAssetBalances.ts

@@ -1,7 +1,8 @@
-// Copyright 2019-2024 @polkadot/extension-polkagate authors & contributors
+// Copyright 2019-2025 @polkadot/extension-polkagate authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type React from 'react';
+import type { Balance } from '@polkadot/types/interfaces';
 //@ts-ignore
 import type { FrameSystemAccountInfo } from '@polkadot/types/lookup';
 import type { HexString } from '@polkadot/util/types';
@@ -42,6 +43,8 @@ export default function useNativeAssetBalances (address: string | undefined, ref
         // some chains such as PARALLEL does not support this call hence BN_ZERO is set for them
         const frozenBalance = systemBalance?.frozen || BN_ZERO;
 
+        const votingBalance = api.createType('Balance', allBalances.freeBalance.add(allBalances.reservedBalance)) as unknown as Balance;
+
         setNewBalances({
           ED,
           assetId: isFetchingNativeTokenOfAssetHub ? NATIVE_TOKEN_ASSET_ID_ON_ASSETHUB : NATIVE_TOKEN_ASSET_ID,
@@ -53,7 +56,8 @@ export default function useNativeAssetBalances (address: string | undefined, ref
           genesisHash: api.genesisHash.toString(),
           pooledBalance: balances?.pooledBalance, // fill from saved balance it exists, it will be updated
           soloTotal: stakingAccount?.stakingLedger?.total as unknown as BN,
-          token
+          token,
+          votingBalance // since api derive does not updated after pools migration
         });
         setRefresh?.(false);
         isFetching.fetching[String(formatted)]['balances'] = false;

packages/extension-polkagate/src/util/types.ts

@@ -1,6 +1,8 @@
-// Copyright 2019-2024 @polkadot/extension-polkagate authors & contributors
+// Copyright 2019-2025 @polkadot/extension-polkagate authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+/* eslint-disable @typescript-eslint/consistent-indexed-object-style */
+
 import type { LinkOption } from '@polkagate/apps-config/endpoints/types';
 import type React from 'react';
 import type { ApiPromise } from '@polkadot/api';
@@ -683,6 +685,7 @@ export interface BalancesInfo extends DeriveBalancesAll {
   decimal: number;
   genesisHash: string;
   pooledBalance?: BN;
+  votingBalance: Balance;
   frozenBalance: BN;
   soloTotal?: BN;
   token: string;

packages/extension-polkagate/src/util/workers/utils/balancify.js

@@ -1,7 +1,9 @@
-// Copyright 2019-2024 @polkadot/extension-polkagate authors & contributors
+// Copyright 2019-2025 @polkadot/extension-polkagate authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // @ts-nocheck
+import { BN_ZERO } from '@polkadot/util';
+
 
 export function balancify (balances) {
   const base = {
@@ -14,7 +16,8 @@ export function balancify (balances) {
     vestedClaimable: String(balances.vestedClaimable),
     vestingLocked: String(balances.vestingLocked),
     vestingTotal: String(balances.vestingTotal),
-    votingBalance: String(balances.votingBalance)
+    // votingBalance: String(balances.votingBalance)
+    votingBalance: String(balances.free.add(balances?.reserved || BN_ZERO)) // after pool migration the voting balance returned fro api is not correct
   };
 
   if (balances.soloTotal) {