From ad30468708f897fc006c3c6e77575f2faafc633f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Oliveira?= <josepfo.w@gmail.com>
Date: Tue, 6 Jul 2021 17:44:28 +0100
Subject: [PATCH] fix: dont display cashbox reset option on history page and
 wrong header width

---
 .../src/pages/Maintenance/CashCassettes.js    | 30 ++++++++++---------
 .../pages/Maintenance/CashCassettes.styles.js |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js b/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js
index 46639a01..263da2fd 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js
@@ -254,21 +254,23 @@ const CashCassettes = () => {
         }}
         iconClassName={classes.listViewButton}
         className={classes.tableWidth}>
-        <Box alignItems="center" justifyContent="end">
-          <Label1 className={classes.cashboxReset}>Cashbox reset</Label1>
-          <Box
-            display="flex"
-            alignItems="center"
-            justifyContent="end"
-            mr="-4px">
-            <P className={classes.selection}>{cashboxReset}</P>
-            <IconButton
-              onClick={() => setEditingSchema(true)}
-              className={classes.button}>
-              <EditIcon />
-            </IconButton>
+        {!showHistory && (
+          <Box alignItems="center" justifyContent="end">
+            <Label1 className={classes.cashboxReset}>Cashbox reset</Label1>
+            <Box
+              display="flex"
+              alignItems="center"
+              justifyContent="end"
+              mr="-4px">
+              <P className={classes.selection}>{cashboxReset}</P>
+              <IconButton
+                onClick={() => setEditingSchema(true)}
+                className={classes.button}>
+                <EditIcon />
+              </IconButton>
+            </Box>
           </Box>
-        </Box>
+        )}
       </TitleSection>
       <div className={classes.tableContainer}>
         {!showHistory && (
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashCassettes.styles.js b/new-lamassu-admin/src/pages/Maintenance/CashCassettes.styles.js
index 1031cfb8..222de7ba 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashCassettes.styles.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashCassettes.styles.js
@@ -16,7 +16,7 @@ export default {
   tableWidth: {
     display: 'flex',
     alignItems: 'center',
-    marginRight: 90
+    marginRight: 1
   },
   descriptions: {
     color: offColor,