From 465efe04a7f3e637189b668fe04b4a1e4e27cbb4 Mon Sep 17 00:00:00 2001
From: Nar Cuenca <28705606+finnar-bin@users.noreply.github.com>
Date: Tue, 16 Apr 2024 14:40:46 +0800
Subject: [PATCH] Date and datetime field timezone fixes (#2680)

Makes sure that the UI renders the correct date regardless of the
timezone for the date and date time fields
---
 .../content-editor/src/app/components/Editor/Field/Field.tsx    | 2 +-
 src/shell/components/FieldTypeDateTime/index.tsx                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/apps/content-editor/src/app/components/Editor/Field/Field.tsx b/src/apps/content-editor/src/app/components/Editor/Field/Field.tsx
index 12fdd53ebe..f06aafeec9 100644
--- a/src/apps/content-editor/src/app/components/Editor/Field/Field.tsx
+++ b/src/apps/content-editor/src/app/components/Editor/Field/Field.tsx
@@ -912,7 +912,7 @@ export const Field = ({
           <FieldTypeDate
             name={name}
             required={required}
-            value={value ? new Date(value) : null}
+            value={value ? moment(value).toDate() : null}
             // format="MMM dd, yyyy"
             onChange={(date) => onDateChange(date, name, datatype)}
             error={errors && Object.values(errors)?.some((error) => !!error)}
diff --git a/src/shell/components/FieldTypeDateTime/index.tsx b/src/shell/components/FieldTypeDateTime/index.tsx
index d46b82d59d..9e44c4eb25 100644
--- a/src/shell/components/FieldTypeDateTime/index.tsx
+++ b/src/shell/components/FieldTypeDateTime/index.tsx
@@ -78,7 +78,7 @@ export const FieldTypeDateTime = ({
       <FieldTypeDate
         name={name}
         required={required}
-        value={dateString ? new Date(dateString) : null}
+        value={dateString ? moment(dateString).toDate() : null}
         onChange={(date) => {
           if (date) {
             onChange(