From a8c2a2c2528d2b4ef1a1438c8d501727f0d99b34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= <sergiodiassalgado@gmail.com>
Date: Wed, 31 May 2023 10:55:39 +0100
Subject: [PATCH] fix: cashout screen column widths

---
 .../src/pages/Cashout/Cashout.js              |  4 +--
 new-lamassu-admin/src/pages/Cashout/helper.js | 25 ++++++++-----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/new-lamassu-admin/src/pages/Cashout/Cashout.js b/new-lamassu-admin/src/pages/Cashout/Cashout.js
index 16cacbe3..ee013792 100644
--- a/new-lamassu-admin/src/pages/Cashout/Cashout.js
+++ b/new-lamassu-admin/src/pages/Cashout/Cashout.js
@@ -122,9 +122,9 @@ const CashOut = ({ name: SCREEN_KEY }) => {
           data={config}
           stripeWhen={wasNeverEnabled}
           enableEdit
-          editWidth={134}
+          editWidth={95}
           enableToggle
-          toggleWidth={109}
+          toggleWidth={100}
           onToggle={onToggle}
           save={save}
           error={error?.message}
diff --git a/new-lamassu-admin/src/pages/Cashout/helper.js b/new-lamassu-admin/src/pages/Cashout/helper.js
index f9dea41d..8ebdc4b4 100644
--- a/new-lamassu-admin/src/pages/Cashout/helper.js
+++ b/new-lamassu-admin/src/pages/Cashout/helper.js
@@ -8,13 +8,13 @@ import { getBillOptions } from 'src/utils/bill-options'
 import { CURRENCY_MAX } from 'src/utils/constants'
 import { transformNumber } from 'src/utils/number'
 
-const widthsByNumberOfCassettes = {
-  2: { machine: 320, cassette: 315 },
-  3: { machine: 305, cassette: 215 },
-  4: { machine: 195, cassette: 190 },
-  5: { machine: 175, cassette: 155 },
-  6: { machine: 170, cassette: 130 },
-  7: { machine: 140, cassette: 125 }
+const widthsByNumberOfUnits = {
+  2: { machine: 325, cassette: 340 },
+  3: { machine: 300, cassette: 235 },
+  4: { machine: 205, cassette: 200 },
+  5: { machine: 180, cassette: 165 },
+  6: { machine: 165, cassette: 140 },
+  7: { machine: 130, cassette: 125 }
 }
 
 const DenominationsSchema = Yup.object().shape({
@@ -89,10 +89,7 @@ const getElements = (machines, locale = {}, classes) => {
     ...R.map(it => it.numberOfStackers, machines),
     0
   )
-  const maxNumberOfCashUnits = Math.max(
-    ...R.map(it => it.numberOfCassettes + it.numberOfStackers, machines),
-    0
-  )
+  const numberOfCashUnits = maxNumberOfCassettes + maxNumberOfStackers
 
   const options = getBillOptions(locale, denominations)
   const cassetteProps =
@@ -109,7 +106,7 @@ const getElements = (machines, locale = {}, classes) => {
     {
       name: 'id',
       header: 'Machine',
-      width: widthsByNumberOfCassettes[maxNumberOfCashUnits]?.machine,
+      width: widthsByNumberOfUnits[numberOfCashUnits]?.machine,
       view: it => machines.find(({ deviceId }) => deviceId === it).name,
       size: 'sm',
       editable: false
@@ -125,7 +122,7 @@ const getElements = (machines, locale = {}, classes) => {
         size: 'sm',
         stripe: true,
         textAlign: 'right',
-        width: widthsByNumberOfCassettes[maxNumberOfCashUnits]?.cassette,
+        width: widthsByNumberOfUnits[numberOfCashUnits]?.cassette,
         suffix: fiatCurrency,
         bold: bold,
         view: it => it,
@@ -151,7 +148,7 @@ const getElements = (machines, locale = {}, classes) => {
         size: 'sm',
         stripe: true,
         textAlign: 'right',
-        width: widthsByNumberOfCassettes[maxNumberOfCashUnits]?.cassette,
+        width: widthsByNumberOfUnits[numberOfCashUnits]?.cassette,
         prefix: it => (R.last(it) === 'f' ? 'F' : 'R'),
         suffix: fiatCurrency,
         bold: bold,