Adding controls to Review page

This commit is contained in:
apanizo 2018-09-25 10:55:52 +02:00
parent d8965b6304
commit 8d98b00d5c
3 changed files with 9 additions and 11 deletions

View File

@ -4,6 +4,7 @@ import CircularProgress from '@material-ui/core/CircularProgress'
import Block from '~/components/layout/Block' import Block from '~/components/layout/Block'
import Bold from '~/components/layout/Bold' import Bold from '~/components/layout/Bold'
import Col from '~/components/layout/Col' import Col from '~/components/layout/Col'
import OpenPaper from '~/routes/open/components/OpenPaper'
import Paragraph from '~/components/layout/Paragraph' import Paragraph from '~/components/layout/Paragraph'
import Pre from '~/components/layout/Pre' import Pre from '~/components/layout/Pre'
import Row from '~/components/layout/Row' import Row from '~/components/layout/Row'
@ -28,11 +29,11 @@ const Deployment = ({ address, tx }: Props) => (
</Block> </Block>
) )
export default ({ address, tx }: Props) => ({ submitting }: FormProps) => { export default ({ address, tx }: Props) => (controls: React$Node, { submitting }: FormProps) => {
const txFinished = !!address const txFinished = !!address
return ( return (
<Block> <OpenPaper controls={controls}>
{ !txFinished && { !txFinished &&
<React.Fragment> <React.Fragment>
<Paragraph align="center" size="lg"> <Paragraph align="center" size="lg">
@ -51,6 +52,6 @@ export default ({ address, tx }: Props) => ({ submitting }: FormProps) => {
} }
</Col> </Col>
</Row> </Row>
</Block> </OpenPaper>
) )
} }

View File

@ -16,7 +16,7 @@ import { history } from '~/store'
import { secondary } from '~/theme/variables' import { secondary } from '~/theme/variables'
const getSteps = () => [ const getSteps = () => [
'Start', 'Owners', 'Confirmations', 'Review', 'Start', 'Details', 'Review', 'Submit',
] ]
const initialValuesFrom = (userAccount: string) => ({ const initialValuesFrom = (userAccount: string) => ({

View File

@ -3,22 +3,19 @@ import * as React from 'react'
import { getNamesFrom, getAccountsFrom } from '~/routes/open/utils/safeDataExtractor' import { getNamesFrom, getAccountsFrom } from '~/routes/open/utils/safeDataExtractor'
import Block from '~/components/layout/Block' import Block from '~/components/layout/Block'
import Bold from '~/components/layout/Bold' import Bold from '~/components/layout/Bold'
import OpenPaper from '~/routes/open/components/OpenPaper'
import Col from '~/components/layout/Col' import Col from '~/components/layout/Col'
import Heading from '~/components/layout/Heading' import Heading from '~/components/layout/Heading'
import Row from '~/components/layout/Row' import Row from '~/components/layout/Row'
import Paragraph from '~/components/layout/Paragraph' import Paragraph from '~/components/layout/Paragraph'
import { FIELD_NAME, FIELD_CONFIRMATIONS, FIELD_DAILY_LIMIT } from '../fields' import { FIELD_NAME, FIELD_CONFIRMATIONS, FIELD_DAILY_LIMIT } from '../fields'
type FormProps = { const ReviewInformation = () => (controls: React$Node, { values }: Object) => {
values: Object,
}
const ReviewInformation = () => ({ values }: FormProps) => {
const names = getNamesFrom(values) const names = getNamesFrom(values)
const addresses = getAccountsFrom(values) const addresses = getAccountsFrom(values)
return ( return (
<Block> <OpenPaper controls={controls}>
<Heading tag="h2">Review the Safe information</Heading> <Heading tag="h2">Review the Safe information</Heading>
<Paragraph> <Paragraph>
<Bold>Safe Name: </Bold> {values[FIELD_NAME]} <Bold>Safe Name: </Bold> {values[FIELD_NAME]}
@ -44,7 +41,7 @@ const ReviewInformation = () => ({ values }: FormProps) => {
</Col> </Col>
</Row> </Row>
))} ))}
</Block> </OpenPaper>
) )
} }