From fb95d6a6ffc5f4e6a308086b08522a7f5f58a11b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Mart=C3=ADnez?= <germaga92@gmail.com>
Date: Mon, 26 Aug 2019 11:54:52 +0200
Subject: [PATCH] Fix style of buttons

---
 src/routes/safe/components/Balances/Receive/index.jsx     | 5 +----
 .../Balances/SendModal/screens/ReviewTx/index.jsx         | 3 +--
 .../Balances/SendModal/screens/SendFunds/index.jsx        | 2 +-
 .../Balances/Tokens/screens/AddCustomToken/index.jsx      | 4 ++--
 .../Balances/Tokens/screens/AddCustomToken/style.js       | 3 ---
 src/routes/safe/components/Balances/style.js              | 8 +++++---
 .../TxsTable/ExpandedTx/CancelTxModal/index.jsx           | 3 +--
 src/routes/safe/components/style.js                       | 6 ++++--
 8 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/routes/safe/components/Balances/Receive/index.jsx b/src/routes/safe/components/Balances/Receive/index.jsx
index 50c3300a..414b6929 100644
--- a/src/routes/safe/components/Balances/Receive/index.jsx
+++ b/src/routes/safe/components/Balances/Receive/index.jsx
@@ -48,9 +48,6 @@ const styles = () => ({
     height: '84px',
     justifyContent: 'center',
   },
-  button: {
-    height: '42px',
-  },
   addressContainer: {
     marginTop: '28px',
   },
@@ -109,7 +106,7 @@ const Receive = ({
     </Col>
     <Hairline />
     <Row align="center" className={classes.buttonRow}>
-      <Button color="primary" className={classes.button} minWidth={140} onClick={onClose} variant="contained">
+      <Button color="primary" minHeight={42} minWidth={140} onClick={onClose} variant="contained">
         Done
       </Button>
     </Row>
diff --git a/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/index.jsx b/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/index.jsx
index 9d233a14..a41c1c02 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/index.jsx
+++ b/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/index.jsx
@@ -138,12 +138,11 @@ const ReviewTx = ({
           </Block>
           <Hairline style={{ position: 'absolute', bottom: 85 }} />
           <Row align="center" className={classes.buttonRow}>
-            <Button className={classes.button} minWidth={140} minHeight={42} onClick={onClickBack}>
+            <Button minWidth={140} minHeight={42} onClick={onClickBack}>
               Back
             </Button>
             <Button
               type="submit"
-              className={classes.button}
               onClick={submitTx}
               variant="contained"
               minWidth={140}
diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.jsx b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.jsx
index 890863c9..dbf7c6b8 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.jsx
+++ b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.jsx
@@ -156,7 +156,7 @@ const SendFunds = ({
                 </Row>
                 <Hairline />
                 <Row align="center" className={classes.buttonRow}>
-                  <Button className={classes.button} minWidth={140} minHeight={42} onClick={onClose}>
+                  <Button minWidth={140} minHeight={42} onClick={onClose}>
                     Cancel
                   </Button>
                   <Button
diff --git a/src/routes/safe/components/Balances/Tokens/screens/AddCustomToken/index.jsx b/src/routes/safe/components/Balances/Tokens/screens/AddCustomToken/index.jsx
index 75b13370..babc3d8f 100644
--- a/src/routes/safe/components/Balances/Tokens/screens/AddCustomToken/index.jsx
+++ b/src/routes/safe/components/Balances/Tokens/screens/AddCustomToken/index.jsx
@@ -189,10 +189,10 @@ const AddCustomToken = (props: Props) => {
             </Block>
             <Hairline />
             <Row align="center" className={classes.buttonRow}>
-              <Button className={classes.button} minWidth={140} onClick={goBackToTokenList}>
+              <Button minHeight={42} minWidth={140} onClick={goBackToTokenList}>
                 Cancel
               </Button>
-              <Button type="submit" className={classes.button} variant="contained" minWidth={140} color="primary">
+              <Button type="submit" variant="contained" minWidth={140} minHeight={42} color="primary">
                 Save
               </Button>
             </Row>
diff --git a/src/routes/safe/components/Balances/Tokens/screens/AddCustomToken/style.js b/src/routes/safe/components/Balances/Tokens/screens/AddCustomToken/style.js
index b09dcabb..3dd3b0ab 100644
--- a/src/routes/safe/components/Balances/Tokens/screens/AddCustomToken/style.js
+++ b/src/routes/safe/components/Balances/Tokens/screens/AddCustomToken/style.js
@@ -28,7 +28,4 @@ export const styles = () => ({
     height: '84px',
     justifyContent: 'center',
   },
-  button: {
-    height: '42px',
-  },
 })
diff --git a/src/routes/safe/components/Balances/style.js b/src/routes/safe/components/Balances/style.js
index a0cc0584..5538c94f 100644
--- a/src/routes/safe/components/Balances/style.js
+++ b/src/routes/safe/components/Balances/style.js
@@ -1,5 +1,5 @@
 // @flow
-import { sm, xs } from '~/theme/variables'
+import { sm } from '~/theme/variables'
 
 export const styles = (theme: Object) => ({
   root: {
@@ -32,13 +32,15 @@ export const styles = (theme: Object) => ({
   },
   receive: {
     width: '95px',
+    minWidth: '95px',
   },
   send: {
-    width: '70px',
+    width: '75px',
+    minWidth: '75px',
     marginLeft: sm,
   },
   leftIcon: {
-    marginRight: xs,
+    marginRight: sm,
   },
   links: {
     textDecoration: 'underline',
diff --git a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/CancelTxModal/index.jsx b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/CancelTxModal/index.jsx
index ad18d01c..05c25121 100644
--- a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/CancelTxModal/index.jsx
+++ b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/CancelTxModal/index.jsx
@@ -65,12 +65,11 @@ const CancelTxModal = ({
             </Row>
           </Block>
           <Row align="center" className={classes.buttonRow}>
-            <Button className={classes.button} minWidth={140} minHeight={42} onClick={onClose}>
+            <Button minWidth={140} minHeight={42} onClick={onClose}>
               Exit
             </Button>
             <Button
               type="submit"
-              className={classes.button}
               variant="contained"
               minWidth={214}
               minHeight={42}
diff --git a/src/routes/safe/components/style.js b/src/routes/safe/components/style.js
index 14e11688..1ddc0acf 100644
--- a/src/routes/safe/components/style.js
+++ b/src/routes/safe/components/style.js
@@ -43,12 +43,14 @@ export const styles = () => ({
   },
   receive: {
     width: '95px',
+    minWidth: '95px',
   },
   send: {
-    width: '70px',
+    width: '75px',
+    minWidth: '75px',
     marginLeft: sm,
   },
   leftIcon: {
-    marginRight: xs,
+    marginRight: sm,
   },
 })