From 042e8a0a168579a86bdb8ce7b1632a97aeeff9cf Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Fri, 20 Mar 2020 08:09:17 +0100
Subject: [PATCH] Majority propose shortcut (council) (#2423)

---
 .../src/Motions/ProposeExternal.tsx           | 90 +++++++++++++++++++
 .../{Propose.tsx => ProposeMotion.tsx}        |  0
 .../page-council/src/Motions/Slashing.tsx     |  6 +-
 packages/page-council/src/Motions/index.tsx   | 10 ++-
 .../src/Actions/Account/SetSessionKey.tsx     |  1 +
 5 files changed, 103 insertions(+), 4 deletions(-)
 create mode 100644 packages/page-council/src/Motions/ProposeExternal.tsx
 rename packages/page-council/src/Motions/{Propose.tsx => ProposeMotion.tsx} (100%)

diff --git a/packages/page-council/src/Motions/ProposeExternal.tsx b/packages/page-council/src/Motions/ProposeExternal.tsx
new file mode 100644
index 0000000000..e328321530
--- /dev/null
+++ b/packages/page-council/src/Motions/ProposeExternal.tsx
@@ -0,0 +1,90 @@
+// Copyright 2017-2020 @polkadot/ui-staking authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+import { SubmittableExtrinsic } from '@polkadot/api/types';
+
+import React, { useCallback, useEffect, useState } from 'react';
+import { Button, Input, InputAddress, Modal, TxButton } from '@polkadot/react-components';
+import { useApi, useToggle } from '@polkadot/react-hooks';
+import { isHex } from '@polkadot/util';
+
+import { useTranslation } from '../translate';
+
+interface Props {
+  className?: string;
+  isMember: boolean;
+  members: string[];
+}
+
+function ProposeExternal ({ className, isMember, members }: Props): React.ReactElement<Props> {
+  const { t } = useTranslation();
+  const { api } = useApi();
+  const [isVisible, toggleVisible] = useToggle();
+  const [accountId, setAcountId] = useState<string | null>(null);
+  const [proposal, setProposal] = useState<SubmittableExtrinsic<'promise'> | null>(null);
+  const [{ isHashValid, hash }, setHash] = useState<{ isHashValid: boolean; hash?: string }>({ isHashValid: false, hash: '' });
+  const threshold = Math.ceil((members.length || 0) * 0.5);
+
+  const _onChangeHash = useCallback(
+    (hash?: string): void => setHash({ isHashValid: isHex(hash, 256), hash }),
+    []
+  );
+
+  useEffect((): void => {
+    if (isHashValid && hash) {
+      setProposal(() => api.tx.democracy.externalProposeMajority(hash));
+    } else {
+      setProposal(null);
+    }
+  }, [hash, isHashValid]);
+
+  return (
+    <>
+      <Button
+        icon='add'
+        isDisabled={!isMember}
+        label={t('Propose external')}
+        onClick={toggleVisible}
+      />
+      {isVisible && (
+        <Modal
+          className={className}
+          header={t('Propose external (majority)')}
+        >
+          <Modal.Content>
+            <InputAddress
+              filter={members}
+              help={t('Select the account you wish to make the proposal with.')}
+              label={t('propose from account')}
+              onChange={setAcountId}
+              type='account'
+              withLabel
+            />
+            <Input
+              autoFocus
+              help={t('The preimage hash of the proposal')}
+              label={t('preimage hash')}
+              onChange={_onChangeHash}
+              value={hash}
+            />
+          </Modal.Content>
+          <Modal.Actions onCancel={toggleVisible}>
+            <TxButton
+              accountId={accountId}
+              icon='plus'
+              isDisabled={!threshold || !members.includes(accountId || '') || !proposal}
+              isPrimary
+              label={t('Propose')}
+              onStart={toggleVisible}
+              params={[threshold, proposal]}
+              tx='council.propose'
+            />
+          </Modal.Actions>
+        </Modal>
+      )}
+    </>
+  );
+}
+
+export default React.memo(ProposeExternal);
diff --git a/packages/page-council/src/Motions/Propose.tsx b/packages/page-council/src/Motions/ProposeMotion.tsx
similarity index 100%
rename from packages/page-council/src/Motions/Propose.tsx
rename to packages/page-council/src/Motions/ProposeMotion.tsx
diff --git a/packages/page-council/src/Motions/Slashing.tsx b/packages/page-council/src/Motions/Slashing.tsx
index 79391af2cb..202569baf0 100644
--- a/packages/page-council/src/Motions/Slashing.tsx
+++ b/packages/page-council/src/Motions/Slashing.tsx
@@ -22,7 +22,7 @@ interface Option {
   value: number;
 }
 
-export default function Slashing ({ className, isMember, members }: Props): React.ReactElement<Props> {
+function Slashing ({ className, isMember, members }: Props): React.ReactElement<Props> {
   const { t } = useTranslation();
   const { api } = useApi();
   const slashes = useAvailableSlashes();
@@ -65,7 +65,7 @@ export default function Slashing ({ className, isMember, members }: Props): Reac
     <>
       <Button
         icon='cancel'
-        isDisabled={!isMember || !members.length || !slashes.length}
+        isDisabled={!isMember || !slashes.length}
         label={t('Cancel slashes')}
         onClick={toggleVisible}
       />
@@ -119,3 +119,5 @@ export default function Slashing ({ className, isMember, members }: Props): Reac
     </>
   );
 }
+
+export default React.memo(Slashing);
diff --git a/packages/page-council/src/Motions/index.tsx b/packages/page-council/src/Motions/index.tsx
index e1511ed1e5..1466001e9a 100644
--- a/packages/page-council/src/Motions/index.tsx
+++ b/packages/page-council/src/Motions/index.tsx
@@ -11,7 +11,8 @@ import { Button, Table } from '@polkadot/react-components';
 import { useTranslation } from '../translate';
 import useCouncilMembers from '../useCouncilMembers';
 import Motion from './Motion';
-import Propose from './Propose';
+import ProposeMotion from './ProposeMotion';
+import ProposeExternal from './ProposeExternal';
 import Slashing from './Slashing';
 
 interface Props {
@@ -27,12 +28,17 @@ function Proposals ({ className, motions, prime }: Props): React.ReactElement<Pr
   return (
     <div className={className}>
       <Button.Group>
-        <Propose
+        <ProposeMotion
           filter={members}
           isMember={isMember}
           members={members}
         />
         <Button.Or />
+        <ProposeExternal
+          isMember={isMember}
+          members={members}
+        />
+        <Button.Or />
         <Slashing
           isMember={isMember}
           members={members}
diff --git a/packages/page-staking/src/Actions/Account/SetSessionKey.tsx b/packages/page-staking/src/Actions/Account/SetSessionKey.tsx
index 1ea5e10037..417f9b7dc7 100644
--- a/packages/page-staking/src/Actions/Account/SetSessionKey.tsx
+++ b/packages/page-staking/src/Actions/Account/SetSessionKey.tsx
@@ -32,6 +32,7 @@ function SetSessionKey ({ controllerId, onClose }: Props): React.ReactElement<Pr
           label={t('controller account')}
         />
         <Input
+          autoFocus
           className='medium'
           help={t('Changing the key only takes effect at the start of the next session. The input here is generates from the author_rotateKeys command')}
           isError={!keys}