From dac7bbd553755173f5fe28d599452080da83cc47 Mon Sep 17 00:00:00 2001
From: Mikhail Mikheev <mmvsha73@gmail.com>
Date: Fri, 6 Sep 2019 17:22:32 +0400
Subject: [PATCH] Fix X of Y annotations in the modals

---
 .../AddOwnerModal/screens/OwnerForm/style.js      |  2 +-
 .../AddOwnerModal/screens/Review/style.js         |  2 +-
 .../AddOwnerModal/screens/ThresholdForm/style.js  |  2 +-
 .../Settings/ManageOwners/EditOwnerModal/style.js |  4 +---
 .../RemoveOwnerModal/screens/CheckOwner/index.jsx | 15 ++++-----------
 .../RemoveOwnerModal/screens/CheckOwner/style.js  |  2 +-
 .../RemoveOwnerModal/screens/Review/style.js      |  2 +-
 .../screens/ThresholdForm/index.jsx               | 14 +++++++-------
 .../screens/ThresholdForm/style.js                |  2 +-
 .../ReplaceOwnerModal/screens/OwnerForm/style.js  |  2 +-
 .../ReplaceOwnerModal/screens/Review/style.js     |  2 +-
 11 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/OwnerForm/style.js b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/OwnerForm/style.js
