From b2c3eb8fd67d1d9a0a348420aabd379371ef8012 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Thu, 28 May 2020 20:22:14 +0200
Subject: [PATCH] Failed council close with 0 length/weight (#2839)

* Failed council close with 0 length/weight

* 0/0 close for tc
---
 packages/page-council/src/Motions/Close.tsx        |  7 +++++--
 packages/page-council/src/Motions/Motion.tsx       |  3 ++-
 packages/page-tech-comm/src/Proposals/Close.tsx    |  7 +++++--
 packages/page-tech-comm/src/Proposals/Proposal.tsx |  3 ++-
 packages/react-hooks/src/useVotingStatus.ts        | 14 ++++++++++----
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/packages/page-council/src/Motions/Close.tsx b/packages/page-council/src/Motions/Close.tsx
index c911ef1474..4f994b27f6 100644
--- a/packages/page-council/src/Motions/Close.tsx
+++ b/packages/page-council/src/Motions/Close.tsx
@@ -11,6 +11,7 @@ import { useAccounts, useApi, useToggle } from '@polkadot/react-hooks';
 import { useTranslation } from '../translate';
 
 interface Props {
+  hasFailed: boolean;
   hash: Hash;
   idNumber: ProposalIndex;
   isDisabled: boolean;
@@ -18,7 +19,7 @@ interface Props {
   proposal: Proposal;
 }
 
-function Close ({ hash, idNumber, isDisabled, members, proposal }: Props): React.ReactElement<Props> | null {
+function Close ({ hasFailed, hash, idNumber, isDisabled, members, proposal }: Props): React.ReactElement<Props> | null {
   const { t } = useTranslation();
   const { api } = useApi();
   const { allAccounts } = useAccounts();
@@ -74,7 +75,9 @@ function Close ({ hash, idNumber, isDisabled, members, proposal }: Props): React
               onStart={toggleOpen}
               params={
                 api.tx.council.close.meta.args.length === 4
-                  ? [hash, idNumber, proposalWeight, proposalLength]
+                  ? hasFailed
+                    ? [hash, idNumber, 0, 0]
+                    : [hash, idNumber, proposalWeight, proposalLength]
                   : [hash, idNumber]
               }
               tx='council.close'
diff --git a/packages/page-council/src/Motions/Motion.tsx b/packages/page-council/src/Motions/Motion.tsx
index 56e2ad78c1..d80f073a17 100644
--- a/packages/page-council/src/Motions/Motion.tsx
+++ b/packages/page-council/src/Motions/Motion.tsx
@@ -25,7 +25,7 @@ interface Props {
 }
 
 function Motion ({ className = '', isMember, members, motion: { hash, proposal, votes }, prime }: Props): React.ReactElement<Props> | null {
-  const { isCloseable, isVoteable, remainingBlocks } = useVotingStatus(votes, members.length, 'council');
+  const { hasFailed, isCloseable, isVoteable, remainingBlocks } = useVotingStatus(votes, members.length, 'council');
 
   if (!votes) {
     return null;
@@ -66,6 +66,7 @@ function Motion ({ className = '', isMember, members, motion: { hash, proposal,
         )}
         {isCloseable && (
           <Close
+            hasFailed={hasFailed}
             hash={hash}
             idNumber={index}
             isDisabled={!isMember}
diff --git a/packages/page-tech-comm/src/Proposals/Close.tsx b/packages/page-tech-comm/src/Proposals/Close.tsx
index 6d2f7a9fd5..f643e6aefe 100644
--- a/packages/page-tech-comm/src/Proposals/Close.tsx
+++ b/packages/page-tech-comm/src/Proposals/Close.tsx
@@ -11,6 +11,7 @@ import { useAccounts, useApi, useToggle } from '@polkadot/react-hooks';
 import { useTranslation } from '../translate';
 
 interface Props {
+  hasFailed: boolean;
   hash: Hash;
   idNumber: ProposalIndex;
   isDisabled: boolean;
@@ -18,7 +19,7 @@ interface Props {
   proposal: Proposal;
 }
 
-function Close ({ hash, idNumber, isDisabled, members, proposal }: Props): React.ReactElement<Props> | null {
+function Close ({ hasFailed, hash, idNumber, isDisabled, members, proposal }: Props): React.ReactElement<Props> | null {
   const { t } = useTranslation();
   const { api } = useApi();
   const { allAccounts } = useAccounts();
@@ -74,7 +75,9 @@ function Close ({ hash, idNumber, isDisabled, members, proposal }: Props): React
               onStart={toggleOpen}
               params={
                 api.tx.technicalCommittee.close.meta.args.length === 4
-                  ? [hash, idNumber, proposalWeight, proposalLength]
+                  ? hasFailed
+                    ? [hash, idNumber, 0, 0]
+                    : [hash, idNumber, proposalWeight, proposalLength]
                   : [hash, idNumber]
               }
               tx='technicalCommittee.close'
diff --git a/packages/page-tech-comm/src/Proposals/Proposal.tsx b/packages/page-tech-comm/src/Proposals/Proposal.tsx
index 530d4e5d2c..f2fdd62499 100644
--- a/packages/page-tech-comm/src/Proposals/Proposal.tsx
+++ b/packages/page-tech-comm/src/Proposals/Proposal.tsx
@@ -31,7 +31,7 @@ function Proposal ({ className = '', imageHash, isMember, members, prime }: Prop
   const votes = useCall<Votes | null>(api.query.technicalCommittee.voting, [imageHash], {
     transform: (optVotes: Option<Votes>) => optVotes.unwrapOr(null)
   });
-  const { isCloseable, isVoteable, remainingBlocks } = useVotingStatus(votes, members.length, 'technicalCommittee');
+  const { hasFailed, isCloseable, isVoteable, remainingBlocks } = useVotingStatus(votes, members.length, 'technicalCommittee');
 
   if (!proposal || !votes) {
     return null;
@@ -85,6 +85,7 @@ function Proposal ({ className = '', imageHash, isMember, members, prime }: Prop
         )}
         {isCloseable && (
           <Close
+            hasFailed={hasFailed}
             hash={imageHash}
             idNumber={index}
             isDisabled={!isMember}
diff --git a/packages/react-hooks/src/useVotingStatus.ts b/packages/react-hooks/src/useVotingStatus.ts
index dc4a4345e4..0b9e77d755 100644
--- a/packages/react-hooks/src/useVotingStatus.ts
+++ b/packages/react-hooks/src/useVotingStatus.ts
@@ -12,6 +12,8 @@ import useApi from './useApi';
 import useCall from './useCall';
 
 interface State {
+  hasFailed: boolean;
+  hasPassed: boolean;
   isCloseable: boolean;
   isVoteable: boolean;
   remainingBlocks: BN | null;
@@ -20,6 +22,8 @@ interface State {
 function getStatus (api: ApiPromise, bestNumber: BlockNumber, votes: Votes, numMembers: number, section: 'council' | 'technicalCommittee'): State {
   if (!votes.end) {
     return {
+      hasFailed: false,
+      hasPassed: false,
       isCloseable: false,
       isVoteable: true,
       remainingBlocks: null
@@ -27,13 +31,15 @@ function getStatus (api: ApiPromise, bestNumber: BlockNumber, votes: Votes, numM
   }
 
   const isEnd = bestNumber.gte(votes.end);
-  const isPassing = votes.threshold.lten(votes.ayes.length);
-  const isFailing = votes.threshold.gtn(Math.abs(numMembers - votes.nays.length));
+  const hasPassed = votes.threshold.lten(votes.ayes.length);
+  const hasFailed = votes.threshold.gtn(Math.abs(numMembers - votes.nays.length));
 
   return {
+    hasFailed,
+    hasPassed,
     isCloseable: api.tx[section].close.meta.args.length === 2
       ? isEnd
-      : isEnd || isPassing || isFailing,
+      : isEnd || hasPassed || hasFailed,
     isVoteable: !isEnd,
     remainingBlocks: isEnd
       ? null
@@ -44,7 +50,7 @@ function getStatus (api: ApiPromise, bestNumber: BlockNumber, votes: Votes, numM
 export default function useVotingStatus (votes: Votes | null | undefined, numMembers: number, section: 'council' | 'technicalCommittee'): State {
   const { api } = useApi();
   const bestNumber = useCall<BlockNumber>(api.derive.chain.bestNumber, []);
-  const [state, setState] = useState<State>({ isCloseable: false, isVoteable: false, remainingBlocks: null });
+  const [state, setState] = useState<State>({ hasFailed: false, hasPassed: false, isCloseable: false, isVoteable: false, remainingBlocks: null });
 
   useEffect((): void => {
     bestNumber && votes && setState(