From 0ea8a5af50576367b22458b7798a10619ae08bce Mon Sep 17 00:00:00 2001 From: siiky Date: Mon, 21 Nov 2022 17:08:31 +0000 Subject: [PATCH 1/2] refactor: unindent `.then()` chain --- lib/plugins.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/plugins.js b/lib/plugins.js index ce85123c..fd471836 100644 --- a/lib/plugins.js +++ b/lib/plugins.js @@ -758,13 +758,11 @@ function plugins (settings, deviceId) { const fiatCode = localeConfig.fiatCurrency return machineLoader.getMachines() - .then(devices => { - return Promise.all([ - checkCryptoBalances(fiatCode, devices), - checkDevicesCashBalances(fiatCode, devices) - ]) - .then(_.flow(_.flattenDeep, _.compact)) - }) + .then(devices => Promise.all([ + checkCryptoBalances(fiatCode, devices), + checkDevicesCashBalances(fiatCode, devices) + ])) + .then(_.flow(_.flattenDeep, _.compact)) } function randomCode () { From 8189028f44d4369801b8f3bc247ce880e7554edc Mon Sep 17 00:00:00 2001 From: siiky Date: Mon, 21 Nov 2022 17:10:40 +0000 Subject: [PATCH 2/2] fix: pick the cashbox notifications threshold --- 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 8428d6a6..58c282fc 100644 --- a/lib/new-config-manager.js +++ b/lib/new-config-manager.js @@ -92,7 +92,7 @@ const getNotifications = (cryptoCurrency, machine, config) => { const findByMachine = _.find(_.matches({ machine })) const cryptoFields = ['cryptoHighBalance', 'cryptoLowBalance', 'highBalance', 'lowBalance'] - const fiatFields = ['fillingPercentageCassette1', 'fillingPercentageCassette2', 'fillingPercentageCassette3', 'fillingPercentageCassette4'] + const fiatFields = ['cashbox', 'fillingPercentageCassette1', 'fillingPercentageCassette2', 'fillingPercentageCassette3', 'fillingPercentageCassette4'] const getCryptoSettings = _.compose(_.pick(cryptoFields), _.defaultTo(notifications), findByCryptoCurrency) const cryptoSettings = getCryptoSettings(notifications.cryptoBalanceOverrides)