From a5723b777998d349d17512acae3f7e76622ffc41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Oliveira?= Date: Thu, 25 Nov 2021 18:29:38 +0000 Subject: [PATCH] fix: max nr of cassette value fallback --- new-lamassu-admin/src/pages/Cashout/helper.js | 3 ++- .../src/pages/Dashboard/SystemStatus/MachinesTable.js | 3 ++- new-lamassu-admin/src/pages/Maintenance/CashCassettes.js | 3 ++- .../src/pages/Notifications/sections/FiatBalanceAlerts.js | 7 ++++--- .../pages/Notifications/sections/FiatBalanceOverrides.js | 3 ++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/new-lamassu-admin/src/pages/Cashout/helper.js b/new-lamassu-admin/src/pages/Cashout/helper.js index 27b442e2..cc424c33 100644 --- a/new-lamassu-admin/src/pages/Cashout/helper.js +++ b/new-lamassu-admin/src/pages/Cashout/helper.js @@ -37,7 +37,8 @@ const DenominationsSchema = Yup.object().shape({ const getElements = (machines, { fiatCurrency } = {}) => { const maxNumberOfCassettes = Math.max( - ...R.map(it => it.numberOfCassettes, machines) + ...R.map(it => it.numberOfCassettes, machines), + 0 ) const elements = [ diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js index 7ab04448..f5fda114 100644 --- a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js +++ b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js @@ -62,7 +62,8 @@ const MachinesTable = ({ machines, numToRender }) => { } const maxNumberOfCassettes = Math.max( - ...R.map(it => it.numberOfCassettes, machines) + ...R.map(it => it.numberOfCassettes, machines), + 0 ) return ( diff --git a/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js b/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js index 04a556fd..7ec10600 100644 --- a/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js +++ b/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js @@ -142,7 +142,8 @@ const CashCassettes = () => { const locale = data?.config && fromNamespace('locale')(data.config) const fiatCurrency = locale?.fiatCurrency const maxNumberOfCassettes = Math.max( - ...R.map(it => it.numberOfCassettes, machines) + ...R.map(it => it.numberOfCassettes, machines), + 0 ) const cashboxCounts = R.reduce( (ret, m) => R.assoc(m.id, m.cashbox, ret), diff --git a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js index 0bd96589..832bc8ca 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js +++ b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js @@ -32,13 +32,14 @@ const FiatBalance = ({ setEditing, data, save, - machines + machines = [] } = useContext(NotificationsCtx) const classes = useStyles() - const maxNumberOfCassettes = - Math.max(...R.map(it => it.numberOfCassettes, machines)) ?? + const maxNumberOfCassettes = Math.max( + ...R.map(it => it.numberOfCassettes, machines), DEFAULT_NUMBER_OF_CASSETTES + ) const editing = isEditing(NAME) diff --git a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js index 7d28fc6a..681c7cd0 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js +++ b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js @@ -56,7 +56,8 @@ const FiatBalanceOverrides = ({ section }) => { } const maxNumberOfCassettes = Math.max( - ...R.map(it => it.numberOfCassettes, machines) + ...R.map(it => it.numberOfCassettes, machines), + 0 ) const notesMin = 0