From 7aeb2c28a7c55862d4edb76b0039f1471b735258 Mon Sep 17 00:00:00 2001
From: syam babu <syam@dexlock.com>
Date: Tue, 2 Jul 2024 16:55:44 +0530
Subject: [PATCH 1/2] fix: fixed warning not appearing in bilingual inputs of
 general settings page

---
 src/constants/calendarSettingsForm.js         | 70 ++++++++++---------
 .../CalendarSettings/CalendarSettings.jsx     |  1 +
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/src/constants/calendarSettingsForm.js b/src/constants/calendarSettingsForm.js
index 5df5dcf4..ece38ad9 100644
--- a/src/constants/calendarSettingsForm.js
+++ b/src/constants/calendarSettingsForm.js
@@ -143,39 +143,45 @@ 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,
+        };
+        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>
-      ),
+            <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/pages/Dashboard/Settings/CalendarSettings/CalendarSettings.jsx b/src/pages/Dashboard/Settings/CalendarSettings/CalendarSettings.jsx
index 1216f0c3..d9d21393 100644
--- a/src/pages/Dashboard/Settings/CalendarSettings/CalendarSettings.jsx
+++ b/src/pages/Dashboard/Settings/CalendarSettings/CalendarSettings.jsx
@@ -372,6 +372,7 @@ function CalendarSettings({ setDirtyStatus, tabKey }) {
                     {item.field({
                       form,
                       isCrop: false,
+                      initialValues,
                       largeAspectRatio: imageConfig?.large?.aspectRatio,
                       thumbnailAspectRatio: imageConfig?.thumbnail?.aspectRatio,
                       largeMaxWidth: imageConfig?.large?.maxWidth,

From 034addea613ed18d368bff6166c425275616ed51 Mon Sep 17 00:00:00 2001
From: syam babu <syam@dexlock.com>
Date: Tue, 2 Jul 2024 16:58:15 +0530
Subject: [PATCH 2/2] closes #1193

---
 src/constants/calendarSettingsForm.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/constants/calendarSettingsForm.js b/src/constants/calendarSettingsForm.js
index ece38ad9..ebdfc0e4 100644
--- a/src/constants/calendarSettingsForm.js
+++ b/src/constants/calendarSettingsForm.js
@@ -148,6 +148,7 @@ export const calendarSettingsFormFields = {
           fr: initialValues?.calendarNameFr,
           en: initialValues?.calendarNameEn,
         };
+
         return (
           <BilingualInput fieldData={fieldData}>
             <Form.Item name="calendarNameFr">