From d8965b6304c24b940dfa167bb85f1b0708e94e7b Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Tue, 25 Sep 2018 10:38:07 +0200
Subject: [PATCH] Adapt owners inputs to new flow

---
 .../open/components/SafeForm/Owners/index.jsx | 42 +++++++++----------
 .../open/components/SafeNameForm/index.jsx    | 13 ++----
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/src/routes/open/components/SafeForm/Owners/index.jsx b/src/routes/open/components/SafeForm/Owners/index.jsx
index e5f395c5..18295edd 100644
--- a/src/routes/open/components/SafeForm/Owners/index.jsx
+++ b/src/routes/open/components/SafeForm/Owners/index.jsx
@@ -52,29 +52,27 @@ const Owners = (props: Props) => {
       </Block>
       { renderOwners && [...Array(Number(numOwners))].map((x, index) => (
         <Row key={`owner${(index)}`}>
-          <Col xs={11} xsOffset={1}>
+          <Col xs={11} xsOffset={1} layout="column" margin="md">
+            <Paragraph weight="bold">Owner Nº {index + 1}</Paragraph>
             <Block margin="sm">
-              <Paragraph weight="bold">Owner Nº {index + 1}</Paragraph>
-              <Block margin="sm">
-                <Field
-                  name={getOwnerNameBy(index)}
-                  component={TextField}
-                  type="text"
-                  validate={required}
-                  placeholder="Owner Name*"
-                  text="Owner Name"
-                />
-              </Block>
-              <Block margin="sm">
-                <Field
-                  name={getOwnerAddressBy(index)}
-                  component={TextField}
-                  type="text"
-                  validate={getAddressValidators(otherAccounts, index)}
-                  placeholder="Owner Address*"
-                  text="Owner Address"
-                />
-              </Block>
+              <Field
+                name={getOwnerNameBy(index)}
+                component={TextField}
+                type="text"
+                validate={required}
+                placeholder="Owner Name*"
+                text="Owner Name"
+              />
+            </Block>
+            <Block margin="sm">
+              <Field
+                name={getOwnerAddressBy(index)}
+                component={TextField}
+                type="text"
+                validate={getAddressValidators(otherAccounts, index)}
+                placeholder="Owner Address*"
+                text="Owner Address"
+              />
             </Block>
           </Col>
         </Row>
diff --git a/src/routes/open/components/SafeNameForm/index.jsx b/src/routes/open/components/SafeNameForm/index.jsx
index 8a4fd0c6..7f73a079 100644
--- a/src/routes/open/components/SafeNameForm/index.jsx
+++ b/src/routes/open/components/SafeNameForm/index.jsx
@@ -7,7 +7,6 @@ import { required } from '~/components/forms/validator'
 import Block from '~/components/layout/Block'
 import { FIELD_NAME } from '~/routes/open/components/fields'
 import Paragraph from '~/components/layout/Paragraph'
-import { lg } from '~/theme/variables'
 import OpenPaper from '../OpenPaper'
 
 type Props = {
@@ -18,15 +17,10 @@ const styles = () => ({
   root: {
     display: 'flex',
   },
-  container: {
-    maxWidth: '600px',
-    letterSpacing: '-0.5px',
-    padding: lg,
-  },
 })
 
 const SafeName = ({ classes }: Props) => (
-  <Block className={classes.container}>
+  <React.Fragment>
     <Block margin="lg">
       <Paragraph noMargin size="md" color="primary" weight="light">
         This setup will create a Safe with one or more owners. Optionally give the Safe a local name.
@@ -53,15 +47,14 @@ const SafeName = ({ classes }: Props) => (
         text="Safe name"
       />
     </Block>
-  </Block>
+  </React.Fragment>
 )
 
 const SafeNameForm = withStyles(styles)(SafeName)
 
 const SafeNamePage = () => (controls: React$Node) => (
-  <OpenPaper>
+  <OpenPaper controls={controls}>
     <SafeNameForm />
-    { controls }
   </OpenPaper>
 )