diff --git a/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.js b/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.js
index 294c355e..a35060af 100644
--- a/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.js
+++ b/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.js
@@ -19,25 +19,32 @@ const Cashbox = ({
className,
emptyPartClassName,
labelClassName,
- inFiatBalanceAlerts
+ applyColorVariant,
+ applyFiatBalanceAlertsStyling,
+ removeInnerPercentage
}) => {
- const classes = cashboxClasses({ percent, cashOut, inFiatBalanceAlerts })
+ console.log(
+ applyColorVariant,
+ applyFiatBalanceAlertsStyling,
+ removeInnerPercentage
+ )
+ const classes = cashboxClasses({ percent, cashOut, applyColorVariant })
const threshold = 51
const showCashBox = {
- [classes.fiatBalanceAlertCashbox]: inFiatBalanceAlerts,
- [classes.cashbox]: !inFiatBalanceAlerts
+ [classes.fiatBalanceAlertCashbox]: applyFiatBalanceAlertsStyling,
+ [classes.cashbox]: !applyFiatBalanceAlertsStyling
}
return (
- {!inFiatBalanceAlerts && percent <= threshold && (
+ {!removeInnerPercentage && percent <= threshold && (
{percent.toFixed(0)}%
)}
- {!inFiatBalanceAlerts && percent > threshold && (
+ {!removeInnerPercentage && percent > threshold && (
{percent.toFixed(0)}%
)}
diff --git a/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.styles.js b/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.styles.js
index f14f711e..cebc8b4f 100644
--- a/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.styles.js
+++ b/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.styles.js
@@ -11,8 +11,8 @@ const colors = {
}
}
-const colorPicker = ({ percent, cashOut, inFiatBalanceAlerts }) => {
- if (inFiatBalanceAlerts) return colors[cashOut ? 'cashOut' : 'cashIn'].full
+const colorPicker = ({ percent, cashOut, applyColorVariant }) => {
+ if (applyColorVariant) return colors[cashOut ? 'cashOut' : 'cashIn'].full
return colors[cashOut ? 'cashOut' : 'cashIn'][
percent >= 50 ? 'full' : 'empty'
]
diff --git a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js
index bb49e187..6aaff131 100644
--- a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js
+++ b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js
@@ -77,7 +77,9 @@ const FiatBalance = ({ section, min = 0, max = 100, fieldWidth = 80 }) => {
values.fillingPercentageCassette1 ??
data?.fillingPercentageCassette1
}
- inFiatBalanceAlerts={true}
+ applyColorVariant
+ applyFiatBalanceAlertsStyling
+ removeInnerPercentage
cashOut
/>
@@ -101,7 +103,9 @@ const FiatBalance = ({ section, min = 0, max = 100, fieldWidth = 80 }) => {
values.fillingPercentageCassette2 ??
data?.fillingPercentageCassette2
}
- inFiatBalanceAlerts={true}
+ applyColorVariant
+ applyFiatBalanceAlertsStyling
+ removeInnerPercentage
cashOut
/>