From 8d98b00d5c49a79c50e4d287f647fce9026a919d Mon Sep 17 00:00:00 2001 From: apanizo Date: Tue, 25 Sep 2018 10:55:52 +0200 Subject: [PATCH] Adding controls to Review page --- src/routes/open/components/FormConfirmation/index.jsx | 7 ++++--- src/routes/open/components/Layout.jsx | 2 +- .../open/components/ReviewInformation/index.jsx | 11 ++++------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/routes/open/components/FormConfirmation/index.jsx b/src/routes/open/components/FormConfirmation/index.jsx index 1fe4c947..cadeabc5 100644 --- a/src/routes/open/components/FormConfirmation/index.jsx +++ b/src/routes/open/components/FormConfirmation/index.jsx @@ -4,6 +4,7 @@ import CircularProgress from '@material-ui/core/CircularProgress' import Block from '~/components/layout/Block' import Bold from '~/components/layout/Bold' import Col from '~/components/layout/Col' +import OpenPaper from '~/routes/open/components/OpenPaper' import Paragraph from '~/components/layout/Paragraph' import Pre from '~/components/layout/Pre' import Row from '~/components/layout/Row' @@ -28,11 +29,11 @@ const Deployment = ({ address, tx }: Props) => ( ) -export default ({ address, tx }: Props) => ({ submitting }: FormProps) => { +export default ({ address, tx }: Props) => (controls: React$Node, { submitting }: FormProps) => { const txFinished = !!address return ( - + { !txFinished && @@ -51,6 +52,6 @@ export default ({ address, tx }: Props) => ({ submitting }: FormProps) => { } - + ) } diff --git a/src/routes/open/components/Layout.jsx b/src/routes/open/components/Layout.jsx index 74735d96..9b041fbf 100644 --- a/src/routes/open/components/Layout.jsx +++ b/src/routes/open/components/Layout.jsx @@ -16,7 +16,7 @@ import { history } from '~/store' import { secondary } from '~/theme/variables' const getSteps = () => [ - 'Start', 'Owners', 'Confirmations', 'Review', + 'Start', 'Details', 'Review', 'Submit', ] const initialValuesFrom = (userAccount: string) => ({ diff --git a/src/routes/open/components/ReviewInformation/index.jsx b/src/routes/open/components/ReviewInformation/index.jsx index 2909aa8c..934a4b52 100644 --- a/src/routes/open/components/ReviewInformation/index.jsx +++ b/src/routes/open/components/ReviewInformation/index.jsx @@ -3,22 +3,19 @@ import * as React from 'react' import { getNamesFrom, getAccountsFrom } from '~/routes/open/utils/safeDataExtractor' import Block from '~/components/layout/Block' import Bold from '~/components/layout/Bold' +import OpenPaper from '~/routes/open/components/OpenPaper' import Col from '~/components/layout/Col' import Heading from '~/components/layout/Heading' import Row from '~/components/layout/Row' import Paragraph from '~/components/layout/Paragraph' import { FIELD_NAME, FIELD_CONFIRMATIONS, FIELD_DAILY_LIMIT } from '../fields' -type FormProps = { - values: Object, -} - -const ReviewInformation = () => ({ values }: FormProps) => { +const ReviewInformation = () => (controls: React$Node, { values }: Object) => { const names = getNamesFrom(values) const addresses = getAccountsFrom(values) return ( - + Review the Safe information Safe Name: {values[FIELD_NAME]} @@ -44,7 +41,7 @@ const ReviewInformation = () => ({ values }: FormProps) => { ))} - + ) }