diff --git a/packages/page-alliance/src/Members/Member.tsx b/packages/page-alliance/src/Members/Member.tsx
index 44095035e9..a8e6a1a577 100644
--- a/packages/page-alliance/src/Members/Member.tsx
+++ b/packages/page-alliance/src/Members/Member.tsx
@@ -6,7 +6,7 @@ import type { Member as MemberType } from '../types';
import React, { useCallback, useMemo } from 'react';
-import { AddressSmall, Menu, Popup, Table, Tag } from '@polkadot/react-components';
+import { AddressSmall, Menu, Popup, Tag } from '@polkadot/react-components';
import { useAccounts, useApi, useQueue } from '@polkadot/react-hooks';
import { useTranslation } from '../translate';
@@ -51,37 +51,36 @@ function Member ({ bestNumber, className, info: { accountId, role }, isPrime, is
return (
- |
+ |
+
+ {(info && info.isRetiringAt && (
+ ('Is retiring')}
+ label={t('retirting')}
+ />
+ )) || (info && info.isUpForKicking && (
+ ('Up for kicking')}
+ label={t('kicking')}
+ />
+ )) || (isPrime && (
+ ('Current prime member, default voting')}
+ label={t('prime voter')}
+ />
+ )) || (isVoter && (
+ ('Allowed to vote on motions')}
+ label={t('voter')}
+ />
+ ))}
+
|
-
- {(info && info.isRetiringAt && (
- ('Is retiring')}
- label={t('retirting')}
- />
- )) || (info && info.isUpForKicking && (
- ('Up for kicking')}
- label={t('kicking')}
- />
- )) || (isPrime && (
- ('Current prime member, default voting')}
- label={t('prime voter')}
- />
- )) || (isVoter && (
- ('Allowed to vote on motions')}
- label={t('voter')}
- />
- ))}
- |
-
{role}
|
diff --git a/packages/page-alliance/src/Members/index.tsx b/packages/page-alliance/src/Members/index.tsx
index 14d7de68f8..04d8034df4 100644
--- a/packages/page-alliance/src/Members/index.tsx
+++ b/packages/page-alliance/src/Members/index.tsx
@@ -29,10 +29,7 @@ function Overview ({ className, members, prime, rule, unscrupulous, voters }: Pr
const bestNumber = useBestNumber();
const hdrRef = useRef<([React.ReactNode?, string?, number?] | false)[]>([
- [t('members'), 'start', 2],
- [t('deposit'), 'number'],
- [t('role'), 'number'],
- []
+ [t('members'), 'start', 3]
]);
return (
@@ -59,6 +56,8 @@ function Overview ({ className, members, prime, rule, unscrupulous, voters }: Pr
('No members')}
header={hdrRef.current}
+ isSplit
+ maxColumns={2}
>
{members && members.map((m) => (
['Retiring', 'Ally', 'Fellow', 'Founder'];
+const ROLES = ['Retiring', 'Ally', 'Fellow'];
function addMembers (prev: Member[], ...query: AccountId32[][]): Member[] {
const all: Member[] = [];
@@ -41,15 +40,13 @@ function useMembersImpl (): Member[] | undefined {
const role0 = useCall(api.query.alliance.members, [ROLES[0]]);
const role1 = useCall(api.query.alliance.members, [ROLES[1]]);
const role2 = useCall(api.query.alliance.members, [ROLES[2]]);
- // for the Founder role, we don't expect and actual value
- const role3 = useCall(api.query.alliance.members, [ROLES[3]]);
useEffect((): void => {
role0 && role1 && role2 &&
setState((prev = []) =>
- addMembers(prev, role0, role1, role2, role3 || [])
+ addMembers(prev, role0, role1, role2)
);
- }, [role0, role1, role2, role3]);
+ }, [role0, role1, role2]);
return state;
}