From 9937fb68f06eca49dd951a1a200e9c8d0b4e7313 Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Sat, 21 Jan 2023 09:52:17 +0200
Subject: [PATCH] Remove founding alliance role (#8855)

* Remove founding alliance role

* Adjust maxColumns
---
 packages/page-alliance/src/Members/Member.tsx | 59 +++++++++----------
 packages/page-alliance/src/Members/index.tsx  |  7 +--
 packages/page-alliance/src/useMembers.ts      |  9 +--
 3 files changed, 35 insertions(+), 40 deletions(-)

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 (
     <tr className={className}>
-      <td className='address'>
+      <td className='address all relative'>
         <AddressSmall value={accountId} />
+        <div className='absolute'>
+          {(info && info.isRetiringAt && (
+            <Tag
+              color='yellow'
+              hover={t<string>('Is retiring')}
+              label={t<string>('retirting')}
+            />
+          )) || (info && info.isUpForKicking && (
+            <Tag
+              color='red'
+              hover={t<string>('Up for kicking')}
+              label={t<string>('kicking')}
+            />
+          )) || (isPrime && (
+            <Tag
+              color='green'
+              hover={t<string>('Current prime member, default voting')}
+              label={t<string>('prime voter')}
+            />
+          )) || (isVoter && (
+            <Tag
+              color='green'
+              hover={t<string>('Allowed to vote on motions')}
+              label={t<string>('voter')}
+            />
+          ))}
+        </div>
       </td>
-      <td className='all'>
-        {(info && info.isRetiringAt && (
-          <Tag
-            color='yellow'
-            hover={t<string>('Is retiring')}
-            label={t<string>('retirting')}
-          />
-        )) || (info && info.isUpForKicking && (
-          <Tag
-            color='red'
-            hover={t<string>('Up for kicking')}
-            label={t<string>('kicking')}
-          />
-        )) || (isPrime && (
-          <Tag
-            color='green'
-            hover={t<string>('Current prime member, default voting')}
-            label={t<string>('prime voter')}
-          />
-        )) || (isVoter && (
-          <Tag
-            color='green'
-            hover={t<string>('Allowed to vote on motions')}
-            label={t<string>('voter')}
-          />
-        ))}
-      </td>
-      <Table.Column.Balance value={info?.deposit} />
       <td className='number'>
         {role}
       </td>
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<string>('members'), 'start', 2],
-    [t<string>('deposit'), 'number'],
-    [t<string>('role'), 'number'],
-    []
+    [t<string>('members'), 'start', 3]
   ]);
 
   return (
@@ -59,6 +56,8 @@ function Overview ({ className, members, prime, rule, unscrupulous, voters }: Pr
       <Table
         empty={members && t<string>('No members')}
         header={hdrRef.current}
+        isSplit
+        maxColumns={2}
       >
         {members && members.map((m) => (
           <Member
diff --git a/packages/page-alliance/src/useMembers.ts b/packages/page-alliance/src/useMembers.ts
index 4e2a5080b5..efaed0fbdf 100644
--- a/packages/page-alliance/src/useMembers.ts
+++ b/packages/page-alliance/src/useMembers.ts
@@ -8,8 +8,7 @@ import { useEffect, useState } from 'react';
 
 import { createNamedHook, useApi, useCall } from '@polkadot/react-hooks';
 
-// these are reversed (catering for old "Founder" role)
-const ROLES = <const> ['Retiring', 'Ally', 'Fellow', 'Founder'];
+const ROLES = <const> ['Retiring', 'Ally', 'Fellow'];
 
 function addMembers (prev: Member[], ...query: AccountId32[][]): Member[] {
   const all: Member[] = [];
@@ -41,15 +40,13 @@ function useMembersImpl (): Member[] | undefined {
   const role0 = useCall<AccountId32[]>(api.query.alliance.members, [ROLES[0]]);
   const role1 = useCall<AccountId32[]>(api.query.alliance.members, [ROLES[1]]);
   const role2 = useCall<AccountId32[]>(api.query.alliance.members, [ROLES[2]]);
-  // for the Founder role, we don't expect and actual value
-  const role3 = useCall<AccountId32[]>(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;
 }