From 2d612876c20da9def3470b42bb196a8eaa2f069c Mon Sep 17 00:00:00 2001
From: Yinyin Liu <liu@innov.energy>
Date: Thu, 19 Mar 2026 12:56:03 +0100
Subject: [PATCH] fixed always check battery priority setting when it's in
 other priority mode

---
 .../SodistoreHomeConfiguration.tsx            | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistoreHomeConfiguration.tsx b/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistoreHomeConfiguration.tsx
index 620a8f388..a6caf051b 100644
--- a/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistoreHomeConfiguration.tsx
+++ b/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistoreHomeConfiguration.tsx
@@ -100,14 +100,16 @@ function SodistoreHomeConfiguration(props: SodistoreHomeConfigurationProps) {
     clusterNumber: props.values.Config.ClusterNumber ?? 1,
     PvNumber: props.values.Config.PvNumber ?? 0,
     timeChargeandDischargePower: props.values.Config?.TimeChargeandDischargePower ?? 0,
-    startTimeChargeandDischargeDayandTime:
-      props.values.Config?.StartTimeChargeandDischargeDayandTime
-        ? dayjs(props.values.Config.StartTimeChargeandDischargeDayandTime).toDate()
-        : null,
-    stopTimeChargeandDischargeDayandTime:
-      props.values.Config?.StopTimeChargeandDischargeDayandTime
-        ? dayjs(props.values.Config.StopTimeChargeandDischargeDayandTime).toDate()
-        : null,
+    startTimeChargeandDischargeDayandTime: (() => {
+      const raw = props.values.Config?.StartTimeChargeandDischargeDayandTime;
+      const parsed = raw ? dayjs(raw) : null;
+      return parsed && parsed.year() >= 2020 ? parsed.toDate() : new Date();
+    })(),
+    stopTimeChargeandDischargeDayandTime: (() => {
+      const raw = props.values.Config?.StopTimeChargeandDischargeDayandTime;
+      const parsed = raw ? dayjs(raw) : null;
+      return parsed && parsed.year() >= 2020 ? parsed.toDate() : new Date();
+    })(),
     controlPermission: String(props.values.Config.ControlPermission).toLowerCase() === "true",
   });
 
@@ -200,9 +202,11 @@ function SodistoreHomeConfiguration(props: SodistoreHomeConfigurationProps) {
     });
   };
 
-// Add time validation function
+// Add time validation function — only relevant for Sinexcel BatteryPriority
   const validateTimeOnly = () => {
-    if (formValues.startTimeChargeandDischargeDayandTime &&
+    if (device === 4 &&
+      OperatingPriorityOptions[formValues.operatingPriority] === 'BatteryPriority' &&
+      formValues.startTimeChargeandDischargeDayandTime &&
       formValues.stopTimeChargeandDischargeDayandTime) {
       const startHours = formValues.startTimeChargeandDischargeDayandTime.getHours();
       const startMinutes = formValues.startTimeChargeandDischargeDayandTime.getMinutes();