From 99b2861ff8695837126f7fe0418bc37e5e754d72 Mon Sep 17 00:00:00 2001 From: siiky Date: Fri, 25 Nov 2022 15:39:18 +0000 Subject: [PATCH 1/2] fix: use the right field --- lib/new-config-manager.js | 9 ++++++--- .../pages/Notifications/sections/FiatBalanceOverrides.js | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/new-config-manager.js b/lib/new-config-manager.js index 17a63adc..318ca56c 100644 --- a/lib/new-config-manager.js +++ b/lib/new-config-manager.js @@ -93,7 +93,7 @@ const getNotifications = (cryptoCurrency, machine, config) => { const findByMachine = _.find(_.matches({ machine })) const cryptoFields = ['cryptoHighBalance', 'cryptoLowBalance', 'highBalance', 'lowBalance'] - const fiatFields = ['cashbox', 'fillingPercentageCassette1', 'fillingPercentageCassette2', 'fillingPercentageCassette3', 'fillingPercentageCassette4'] + const fiatFields = ['cashInAlertThreshold', 'fillingPercentageCassette1', 'fillingPercentageCassette2', 'fillingPercentageCassette3', 'fillingPercentageCassette4'] const getCryptoSettings = _.compose(_.pick(cryptoFields), _.defaultTo(notifications), findByCryptoCurrency) const cryptoSettings = getCryptoSettings(notifications.cryptoBalanceOverrides) @@ -108,8 +108,11 @@ const getNotifications = (cryptoCurrency, machine, config) => { delete cryptoSettings.lowBalance } - const getFiatSettings = _.compose(_.pick(fiatFields), _.defaultTo(notifications), findByMachine) - const fiatSettings = getFiatSettings(notifications.fiatBalanceOverrides) + const fiatSettings = _.flow( + findByMachine, + _.defaultTo(notifications), + _.pick(fiatFields), + )(notifications.fiatBalanceOverrides) return { ...notifNoOverrides, sms: smsSettings, email: emailSettings, ...cryptoSettings, ...fiatSettings, notificationCenter: notificationCenterSettings } } diff --git a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js index e7cfeb4c..98ef8fb4 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js +++ b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js @@ -10,7 +10,7 @@ import { transformNumber } from 'src/utils/number' import NotificationsCtx from '../NotificationsContext' -const CASHBOX_KEY = 'cashbox' +const CASHBOX_KEY = 'cashInAlertThreshold' const CASSETTE_1_KEY = 'fillingPercentageCassette1' const CASSETTE_2_KEY = 'fillingPercentageCassette2' const CASSETTE_3_KEY = 'fillingPercentageCassette3' From 1fc8aa0269ef6c658cef250376275e8d85b21f6d Mon Sep 17 00:00:00 2001 From: siiky Date: Fri, 25 Nov 2022 15:44:43 +0000 Subject: [PATCH 2/2] fix: use default thresholds when no overrides exist --- lib/new-config-manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/new-config-manager.js b/lib/new-config-manager.js index 318ca56c..65c7966d 100644 --- a/lib/new-config-manager.js +++ b/lib/new-config-manager.js @@ -110,7 +110,7 @@ const getNotifications = (cryptoCurrency, machine, config) => { const fiatSettings = _.flow( findByMachine, - _.defaultTo(notifications), + _.assignWith(_.defaultTo, notifications), _.pick(fiatFields), )(notifications.fiatBalanceOverrides) return { ...notifNoOverrides, sms: smsSettings, email: emailSettings, ...cryptoSettings, ...fiatSettings, notificationCenter: notificationCenterSettings }