From ca4ec5816f6302a88f0ebf85a2bbfa1b384f3367 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sun, 22 Mar 2020 17:52:22 +0100
Subject: [PATCH] Use tech comm useMembers (#2436)

---
 packages/page-democracy/src/Overview/Fasttrack.tsx | 6 +++---
 packages/page-tech-comm/src/Overview/Members.tsx   | 4 ++--
 packages/page-tech-comm/src/Overview/Summary.tsx   | 2 +-
 packages/page-tech-comm/src/Proposals/index.tsx    | 2 +-
 packages/page-tech-comm/src/index.tsx              | 8 ++++----
 packages/page-tech-comm/src/types.ts               | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/page-democracy/src/Overview/Fasttrack.tsx b/packages/page-democracy/src/Overview/Fasttrack.tsx
index 2b64c1c20d..6d5c2e19a0 100644
--- a/packages/page-democracy/src/Overview/Fasttrack.tsx
+++ b/packages/page-democracy/src/Overview/Fasttrack.tsx
@@ -21,7 +21,7 @@ const ONE_MIN = (1 * 60) / 6;
 const DEF_DELAY = new BN(ONE_MIN);
 const DEF_VOTING = new BN(ONE_MIN * 60 * 3);
 
-function Fasttrack ({ hash, threshold }: Props): React.ReactElement<Props> | null {
+function Fasttrack ({ hash }: Props): React.ReactElement<Props> | null {
   const { t } = useTranslation();
   const { api } = useApi();
   const { isMember, members } = useMembers('technicalCommittee');
@@ -37,8 +37,8 @@ function Fasttrack ({ hash, threshold }: Props): React.ReactElement<Props> | nul
   );
 
   useEffect((): void => {
-    setAllowFast(isMember && threshold.isSimplemajority);
-  }, [isMember, threshold]);
+    setAllowFast(isMember); // && threshold.isSimplemajority);
+  }, [isMember]);
 
   useEffect((): void => {
     setProposal(
diff --git a/packages/page-tech-comm/src/Overview/Members.tsx b/packages/page-tech-comm/src/Overview/Members.tsx
index 1732b72b22..e036a8b2da 100644
--- a/packages/page-tech-comm/src/Overview/Members.tsx
+++ b/packages/page-tech-comm/src/Overview/Members.tsx
@@ -12,7 +12,7 @@ import { useTranslation } from '../translate';
 
 interface Props {
   className?: string;
-  members?: AccountId[];
+  members: string[];
   prime?: AccountId | null;
 }
 
@@ -21,7 +21,7 @@ function Members ({ className, members, prime }: Props): React.ReactElement<Prop
 
   return (
     <div className={className}>
-      {members?.length
+      {members.length
         ? (
           <Table>
             <Table.Body>
diff --git a/packages/page-tech-comm/src/Overview/Summary.tsx b/packages/page-tech-comm/src/Overview/Summary.tsx
index 9f2dc426de..8a8878207b 100644
--- a/packages/page-tech-comm/src/Overview/Summary.tsx
+++ b/packages/page-tech-comm/src/Overview/Summary.tsx
@@ -21,7 +21,7 @@ export default function Summary ({ className, members, proposals }: Props): Reac
   return (
     <SummaryBox className={className}>
       <CardSummary label={t('members')}>
-        {formatNumber(members?.length)}
+        {formatNumber(members.length)}
       </CardSummary>
       <section>
         <CardSummary label={t('proposals')}>
diff --git a/packages/page-tech-comm/src/Proposals/index.tsx b/packages/page-tech-comm/src/Proposals/index.tsx
index f3dd9fb55d..181e54b81a 100644
--- a/packages/page-tech-comm/src/Proposals/index.tsx
+++ b/packages/page-tech-comm/src/Proposals/index.tsx
@@ -21,7 +21,7 @@ export default function Proposals ({ className, members, prime, proposals }: Pro
     <div className={className}>
       {isProposeOpen && (
         <Propose
-          memberCount={members?.length}
+          memberCount={members.length}
           onClose={togglePropose}
         />
       )}
diff --git a/packages/page-tech-comm/src/index.tsx b/packages/page-tech-comm/src/index.tsx
index e099397f9b..2ac392035b 100644
--- a/packages/page-tech-comm/src/index.tsx
+++ b/packages/page-tech-comm/src/index.tsx
@@ -8,7 +8,7 @@ import { AppProps, BareProps } from '@polkadot/react-components/types';
 
 import React, { useMemo } from 'react';
 import { Route, Switch } from 'react-router';
-import { useApi, useCall } from '@polkadot/react-hooks';
+import { useApi, useCall, useMembers } from '@polkadot/react-hooks';
 import { Tabs } from '@polkadot/react-components';
 
 import Overview from './Overview';
@@ -22,9 +22,9 @@ interface Props extends AppProps, BareProps {}
 export default function TechCommApp ({ basePath, className }: Props): React.ReactElement<Props> {
   const { t } = useTranslation();
   const { api } = useApi();
-  const members = useCall<AccountId[]>(api.query.technicalCommittee.members);
-  const prime = useCall<AccountId | null>(api.query.council.prime, [], {
-    transform: (result: Option<AccountId>): AccountId | null => result?.unwrapOr(null) || null
+  const { members } = useMembers('technicalCommittee');
+  const prime = useCall<AccountId | null>(api.query.technicalCommittee.prime, [], {
+    transform: (result: Option<AccountId>): AccountId | null => result.unwrapOr(null)
   }) || null;
   const proposals = useCall<Hash[]>(api.query.technicalCommittee.proposals);
   const items = useMemo(() => [
diff --git a/packages/page-tech-comm/src/types.ts b/packages/page-tech-comm/src/types.ts
index 0fdd39dee4..ad392f76d5 100644
--- a/packages/page-tech-comm/src/types.ts
+++ b/packages/page-tech-comm/src/types.ts
@@ -8,5 +8,5 @@ export interface ComponentProps {
   className?: string;
   prime?: AccountId | null;
   proposals?: Hash[];
-  members?: AccountId[];
+  members: string[];
 }