From 83b06c6206e89c5c29d43b4d9a5e4576b54a1345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Leal?= <37.joao.leal@gmail.com>
Date: Mon, 24 May 2021 02:47:00 +0100
Subject: [PATCH] fix: Refactored some code. Deleted useless comments

---
 .../machineActions/MachineActions.js          |  2 --
 .../machineActions/MachineActions.styles.js   |  3 ---
 .../src/pages/Machines/Machines.js            | 22 ++++++++-----------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/new-lamassu-admin/src/components/machineActions/MachineActions.js b/new-lamassu-admin/src/components/machineActions/MachineActions.js
index 90953a22..6a50219a 100644
--- a/new-lamassu-admin/src/components/machineActions/MachineActions.js
+++ b/new-lamassu-admin/src/components/machineActions/MachineActions.js
@@ -1,12 +1,10 @@
 import { useMutation, useLazyQuery } from '@apollo/react-hooks'
 import { makeStyles } from '@material-ui/core/styles'
 import gql from 'graphql-tag'
-// import moment from 'moment'
 import React, { memo, useState } from 'react'
 
 import { ConfirmDialog } from 'src/components/ConfirmDialog'
 import ActionButton from 'src/components/buttons/ActionButton'
-// // import { Status } from 'src/components/Status'
 import { ReactComponent as EditReversedIcon } from 'src/styling/icons/button/edit/white.svg'
 import { ReactComponent as EditIcon } from 'src/styling/icons/button/edit/zodiac.svg'
 import { ReactComponent as RebootReversedIcon } from 'src/styling/icons/button/reboot/white.svg'
diff --git a/new-lamassu-admin/src/components/machineActions/MachineActions.styles.js b/new-lamassu-admin/src/components/machineActions/MachineActions.styles.js
index 672ee3b1..91bfd465 100644
--- a/new-lamassu-admin/src/components/machineActions/MachineActions.styles.js
+++ b/new-lamassu-admin/src/components/machineActions/MachineActions.styles.js
@@ -35,8 +35,6 @@ const machineActionsStyles = {
   },
   wrapper: {
     display: 'flex',
-    // marginTop: 24,
-    // marginBottom: 32,
     marginTop: 12,
     marginBottom: 16,
     fontSize: fontSize4
@@ -44,7 +42,6 @@ const machineActionsStyles = {
   row: {
     display: 'flex',
     flexDirection: 'row'
-    // marginBottom: 36
   },
   list: {
     padding: 0,
diff --git a/new-lamassu-admin/src/pages/Machines/Machines.js b/new-lamassu-admin/src/pages/Machines/Machines.js
index 544a491e..fb969cb5 100644
--- a/new-lamassu-admin/src/pages/Machines/Machines.js
+++ b/new-lamassu-admin/src/pages/Machines/Machines.js
@@ -6,7 +6,7 @@ import NavigateNextIcon from '@material-ui/icons/NavigateNext'
 import classnames from 'classnames'
 import gql from 'graphql-tag'
 import * as R from 'ramda'
-import React, { useState, useEffect } from 'react'
+import React from 'react'
 import { Link, useLocation } from 'react-router-dom'
 
 import { TL1, TL2, Label3 } from 'src/components/typography'
@@ -51,24 +51,20 @@ const getMachineID = path => path.slice(path.lastIndexOf('/') + 1)
 
 const Machines = () => {
   const location = useLocation()
-  const [machine, setMachine] = useState({})
-  const [config, setConfig] = useState({})
   const { data, refetch } = useQuery(GET_INFO, {
     variables: {
       deviceId: getMachineID(location.pathname)
-    },
-    onCompleted: () => {
-      setMachine(data.machine)
-      setConfig(data.config)
     }
   })
   const classes = useStyles()
 
   const timezone = R.path(['config', 'locale_timezone'], data) ?? {}
 
-  useEffect(() => {
-    if (data) setMachine(data.machine)
-  }, [data])
+  const machine = R.path(['machine'])(data) ?? {}
+  const config = R.path(['config'])(data) ?? {}
+
+  const machineName = R.path(['name'])(machine) ?? null
+  const machineID = R.path(['deviceId'])(machine) ?? null
 
   return (
     <Grid container className={classes.grid}>
@@ -82,7 +78,7 @@ const Machines = () => {
                 </Label3>
               </Link>
               <TL2 noMargin className={classes.subtitle}>
-                {machine.name}
+                {machineName}
               </TL2>
             </Breadcrumbs>
             <Overview data={machine} onActionSuccess={refetch} />
@@ -115,11 +111,11 @@ const Machines = () => {
           </div>
           <div className={classes.transactionsItem}>
             <TL1 className={classes.subtitle}>{'Latest transactions'}</TL1>
-            <Transactions id={machine?.deviceId ?? null} />
+            <Transactions id={machineID} />
           </div>
           <div className={classes.detailItem}>
             <TL1 className={classes.subtitle}>{'Commissions'}</TL1>
-            <Commissions name={'commissions'} id={machine?.deviceId ?? null} />
+            <Commissions name={'commissions'} id={machineID} />
           </div>
         </div>
       </Grid>