lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1457 from siiky/fix/lam-609/fix-cashin-overrides

Browse source 
fix: use the right field
This commit is contained in:
Rafael Taranto 2022-11-29 08:42:37 +00:00 • committed by GitHub
commit f1680cdced
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/new-config-manager.js
View file

@ -93,7 +93,7 @@ const getNotifications = (cryptoCurrency, machine, config) => {
const findByMachine = _.find(_.matches({ machine })) const findByMachine = _.find(_.matches({ machine }))
const cryptoFields = ['cryptoHighBalance', 'cryptoLowBalance', 'highBalance', 'lowBalance'] 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 getCryptoSettings = _.compose(_.pick(cryptoFields), _.defaultTo(notifications), findByCryptoCurrency)
const cryptoSettings = getCryptoSettings(notifications.cryptoBalanceOverrides) const cryptoSettings = getCryptoSettings(notifications.cryptoBalanceOverrides)
@ -108,8 +108,11 @@ const getNotifications = (cryptoCurrency, machine, config) => {
delete cryptoSettings.lowBalance delete cryptoSettings.lowBalance
} }
const getFiatSettings = _.compose(_.pick(fiatFields), _.defaultTo(notifications), findByMachine) const fiatSettings = _.flow(
const fiatSettings = getFiatSettings(notifications.fiatBalanceOverrides) findByMachine,
_.assignWith(_.defaultTo, notifications),
_.pick(fiatFields),
)(notifications.fiatBalanceOverrides)
return { ...notifNoOverrides, sms: smsSettings, email: emailSettings, ...cryptoSettings, ...fiatSettings, notificationCenter: notificationCenterSettings } return { ...notifNoOverrides, sms: smsSettings, email: emailSettings, ...cryptoSettings, ...fiatSettings, notificationCenter: notificationCenterSettings }
} }

2
new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js
View file

@ -10,7 +10,7 @@ import { transformNumber } from 'src/utils/number'
import NotificationsCtx from '../NotificationsContext' import NotificationsCtx from '../NotificationsContext'
const CASHBOX_KEY = 'cashbox' const CASHBOX_KEY = 'cashInAlertThreshold'
const CASSETTE_1_KEY = 'fillingPercentageCassette1' const CASSETTE_1_KEY = 'fillingPercentageCassette1'
const CASSETTE_2_KEY = 'fillingPercentageCassette2' const CASSETTE_2_KEY = 'fillingPercentageCassette2'
const CASSETTE_3_KEY = 'fillingPercentageCassette3' const CASSETTE_3_KEY = 'fillingPercentageCassette3'