From 0e3e2eb141b77e6b7c181595ce7fea602dbbe270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Oliveira?= Date: Wed, 24 Nov 2021 23:41:49 +0000 Subject: [PATCH 1/3] fix: check for null values when selecting exchange --- .../src/pages/Wizard/components/Wallet/ChooseExchange.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.js b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.js index 98760107..ff4e8959 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.js @@ -38,7 +38,7 @@ const SAVE_ACCOUNTS = gql` } ` -const isConfigurable = it => !R.contains(it)(['mock-exchange']) +const isConfigurable = it => !R.isNil(it) && !R.contains(it)(['mock-exchange']) const ChooseExchange = ({ data: currentData, addData }) => { const classes = useStyles() From b8517b3c1923e5bba8ceea55e29dc429b013294e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Oliveira?= Date: Thu, 25 Nov 2021 00:13:41 +0000 Subject: [PATCH 2/3] fix: maxNumberOfCassettes having -Infinity value --- .../src/pages/Dashboard/SystemStatus/MachinesTable.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js index 7ab04448..1c240552 100644 --- a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js +++ b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js @@ -61,9 +61,9 @@ const MachinesTable = ({ machines, numToRender }) => { }) } - const maxNumberOfCassettes = Math.max( - ...R.map(it => it.numberOfCassettes, machines) - ) + const maxNumberOfCassettes = R.isEmpty(machines) + ? 0 + : Math.max(...R.map(it => it.numberOfCassettes, machines)) return ( From 8dac871324314c7a7ddeb9205f3565d49499289b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Oliveira?= Date: Thu, 25 Nov 2021 18:06:54 +0000 Subject: [PATCH 3/3] fix: add fallback for max number of cassettes calculations --- new-lamassu-admin/src/pages/Cashout/helper.js | 3 ++- .../src/pages/Dashboard/SystemStatus/MachinesTable.js | 9 +++++---- new-lamassu-admin/src/pages/Maintenance/CashCassettes.js | 3 ++- .../pages/Notifications/sections/FiatBalanceAlerts.js | 7 ++++--- .../pages/Notifications/sections/FiatBalanceOverrides.js | 3 ++- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/new-lamassu-admin/src/pages/Cashout/helper.js b/new-lamassu-admin/src/pages/Cashout/helper.js index c6fe4296..d9df7590 100644 --- a/new-lamassu-admin/src/pages/Cashout/helper.js +++ b/new-lamassu-admin/src/pages/Cashout/helper.js @@ -41,7 +41,8 @@ const DenominationsSchema = Yup.object().shape({ const getElements = (machines, locale = {}, classes) => { const fiatCurrency = R.prop('fiatCurrency')(locale) const maxNumberOfCassettes = Math.max( - ...R.map(it => it.numberOfCassettes, machines) + ...R.map(it => it.numberOfCassettes, machines), + 0 ) const options = getBillOptions(locale, denominations) diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js index 1c240552..85472291 100644 --- a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js +++ b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js @@ -40,7 +40,7 @@ const HeaderCell = withStyles({ } })(TableCell) -const MachinesTable = ({ machines, numToRender }) => { +const MachinesTable = ({ machines = [], numToRender }) => { const classes = useStyles() const history = useHistory() const getPercent = (notes, capacity = 500) => { @@ -61,9 +61,10 @@ const MachinesTable = ({ machines, numToRender }) => { }) } - const maxNumberOfCassettes = R.isEmpty(machines) - ? 0 - : Math.max(...R.map(it => it.numberOfCassettes, machines)) + const maxNumberOfCassettes = Math.max( + ...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 ee9784de..56ac1966 100644 --- a/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js +++ b/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js @@ -160,7 +160,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 813b66ca..f17c08f2 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js +++ b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js @@ -27,13 +27,14 @@ const FiatBalance = ({ section, min = 0, max = 100, fieldWidth = 80 }) => { 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 fdec9247..c53fe489 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 percentMin = 0