From 165e248ad0e957ef90811457b67c2376ede547a9 Mon Sep 17 00:00:00 2001
From: Taranto <rafael.taranto@protonmail.com>
Date: Mon, 10 Jul 2023 11:53:56 +0100
Subject: [PATCH] fix: form init and validation for stackers

---
 .../sections/FiatBalanceAlerts.js             | 49 +++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js
index b459773d..7a3c35fe 100644
--- a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js
+++ b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js
@@ -46,6 +46,13 @@ const FiatBalance = ({ section, min = 0, max = 100, fieldWidth = 80 }) => {
     DEFAULT_NUMBER_OF_STACKERS
   )
 
+  const percentValidation = Yup.number()
+    .transform(transformNumber)
+    .integer()
+    .min(0)
+    .max(100)
+    .nullable()
+
   const schema = Yup.object().shape({
     cashInAlertThreshold: Yup.number()
       .transform(transformNumber)
@@ -53,30 +60,16 @@ const FiatBalance = ({ section, min = 0, max = 100, fieldWidth = 80 }) => {
       .min(notesMin)
       .max(notesMax)
       .nullable(),
-    fillingPercentageCassette1: Yup.number()
-      .transform(transformNumber)
-      .integer()
-      .min(min)
-      .max(max)
-      .nullable(),
-    fillingPercentageCassette2: Yup.number()
-      .transform(transformNumber)
-      .integer()
-      .min(min)
-      .max(max)
-      .nullable(),
-    fiatBalanceCassette3: Yup.number()
-      .transform(transformNumber)
-      .integer()
-      .min(min)
-      .max(max)
-      .nullable(),
-    fiatBalanceCassette4: Yup.number()
-      .transform(transformNumber)
-      .integer()
-      .min(min)
-      .max(max)
-      .nullable()
+    fillingPercentageCassette1: percentValidation,
+    fillingPercentageCassette2: percentValidation,
+    fillingPercentageCassette3: percentValidation,
+    fillingPercentageCassette4: percentValidation,
+    fillingPercentageStacker1f: percentValidation,
+    fillingPercentageStacker1r: percentValidation,
+    fillingPercentageStacker2f: percentValidation,
+    fillingPercentageStacker2r: percentValidation,
+    fillingPercentageStacker3f: percentValidation,
+    fillingPercentageStacker3r: percentValidation
   })
 
   return (
@@ -89,7 +82,13 @@ const FiatBalance = ({ section, min = 0, max = 100, fieldWidth = 80 }) => {
         fillingPercentageCassette1: data?.fillingPercentageCassette1 ?? '',
         fillingPercentageCassette2: data?.fillingPercentageCassette2 ?? '',
         fillingPercentageCassette3: data?.fillingPercentageCassette3 ?? '',
-        fillingPercentageCassette4: data?.fillingPercentageCassette4 ?? ''
+        fillingPercentageCassette4: data?.fillingPercentageCassette4 ?? '',
+        fillingPercentageStacker1f: data?.fillingPercentageStacker1f ?? '',
+        fillingPercentageStacker1r: data?.fillingPercentageStacker1r ?? '',
+        fillingPercentageStacker2f: data?.fillingPercentageStacker2f ?? '',
+        fillingPercentageStacker2r: data?.fillingPercentageStacker2r ?? '',
+        fillingPercentageStacker3f: data?.fillingPercentageStacker3f ?? '',
+        fillingPercentageStacker3r: data?.fillingPercentageStacker3r ?? ''
       }}
       validationSchema={schema}
       onSubmit={it => save(section, schema.cast(it))}