From 6980e1ebebe2c090440f9357d588f3cb74a6161e Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Wed, 27 Jul 2022 07:45:50 +0200
Subject: [PATCH] Add alliance join (#7915)

---
 packages/apps/src/Menu/Grouping.tsx           |  2 +-
 packages/page-alliance/src/Join.tsx           | 72 +++++++++++++++++++
 packages/page-alliance/src/Member.tsx         |  2 +-
 packages/page-alliance/src/Members.tsx        | 23 +++++-
 packages/page-alliance/src/types.ts           |  2 +-
 packages/page-alliance/src/useMembers.ts      | 60 ++++++++--------
 .../src/Overview/SubmitCandidacy.tsx          |  4 +-
 packages/page-poll/src/index.tsx              |  4 +-
 8 files changed, 131 insertions(+), 38 deletions(-)
 create mode 100644 packages/page-alliance/src/Join.tsx

diff --git a/packages/apps/src/Menu/Grouping.tsx b/packages/apps/src/Menu/Grouping.tsx
index eb5b6febbf..b755eee0b5 100644
--- a/packages/apps/src/Menu/Grouping.tsx
+++ b/packages/apps/src/Menu/Grouping.tsx
@@ -19,7 +19,7 @@ const SHA_COL = 'rgba(34, 36, 38, 0.12)';
 const SHA_OFF = '5px';
 
 function Grouping ({ className = '', isActive, name, routes }: Props): React.ReactElement<Props> {
-  if (routes.length === 1) {
+  if (routes.length === 1 && routes[0].group === 'settings') {
     return (
       <Item
         className={isActive ? 'isActive' : ''}
diff --git a/packages/page-alliance/src/Join.tsx b/packages/page-alliance/src/Join.tsx
new file mode 100644
index 0000000000..4baeb66970
--- /dev/null
+++ b/packages/page-alliance/src/Join.tsx
@@ -0,0 +1,72 @@
+// Copyright 2017-2022 @polkadot/app-alliance authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Member } from './types';
+
+import React, { useMemo, useState } from 'react';
+
+import { InputAddress, InputBalance, Modal, TxButton } from '@polkadot/react-components';
+import { useAccounts, useApi } from '@polkadot/react-hooks';
+
+import { useTranslation } from './translate';
+
+interface Props {
+  className?: string;
+  members: Member[];
+  onClose: () => void;
+}
+
+function Join ({ className, members, onClose }: Props): React.ReactElement<Props> {
+  const { t } = useTranslation();
+  const { api } = useApi();
+  const { allAccounts } = useAccounts();
+  const [accountId, setAccountId] = useState<string | null>(null);
+
+  const available = useMemo(
+    (): string[] =>
+      allAccounts.filter((a) =>
+        !members.some(({ accountId }) =>
+          accountId === a
+        )
+      ),
+    [allAccounts, members]
+  );
+
+  return (
+    <Modal
+      className={className}
+      header={t<string>('Join alliance')}
+      onClose={onClose}
+      size='large'
+    >
+      <Modal.Content>
+        <Modal.Columns hint={t<string>('This account will be submitted to join the aliance. It will be allocated one of the alliance roles upon joining, starting with Ally.')}>
+          <InputAddress
+            filter={available}
+            help={t<string>('Select the account you wish to join with')}
+            label={t<string>('alliance account')}
+            onChange={setAccountId}
+            type='account'
+          />
+        </Modal.Columns>
+        <Modal.Columns hint={t('The bond will be reserved for the duration of your alliance membership.')}>
+          <InputBalance
+            defaultValue={api.consts.alliance.allyDeposit}
+            help={t<string>('The deposit that is reserved')}
+            isDisabled
+            label={t<string>('alliance deposit')}
+          />
+        </Modal.Columns>
+      </Modal.Content>
+      <Modal.Actions>
+        <TxButton
+          accountId={accountId}
+          onStart={onClose}
+          tx={api.tx.alliance.joinAlliance}
+        />
+      </Modal.Actions>
+    </Modal>
+  );
+}
+
+export default React.memo(Join);
diff --git a/packages/page-alliance/src/Member.tsx b/packages/page-alliance/src/Member.tsx
index 4598b5890c..f189302363 100644
--- a/packages/page-alliance/src/Member.tsx
+++ b/packages/page-alliance/src/Member.tsx
@@ -20,7 +20,7 @@ function Member ({ className, info: { accountId, role } }: Props): React.ReactEl
         <AddressSmall value={accountId} />
       </td>
       <td className='number'>
-        {role.type}
+        {role}
       </td>
     </tr>
   );
diff --git a/packages/page-alliance/src/Members.tsx b/packages/page-alliance/src/Members.tsx
index 946146e252..bf496f7146 100644
--- a/packages/page-alliance/src/Members.tsx
+++ b/packages/page-alliance/src/Members.tsx
@@ -3,8 +3,10 @@
 
 import React, { useRef } from 'react';
 
-import { Table } from '@polkadot/react-components';
+import { Button, Table } from '@polkadot/react-components';
+import { useToggle } from '@polkadot/react-hooks';
 
+import Join from './Join';
 import Member from './Member';
 import Summary from './Summary';
 import { useTranslation } from './translate';
@@ -14,8 +16,9 @@ interface Props {
   className?: string;
 }
 
-function Collators ({ className }: Props): React.ReactElement<Props> {
+function Members ({ className }: Props): React.ReactElement<Props> {
   const { t } = useTranslation();
+  const [isJoinOpen, toggleJoin] = useToggle();
   const members = useMembers();
 
   const hdrRef = useRef([
@@ -26,6 +29,20 @@ function Collators ({ className }: Props): React.ReactElement<Props> {
   return (
     <div className={className}>
       <Summary />
+      <Button.Group>
+        <Button
+          icon='add'
+          isDisabled={!members}
+          label={t<string>('Join')}
+          onClick={toggleJoin}
+        />
+        {members && isJoinOpen && (
+          <Join
+            members={members}
+            onClose={toggleJoin}
+          />
+        )}
+      </Button.Group>
       <Table
         empty={members && t<string>('No members')}
         header={hdrRef.current}
@@ -41,4 +58,4 @@ function Collators ({ className }: Props): React.ReactElement<Props> {
   );
 }
 
-export default React.memo(Collators);
+export default React.memo(Members);
diff --git a/packages/page-alliance/src/types.ts b/packages/page-alliance/src/types.ts
index 41eb9183ca..cb45dc2f75 100644
--- a/packages/page-alliance/src/types.ts
+++ b/packages/page-alliance/src/types.ts
@@ -5,5 +5,5 @@ import type { PalletAllianceMemberRole } from '@polkadot/types/lookup';
 
 export interface Member {
   accountId: string;
-  role: PalletAllianceMemberRole;
+  role: PalletAllianceMemberRole['type'];
 }
diff --git a/packages/page-alliance/src/useMembers.ts b/packages/page-alliance/src/useMembers.ts
index 2cf2bbce26..9cc279523f 100644
--- a/packages/page-alliance/src/useMembers.ts
+++ b/packages/page-alliance/src/useMembers.ts
@@ -1,43 +1,47 @@
 // Copyright 2017-2022 @polkadot/app-alliance authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { StorageKey } from '@polkadot/types';
 import type { AccountId32 } from '@polkadot/types/interfaces';
-import type { PalletAllianceMemberRole } from '@polkadot/types/lookup';
 import type { Member } from './types';
 
-import { createNamedHook, useApi, useCall } from '@polkadot/react-hooks';
+import { useMemo } from 'react';
 
-const OPT_MEM = {
-  transform: (entries: [StorageKey<[PalletAllianceMemberRole]>, AccountId32[]][]) =>
-    entries
-      .reduce((all: Member[], [{ args: [role] }, accountIds]): Member[] => {
-        for (let i = 0; i < accountIds.length; i++) {
-          all.push({
-            accountId: accountIds[i].toString(),
-            role
-          });
-        }
+import { createNamedHook, useApi, useCallMulti } from '@polkadot/react-hooks';
 
-        return all;
-      }, [])
-      .sort((a, b) =>
-        a.role.type === b.role.type
-          ? 0
-          : a.role.type === 'Founder'
-            ? -1
-            : b.role.type === 'Founder'
-              ? 1
-              : a.role.type === 'Fellow'
-                ? -1
-                : 1
-      )
-};
+const ROLES = <const> ['Founder', 'Fellow', 'Ally'];
+
+function addMembers (all: Member[], role: Member['role'], accountIds: AccountId32[] = []): Member[] {
+  for (let i = 0; i < accountIds.length; i++) {
+    all.push({
+      accountId: accountIds[i].toString(),
+      role
+    });
+  }
+
+  return all;
+}
 
 function useMembersImpl (): Member[] | undefined {
   const { api } = useApi();
+  const query = useCallMulti<AccountId32[][]>([
+    [api.query.alliance.members, ROLES[0]],
+    [api.query.alliance.members, ROLES[1]],
+    [api.query.alliance.members, ROLES[2]]
+  ]);
 
-  return useCall<Member[]>(api.query.alliance.members.entries, [], OPT_MEM);
+  return useMemo((): Member[] | undefined => {
+    if (query && query.length === ROLES.length) {
+      const all: Member[] = [];
+
+      for (let i = 0; i < ROLES.length; i++) {
+        addMembers(all, ROLES[i], query[i]);
+      }
+
+      return all;
+    }
+
+    return undefined;
+  }, [query]);
 }
 
 export default createNamedHook('useMembersImpl', useMembersImpl);
diff --git a/packages/page-council/src/Overview/SubmitCandidacy.tsx b/packages/page-council/src/Overview/SubmitCandidacy.tsx
index edf3ff8650..8adb814028 100644
--- a/packages/page-council/src/Overview/SubmitCandidacy.tsx
+++ b/packages/page-council/src/Overview/SubmitCandidacy.tsx
@@ -14,7 +14,7 @@ import { useModuleElections } from '../useModuleElections';
 function SubmitCandidacy ({ electionsInfo }: Props): React.ReactElement<Props> | null {
   const { api } = useApi();
   const { t } = useTranslation();
-  const [accountId, setAcountId] = useState<string | null>(null);
+  const [accountId, setAccountId] = useState<string | null>(null);
   const { isOpen, onClose, onOpen } = useModal();
   const modLocation = useModuleElections();
 
@@ -35,7 +35,7 @@ function SubmitCandidacy ({ electionsInfo }: Props): React.ReactElement<Props> |
               <InputAddress
                 help={t<string>('Select the account you wish to submit for candidacy.')}
                 label={t<string>('candidate account')}
-                onChange={setAcountId}
+                onChange={setAccountId}
                 type='account'
               />
             </Modal.Columns>
diff --git a/packages/page-poll/src/index.tsx b/packages/page-poll/src/index.tsx
index c53fafaffa..f9026731b6 100644
--- a/packages/page-poll/src/index.tsx
+++ b/packages/page-poll/src/index.tsx
@@ -27,7 +27,7 @@ interface Turnout {
   voted: BN;
 }
 
-const optMulti = {
+const OPT_MULTI = {
   defaultValue: [undefined, undefined] as MultiResult
 };
 
@@ -38,7 +38,7 @@ function PollApp ({ basePath, className }: Props): React.ReactElement<Props> {
   const [totalIssuance, totals] = useCallMulti<MultiResult>([
     api.query.balances?.totalIssuance,
     api.query.poll.totals
-  ], optMulti);
+  ], OPT_MULTI);
   const [accountId, setAccountId] = useState<string | null>(null);
   const [turnout, setTurnout] = useState<Turnout | null>(null);
   const [opt10m, setOpt10m] = useState(false);