Merged in release/2022-02-11 (pull request #382)

Release/2022 02 11

client/src/components/form-date-picker/form-date-picker.component.jsx

@@ -1,5 +1,5 @@
 import { DatePicker } from "antd";
-import moment from "moment-timezone";
+import moment from "moment";
 import React, { useRef } from "react";
 //To be used as a form element only.
 
@@ -29,16 +29,14 @@ export function FormDatePicker({
 
   const handleChange = (newDate) => {
     if (value !== newDate && onChange) {
-      console.log(newDate.tz(bodyshop.timezone));
-      onChange(newDate.tz(bodyshop.timezone));
+      onChange(newDate);
     }
   };
 
   const handleKeyDown = (e) => {
     if (e.key.toLowerCase() === "t") {
       if (onChange) {
-        console.log(moment().tz(bodyshop.timezone));
-        onChange(moment().tz(bodyshop.timezone));
+        onChange(moment());
         // if (ref.current && ref.current.blur) ref.current.blur();
       }
     } else if (e.key.toLowerCase() === "enter") {

client/src/redux/user/user.sagas.js

@@ -42,8 +42,6 @@ import axios from "axios";
 import { messaging } from "../../firebase/firebase.utils";
 import { getToken } from "firebase/messaging";
 
-import moment from "moment-timezone";
-
 export function* onEmailSignInStart() {
   yield takeLatest(UserActionTypes.EMAIL_SIGN_IN_START, signInWithEmail);
 }
@@ -271,7 +269,7 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
     const userEmail = yield select((state) => state.user.currentUser.email);
     try {
       console.log("Setting shop timezone.");
-      moment.tz.setDefault(payload.timezone);
+     // moment.tz.setDefault(payload.timezone);
     } catch (error) {
       console.log(error);
     }