diff --git a/new-lamassu-admin/src/pages/Maintenance/CashCassettesFooter.js b/new-lamassu-admin/src/pages/Maintenance/CashCassettesFooter.js index 271e356c..53cfe9dc 100644 --- a/new-lamassu-admin/src/pages/Maintenance/CashCassettesFooter.js +++ b/new-lamassu-admin/src/pages/Maintenance/CashCassettesFooter.js @@ -7,7 +7,6 @@ import { Info1, Info2, Info3 } from 'src/components/typography/index' // import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg' import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg' import { fromNamespace } from 'src/utils/config' -import { isValidNumber } from 'src/utils/number' import styles from './CashCassettesFooter.styles.js' const useStyles = makeStyles(styles) @@ -26,10 +25,15 @@ const CashCassettesFooter = ({ const classes = useStyles() const cashout = config && fromNamespace('cashOut')(config) const getCashoutSettings = id => fromNamespace(id)(cashout) - const reducerFn = (acc, { cassette1, cassette2, id }) => [ - (acc[0] += cassette1 * getCashoutSettings(id).top), - (acc[1] += cassette2 * getCashoutSettings(id).bottom) - ] + const reducerFn = (acc, { cassette1, cassette2, id }) => { + const topDenomination = getCashoutSettings(id).top ?? 0 + const bottomDenomination = getCashoutSettings(id).bottom ?? 0 + return [ + (acc[0] += cassette1 * topDenomination), + (acc[1] += cassette2 * bottomDenomination) + ] + } + const totalInCassettes = R.sum(R.reduce(reducerFn, [0, 0], machines)) /* const totalInCashBox = R.sum( @@ -61,8 +65,7 @@ const CashCassettesFooter = ({ Cash-out: - {isValidNumber(totalInCassettes) ? totalInCassettes : 0}{' '} - {currencyCode} + {totalInCassettes} {currencyCode} {/*
diff --git a/new-lamassu-admin/src/utils/number.js b/new-lamassu-admin/src/utils/number.js index 6c907686..e05d5796 100644 --- a/new-lamassu-admin/src/utils/number.js +++ b/new-lamassu-admin/src/utils/number.js @@ -4,4 +4,4 @@ const isValidNumber = R.both(R.is(Number), R.complement(R.equals(NaN))) const transformNumber = value => (isValidNumber(value) ? value : null) -export { transformNumber, isValidNumber } +export { transformNumber }