Merge pull request #936 from culturecreates/develop

Develop

src/components/Input/Number/StyledNumber.jsx

@@ -1,9 +1,18 @@
 import React from 'react';
 import './styledNumber.css';
 import { InputNumber } from 'antd';
+import i18n from 'i18next';
 
 function StyledNumber(props) {
-  return <InputNumber {...props} size="large" className="form-item-number-input" />;
+  return (
+    <InputNumber
+      {...props}
+      className="form-item-number-input"
+      size="large"
+      decimalSeparator={i18n?.language === 'fr' ? ',' : '.'}
+      precision={2}
+    />
+  );
 }
 
 export default StyledNumber;

src/components/TimePicker/TimePicker.jsx

@@ -10,7 +10,6 @@ function TimePickerStyled(props) {
       showNow={false}
       size="large"
       suffixIcon={false}
-      autoFocus={true}
       minuteStep={15}
       getPopupContainer={(trigger) => trigger.parentNode}
       {...props}

src/pages/Dashboard/AddEvent/AddEvent.jsx

@@ -991,10 +991,14 @@ function AddEvent() {
     setScrollToSelectedField(array?.at(-1));
   };
 
-  const onValuesChangeHandler = () => {
+  const onValuesChangeHandler = (changedValues, allValues) => {
     if (eventId) {
       if (!updateEventSuccess) {
-        if (!showDialog) setShowDialog(true);
+        //Check if the initial values are changed by quill editor
+        if (changedValues?.frenchEditor || changedValues?.englishEditor) {
+          if (changedValues?.frenchEditor && allValues?.frenchEditor) setShowDialog(true);
+          if (changedValues?.englishEditor && allValues?.englishEditor) setShowDialog(true);
+        } else if (!showDialog) setShowDialog(true);
       }
     } else {
       if (!addEventSuccess) {
@@ -1087,8 +1091,10 @@ function AddEvent() {
 
   useEffect(() => {
     if (addedFields?.length > 0) {
-      const element = document.getElementsByClassName(scrollToSelectedField);
-      element[0]?.scrollIntoView({ block: 'center', behavior: 'smooth' });
+      if (scrollToSelectedField) {
+        const element = document.getElementsByClassName(scrollToSelectedField);
+        element[0]?.scrollIntoView({ block: 'center', behavior: 'smooth' });
+      }
     }
   }, [addedFields]);