From 9e3b93d3857d3f1f5659aa2810c4a398f10a98a2 Mon Sep 17 00:00:00 2001
From: nreisingercres <141150843+nreisingercres@users.noreply.github.com>
Date: Tue, 31 Oct 2023 15:30:10 -0500
Subject: [PATCH] Fix days selector to ignore daylight savings (#3117)

---
 .../Common/FormComponents/DaysSelector/DaysSelector.tsx    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/portal-ui/src/screens/Console/Common/FormComponents/DaysSelector/DaysSelector.tsx b/portal-ui/src/screens/Console/Common/FormComponents/DaysSelector/DaysSelector.tsx
index bc937948b..6993e03f0 100644
--- a/portal-ui/src/screens/Console/Common/FormComponents/DaysSelector/DaysSelector.tsx
+++ b/portal-ui/src/screens/Console/Common/FormComponents/DaysSelector/DaysSelector.tsx
@@ -33,7 +33,10 @@ const calculateNewTime = (
   hours: number,
   minutes: number,
 ) => {
-  return DateTime.fromJSDate(initialDate).plus({ days, hours, minutes });
+  return DateTime.fromJSDate(initialDate).plus({
+    hours: hours + days * 24,
+    minutes,
+  }); // Lump days into hours to avoid daylight savings causing issues
 };
 
 const DaysSelector = ({
@@ -249,7 +252,7 @@ const DaysSelector = ({
             <LinkIcon />
             <div>{entity} will be available until:</div>{" "}
             <div className={"validTill"}>
-              {dateSelected.toFormat("MM/dd/yyyy HH:mm:ss")}
+              {dateSelected.toFormat("MM/dd/yyyy HH:mm:ss ZZZZ")}
             </div>
           </div>
         ) : (