From cdd3841d4920050b35598813cbc0c040de681046 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 10 Feb 2022 16:21:10 -0800
Subject: [PATCH] IO-1708 Updated timezone for date fields.

---
 .../form-date-picker/form-date-picker.component.jsx      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/src/components/form-date-picker/form-date-picker.component.jsx b/client/src/components/form-date-picker/form-date-picker.component.jsx
index e8c3eb7d1..56a7f1846 100644
--- a/client/src/components/form-date-picker/form-date-picker.component.jsx
+++ b/client/src/components/form-date-picker/form-date-picker.component.jsx
@@ -29,14 +29,16 @@ export function FormDatePicker({
 
   const handleChange = (newDate) => {
     if (value !== newDate && onChange) {
-      onChange(newDate);
+      console.log(newDate.tz(bodyshop.timezone));
+      onChange(newDate.tz(bodyshop.timezone));
     }
   };
 
   const handleKeyDown = (e) => {
     if (e.key.toLowerCase() === "t") {
       if (onChange) {
-        onChange(moment());
+        console.log(moment().tz(bodyshop.timezone));
+        onChange(moment().tz(bodyshop.timezone));
         // if (ref.current && ref.current.blur) ref.current.blur();
       }
     } else if (e.key.toLowerCase() === "enter") {
@@ -71,10 +73,11 @@ export function FormDatePicker({
     <div onKeyDown={handleKeyDown}>
       <DatePicker
         ref={ref}
-        value={value ? moment(value) : null}
+        value={value ? moment(value).tz(bodyshop.timezone) : null}
         onChange={handleChange}
         format={dateFormat}
         onBlur={onBlur || handleBlur}
+        showToday={false}
         disabledTime
         {...(onlyFuture && {
           disabledDate: (d) => moment().subtract(1, "day").isAfter(d),