diff --git a/src/components/Card/MandatoryField/MandatoryField.jsx b/src/components/Card/MandatoryField/MandatoryField.jsx
index 87b8347c3..b05b3912d 100644
--- a/src/components/Card/MandatoryField/MandatoryField.jsx
+++ b/src/components/Card/MandatoryField/MandatoryField.jsx
@@ -34,7 +34,7 @@ function MandatoryField(props) {
 
       setAddedFields(updatedFields);
       setAvailableFields([...availableFields, removedField]);
-      setDirtyStatus();
+      setDirtyStatus(true);
     }
   };
 
@@ -54,7 +54,7 @@ function MandatoryField(props) {
     });
     setAddedFields([...addedFields, { ...field, isRequiredField: true }]);
     setAvailableFields(updatedFields);
-    setDirtyStatus();
+    setDirtyStatus(true);
   };
 
   useEffect(() => {
diff --git a/src/components/ImageUpload/ImageUpload.jsx b/src/components/ImageUpload/ImageUpload.jsx
index a45eece02..f0597d39a 100644
--- a/src/components/ImageUpload/ImageUpload.jsx
+++ b/src/components/ImageUpload/ImageUpload.jsx
@@ -107,6 +107,9 @@ function ImageUpload(props) {
   };
 
   const onRemove = () => {
+    form.setFieldsValue({
+      imageCrop: null,
+    });
     setImageUrl(false);
   };
 
diff --git a/src/components/MultipleImageUpload/MultipleImageUpload.jsx b/src/components/MultipleImageUpload/MultipleImageUpload.jsx
index 7be958dfc..8dc47676b 100644
--- a/src/components/MultipleImageUpload/MultipleImageUpload.jsx
+++ b/src/components/MultipleImageUpload/MultipleImageUpload.jsx
@@ -1,5 +1,5 @@
-import { DownloadOutlined, DeleteOutlined } from '@ant-design/icons';
-import { Tooltip, Upload, message } from 'antd';
+import { DownloadOutlined, DeleteOutlined, HolderOutlined } from '@ant-design/icons';
+import { Upload, message } from 'antd';
 import update from 'immutability-helper';
 import React, { useCallback, useRef, useState } from 'react';
 import { DndProvider, useDrag, useDrop } from 'react-dnd';
@@ -8,8 +8,10 @@ import { useTranslation } from 'react-i18next';
 import Outlined from '../Button/Outlined';
 const type = 'DragableUploadList';
 import './multipleImageUpload.css';
+import { getWidthFromAspectRatio } from '../../utils/getWidthFromAspectRatio';
+import { useOutletContext } from 'react-router-dom';
 
-const DragableUploadListItem = ({ originNode, moveRow, file, fileList }) => {
+const DragableUploadListItem = ({ moveRow, file, fileList, actions, width }) => {
   const ref = useRef(null);
 
   const index = fileList.indexOf(file);
@@ -39,7 +41,7 @@ const DragableUploadListItem = ({ originNode, moveRow, file, fileList }) => {
     }),
   });
   drop(drag(ref));
-  const errorNode = <Tooltip title="Upload Error">{originNode.props.children}</Tooltip>;
+  // const errorNode = <Tooltip title="Upload Error">{originNode.props.children}</Tooltip>;
   return (
     <div
       ref={ref}
@@ -47,7 +49,42 @@ const DragableUploadListItem = ({ originNode, moveRow, file, fileList }) => {
       style={{
         cursor: 'grab',
       }}>
-      {file.status === 'error' ? errorNode : originNode}
+      <span className="image-footer">
+        <span className="image-contents">
+          <span className="image-actions">
+            <span
+              onClick={actions?.download}
+              data-cy="span-download-image"
+              style={{
+                cursor: 'grab',
+              }}>
+              <HolderOutlined style={{ color: '#1B3DE6', fontWeight: '600', fontSize: '22px' }} />
+            </span>
+          </span>
+          <img
+            className="image-thumbnail"
+            src={file?.url ?? file?.thumbUrl}
+            style={{
+              width: width ? `${width}px` : 'auto',
+              minWidth: width ? `${width}px` : 'none',
+            }}
+          />
+          <a
+            className="image-name"
+            target="_blank"
+            rel="noopener noreferrer"
+            href={file?.url}
+            data-cy="anchor-image-link">
+            {file?.name}
+          </a>
+        </span>
+        <span className="image-actions">
+          <span onClick={actions?.remove} data-cy="span-download-image">
+            <DeleteOutlined style={{ color: '#1B3DE6', fontWeight: '600', fontSize: '16px' }} />
+          </span>
+        </span>
+      </span>
+      {/* {file.status === 'error' ? errorNode : originNode} */}
     </div>
   );
 };
@@ -63,8 +100,9 @@ const getBase64 = (img, callback) => {
   });
 };
 const MultipleImageUpload = (props) => {
-  const { eventImageData, form, imageReadOnly } = props;
+  const { eventImageData, form, imageReadOnly, setShowDialog } = props;
   const { t } = useTranslation();
+  const [currentCalendarData] = useOutletContext();
 
   const [fileList, setFileList] = useState(
     eventImageData?.length > 0
@@ -98,6 +136,14 @@ const MultipleImageUpload = (props) => {
       : [],
   );
 
+  let aspectRatio;
+  let width;
+
+  if (currentCalendarData?.imageConfig[0]?.thumbnail?.aspectRatio) {
+    aspectRatio = currentCalendarData.imageConfig[0]?.large.aspectRatio;
+    width = getWidthFromAspectRatio(aspectRatio, 48);
+  }
+
   const moveRow = useCallback(
     (dragIndex, hoverIndex) => {
       const dragRow = fileList[dragIndex];
@@ -148,6 +194,7 @@ const MultipleImageUpload = (props) => {
     form.setFieldsValue({
       multipleImagesCrop: newFileList,
     });
+    if (setShowDialog) setShowDialog(true);
   };
 
   const beforeUpload = (file) => {
@@ -174,6 +221,7 @@ const MultipleImageUpload = (props) => {
           customRequest={customRequest}
           beforeUpload={beforeUpload}
           showUploadList={{
+            showRemoveIcon: imageReadOnly ? false : true,
             removeIcon: <DeleteOutlined style={{ color: '#1B3DE6', fontWeight: '600', fontSize: '16px' }} />,
           }}
           multiple
@@ -185,11 +233,19 @@ const MultipleImageUpload = (props) => {
                 fileList={currFileList}
                 moveRow={moveRow}
                 actions={actions}
+                width={width}
               />
             ) : (
               <span className="image-footer">
                 <span className="image-contents">
-                  <img className="image-thumbnail" src={file?.url ?? file?.thumbUrl} />
+                  <img
+                    className="image-thumbnail"
+                    src={file?.url ?? file?.thumbUrl}
+                    style={{
+                      width: width ? `${width}px` : 'auto',
+                      minWidth: width ? `${width}px` : 'none',
+                    }}
+                  />
                   <a
                     className="image-name"
                     target="_blank"
diff --git a/src/components/MultipleImageUpload/multipleImageUpload.css b/src/components/MultipleImageUpload/multipleImageUpload.css
index 5672ddd9a..78cc2b8e7 100644
--- a/src/components/MultipleImageUpload/multipleImageUpload.css
+++ b/src/components/MultipleImageUpload/multipleImageUpload.css
@@ -12,8 +12,8 @@
   justify-content: space-between;
   width: 100%;
   gap: 10px;
-  border: 1px solid #d9d9d9;
-  border-radius: 2px;
+  border: 1px solid #607efc;
+  border-radius: 4px;
   height: 66px;
   padding: 8px;
   margin-top: 8px;
@@ -52,6 +52,13 @@
   font-size: 16px;
 }
 
+.multiple-image-upload-wrapper .ant-upload-list-picture .ant-upload-list-item-name {
+  flex: auto;
+  margin: 0;
+  padding-right: 8px;
+  padding-left: 48px;
+}
+
 @media (max-width: 480px) {
   .multiple-image-upload-wrapper .image-footer .image-name {
     text-wrap: wrap;
diff --git a/src/components/RecurringEvents/RecurringEvents.jsx b/src/components/RecurringEvents/RecurringEvents.jsx
index 0cbee1634..70cc30295 100644
--- a/src/components/RecurringEvents/RecurringEvents.jsx
+++ b/src/components/RecurringEvents/RecurringEvents.jsx
@@ -24,6 +24,10 @@ const RecurringEvents = function ({
   eventDetails,
   setFormFields,
   dateType,
+  disabledDate,
+  onCalendarChange,
+  setSubEventCount,
+  subEventCount,
 }) {
   const [nummberofDates, setNumberofDates] = useState(numberOfDaysEvent);
   const [isModalVisible, setIsModalVisible] = useState(false);
@@ -32,7 +36,6 @@ const RecurringEvents = function ({
   const [isCustom, setIsCustom] = useState(false);
   const [selectedWeekDays, setSelectedWeekDays] = useState([]);
   const [dateModified, setDateModified] = useState(false);
-  const [subEventCount, setSubEventCount] = useState(0);
   const startDateRecur = Form.useWatch('startDateRecur', form);
   const { t } = useTranslation();
   Form.useWatch('endTimeRecur', form);
@@ -341,6 +344,8 @@ const RecurringEvents = function ({
             <DateRangePicker
               style={{ width: '423px' }}
               disabled={(isCustom || formFields?.frequency === 'CUSTOM') && startDateRecur?.length == 2 && true}
+              disabledDate={disabledDate}
+              onCalendarChange={onCalendarChange}
               suffixIcon={
                 subEventCount > 0 && (
                   <Tags
diff --git a/src/constants/calendarSettingsForm.js b/src/constants/calendarSettingsForm.js
index 5df5dcf44..ebdfc0e4b 100644
--- a/src/constants/calendarSettingsForm.js
+++ b/src/constants/calendarSettingsForm.js
@@ -143,39 +143,46 @@ export const calendarSettingsFormFields = {
     {
       name: 'calendarName',
       label: <Translation>{(t) => t('dashboard.settings.calendarSettings.calendarName')}</Translation>,
-      field: ({ t }) => (
-        <BilingualInput>
-          <Form.Item name="calendarNameFr">
-            <TextArea
-              autoSize
-              style={{
-                borderRadius: '4px',
-                border: '4px solid #E8E8E8',
-                width: '100%',
-              }}
-              size="large"
-              autoComplete="off"
-              placeholder={t('dashboard.settings.calendarSettings.placeholders.calendarNameFr')}
-              data-cy="input-calendar-name"
-            />
-          </Form.Item>
+      field: ({ t, initialValues }) => {
+        const fieldData = {
+          fr: initialValues?.calendarNameFr,
+          en: initialValues?.calendarNameEn,
+        };
 
-          <Form.Item name="calendarNameEn">
-            <TextArea
-              autoSize
-              style={{
-                borderRadius: '4px',
-                border: '4px solid #E8E8E8',
-                width: '100%',
-              }}
-              size="large"
-              autoComplete="off"
-              placeholder={t('dashboard.settings.calendarSettings.placeholders.calendarNameEn')}
-              data-cy="input-calendar-name"
-            />
-          </Form.Item>
-        </BilingualInput>
-      ),
+        return (
+          <BilingualInput fieldData={fieldData}>
+            <Form.Item name="calendarNameFr">
+              <TextArea
+                autoSize
+                style={{
+                  borderRadius: '4px',
+                  border: '4px solid #E8E8E8',
+                  width: '100%',
+                }}
+                size="large"
+                autoComplete="off"
+                placeholder={t('dashboard.settings.calendarSettings.placeholders.calendarNameFr')}
+                data-cy="input-calendar-name"
+              />
+            </Form.Item>
+
+            <Form.Item name="calendarNameEn">
+              <TextArea
+                autoSize
+                style={{
+                  borderRadius: '4px',
+                  border: '4px solid #E8E8E8',
+                  width: '100%',
+                }}
+                size="large"
+                autoComplete="off"
+                placeholder={t('dashboard.settings.calendarSettings.placeholders.calendarNameEn')}
+                data-cy="input-calendar-name"
+              />
+            </Form.Item>
+          </BilingualInput>
+        );
+      },
       rules: [
         ({ getFieldValue }) => ({
           validator() {
diff --git a/src/constants/formFields.js b/src/constants/formFields.js
index f2fa180c7..f823a4679 100644
--- a/src/constants/formFields.js
+++ b/src/constants/formFields.js
@@ -370,6 +370,7 @@ export const formFieldValue = [
       eventImageGalleryData,
       enableGallery,
       t,
+      setShowDialog,
     }) => (
       <>
         {position === 'top' && datatype === dataTypes.IMAGE && <p className="add-event-date-heading">{userTips}</p>}
@@ -390,10 +391,10 @@ export const formFieldValue = [
         {name?.includes(mappedFieldTypes.IMAGE) && (
           <Form.Item
             label={t('dashboard.events.addEditEvent.otherInformation.image.additionalImages')}
-            className="subheading-wrap"
             data-cy="form-item-event-multiple-image"
             hidden={!enableGallery}>
             <MultipleImageUpload
+              setShowDialog={setShowDialog}
               form={form}
               largeAspectRatio={largeAspectRatio}
               thumbnailAspectRatio={thumbnailAspectRatio}
@@ -691,6 +692,7 @@ export const returnFormDataWithFields = ({
   isEntitiesFetching,
   adminOnlyFields,
   mandatoryFields,
+  setShowDialog,
 }) => {
   return renderFormFields({
     fieldName: field?.name,
@@ -767,6 +769,7 @@ export const returnFormDataWithFields = ({
       isExternalSourceFetching,
       isEntitiesFetching,
       // required: checkMandatoryAdminOnlyFields(field?.name, mandatoryFields),
+      setShowDialog,
     }),
     key: index,
     initialValue: formInitialValueHandler(field?.type, field?.mappedField, field?.datatype, entityData),
diff --git a/src/locales/fr/transalationFr.json b/src/locales/fr/transalationFr.json
index eb9575249..6cc40dfcf 100644
--- a/src/locales/fr/transalationFr.json
+++ b/src/locales/fr/transalationFr.json
@@ -254,7 +254,7 @@
             "title": "Image",
             "mainImage": "Image principale",
             "additionalImages": "Images supplémentaires",
-            "subHeading": "Les images doivent être au format paysage ou carré et mesurer au moins 600 px de large. Uniquement les fichiers .jpeg et .png sont acceptés.",
+            "subHeading": "Uniquement les fichiers .jpeg et .png sont acceptés.",
             "dragAndDrop": "ou glisser pour télécharger",
             "browse": "Parcourir",
             "imageGallery": "Galerie d'images",
diff --git a/src/pages/Dashboard/AddEvent/AddEvent.jsx b/src/pages/Dashboard/AddEvent/AddEvent.jsx
index 985d1c04a..47099bc4c 100644
--- a/src/pages/Dashboard/AddEvent/AddEvent.jsx
+++ b/src/pages/Dashboard/AddEvent/AddEvent.jsx
@@ -107,6 +107,7 @@ import { groupEventsByDate } from '../../../utils/groupSubEventsConfigByDate';
 import MultipleImageUpload from '../../../components/MultipleImageUpload';
 import { adminCheckHandler } from '../../../utils/adminCheckHandler';
 import { getCurrentCalendarDetailsFromUserDetails } from '../../../utils/getCurrentCalendarDetailsFromUserDetails';
+import { getWeekDayDates } from '../../../utils/getWeekDayDates';
 
 const { TextArea } = Input;
 
@@ -160,6 +161,9 @@ function AddEvent() {
   const [getAllTaxonomy] = useLazyGetAllTaxonomyQuery({ sessionId: timestampRef });
 
   const [dateType, setDateType] = useState();
+  const [subEventCount, setSubEventCount] = useState(0);
+  const [startDate, setStartDate] = useState();
+  const [endDate, setEndDate] = useState();
   const [ticketType, setTicketType] = useState();
   const [organizersList, setOrganizersList] = useState([]);
   const [performerList, setPerformerList] = useState([]);
@@ -232,9 +236,29 @@ function AddEvent() {
   let mainImageData = eventData?.image?.find((image) => image?.isMain) || null;
 
   const calendarContentLanguage = currentCalendarData?.contentLanguage;
-  const dateTimeConverter = (date, time) => {
-    let dateSelected = date.format('DD-MM-YYYY');
-    let timeSelected = time.format('hh:mm:ss a');
+  const dateTimeConverter = (date, time, isAdjustedCustomDate = false) => {
+    let dateSelected;
+    let timeSelected;
+
+    // Determine if the date is already in the 'DD-MM-YYYY' format.
+    // This is to hadle for cases where the date comes from a recurring event configurations that are being converted to single event
+    if (moment.isMoment(date)) {
+      dateSelected = date.format('DD-MM-YYYY');
+    } else {
+      dateSelected = moment(date).format('DD-MM-YYYY');
+    }
+
+    // adjustedCustomDate is used to handle dates that are coming from custom recurring event config
+    if (isAdjustedCustomDate) {
+      return moment.tz(dateSelected + ' ' + time, 'DD-MM-YYYY HH:mm a', 'Canada/Eastern');
+    }
+
+    if (moment.isMoment(time)) {
+      timeSelected = time.format('hh:mm:ss a');
+    } else {
+      timeSelected = time;
+    }
+
     // Combine date and time and explicitly set the timezone to 'Canada/Eastern'
     let dateTime = moment.tz(dateSelected + ' ' + timeSelected, 'DD-MM-YYYY HH:mm a', 'Canada/Eastern');
     return dateTime.toISOString();
@@ -445,27 +469,25 @@ function AddEvent() {
             });
             // Use a regular expression to remove <p><br></p> tags at the end
 
-            if (dateType === dateTypes.SINGLE) {
-              if (values?.startTime) startDateTime = dateTimeConverter(values?.datePicker, values?.startTime);
-              else
-                startDateTime = moment
-                  .tz(values?.datePicker, eventData?.scheduleTimezone ?? 'Canada/Eastern')
-                  .format('YYYY-MM-DD');
-              if (values?.endTime) endDateTime = dateTimeConverter(values?.datePicker, values?.endTime);
-            }
-            if (dateType === dateTypes.RANGE) {
-              if (values?.startTime) startDateTime = dateTimeConverter(values?.dateRangePicker[0], values?.startTime);
-              else
-                startDateTime = moment
-                  .tz(values?.dateRangePicker[0], eventData?.scheduleTimezone ?? 'Canada/Eastern')
-                  .format('YYYY-MM-DD');
-              if (values?.endTime) endDateTime = dateTimeConverter(values?.dateRangePicker[1], values?.endTime);
-              else
-                endDateTime = moment
-                  .tz(values?.dateRangePicker[1], eventData?.scheduleTimezone ?? 'Canada/Eastern')
-                  .format('YYYY-MM-DD');
-            }
-            if (dateType === dateTypes.MULTIPLE) {
+            // Below code handles dates and time for single, range and multiple dates
+            // custom dates that has only one occurance will be converted to single event
+            // multiple dates that has only one occurance will be converted to single event
+
+            let datePickerValue = values?.datePicker;
+            let startTimeValue = values?.startTime;
+            let endTimeValue = values?.endTime;
+            let dateTypeValue = dateType;
+
+            let customTimeFlag = false;
+            let customStartTimeFlag = false;
+            let customEndTimeFlag = false;
+            let customDatesFlag = false;
+
+            let multipleDatesFlag = false;
+            let multipleStartTimeFlag = false;
+            let multipleEndTimeFlag = false;
+
+            if (dateTypeValue === dateTypes.MULTIPLE) {
               const recurEvent = {
                 frequency: values.frequency,
                 startDate:
@@ -490,8 +512,74 @@ function AddEvent() {
                 customDates:
                   form.getFieldsValue().frequency === 'CUSTOM' ? form.getFieldsValue().customDates : undefined,
               };
-              recurringEvent = recurEvent;
+
+              customDatesFlag = !!recurEvent?.customDates;
+
+              if (customDatesFlag && recurEvent.customDates.length === 1) {
+                // sets flags for customTime and customDates inclusion
+                const customTimes = recurEvent.customDates[0]?.customTimes || [];
+                customTimeFlag = customTimes.length == 1;
+                customDatesFlag = customTimes.length <= 1;
+              } else if (subEventCount == 1) {
+                // sets flags and values for multipleDay event with only one occurance
+                multipleDatesFlag = true;
+                dateTypeValue = dateTypes.SINGLE;
+                datePickerValue = getWeekDayDates(recurEvent);
+              } else {
+                customDatesFlag = false;
+              }
+
+              // following code convert custom date to a single day event if there is only one occurance
+              if (customDatesFlag) {
+                // Custom dates to single event conversion logic
+                dateTypeValue = dateTypes.SINGLE;
+                const singleCustomDate = recurEvent.customDates?.[0];
+                datePickerValue = singleCustomDate ? moment(singleCustomDate.startDate) : undefined;
+
+                if (customTimeFlag) {
+                  const customTimes = singleCustomDate?.customTimes?.[0] || {};
+                  startTimeValue = customTimes.startTime ?? undefined;
+                  endTimeValue = customTimes.endTime ?? undefined;
+
+                  customStartTimeFlag = !!startTimeValue;
+                  customEndTimeFlag = !!endTimeValue;
+                } else {
+                  startTimeValue = undefined;
+                  endTimeValue = undefined;
+                }
+              } else if (multipleDatesFlag) {
+                startTimeValue = recurEvent?.startTime ?? undefined;
+                endTimeValue = recurEvent?.endTime ?? undefined;
+
+                multipleStartTimeFlag = !!startTimeValue;
+                multipleEndTimeFlag = !!endTimeValue;
+              } else {
+                recurringEvent = recurEvent;
+              }
             }
+
+            if (dateTypeValue === dateTypes.SINGLE) {
+              if (startTimeValue) startDateTime = dateTimeConverter(datePickerValue, startTimeValue, customTimeFlag);
+              else
+                startDateTime = moment
+                  .tz(datePickerValue, eventData?.scheduleTimezone ?? 'Canada/Eastern')
+                  .format('YYYY-MM-DD');
+              if (endTimeValue) endDateTime = dateTimeConverter(datePickerValue, endTimeValue, customTimeFlag);
+            }
+
+            if (dateTypeValue === dateTypes.RANGE) {
+              if (values?.startTime) startDateTime = dateTimeConverter(values?.dateRangePicker[0], values?.startTime);
+              else
+                startDateTime = moment
+                  .tz(values?.dateRangePicker[0], eventData?.scheduleTimezone ?? 'Canada/Eastern')
+                  .format('YYYY-MM-DD');
+              if (values?.endTime) endDateTime = dateTimeConverter(values?.dateRangePicker[1], values?.endTime);
+              else
+                endDateTime = moment
+                  .tz(values?.dateRangePicker[1], eventData?.scheduleTimezone ?? 'Canada/Eastern')
+                  .format('YYYY-MM-DD');
+            }
+
             if (values?.eventType) {
               additionalType = values?.eventType?.map((eventTypeId) => {
                 return {
@@ -698,12 +786,24 @@ function AddEvent() {
             if (nameEn) name['en'] = nameEn;
             if (nameFr) name['fr'] = nameFr;
 
+            const isStartDateConvertedCustomDates = values?.startTime && !(customDatesFlag || multipleDatesFlag);
+            const isEndDateConvertedCustomDates = values?.endTime && !(customDatesFlag || multipleDatesFlag);
+            const isCustomOrMultipleDatesHasEndTime = customEndTimeFlag || multipleEndTimeFlag;
+            const isCustomOrMultipleDatesHasStartTime = customStartTimeFlag || multipleStartTimeFlag;
             eventObj = {
               name: !(Object.keys(name).length > 0) ? { ...name, ...eventData?.name } : name,
-              ...(values?.startTime && { startDateTime }),
-              ...(!values?.startTime && { startDate: startDateTime }),
-              ...(values?.endTime && { endDateTime }),
-              ...(!values?.endTime && { endDate: endDateTime }),
+              ...((isStartDateConvertedCustomDates || isCustomOrMultipleDatesHasStartTime) && {
+                startDateTime,
+              }),
+              ...((isStartDateConvertedCustomDates || !isCustomOrMultipleDatesHasStartTime) && {
+                startDate: startDateTime,
+              }),
+              ...((isEndDateConvertedCustomDates || isCustomOrMultipleDatesHasEndTime) && {
+                endDateTime,
+              }),
+              ...((isEndDateConvertedCustomDates || !isCustomOrMultipleDatesHasEndTime) && {
+                endDate: endDateTime,
+              }),
               eventStatus: values?.eventStatus,
               ...((values?.englishEditor || values?.frenchEditor) && { description }),
               ...(values?.eventAccessibility && {
@@ -733,29 +833,31 @@ function AddEvent() {
               subEventConfiguration: eventData?.subEventConfiguration,
             };
 
-            let imageCrop = [form.getFieldValue('imageCrop')];
-            imageCrop = [
-              {
-                large: {
-                  xCoordinate: imageCrop[0]?.large?.x,
-                  yCoordinate: imageCrop[0]?.large?.y,
-                  height: imageCrop[0]?.large?.height,
-                  width: imageCrop[0]?.large?.width,
-                },
-                thumbnail: {
-                  xCoordinate: imageCrop[0]?.thumbnail?.x,
-                  yCoordinate: imageCrop[0]?.thumbnail?.y,
-                  height: imageCrop[0]?.thumbnail?.height,
-                  width: imageCrop[0]?.thumbnail?.width,
-                },
-                original: {
-                  entityId: imageCrop[0]?.original?.entityId,
-                  height: imageCrop[0]?.original?.height,
-                  width: imageCrop[0]?.original?.width,
+            let imageCrop = form.getFieldValue('imageCrop') ? [form.getFieldValue('imageCrop')] : [];
+            if (imageCrop.length > 0) {
+              imageCrop = [
+                {
+                  large: {
+                    xCoordinate: imageCrop[0]?.large?.x,
+                    yCoordinate: imageCrop[0]?.large?.y,
+                    height: imageCrop[0]?.large?.height,
+                    width: imageCrop[0]?.large?.width,
+                  },
+                  thumbnail: {
+                    xCoordinate: imageCrop[0]?.thumbnail?.x,
+                    yCoordinate: imageCrop[0]?.thumbnail?.y,
+                    height: imageCrop[0]?.thumbnail?.height,
+                    width: imageCrop[0]?.thumbnail?.width,
+                  },
+                  original: {
+                    entityId: imageCrop[0]?.original?.entityId,
+                    height: imageCrop[0]?.original?.height,
+                    width: imageCrop[0]?.original?.width,
+                  },
+                  isMain: true,
                 },
-                isMain: true,
-              },
-            ];
+              ];
+            }
 
             const uploadImageList = async () => {
               for (let i = 0; i < values.multipleImagesCrop.length; i++) {
@@ -858,11 +960,15 @@ function AddEvent() {
                   });
             } else {
               if (values.multipleImagesCrop?.length > 0) await uploadImageList();
-              if (values?.draggerWrap) {
-                if (values?.dragger && values?.dragger?.length == 0 && values.multipleImagesCrop?.length == 0)
-                  eventObj['image'] = null;
-                else eventObj['image'] = imageCrop;
-              }
+              if (
+                values?.draggerWrap &&
+                values?.dragger?.length === 0 &&
+                (!values.multipleImagesCrop || values.multipleImagesCrop?.length === 0)
+              ) {
+                // Main image is removed and no new image is added
+                // No gallery images are added
+                eventObj['image'] = [];
+              } else eventObj['image'] = imageCrop;
 
               addUpdateEventApiHandler(eventObj, toggle)
                 .then((id) => resolve(id))
@@ -2306,7 +2412,7 @@ function AddEvent() {
                 <Row>
                   <Col>
                     <p className="add-event-date-heading" data-cy="heading-dates">
-                      {t('dashboard.events.addEditEvent.dates.heading')}
+                      {t('dashboard.events.addEditEvent.dates.heading')} hello
                     </p>
                   </Col>
                 </Row>
@@ -2442,7 +2548,18 @@ function AddEvent() {
                             },
                           ]}
                           data-cy="form-item-date-range-label">
-                          <DateRangePicker style={{ width: '100%' }} data-cy="date-range" />
+                          <DateRangePicker
+                            style={{ width: '100%' }}
+                            onCalendarChange={(dates) => {
+                              setStartDate(dates?.[0]);
+                              setEndDate(dates?.[1]);
+                            }}
+                            disabledDate={(current) =>
+                              (startDate && current.isSame(startDate, 'day')) ||
+                              (endDate && current.isSame(endDate, 'day'))
+                            }
+                            data-cy="date-range"
+                          />
                         </Form.Item>
                       )}
                       {dateType === dateTypes.MULTIPLE && (
@@ -2453,6 +2570,16 @@ function AddEvent() {
                             numberOfDaysEvent={eventData?.subEvents?.length}
                             form={form}
                             eventDetails={eventData}
+                            subEventCount={subEventCount}
+                            setSubEventCount={setSubEventCount}
+                            onCalendarChange={(dates) => {
+                              setStartDate(dates?.[0]);
+                              setEndDate(dates?.[1]);
+                            }}
+                            disabledDate={(current) =>
+                              (startDate && current.isSame(startDate, 'day')) ||
+                              (endDate && current.isSame(endDate, 'day'))
+                            }
                             setFormFields={setFormValue}
                             dateType={dateType}
                           />
@@ -3616,6 +3743,7 @@ function AddEvent() {
                       : null
                   }
                   eventImageData={eventData?.image?.filter((image) => !image?.isMain)}
+                  setShowDialog={setShowDialog}
                 />
               </Form.Item>
 
diff --git a/src/pages/Dashboard/AddUser/AddUser.jsx b/src/pages/Dashboard/AddUser/AddUser.jsx
index c18eeb397..9be7cd498 100644
--- a/src/pages/Dashboard/AddUser/AddUser.jsx
+++ b/src/pages/Dashboard/AddUser/AddUser.jsx
@@ -93,10 +93,6 @@ const AddUser = () => {
     return calendar?.calendarId === calendarId;
   });
 
-  useEffect(() => {
-    console.log(selectedCalendars);
-  }, [selectedCalendars]);
-
   const [getUser, { isFetching: isUserFetching }] = useLazyGetUserByIdQuery({ sessionId: timestampRef });
   const [getUserSearch] = useLazyGetAllUsersQuery({ sessionId: timestampRef });
 
@@ -270,6 +266,7 @@ const AddUser = () => {
       formInstance
         .validateFields()
         .then((values) => {
+          setIsFormDirty(false);
           let organizations = values?.organizers[calendarId];
           organizations = organizations?.map((organizer) => {
             return { entityId: organizer?.value };
@@ -317,6 +314,7 @@ const AddUser = () => {
       formInstance
         .validateFields()
         .then((values) => {
+          setIsFormDirty(false);
           let organizations = values?.organizers[calendarId];
           organizations = organizations?.map((organizer) => {
             return { entityId: organizer?.value };
@@ -844,7 +842,11 @@ const AddUser = () => {
                             validateNotEmpty(_, value, t('dashboard.settings.addUser.validationTexts.language')),
                         },
                       ]}>
-                      <Select options={userLanguages} data-cy="select-user-language" />
+                      <Select
+                        options={userLanguages}
+                        onChange={(value) => setFormItemValues({ value, fieldType: 'languagePreference' })}
+                        data-cy="select-user-language"
+                      />
                     </Form.Item>
 
                     {isCurrentUser && (
diff --git a/src/pages/Dashboard/CreateNewOrganization/CreateNewOrganization.jsx b/src/pages/Dashboard/CreateNewOrganization/CreateNewOrganization.jsx
index e2c4ad24f..63cd2b9d1 100644
--- a/src/pages/Dashboard/CreateNewOrganization/CreateNewOrganization.jsx
+++ b/src/pages/Dashboard/CreateNewOrganization/CreateNewOrganization.jsx
@@ -320,30 +320,31 @@ function CreateNewOrganization() {
               },
             };
           }
-          let imageCrop = [form.getFieldValue('imageCrop')];
-          imageCrop = [
-            {
-              large: {
-                xCoordinate: imageCrop[0]?.large?.x,
-                yCoordinate: imageCrop[0]?.large?.y,
-                height: imageCrop[0]?.large?.height,
-                width: imageCrop[0]?.large?.width,
-              },
-              thumbnail: {
-                xCoordinate: imageCrop[0]?.thumbnail?.x,
-                yCoordinate: imageCrop[0]?.thumbnail?.y,
-                height: imageCrop[0]?.thumbnail?.height,
-                width: imageCrop[0]?.thumbnail?.width,
-              },
-              original: {
-                entityId: imageCrop[0]?.original?.entityId,
-                height: imageCrop[0]?.original?.height,
-                width: imageCrop[0]?.original?.width,
+          let imageCrop = form.getFieldValue('imageCrop') ? [form.getFieldValue('imageCrop')] : [];
+          if (imageCrop.length > 0) {
+            imageCrop = [
+              {
+                large: {
+                  xCoordinate: imageCrop[0]?.large?.x,
+                  yCoordinate: imageCrop[0]?.large?.y,
+                  height: imageCrop[0]?.large?.height,
+                  width: imageCrop[0]?.large?.width,
+                },
+                thumbnail: {
+                  xCoordinate: imageCrop[0]?.thumbnail?.x,
+                  yCoordinate: imageCrop[0]?.thumbnail?.y,
+                  height: imageCrop[0]?.thumbnail?.height,
+                  width: imageCrop[0]?.thumbnail?.width,
+                },
+                original: {
+                  entityId: imageCrop[0]?.original?.entityId,
+                  height: imageCrop[0]?.original?.height,
+                  width: imageCrop[0]?.original?.width,
+                },
+                isMain: true,
               },
-              isMain: true,
-            },
-          ];
-
+            ];
+          }
           const uploadImageList = async () => {
             for (let i = 0; i < values?.multipleImagesCrop.length; i++) {
               const file = values.multipleImagesCrop[i]?.originFileObj;
@@ -443,11 +444,15 @@ function CreateNewOrganization() {
                   });
             } else {
               if (values.multipleImagesCrop?.length > 0) await uploadImageList();
-              if (values?.image) {
-                if (values?.image && values?.image?.length == 0 && values.multipleImagesCrop?.length == 0)
-                  organizationPayload['image'] = null;
-                else organizationPayload['image'] = imageCrop;
-              }
+              if (
+                values?.image &&
+                values?.image?.length === 0 &&
+                (!values.multipleImagesCrop || values.multipleImagesCrop?.length === 0)
+              ) {
+                // Main image is removed and no new image is added
+                // No gallery images are added
+                organizationPayload['image'] = [];
+              } else organizationPayload['image'] = imageCrop;
               addUpdateOrganizationApiHandler(organizationPayload, toggle)
                 .then((id) => resolve(id))
                 .catch((error) => {
@@ -589,11 +594,15 @@ function CreateNewOrganization() {
                 await uploadImageList();
                 organizationPayload['image'] = imageCrop;
               }
-              if (values?.image) {
-                if (values?.image && values?.image?.length == 0 && values.multipleImagesCrop?.length == 0)
-                  organizationPayload['image'] = null;
-                else organizationPayload['image'] = imageCrop;
-              }
+              if (
+                values?.image &&
+                values?.image?.length === 0 &&
+                (!values.multipleImagesCrop || values.multipleImagesCrop?.length === 0)
+              ) {
+                // Main image is removed and no new image is added
+                // No gallery images are added
+                organizationPayload['image'] = [];
+              } else organizationPayload['image'] = imageCrop;
               if (values?.logo?.length > 0 && values?.logo[0]?.originFileObj) {
                 const formdata = new FormData();
                 formdata.append('file', values?.logo[0].originFileObj);
@@ -644,11 +653,15 @@ function CreateNewOrganization() {
               await uploadImageList();
               organizationPayload['image'] = imageCrop;
             }
-            if (values?.image) {
-              if (values?.image && values?.image?.length == 0 && values.multipleImagesCrop?.length > 0)
-                organizationPayload['image'] = null;
-              else organizationPayload['image'] = imageCrop;
-            }
+            if (
+              values?.image &&
+              values?.image?.length === 0 &&
+              (!values.multipleImagesCrop || values.multipleImagesCrop?.length === 0)
+            ) {
+              // Main image is removed and no new image is added
+              // No gallery images are added
+              organizationPayload['image'] = [];
+            } else organizationPayload['image'] = imageCrop;
             addUpdateOrganizationApiHandler(organizationPayload, toggle)
               .then((id) => resolve(id))
               .catch((error) => {
@@ -1248,6 +1261,7 @@ function CreateNewOrganization() {
                               isExternalSourceFetching,
                               mandatoryFields: formFieldProperties?.mandatoryFields?.standardFields ?? [],
                               adminOnlyFields: formFieldProperties?.adminOnlyFields?.standardFields ?? [],
+                              setShowDialog,
                             });
                           }
                         });
diff --git a/src/pages/Dashboard/CreateNewPerson/CreateNewPerson.jsx b/src/pages/Dashboard/CreateNewPerson/CreateNewPerson.jsx
index c447267d1..035daeab7 100644
--- a/src/pages/Dashboard/CreateNewPerson/CreateNewPerson.jsx
+++ b/src/pages/Dashboard/CreateNewPerson/CreateNewPerson.jsx
@@ -253,30 +253,31 @@ function CreateNewPerson() {
             };
           }
         });
-        let imageCrop = [form.getFieldValue('imageCrop')];
-        imageCrop = [
-          {
-            large: {
-              xCoordinate: imageCrop[0]?.large?.x,
-              yCoordinate: imageCrop[0]?.large?.y,
-              height: imageCrop[0]?.large?.height,
-              width: imageCrop[0]?.large?.width,
-            },
-            thumbnail: {
-              xCoordinate: imageCrop[0]?.thumbnail?.x,
-              yCoordinate: imageCrop[0]?.thumbnail?.y,
-              height: imageCrop[0]?.thumbnail?.height,
-              width: imageCrop[0]?.thumbnail?.width,
-            },
-            original: {
-              entityId: imageCrop[0]?.original?.entityId,
-              height: imageCrop[0]?.original?.height,
-              width: imageCrop[0]?.original?.width,
+        let imageCrop = form.getFieldValue('imageCrop') ? [form.getFieldValue('imageCrop')] : [];
+        if (imageCrop.length > 0) {
+          imageCrop = [
+            {
+              large: {
+                xCoordinate: imageCrop[0]?.large?.x,
+                yCoordinate: imageCrop[0]?.large?.y,
+                height: imageCrop[0]?.large?.height,
+                width: imageCrop[0]?.large?.width,
+              },
+              thumbnail: {
+                xCoordinate: imageCrop[0]?.thumbnail?.x,
+                yCoordinate: imageCrop[0]?.thumbnail?.y,
+                height: imageCrop[0]?.thumbnail?.height,
+                width: imageCrop[0]?.thumbnail?.width,
+              },
+              original: {
+                entityId: imageCrop[0]?.original?.entityId,
+                height: imageCrop[0]?.original?.height,
+                width: imageCrop[0]?.original?.width,
+              },
+              isMain: true,
             },
-            isMain: true,
-          },
-        ];
-
+          ];
+        }
         const uploadImageList = async () => {
           for (let i = 0; i < values.multipleImagesCrop.length; i++) {
             const file = values.multipleImagesCrop[i]?.originFileObj;
@@ -370,9 +371,14 @@ function CreateNewPerson() {
               });
         } else {
           if (values.multipleImagesCrop?.length > 0) await uploadImageList();
-          if (values?.image) {
-            if (values?.image && values?.image?.length == 0 && values.multipleImagesCrop?.length == 0)
-              personPayload['image'] = null;
+          if (
+            values?.image &&
+            values?.image?.length === 0 &&
+            (!values.multipleImagesCrop || values.multipleImagesCrop?.length === 0)
+          ) {
+            // Main image is removed and no new image is added
+            // No gallery images are added
+            personPayload['image'] = [];
           } else personPayload['image'] = imageCrop;
           addUpdatePersonApiHandler(personPayload);
         }
@@ -783,6 +789,7 @@ function CreateNewPerson() {
                               form,
                               mandatoryFields: formFieldProperties?.mandatoryFields?.standardFields ?? [],
                               adminOnlyFields: formFieldProperties?.adminOnlyFields?.standardFields ?? [],
+                              setShowDialog,
                             });
                           }
                         });
diff --git a/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx b/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx
index b99c0908a..f4186cd02 100644
--- a/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx
+++ b/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx
@@ -473,29 +473,31 @@ function CreateNewPlace() {
               };
             });
           }
-          let imageCrop = [form.getFieldValue('imageCrop')];
-          imageCrop = [
-            {
-              large: {
-                xCoordinate: imageCrop[0]?.large?.x,
-                yCoordinate: imageCrop[0]?.large?.y,
-                height: imageCrop[0]?.large?.height,
-                width: imageCrop[0]?.large?.width,
-              },
-              thumbnail: {
-                xCoordinate: imageCrop[0]?.thumbnail?.x,
-                yCoordinate: imageCrop[0]?.thumbnail?.y,
-                height: imageCrop[0]?.thumbnail?.height,
-                width: imageCrop[0]?.thumbnail?.width,
-              },
-              original: {
-                entityId: imageCrop[0]?.original?.entityId,
-                height: imageCrop[0]?.original?.height,
-                width: imageCrop[0]?.original?.width,
+          let imageCrop = form.getFieldValue('imageCrop') ? [form.getFieldValue('imageCrop')] : [];
+          if (imageCrop.length > 0) {
+            imageCrop = [
+              {
+                large: {
+                  xCoordinate: imageCrop[0]?.large?.x,
+                  yCoordinate: imageCrop[0]?.large?.y,
+                  height: imageCrop[0]?.large?.height,
+                  width: imageCrop[0]?.large?.width,
+                },
+                thumbnail: {
+                  xCoordinate: imageCrop[0]?.thumbnail?.x,
+                  yCoordinate: imageCrop[0]?.thumbnail?.y,
+                  height: imageCrop[0]?.thumbnail?.height,
+                  width: imageCrop[0]?.thumbnail?.width,
+                },
+                original: {
+                  entityId: imageCrop[0]?.original?.entityId,
+                  height: imageCrop[0]?.original?.height,
+                  width: imageCrop[0]?.original?.width,
+                },
+                isMain: true,
               },
-              isMain: true,
-            },
-          ];
+            ];
+          }
           if (values?.containedInPlace || values?.containedInPlace?.length > 0) {
             if (containedInPlace?.source === sourceOptions.CMS)
               containedInPlaceObj = {
@@ -678,11 +680,15 @@ function CreateNewPlace() {
                 });
           } else {
             if (values.multipleImagesCrop?.length > 0) await uploadImageList();
-            if (values?.draggerWrap) {
-              if (values?.dragger && values?.dragger?.length == 0 && values.multipleImagesCrop?.length == 0)
-                placeObj['image'] = null;
-              else placeObj['image'] = imageCrop;
-            }
+            if (
+              values?.draggerWrap &&
+              values?.dragger?.length === 0 &&
+              (!values.multipleImagesCrop || values.multipleImagesCrop?.length === 0)
+            ) {
+              // Main image is removed and no new image is added
+              // No gallery images are added
+              placeObj['image'] = [];
+            } else placeObj['image'] = imageCrop;
 
             addUpdatePlaceApiHandler(placeObj, postalObj)
               .then((id) => resolve(id))
@@ -1878,6 +1884,7 @@ function CreateNewPlace() {
                   data-cy="form-item-event-multiple-image"
                   hidden={!imageConfig?.enableGallery}>
                   <MultipleImageUpload
+                    setShowDialog={setShowDialog}
                     form={form}
                     largeAspectRatio={
                       currentCalendarData?.imageConfig?.length > 0
diff --git a/src/pages/Dashboard/Settings/CalendarSettings/CalendarSettings.jsx b/src/pages/Dashboard/Settings/CalendarSettings/CalendarSettings.jsx
index 1216f0c31..a494cee93 100644
--- a/src/pages/Dashboard/Settings/CalendarSettings/CalendarSettings.jsx
+++ b/src/pages/Dashboard/Settings/CalendarSettings/CalendarSettings.jsx
@@ -150,6 +150,7 @@ function CalendarSettings({ setDirtyStatus, tabKey }) {
     updateCalendar({ calendarId, data })
       .unwrap()
       .then(() => {
+        setDirtyStatus(false);
         getCalendar({ id: calendarId, sessionId: timestampRef })
           .unwrap()
           .then((response) => {
@@ -358,7 +359,7 @@ function CalendarSettings({ setDirtyStatus, tabKey }) {
               name="calendar-settings"
               initialValues={initialValues}
               onFieldsChange={() => {
-                setDirtyStatus();
+                setDirtyStatus(true);
               }}>
               {calendarSettingsFormFields.GENERAL_SETTINGS.map((item, index) => {
                 return (
@@ -372,6 +373,7 @@ function CalendarSettings({ setDirtyStatus, tabKey }) {
                     {item.field({
                       form,
                       isCrop: false,
+                      initialValues,
                       largeAspectRatio: imageConfig?.large?.aspectRatio,
                       thumbnailAspectRatio: imageConfig?.thumbnail?.aspectRatio,
                       largeMaxWidth: imageConfig?.large?.maxWidth,
diff --git a/src/pages/Dashboard/Settings/MandatoryFields/MandatoryFields.jsx b/src/pages/Dashboard/Settings/MandatoryFields/MandatoryFields.jsx
index a3c114520..7b9cfd479 100644
--- a/src/pages/Dashboard/Settings/MandatoryFields/MandatoryFields.jsx
+++ b/src/pages/Dashboard/Settings/MandatoryFields/MandatoryFields.jsx
@@ -185,6 +185,7 @@ function MandatoryFields({ setDirtyStatus, tabKey }) {
     updateCalendar({ data: calendarData, calendarId: currentCalendarData.id })
       .unwrap()
       .then(() => {
+        setDirtyStatus(false);
         getCalendar({ id: calendarId, sessionId: timestampRef })
           .unwrap()
           .then(() => {
diff --git a/src/pages/Dashboard/Settings/Settings.jsx b/src/pages/Dashboard/Settings/Settings.jsx
index 7a181f7d6..52fa2ee5b 100644
--- a/src/pages/Dashboard/Settings/Settings.jsx
+++ b/src/pages/Dashboard/Settings/Settings.jsx
@@ -84,42 +84,21 @@ const Settings = () => {
     {
       label: t('dashboard.settings.tab2'),
       key: '2',
-      children: (
-        <WidgetSettings
-          tabKey={tabKey}
-          setDirtyStatus={() => {
-            if (!isFormDirty) setIsFormDirty(true);
-          }}
-        />
-      ),
+      children: <WidgetSettings tabKey={tabKey} setDirtyStatus={setIsFormDirty} />,
       disabled: false,
       adminOnly: true,
     },
     {
       label: t('dashboard.settings.tab3'),
       key: '3',
-      children: currentCalendarData && (
-        <CalendarSettings
-          tabKey={tabKey}
-          setDirtyStatus={() => {
-            if (!isFormDirty) setIsFormDirty(true);
-          }}
-        />
-      ),
+      children: currentCalendarData && <CalendarSettings tabKey={tabKey} setDirtyStatus={setIsFormDirty} />,
       disabled: false,
       adminOnly: true,
     },
     {
       label: t('dashboard.settings.tab4'),
       key: '4',
-      children: (
-        <MandatoryFields
-          tabKey={tabKey}
-          setDirtyStatus={() => {
-            if (!isFormDirty) setIsFormDirty(true);
-          }}
-        />
-      ),
+      children: <MandatoryFields tabKey={tabKey} setDirtyStatus={setIsFormDirty} />,
       disabled: false,
       adminOnly: true,
     },
diff --git a/src/pages/Dashboard/Settings/WidgetSettings/WidgetSettings.jsx b/src/pages/Dashboard/Settings/WidgetSettings/WidgetSettings.jsx
index 1099a54f5..9b70cec4c 100644
--- a/src/pages/Dashboard/Settings/WidgetSettings/WidgetSettings.jsx
+++ b/src/pages/Dashboard/Settings/WidgetSettings/WidgetSettings.jsx
@@ -192,7 +192,7 @@ const WidgetSettings = ({ setDirtyStatus, tabKey }) => {
       setIframeCode(
         `<iframe src="${urlCopy.href}" width="100%" style="max-width:${width}px; border:none" height="${height}px"></iframe>`,
       );
-      setDirtyStatus();
+      setDirtyStatus(true);
     }
   };
 
diff --git a/src/utils/getWeekDayDates.js b/src/utils/getWeekDayDates.js
new file mode 100644
index 000000000..64cbf31eb
--- /dev/null
+++ b/src/utils/getWeekDayDates.js
@@ -0,0 +1,30 @@
+import moment from 'moment';
+
+const weekDaysMap = {
+  sunday: 0,
+  monday: 1,
+  tuesday: 2,
+  wednesday: 3,
+  thursday: 4,
+  friday: 5,
+  saturday: 6,
+};
+
+export const getWeekDayDates = (schedule) => {
+  const { startDate, endDate, weekDays } = schedule;
+  const start = moment(startDate);
+  const end = moment(endDate);
+  const targetWeekDays = weekDays.map((day) => weekDaysMap[day.toLowerCase()]);
+
+  let dates = [];
+  let currentDate = moment(start);
+
+  while (currentDate <= end) {
+    if (targetWeekDays.includes(currentDate.day())) {
+      dates.push(currentDate.format('YYYY-MM-DD'));
+    }
+    currentDate.add(1, 'days');
+  }
+
+  return dates.length > 0 ? dates[0] : startDate;
+};