Merge pull request #302 from noharm-ai/develop

v3.0.20
noharm-ai · Jan 28, 2024 · 1db2df2 · 1db2df2
2 parents e01f444 + 859d5b3
commit 1db2df2
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 643 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "noharm-app",
-  "version": "3.0.19",
+  "version": "3.0.20",
   "private": true,
   "dependencies": {
     "@ckeditor/ckeditor5-build-classic": "^35.0.1",

diff --git a/src/components/Forms/CustomForm/Field.jsx b/src/components/Forms/CustomForm/Field.jsx
@@ -83,9 +83,11 @@ export default function Field({ question, values, setFieldValue }) {
       <DatePicker
         format="DD/MM/YYYY"
         disabled={question.disabled}
-        value={values[question.id] ? dayjs(values[question.id]) : null}
+        value={
+          values[question.id] ? dayjs(values[question.id], "DD/MM/YYYY") : null
+        }
         onChange={(value) =>
-          setFieldValue(question.id, value.format("DD/MM/YYYY"))
+          setFieldValue(question.id, value ? value.format("DD/MM/YYYY") : null)
         }
         popupClassName="noArrow"
         allowClear