index 26b7a097..7bc8a697 100644
--- a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/OwnerForm/style.js
+++ b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/OwnerForm/style.js
@@ -11,10 +11,10 @@ export const styles = () => ({
     maxHeight: '75px',
   },
   annotation: {
-    letterSpacing: '-1px',
     color: secondaryText,
     marginRight: 'auto',
     marginLeft: '20px',
+    lineHeight: 'normal',
   },
   manage: {
     fontSize: '24px',
diff --git a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/style.js b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/style.js
index dbb876b1..6f47dbc0 100644
--- a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/style.js
+++ b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/style.js
@@ -14,10 +14,10 @@ export const styles = () => ({
     maxHeight: '75px',
   },
   annotation: {
-    letterSpacing: '-1px',
     color: secondaryText,
     marginRight: 'auto',
     marginLeft: '20px',
+    lineHeight: 'normal',
   },
   manage: {
     fontSize: '24px',
diff --git a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/style.js b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/style.js
index 68cbadd6..8f37e209 100644
--- a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/style.js
+++ b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/style.js
@@ -11,10 +11,10 @@ export const styles = () => ({
     maxHeight: '75px',
   },
   annotation: {
-    letterSpacing: '-1px',
     color: secondaryText,
     marginRight: 'auto',
     marginLeft: '20px',
+    lineHeight: 'normal',
   },
   manage: {
     fontSize: '24px',
diff --git a/src/routes/safe/components/Settings/ManageOwners/EditOwnerModal/style.js b/src/routes/safe/components/Settings/ManageOwners/EditOwnerModal/style.js
index 69e9a9a4..fb0d4b09 100644
--- a/src/routes/safe/components/Settings/ManageOwners/EditOwnerModal/style.js
+++ b/src/routes/safe/components/Settings/ManageOwners/EditOwnerModal/style.js
@@ -5,9 +5,8 @@ import {
 
 export const styles = () => ({
   heading: {
-    padding: `${sm} ${lg}`,
+    padding: lg,
     justifyContent: 'space-between',
-    maxHeight: '75px',
     boxSizing: 'border-box',
   },
   manage: {
@@ -15,7 +14,6 @@ export const styles = () => ({
   },
   container: {
     padding: `${md} ${lg}`,
-    paddingBottom: '40px',
   },
   close: {
     height: '35px',
diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/index.jsx b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/index.jsx
index b23c4386..ff2ff84f 100644
--- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/index.jsx
+++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/index.jsx
@@ -34,19 +34,14 @@ type Props = {
 }
 
 const CheckOwner = ({
-  classes,
-  onClose,
-  ownerAddress,
-  ownerName,
-  network,
-  onSubmit,
+  classes, onClose, ownerAddress, ownerName, network, onSubmit,
 }: Props) => {
   const handleSubmit = (values) => {
     onSubmit(values)
   }
 
   return (
-    <React.Fragment>
+    <>
       <Row align="center" grow className={classes.heading}>
         <Paragraph weight="bolder" className={classes.manage} noMargin>
           Remove owner
@@ -59,9 +54,7 @@ const CheckOwner = ({
       <Hairline />
       <Block className={classes.formContainer}>
         <Row margin="md">
-          <Paragraph>
-            Review the owner you want to remove from the active Safe:
-          </Paragraph>
+          <Paragraph>Review the owner you want to remove from the active Safe:</Paragraph>
         </Row>
         <Row className={classes.owner}>
           <Col xs={1} align="center">
@@ -100,7 +93,7 @@ const CheckOwner = ({
           Next
         </Button>
       </Row>
-    </React.Fragment>
+    </>
   )
 }
 
diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/style.js b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/style.js
index f142aecb..2086f27f 100644
--- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/style.js
+++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/style.js
@@ -11,7 +11,7 @@ export const styles = () => ({
     maxHeight: '75px',
   },
   annotation: {
-    letterSpacing: '-1px',
+    lineHeight: 'normal',
     color: secondaryText,
     marginRight: 'auto',
     marginLeft: '20px',
diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/style.js b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/style.js
index 01518ffd..f2ab9539 100644
--- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/style.js
+++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/style.js
@@ -14,7 +14,7 @@ export const styles = () => ({
     maxHeight: '75px',
   },
   annotation: {
-    letterSpacing: '-1px',
+    lineHeight: 'normal',
     color: secondaryText,
     marginRight: 'auto',
     marginLeft: '20px',
diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.jsx b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.jsx
index 73667ea8..ca129362 100644
--- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.jsx
+++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/index.jsx
@@ -40,7 +40,7 @@ const ThresholdForm = ({
   const defaultThreshold = threshold > 1 ? threshold - 1 : threshold
 
   return (
-    <React.Fragment>
+    <>
       <Row align="center" grow className={classes.heading}>
         <Paragraph weight="bolder" className={classes.manage} noMargin>
           Remove owner
@@ -56,7 +56,7 @@ const ThresholdForm = ({
           const numOptions = owners.size > 1 ? owners.size - 1 : 1
 
           return (
-            <React.Fragment>
+            <>
               <Block className={classes.formContainer}>
                 <Row>
                   <Paragraph weight="bolder" className={classes.headingText}>
@@ -72,8 +72,8 @@ const ThresholdForm = ({
                   <Col xs={2}>
                     <Field
                       name="threshold"
-                      render={props => (
-                        <React.Fragment>
+                      render={(props) => (
+                        <>
                           <SelectField {...props} disableError>
                             {[...Array(Number(numOptions))].map((x, index) => (
                               <MenuItem key={index} value={`${index + 1}`}>
@@ -86,7 +86,7 @@ const ThresholdForm = ({
                               {props.meta.error}
                             </Paragraph>
                           )}
-                        </React.Fragment>
+                        </>
                       )}
                       validate={composeValidators(required, mustBeInteger, minValue(1), maxValue(numOptions))}
                       data-testid="threshold-select-input"
@@ -119,11 +119,11 @@ owner(s)
                   Review
                 </Button>
               </Row>
-            </React.Fragment>
+            </>
           )
         }}
       </GnoForm>
-    </React.Fragment>
+    </>
   )
 }
 
diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/style.js b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/style.js
index 68cbadd6..da414b18 100644
--- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/style.js
+++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/style.js
@@ -11,7 +11,7 @@ export const styles = () => ({
     maxHeight: '75px',
   },
   annotation: {
-    letterSpacing: '-1px',
+    lineHeight: 'normal',
     color: secondaryText,
     marginRight: 'auto',
     marginLeft: '20px',
diff --git a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/style.js b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/style.js
index 9cd32317..9a0e2ce3 100644
--- a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/style.js
+++ b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/style.js
@@ -11,10 +11,10 @@ export const styles = () => ({
     maxHeight: '75px',
   },
   annotation: {
-    letterSpacing: '-1px',
     color: secondaryText,
     marginRight: 'auto',
     marginLeft: '20px',
+    lineHeight: 'normal',
   },
   manage: {
     fontSize: '24px',
diff --git a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/style.js b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/style.js
index 043d7727..6c3ccc01 100644
--- a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/style.js
+++ b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/style.js
@@ -14,10 +14,10 @@ export const styles = () => ({
     maxHeight: '75px',
   },
   annotation: {
-    letterSpacing: '-1px',
     color: secondaryText,
     marginRight: 'auto',
     marginLeft: '20px',
+    lineHeight: 'normal',
   },
   manage: {
     fontSize: '24px',