From 3aba04abcd28313402d45998772b291282444a82 Mon Sep 17 00:00:00 2001
From: Weiko <corentin@twenty.com>
Date: Thu, 24 Jul 2025 17:19:40 +0200
Subject: [PATCH] Fix date field creation with disabled save button (#13416)

Fixes https://github.com/twentyhq/twenty/issues/13297

See SettingsDataModelFieldDateForm form validation which expects a
settings field to be present with a default display format. This PR adds
the missing initial value.
---
 .../forms/date/hooks/useDateSettingsFormInitialValues.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/hooks/useDateSettingsFormInitialValues.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/hooks/useDateSettingsFormInitialValues.ts
index d6ce4447a..1baac2502 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/hooks/useDateSettingsFormInitialValues.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/hooks/useDateSettingsFormInitialValues.ts
@@ -9,10 +9,11 @@ export const useDateSettingsFormInitialValues = ({
 }: {
   fieldMetadataItem?: Pick<FieldMetadataItem, 'settings'>;
 }) => {
-  const initialDisplayFormat = fieldMetadataItem?.settings
-    ?.displayFormat as FieldDateDisplayFormat;
-  const initialCustomUnicodeDateFormat = fieldMetadataItem?.settings
-    ?.customUnicodeDateFormat as string;
+  const initialDisplayFormat =
+    (fieldMetadataItem?.settings?.displayFormat as FieldDateDisplayFormat) ??
+    FieldDateDisplayFormat.USER_SETTINGS;
+  const initialCustomUnicodeDateFormat =
+    (fieldMetadataItem?.settings?.customUnicodeDateFormat as string) ?? '';
 
   const { resetField } = useFormContext<SettingsDataModelFieldDateFormValues>();