From b51cfaecb99472bb21da9ae4c2252fe3da59964a Mon Sep 17 00:00:00 2001
From: Abhishek P Anil <abhishek@culturecreates.com>
Date: Tue, 1 Oct 2024 12:49:59 +0530
Subject: [PATCH 1/2] fix: checked logo and image mandatory

---
 src/utils/formInitialValueHandler.js | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/utils/formInitialValueHandler.js b/src/utils/formInitialValueHandler.js
index f55f49f8b..c45c8de43 100644
--- a/src/utils/formInitialValueHandler.js
+++ b/src/utils/formInitialValueHandler.js
@@ -14,7 +14,27 @@ export const formInitialValueHandler = (type, mappedField, datatype, data) => {
     case formTypes.MULTISELECT:
       if (initialData?.length > 0) return initialData?.map((concept) => concept?.entityId);
       else return [];
-
+    case formTypes.IMAGE:
+      if (Array.isArray(initialData) && initialData.length > 0) {
+        return [
+          {
+            uid: initialData[0]?.original?.entityId,
+            name: initialData[0]?.original?.entityId,
+            status: 'done',
+            url: initialData[0].original.uri,
+          },
+        ];
+      } else if (initialData?.original?.uri) {
+        return [
+          {
+            uid: initialData.original.entityId,
+            name: initialData.original.entityId,
+            status: 'done',
+            url: initialData.original.uri,
+          },
+        ];
+      }
+      break;
     default:
       break;
   }

From 6eb3928fe3806b3bc1a5a5e4cb8573ce6fc63af6 Mon Sep 17 00:00:00 2001
From: syam babu <syam@dexlock.com>
Date: Tue, 1 Oct 2024 15:51:40 +0530
Subject: [PATCH 2/2] feat: added date persist functionality during switching
 dates for existing events. closes #1346

---
 src/pages/Dashboard/AddEvent/AddEvent.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Dashboard/AddEvent/AddEvent.jsx b/src/pages/Dashboard/AddEvent/AddEvent.jsx
index 1789eff9d..349afe349 100644
--- a/src/pages/Dashboard/AddEvent/AddEvent.jsx
+++ b/src/pages/Dashboard/AddEvent/AddEvent.jsx
@@ -1530,7 +1530,7 @@ function AddEvent() {
 
     setDateType(activeDateType);
 
-    if (currentActiveDateValue && !eventId) {
+    if (currentActiveDateValue) {
       switch (activeDateType) {
         case dateTypes.SINGLE:
           form.setFieldValue(