From 2426640bbf65848b4d1bf15fad263a384fe090b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20S=C3=A1?= <siiky@users.noreply.github.com>
Date: Fri, 11 Mar 2022 15:14:06 +0000
Subject: [PATCH] fix: show name of unpaired machines

---
 .../src/pages/Maintenance/CashCassettes.js             | 10 +++++++++-
 .../src/pages/Maintenance/CashboxHistory.js            |  9 ++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js b/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js
index f8a01e4d..4770792b 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js
@@ -98,6 +98,10 @@ const GET_MACHINES_AND_CONFIG = gql`
       cassette4
       numberOfCassettes
     }
+    unpairedMachines {
+      id: deviceId
+      name
+    }
     config
     bills(filters: $billFilters) {
       id
@@ -160,6 +164,7 @@ const CashCassettes = () => {
   const [machineId, setMachineId] = useState('')
 
   const machines = R.path(['machines'])(data) ?? []
+  const unpairedMachines = R.path(['unpairedMachines'])(data) ?? []
   const config = R.path(['config'])(data) ?? {}
   const fillingPercentageSettings = fromNamespace('notifications', config)
   const [setCassetteBills, { error }] = useMutation(SET_CASSETTE_BILLS, {
@@ -356,7 +361,10 @@ const CashCassettes = () => {
           </>
         )}
         {showHistory && (
-          <CashboxHistory machines={machines} currency={fiatCurrency} />
+          <CashboxHistory
+            machines={R.concat(machines, unpairedMachines)}
+            currency={fiatCurrency}
+          />
         )}
         <CashCassettesFooter
           currencyCode={fiatCurrency}
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js b/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js
index 5c36e8ed..b815175e 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js
@@ -161,9 +161,12 @@ const CashboxHistory = ({ machines, currency }) => {
       header: 'Machine',
       width: 200,
       textAlign: 'left',
-      view: it => {
-        return R.find(R.propEq('id', it.deviceId))(machines).name
-      }
+      view: R.pipe(
+        R.prop('deviceId'),
+        id => R.find(R.propEq('id', id), machines),
+        R.defaultTo({ name: <i>Unpaired device</i> }),
+        R.prop('name')
+      )
     },
     {
       name: 'billCount',