Skip to content

Commit 3cf2d66

Browse files
authored
Fix for remaining locked balance (#1491)
* Fix for remaining locked balance * Cleanup * Identity handling fix
1 parent a424cbf commit 3cf2d66

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/staking-v3/hooks/useVote.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { useDappStakingNavigation } from './useDappStakingNavigation';
99

1010
export function useVote(dapps: Ref<DappVote[]>, dappToMoveTokensFromAddress?: string) {
1111
const { currentAccount } = useAccount();
12-
const { useableBalance, lockedInDemocracy } = useBalance(currentAccount);
12+
const { useableBalance } = useBalance(currentAccount);
1313
const {
1414
ledger,
1515
totalStake,
@@ -28,7 +28,7 @@ export function useVote(dapps: Ref<DappVote[]>, dappToMoveTokensFromAddress?: st
2828
let remainingLockedTokensInitial = BigInt(0);
2929

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

3333
const totalStakeAmount = computed<bigint>(() =>
3434
ethers.utils

src/v2/repositories/implementations/IdentityRepository.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,18 @@ export class IdentityRepository implements IIdentityRepository {
3535
if (!api.query.identity) {
3636
return undefined;
3737
}
38-
const result = await api.query.identity.identityOf<Option<Tuple>>(address);
38+
const result = await api.query.identity.identityOf<Option<PalletIdentityRegistration>>(address);
3939

4040
if (result.isNone) {
4141
return undefined;
4242
}
4343

4444
const unwrappedResult = result.unwrapOrDefault();
45-
const identity = <PalletIdentityRegistration>unwrappedResult[0];
45+
const identity = <PalletIdentityRegistration>unwrappedResult;
46+
if (!identity || !identity.info) {
47+
return undefined;
48+
}
49+
4650
const data = new IdentityData(u8aToString(identity.info.display.asRaw), []);
4751
identity.info.additional.forEach((x) => {
4852
// Seems dirty. The problem here is that some raw data is treated as ASCII and some as bytes

0 commit comments

Comments
 (0)