From 161eed0e60238ecb38f4db2b321050b3678e6f7c Mon Sep 17 00:00:00 2001
From: Fr4ctalbit <55669487+fr4ctalbit@users.noreply.github.com>
Date: Wed, 9 Oct 2019 17:58:14 +0200
Subject: [PATCH] Turn Submit proposal tab into a modal (#1698)

* Turn Submit proposal tab into a modal

* Fix linting issues

* adjust imports, remove account field

* switch the order of arguments in txParams
---
 .../src/{ => Overview}/Propose.tsx            | 96 +++++++++----------
 packages/app-democracy/src/Overview/index.tsx |  2 +
 packages/app-democracy/src/index.tsx          |  9 --
 3 files changed, 47 insertions(+), 60 deletions(-)
 rename packages/app-democracy/src/{ => Overview}/Propose.tsx (53%)

diff --git a/packages/app-democracy/src/Propose.tsx b/packages/app-democracy/src/Overview/Propose.tsx
similarity index 53%
rename from packages/app-democracy/src/Propose.tsx
rename to packages/app-democracy/src/Overview/Propose.tsx
index 7377d3a941..3bcde41958 100644
--- a/packages/app-democracy/src/Propose.tsx
+++ b/packages/app-democracy/src/Overview/Propose.tsx
@@ -3,51 +3,71 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Call } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/react-components/types';
 import { ApiProps } from '@polkadot/react-api/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { RouteComponentProps } from 'react-router';
-import { withRouter } from 'react-router-dom';
 import { createType } from '@polkadot/types';
-import { Button, Extrinsic, InputAddress, InputBalance, TxButton, TxComponent } from '@polkadot/react-components';
+import { Button, Extrinsic, InputBalance } from '@polkadot/react-components';
+import TxModal, { TxModalState, TxModalProps } from '@polkadot/react-components/TxModal';
 import { withApi, withMulti } from '@polkadot/react-api';
 
-import translate from './translate';
+import translate from '../translate';
 
-interface Props extends I18nProps, ApiProps, RouteComponentProps {
-  basePath: string;
-}
+interface Props extends TxModalProps, ApiProps {}
 
-interface State {
+interface State extends TxModalState {
   accountId?: string | null;
   method: Call | null;
   value: BN;
   isValid: boolean;
 }
 
-class Propose extends TxComponent<Props, State> {
+class Propose extends TxModal<Props, State> {
   public state: State = {
-    method: null,
-    value: new BN(0),
-    isValid: false
+    ...this.defaultState,
+    value: new BN(0)
   };
 
-  public render (): React.ReactNode {
+  protected headerText = (): string => this.props.t('Submit proposal');
+
+  protected txMethod = (): string => 'democracy.propose';
+
+  protected txParams = (): [Call, BN] => {
+    const { value, method } = this.state;
+    return [createType('Proposal', method), value];
+  }
+
+  protected isDisabled = (): boolean => {
+    const { accountId, value, method } = this.state;
+    const hasValue = !!value && value.gtn(0);
+    const hasMethod = !!method;
+
+    return !accountId || !hasValue || !hasMethod;
+  }
+
+  protected renderTrigger = (): React.ReactNode => {
+    const { t } = this.props;
+
+    return (
+      <Button.Group>
+        <Button
+          isPrimary
+          label={t('Submit proposal')}
+          icon='add'
+          onClick={this.showModal}
+        />
+      </Button.Group>
+    );
+  }
+
+  protected renderContent = (): React.ReactNode => {
     const { apiDefaultTxSudo, t } = this.props;
-    const { isValid, accountId, method, value } = this.state;
+    const { value } = this.state;
     const hasValue = !!value && value.gtn(0);
 
     return (
       <section>
-        <InputAddress
-          className='medium'
-          label={t('account')}
-          help={t('The account used to make the new proposal')}
-          type='account'
-          onChange={this.onChangeAccount}
-        />
         <Extrinsic
           defaultValue={apiDefaultTxSudo}
           label={t('propose')}
@@ -62,28 +82,13 @@ class Propose extends TxComponent<Props, State> {
           onChange={this.onChangeValue}
           onEnter={this.sendTx}
         />
-        <Button.Group>
-          <TxButton
-            accountId={accountId}
-            label={t('Submit Proposal')}
-            icon='sign-in'
-            tx='democracy.propose'
-            isDisabled={!isValid}
-            params={[
-              ...(method ? [createType('Proposal', method)] : []),
-              ...(hasValue ? [value] : [])
-            ]}
-            onSuccess={this.onSubmitProposal}
-            ref={this.button}
-          />
-        </Button.Group>
       </section>
     );
   }
 
   private nextState (newState: Partial<State>): void {
     this.setState(
-      (prevState: State): State => {
+      (prevState: State): Pick<State, never> => {
         const { accountId = prevState.accountId, method = prevState.method, value = prevState.value } = newState;
         const isValid = !!method && !!value && value.gt(new BN(0)) && !!accountId && accountId.length > 0;
 
@@ -97,10 +102,6 @@ class Propose extends TxComponent<Props, State> {
     );
   }
 
-  private onChangeAccount = (accountId: string | null): void => {
-    this.nextState({ accountId });
-  }
-
   private onChangeExtrinsic = (method?: Call): void => {
     if (!method) {
       return;
@@ -112,16 +113,9 @@ class Propose extends TxComponent<Props, State> {
   private onChangeValue = (value?: BN): void => {
     this.nextState({ value });
   }
-
-  private onSubmitProposal = (): void => {
-    const { history, basePath } = this.props;
-
-    history.push(basePath);
-  }
 }
 
 export default withMulti(
-  withRouter(Propose),
-  translate,
-  withApi
+  withApi(Propose),
+  translate
 );
diff --git a/packages/app-democracy/src/Overview/index.tsx b/packages/app-democracy/src/Overview/index.tsx
index a3db417920..56daf1a0c1 100644
--- a/packages/app-democracy/src/Overview/index.tsx
+++ b/packages/app-democracy/src/Overview/index.tsx
@@ -8,11 +8,13 @@ import { Columar } from '@polkadot/react-components';
 import Proposals from './Proposals';
 import Referendums from './Referendums';
 import Summary from './Summary';
+import Propose from './Propose';
 
 export default function Overview (): React.ReactElement {
   return (
     <>
       <Summary />
+      <Propose />
       <Columar>
         <Referendums />
         <Proposals />
diff --git a/packages/app-democracy/src/index.tsx b/packages/app-democracy/src/index.tsx
index 80b280456e..7b74bdfc3e 100644
--- a/packages/app-democracy/src/index.tsx
+++ b/packages/app-democracy/src/index.tsx
@@ -11,7 +11,6 @@ import uiSettings from '@polkadot/ui-settings';
 
 import basicMd from './md/basic.md';
 import Overview from './Overview';
-import Propose from './Propose';
 import translate from './translate';
 
 interface Props extends AppProps, BareProps, I18nProps {}
@@ -33,19 +32,11 @@ function App ({ basePath, t }: Props): React.ReactElement<Props> {
               isRoot: true,
               name: 'overview',
               text: t('Democracy overview')
-            },
-            {
-              name: 'propose',
-              text: t('Submit proposal')
             }
           ]}
         />
       </header>
       <Switch>
-        <Route
-          path={`${basePath}/propose`}
-          render={(): React.ReactNode => <Propose basePath={basePath} />}
-        />
         <Route component={Overview} />
       </Switch>
     </main>