From 16b00a768619be1191326c49080d57f601ede326 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 29 Jan 2021 14:00:11 +0100 Subject: [PATCH] Cater for limited chains without utility.* (#4535) --- packages/page-accounts/src/Accounts/Account.tsx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/page-accounts/src/Accounts/Account.tsx b/packages/page-accounts/src/Accounts/Account.tsx index 18c53aaee0..0cec4881f9 100644 --- a/packages/page-accounts/src/Accounts/Account.tsx +++ b/packages/page-accounts/src/Accounts/Account.tsx @@ -66,12 +66,14 @@ function calcVisible (filter: string, name: string, tags: string[]): boolean { }, name.toLowerCase().includes(_filter)); } -function createClearDemocracyTx (api: ApiPromise, address: string, unlockableIds: BN[]): SubmittableExtrinsic<'promise'> { - return api.tx.utility.batch( - unlockableIds - .map((id) => api.tx.democracy.removeVote(id)) - .concat(api.tx.democracy.unlock(address)) - ); +function createClearDemocracyTx (api: ApiPromise, address: string, unlockableIds: BN[]): SubmittableExtrinsic<'promise'> | null { + return api.tx.utility + ? api.tx.utility.batch( + unlockableIds + .map((id) => api.tx.democracy.removeVote(id)) + .concat(api.tx.democracy.unlock(address)) + ) + : null; } async function showLedgerAddress (getLedger: () => Ledger, meta: KeyringJson$Meta): Promise { @@ -301,7 +303,7 @@ function Account ({ account: { address, meta }, className = '', delegation, filt onClick={toggleDelegate} /> )} - {!!proxy?.[0].length && ( + {!!proxy?.[0].length && api.api.tx.utility && ( ('This account has {{proxyNumber}} proxy set.', {