From 7f7ea59b51be9a8ce3389cdfcdaef991e5137607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tha=C3=AFs?= <guigon.thais@gmail.com>
Date: Fri, 24 May 2024 12:15:17 +0200
Subject: [PATCH] refactor: reset field default value on type change in
 Settings (#5534)

Related issue: #5412

See https://github.com/twentyhq/twenty/pull/5436#discussion_r1609470484
for context.
---
 .../validation-schemas/selectOptionsSchema.ts |  2 +-
 .../SettingsDataModelFieldBooleanForm.tsx     | 20 +++----
 ...sDataModelFieldBooleanSettingsFormCard.tsx | 57 ++++++++++++++++++
 .../useBooleanSettingsFormInitialValues.ts    | 26 ++++++++
 ...SettingsDataModelFieldSettingsFormCard.tsx | 51 ++++++++--------
 .../SettingsDataModelFieldTypeSelect.tsx      | 41 ++++++++++++-
 .../SettingsDataModelFieldCurrencyForm.tsx    | 29 +++------
 ...DataModelFieldCurrencySettingsFormCard.tsx | 60 +++++++++++++++++++
 .../useCurrencySettingsFormInitialValues.ts   | 37 ++++++++++++
 .../useSelectSettingsFormInitialValues.ts     | 38 ------------
 .../SettingsDataModelFieldRelationForm.tsx    |  4 +-
 ...DataModelFieldRelationSettingsFormCard.tsx |  4 +-
 .../useRelationSettingsFormInitialValues.ts   |  0
 .../SettingsDataModelFieldSelectForm.tsx      | 11 +---
 ...tingsDataModelFieldSelectFormOptionRow.tsx |  2 +-
 ...gsDataModelFieldSelectSettingsFormCard.tsx |  8 +--
 .../useSelectSettingsFormInitialValues.ts     | 49 +++++++++++++++
 .../generateNewSelectOptionLabel.test.ts      |  2 +-
 .../__tests__/getOptionValueFromLabel.test.ts |  2 +-
 .../utils/generateNewSelectOption.ts          |  4 +-
 .../utils/generateNewSelectOptionLabel.ts     |  0
 .../utils/getOptionValueFromLabel.ts          |  0
 .../SettingsObjectNewFieldStep2.tsx           | 10 ----
 23 files changed, 326 insertions(+), 131 deletions(-)
 rename packages/twenty-front/src/modules/settings/data-model/fields/forms/{components/boolean => boolean/components}/SettingsDataModelFieldBooleanForm.tsx (79%)
 create mode 100644 packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanSettingsFormCard.tsx
 create mode 100644 packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/hooks/useBooleanSettingsFormInitialValues.ts
 rename packages/twenty-front/src/modules/settings/data-model/fields/forms/{components/currency => currency/components}/SettingsDataModelFieldCurrencyForm.tsx (72%)
 create mode 100644 packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencySettingsFormCard.tsx
 create mode 100644 packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts
 delete mode 100644 packages/twenty-front/src/modules/settings/data-model/fields/forms/hooks/useSelectSettingsFormInitialValues.ts
 rename packages/twenty-front/src/modules/settings/data-model/fields/forms/{components/relation => relation/components}/SettingsDataModelFieldRelationForm.tsx (98%)
 rename packages/twenty-front/src/modules/settings/data-model/fields/forms/{components/relation => relation/components}/SettingsDataModelFieldRelationSettingsFormCard.tsx (96%)
 rename packages/twenty-front/src/modules/settings/data-model/fields/forms/{ => relation}/hooks/useRelationSettingsFormInitialValues.ts (100%)
 rename packages/twenty-front/src/modules/settings/data-model/fields/forms/{components/select => select/components}/SettingsDataModelFieldSelectForm.tsx (95%)
 rename packages/twenty-front/src/modules/settings/data-model/fields/forms/{components/select => select/components}/SettingsDataModelFieldSelectFormOptionRow.tsx (99%)
 rename packages/twenty-front/src/modules/settings/data-model/fields/forms/{components/select => select/components}/SettingsDataModelFieldSelectSettingsFormCard.tsx (88%)
 create mode 100644 packages/twenty-front/src/modules/settings/data-model/fields/forms/select/hooks/useSelectSettingsFormInitialValues.ts
 rename packages/twenty-front/src/modules/settings/data-model/fields/forms/{ => select}/utils/__tests__/generateNewSelectOptionLabel.test.ts (85%)
 rename packages/twenty-front/src/modules/settings/data-model/fields/forms/{ => select}/utils/__tests__/getOptionValueFromLabel.test.ts (90%)
 rename packages/twenty-front/src/modules/settings/data-model/fields/forms/{ => select}/utils/generateNewSelectOption.ts (85%)
 rename packages/twenty-front/src/modules/settings/data-model/fields/forms/{ => select}/utils/generateNewSelectOptionLabel.ts (100%)
 rename packages/twenty-front/src/modules/settings/data-model/fields/forms/{ => select}/utils/getOptionValueFromLabel.ts (100%)

diff --git a/packages/twenty-front/src/modules/object-metadata/validation-schemas/selectOptionsSchema.ts b/packages/twenty-front/src/modules/object-metadata/validation-schemas/selectOptionsSchema.ts
index 4b634a3ac4..814892da9b 100644
--- a/packages/twenty-front/src/modules/object-metadata/validation-schemas/selectOptionsSchema.ts
+++ b/packages/twenty-front/src/modules/object-metadata/validation-schemas/selectOptionsSchema.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod';
 
 import { FieldMetadataItemOption } from '@/object-metadata/types/FieldMetadataItem';
-import { getOptionValueFromLabel } from '@/settings/data-model/fields/forms/utils/getOptionValueFromLabel';
+import { getOptionValueFromLabel } from '@/settings/data-model/fields/forms/select/utils/getOptionValueFromLabel';
 import { themeColorSchema } from '@/ui/theme/utils/themeColorSchema';
 import { computeOptionValueFromLabelOrThrow } from '~/pages/settings/data-model/utils/compute-option-value-from-label.utils';
 
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/boolean/SettingsDataModelFieldBooleanForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm.tsx
similarity index 79%
rename from packages/twenty-front/src/modules/settings/data-model/fields/forms/components/boolean/SettingsDataModelFieldBooleanForm.tsx
rename to packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm.tsx
index 806e3d16fb..c737fab7db 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/boolean/SettingsDataModelFieldBooleanForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm.tsx
@@ -1,10 +1,10 @@
-import { useEffect } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 import styled from '@emotion/styled';
 import { IconCheck, IconX } from 'twenty-ui';
 import { z } from 'zod';
 
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { useBooleanSettingsFormInitialValues } from '@/settings/data-model/fields/forms/boolean/hooks/useBooleanSettingsFormInitialValues';
 import { Select } from '@/ui/input/components/Select';
 import { CardContent } from '@/ui/layout/card/components/CardContent';
 import { isDefined } from '~/utils/isDefined';
@@ -13,13 +13,13 @@ export const settingsDataModelFieldBooleanFormSchema = z.object({
   defaultValue: z.boolean(),
 });
 
-type SettingsDataModelFieldBooleanFormValues = z.infer<
+export type SettingsDataModelFieldBooleanFormValues = z.infer<
   typeof settingsDataModelFieldBooleanFormSchema
 >;
 
 type SettingsDataModelFieldBooleanFormProps = {
   className?: string;
-  fieldMetadataItem?: Pick<FieldMetadataItem, 'defaultValue'>;
+  fieldMetadataItem: Pick<FieldMetadataItem, 'defaultValue'>;
 };
 
 const StyledContainer = styled(CardContent)`
@@ -38,16 +38,12 @@ export const SettingsDataModelFieldBooleanForm = ({
   className,
   fieldMetadataItem,
 }: SettingsDataModelFieldBooleanFormProps) => {
-  const { control, resetField } =
-    useFormContext<SettingsDataModelFieldBooleanFormValues>();
+  const { control } = useFormContext<SettingsDataModelFieldBooleanFormValues>();
 
   const isEditMode = isDefined(fieldMetadataItem?.defaultValue);
-  const initialValue = fieldMetadataItem?.defaultValue ?? true;
-
-  // Reset defaultValue on mount, so it doesn't conflict with other field types.
-  useEffect(() => {
-    resetField('defaultValue', { defaultValue: initialValue });
-  }, [initialValue, resetField]);
+  const { initialDefaultValue } = useBooleanSettingsFormInitialValues({
+    fieldMetadataItem,
+  });
 
   return (
     <StyledContainer>
@@ -55,7 +51,7 @@ export const SettingsDataModelFieldBooleanForm = ({
       <Controller
         name="defaultValue"
         control={control}
-        defaultValue={initialValue}
+        defaultValue={initialDefaultValue}
         render={({ field: { onChange, value } }) => (
           <Select
             className={className}
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanSettingsFormCard.tsx
new file mode 100644
index 0000000000..d8dc5a81b9
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanSettingsFormCard.tsx
@@ -0,0 +1,57 @@
+import { useFormContext } from 'react-hook-form';
+import styled from '@emotion/styled';
+
+import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { SettingsDataModelPreviewFormCard } from '@/settings/data-model/components/SettingsDataModelPreviewFormCard';
+import {
+  SettingsDataModelFieldBooleanForm,
+  SettingsDataModelFieldBooleanFormValues,
+} from '@/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm';
+import { useBooleanSettingsFormInitialValues } from '@/settings/data-model/fields/forms/boolean/hooks/useBooleanSettingsFormInitialValues';
+import {
+  SettingsDataModelFieldPreviewCard,
+  SettingsDataModelFieldPreviewCardProps,
+} from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewCard';
+
+type SettingsDataModelFieldBooleanSettingsFormCardProps = {
+  fieldMetadataItem: Pick<
+    FieldMetadataItem,
+    'icon' | 'label' | 'type' | 'defaultValue'
+  >;
+} & Pick<SettingsDataModelFieldPreviewCardProps, 'objectMetadataItem'>;
+
+const StyledFieldPreviewCard = styled(SettingsDataModelFieldPreviewCard)`
+  display: grid;
+  flex: 1 1 100%;
+`;
+
+export const SettingsDataModelFieldBooleanSettingsFormCard = ({
+  fieldMetadataItem,
+  objectMetadataItem,
+}: SettingsDataModelFieldBooleanSettingsFormCardProps) => {
+  const { initialDefaultValue } = useBooleanSettingsFormInitialValues({
+    fieldMetadataItem,
+  });
+
+  const { watch: watchFormValue } =
+    useFormContext<SettingsDataModelFieldBooleanFormValues>();
+
+  return (
+    <SettingsDataModelPreviewFormCard
+      preview={
+        <StyledFieldPreviewCard
+          fieldMetadataItem={{
+            ...fieldMetadataItem,
+            defaultValue: watchFormValue('defaultValue', initialDefaultValue),
+          }}
+          objectMetadataItem={objectMetadataItem}
+        />
+      }
+      form={
+        <SettingsDataModelFieldBooleanForm
+          fieldMetadataItem={fieldMetadataItem}
+        />
+      }
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/hooks/useBooleanSettingsFormInitialValues.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/hooks/useBooleanSettingsFormInitialValues.ts
new file mode 100644
index 0000000000..0c69856e10
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/boolean/hooks/useBooleanSettingsFormInitialValues.ts
@@ -0,0 +1,26 @@
+import { useFormContext } from 'react-hook-form';
+
+import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { SettingsDataModelFieldBooleanFormValues } from '@/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm';
+
+export const useBooleanSettingsFormInitialValues = ({
+  fieldMetadataItem,
+}: {
+  fieldMetadataItem?: Pick<FieldMetadataItem, 'defaultValue'>;
+}) => {
+  const initialDefaultValue =
+    (fieldMetadataItem?.defaultValue as SettingsDataModelFieldBooleanFormValues['defaultValue']) ??
+    true;
+
+  const { resetField } =
+    useFormContext<SettingsDataModelFieldBooleanFormValues>();
+
+  const resetDefaultValueField = () => {
+    resetField('defaultValue', { defaultValue: initialDefaultValue });
+  };
+
+  return {
+    initialDefaultValue,
+    resetDefaultValueField,
+  };
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx
index 650378b992..a81da911e2 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx
@@ -5,21 +5,17 @@ import { z } from 'zod';
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { SettingsDataModelPreviewFormCard } from '@/settings/data-model/components/SettingsDataModelPreviewFormCard';
 import { SETTINGS_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsFieldTypeConfigs';
-import {
-  SettingsDataModelFieldBooleanForm,
-  settingsDataModelFieldBooleanFormSchema,
-} from '@/settings/data-model/fields/forms/components/boolean/SettingsDataModelFieldBooleanForm';
-import {
-  SettingsDataModelFieldCurrencyForm,
-  settingsDataModelFieldCurrencyFormSchema,
-} from '@/settings/data-model/fields/forms/components/currency/SettingsDataModelFieldCurrencyForm';
-import { settingsDataModelFieldRelationFormSchema } from '@/settings/data-model/fields/forms/components/relation/SettingsDataModelFieldRelationForm';
-import { SettingsDataModelFieldRelationSettingsFormCard } from '@/settings/data-model/fields/forms/components/relation/SettingsDataModelFieldRelationSettingsFormCard';
+import { settingsDataModelFieldBooleanFormSchema } from '@/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm';
+import { SettingsDataModelFieldBooleanSettingsFormCard } from '@/settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanSettingsFormCard';
+import { settingsDataModelFieldCurrencyFormSchema } from '@/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm';
+import { SettingsDataModelFieldCurrencySettingsFormCard } from '@/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencySettingsFormCard';
+import { settingsDataModelFieldRelationFormSchema } from '@/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm';
+import { SettingsDataModelFieldRelationSettingsFormCard } from '@/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationSettingsFormCard';
 import {
   settingsDataModelFieldMultiSelectFormSchema,
   settingsDataModelFieldSelectFormSchema,
-} from '@/settings/data-model/fields/forms/components/select/SettingsDataModelFieldSelectForm';
-import { SettingsDataModelFieldSelectSettingsFormCard } from '@/settings/data-model/fields/forms/components/select/SettingsDataModelFieldSelectSettingsFormCard';
+} from '@/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm';
+import { SettingsDataModelFieldSelectSettingsFormCard } from '@/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectSettingsFormCard';
 import {
   SettingsDataModelFieldPreviewCard,
   SettingsDataModelFieldPreviewCardProps,
@@ -108,6 +104,25 @@ export const SettingsDataModelFieldSettingsFormCard = ({
 }: SettingsDataModelFieldSettingsFormCardProps) => {
   if (!previewableTypes.includes(fieldMetadataItem.type)) return null;
 
+  if (fieldMetadataItem.type === FieldMetadataType.Boolean) {
+    return (
+      <SettingsDataModelFieldBooleanSettingsFormCard
+        fieldMetadataItem={fieldMetadataItem}
+        objectMetadataItem={objectMetadataItem}
+      />
+    );
+  }
+
+  if (fieldMetadataItem.type === FieldMetadataType.Currency) {
+    return (
+      <SettingsDataModelFieldCurrencySettingsFormCard
+        disabled={disableCurrencyForm}
+        fieldMetadataItem={fieldMetadataItem}
+        objectMetadataItem={objectMetadataItem}
+      />
+    );
+  }
+
   if (fieldMetadataItem.type === FieldMetadataType.Relation) {
     return (
       <SettingsDataModelFieldRelationSettingsFormCard
@@ -137,18 +152,6 @@ export const SettingsDataModelFieldSettingsFormCard = ({
           objectMetadataItem={objectMetadataItem}
         />
       }
-      form={
-        fieldMetadataItem.type === FieldMetadataType.Boolean ? (
-          <SettingsDataModelFieldBooleanForm
-            fieldMetadataItem={fieldMetadataItem}
-          />
-        ) : fieldMetadataItem.type === FieldMetadataType.Currency ? (
-          <SettingsDataModelFieldCurrencyForm
-            disabled={disableCurrencyForm}
-            fieldMetadataItem={fieldMetadataItem}
-          />
-        ) : undefined
-      }
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldTypeSelect.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldTypeSelect.tsx
index 7b236d3e13..b76341dd29 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldTypeSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldTypeSelect.tsx
@@ -7,6 +7,9 @@ import {
   SETTINGS_FIELD_TYPE_CONFIGS,
   SettingsFieldTypeConfig,
 } from '@/settings/data-model/constants/SettingsFieldTypeConfigs';
+import { useBooleanSettingsFormInitialValues } from '@/settings/data-model/fields/forms/boolean/hooks/useBooleanSettingsFormInitialValues';
+import { useCurrencySettingsFormInitialValues } from '@/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues';
+import { useSelectSettingsFormInitialValues } from '@/settings/data-model/fields/forms/select/hooks/useSelectSettingsFormInitialValues';
 import { SettingsSupportedFieldType } from '@/settings/data-model/types/SettingsSupportedFieldType';
 import { Select, SelectOption } from '@/ui/input/components/Select';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
@@ -28,7 +31,10 @@ type SettingsDataModelFieldTypeSelectProps = {
   className?: string;
   disabled?: boolean;
   excludedFieldTypes?: SettingsSupportedFieldType[];
-  fieldMetadataItem?: FieldMetadataItem;
+  fieldMetadataItem?: Pick<
+    FieldMetadataItem,
+    'defaultValue' | 'options' | 'type'
+  >;
 };
 
 export const SettingsDataModelFieldTypeSelect = ({
@@ -51,6 +57,34 @@ export const SettingsDataModelFieldTypeSelect = ({
     value: key as SettingsSupportedFieldType,
   }));
 
+  const { resetDefaultValueField: resetBooleanDefaultValueField } =
+    useBooleanSettingsFormInitialValues({ fieldMetadataItem });
+
+  const { resetDefaultValueField: resetCurrencyDefaultValueField } =
+    useCurrencySettingsFormInitialValues({ fieldMetadataItem });
+
+  const { resetDefaultValueField: resetSelectDefaultValueField } =
+    useSelectSettingsFormInitialValues({ fieldMetadataItem });
+
+  // Reset defaultValue on type change with a valid value for the selected type
+  // so the form does not become invalid.
+  const resetDefaultValueField = (nextValue: SettingsSupportedFieldType) => {
+    switch (nextValue) {
+      case FieldMetadataType.Boolean:
+        resetBooleanDefaultValueField();
+        break;
+      case FieldMetadataType.Currency:
+        resetCurrencyDefaultValueField();
+        break;
+      case FieldMetadataType.Select:
+      case FieldMetadataType.MultiSelect:
+        resetSelectDefaultValueField();
+        break;
+      default:
+        break;
+    }
+  };
+
   return (
     <Controller
       name="type"
@@ -67,7 +101,10 @@ export const SettingsDataModelFieldTypeSelect = ({
           disabled={disabled}
           dropdownId="object-field-type-select"
           value={value}
-          onChange={onChange}
+          onChange={(nextValue) => {
+            onChange(nextValue);
+            resetDefaultValueField(nextValue);
+          }}
           options={fieldTypeOptions}
         />
       )}
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/currency/SettingsDataModelFieldCurrencyForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsx
similarity index 72%
rename from packages/twenty-front/src/modules/settings/data-model/fields/forms/components/currency/SettingsDataModelFieldCurrencyForm.tsx
rename to packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsx
index 7c09c9ac0f..c8711cbab0 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/currency/SettingsDataModelFieldCurrencyForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsx
@@ -1,11 +1,10 @@
-import { useEffect } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 import { z } from 'zod';
 
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
 import { currencyCodeSchema } from '@/object-record/record-field/validation-schemas/currencyCodeSchema';
 import { SETTINGS_FIELD_CURRENCY_CODES } from '@/settings/data-model/constants/SettingsFieldCurrencyCodes';
+import { useCurrencySettingsFormInitialValues } from '@/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues';
 import { Select } from '@/ui/input/components/Select';
 import { CardContent } from '@/ui/layout/card/components/CardContent';
 import { applySimpleQuotesToString } from '~/utils/string/applySimpleQuotesToString';
@@ -14,7 +13,7 @@ import { simpleQuotesStringSchema } from '~/utils/validation-schemas/simpleQuote
 
 export const settingsDataModelFieldCurrencyFormSchema = z.object({
   defaultValue: z.object({
-    amountMicros: z.null(),
+    amountMicros: z.number().nullable(),
     currencyCode: simpleQuotesStringSchema.refine(
       (value) =>
         currencyCodeSchema.safeParse(stripSimpleQuotesFromString(value))
@@ -24,13 +23,13 @@ export const settingsDataModelFieldCurrencyFormSchema = z.object({
   }),
 });
 
-type SettingsDataModelFieldCurrencyFormValues = z.infer<
+export type SettingsDataModelFieldCurrencyFormValues = z.infer<
   typeof settingsDataModelFieldCurrencyFormSchema
 >;
 
 type SettingsDataModelFieldCurrencyFormProps = {
   disabled?: boolean;
-  fieldMetadataItem?: Pick<FieldMetadataItem, 'defaultValue'>;
+  fieldMetadataItem: Pick<FieldMetadataItem, 'defaultValue'>;
 };
 
 const OPTIONS = Object.entries(SETTINGS_FIELD_CURRENCY_CODES).map(
@@ -45,25 +44,11 @@ export const SettingsDataModelFieldCurrencyForm = ({
   disabled,
   fieldMetadataItem,
 }: SettingsDataModelFieldCurrencyFormProps) => {
-  const { control, resetField } =
+  const { control } =
     useFormContext<SettingsDataModelFieldCurrencyFormValues>();
 
-  const initialAmountMicrosValue = null;
-  const initialCurrencyCode =
-    (fieldMetadataItem?.defaultValue?.currencyCode as CurrencyCode) ??
-    CurrencyCode.USD;
-  const initialCurrencyCodeValue =
-    applySimpleQuotesToString(initialCurrencyCode);
-
-  // Reset defaultValue on mount, so it doesn't conflict with other field types.
-  useEffect(() => {
-    resetField('defaultValue', {
-      defaultValue: {
-        amountMicros: initialAmountMicrosValue,
-        currencyCode: initialCurrencyCodeValue,
-      },
-    });
-  }, [initialCurrencyCodeValue, resetField]);
+  const { initialAmountMicrosValue, initialCurrencyCodeValue } =
+    useCurrencySettingsFormInitialValues({ fieldMetadataItem });
 
   return (
     <CardContent>
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencySettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencySettingsFormCard.tsx
new file mode 100644
index 0000000000..3112b316cb
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencySettingsFormCard.tsx
@@ -0,0 +1,60 @@
+import { useFormContext } from 'react-hook-form';
+import styled from '@emotion/styled';
+
+import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { SettingsDataModelPreviewFormCard } from '@/settings/data-model/components/SettingsDataModelPreviewFormCard';
+import {
+  SettingsDataModelFieldCurrencyForm,
+  SettingsDataModelFieldCurrencyFormValues,
+} from '@/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm';
+import { useCurrencySettingsFormInitialValues } from '@/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues';
+import {
+  SettingsDataModelFieldPreviewCard,
+  SettingsDataModelFieldPreviewCardProps,
+} from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewCard';
+
+type SettingsDataModelFieldCurrencySettingsFormCardProps = {
+  disabled?: boolean;
+  fieldMetadataItem: Pick<
+    FieldMetadataItem,
+    'icon' | 'label' | 'type' | 'defaultValue'
+  >;
+} & Pick<SettingsDataModelFieldPreviewCardProps, 'objectMetadataItem'>;
+
+const StyledFieldPreviewCard = styled(SettingsDataModelFieldPreviewCard)`
+  display: grid;
+  flex: 1 1 100%;
+`;
+
+export const SettingsDataModelFieldCurrencySettingsFormCard = ({
+  disabled,
+  fieldMetadataItem,
+  objectMetadataItem,
+}: SettingsDataModelFieldCurrencySettingsFormCardProps) => {
+  const { initialDefaultValue } = useCurrencySettingsFormInitialValues({
+    fieldMetadataItem,
+  });
+
+  const { watch: watchFormValue } =
+    useFormContext<SettingsDataModelFieldCurrencyFormValues>();
+
+  return (
+    <SettingsDataModelPreviewFormCard
+      preview={
+        <StyledFieldPreviewCard
+          fieldMetadataItem={{
+            ...fieldMetadataItem,
+            defaultValue: watchFormValue('defaultValue', initialDefaultValue),
+          }}
+          objectMetadataItem={objectMetadataItem}
+        />
+      }
+      form={
+        <SettingsDataModelFieldCurrencyForm
+          disabled={disabled}
+          fieldMetadataItem={fieldMetadataItem}
+        />
+      }
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts
new file mode 100644
index 0000000000..26d9f492a5
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts
@@ -0,0 +1,37 @@
+import { useFormContext } from 'react-hook-form';
+
+import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
+import { SettingsDataModelFieldCurrencyFormValues } from '@/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm';
+import { applySimpleQuotesToString } from '~/utils/string/applySimpleQuotesToString';
+
+export const useCurrencySettingsFormInitialValues = ({
+  fieldMetadataItem,
+}: {
+  fieldMetadataItem?: Pick<FieldMetadataItem, 'defaultValue'>;
+}) => {
+  const initialAmountMicrosValue =
+    (fieldMetadataItem?.defaultValue?.amountMicros as number | null) ?? null;
+  const initialCurrencyCode =
+    (fieldMetadataItem?.defaultValue?.currencyCode as CurrencyCode) ??
+    CurrencyCode.USD;
+  const initialCurrencyCodeValue =
+    applySimpleQuotesToString(initialCurrencyCode);
+  const initialDefaultValue = {
+    amountMicros: initialAmountMicrosValue,
+    currencyCode: initialCurrencyCodeValue,
+  };
+
+  const { resetField } =
+    useFormContext<SettingsDataModelFieldCurrencyFormValues>();
+
+  const resetDefaultValueField = () =>
+    resetField('defaultValue', { defaultValue: initialDefaultValue });
+
+  return {
+    initialAmountMicrosValue,
+    initialCurrencyCodeValue,
+    initialDefaultValue,
+    resetDefaultValueField,
+  };
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/hooks/useSelectSettingsFormInitialValues.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/hooks/useSelectSettingsFormInitialValues.ts
deleted file mode 100644
index bf8af5101a..0000000000
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/hooks/useSelectSettingsFormInitialValues.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { useMemo } from 'react';
-import { v4 } from 'uuid';
-
-import {
-  FieldMetadataItem,
-  FieldMetadataItemOption,
-} from '@/object-metadata/types/FieldMetadataItem';
-import { getOptionValueFromLabel } from '@/settings/data-model/fields/forms/utils/getOptionValueFromLabel';
-
-const DEFAULT_OPTION: FieldMetadataItemOption = {
-  color: 'green',
-  id: v4(),
-  label: 'Option 1',
-  position: 0,
-  value: getOptionValueFromLabel('Option 1'),
-};
-
-export const useSelectSettingsFormInitialValues = ({
-  fieldMetadataItem,
-}: {
-  fieldMetadataItem: Pick<FieldMetadataItem, 'defaultValue' | 'options'>;
-}) => {
-  const initialDefaultValue = fieldMetadataItem.defaultValue ?? null;
-  const initialOptions = useMemo(
-    () =>
-      fieldMetadataItem.options?.length
-        ? [...fieldMetadataItem.options].sort(
-            (optionA, optionB) => optionA.position - optionB.position,
-          )
-        : [DEFAULT_OPTION],
-    [fieldMetadataItem.options],
-  );
-
-  return {
-    initialDefaultValue,
-    initialOptions,
-  };
-};
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/relation/SettingsDataModelFieldRelationForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx
similarity index 98%
rename from packages/twenty-front/src/modules/settings/data-model/fields/forms/components/relation/SettingsDataModelFieldRelationForm.tsx
rename to packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx
index 1e43db7432..f41b48bbf5 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/relation/SettingsDataModelFieldRelationForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx
@@ -8,7 +8,7 @@ import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { isObjectMetadataAvailableForRelation } from '@/object-metadata/utils/isObjectMetadataAvailableForRelation';
 import { fieldMetadataItemSchema } from '@/object-metadata/validation-schemas/fieldMetadataItemSchema';
 import { RELATION_TYPES } from '@/settings/data-model/constants/RelationTypes';
-import { useRelationSettingsFormInitialValues } from '@/settings/data-model/fields/forms/hooks/useRelationSettingsFormInitialValues';
+import { useRelationSettingsFormInitialValues } from '@/settings/data-model/fields/forms/relation/hooks/useRelationSettingsFormInitialValues';
 import { RelationType } from '@/settings/data-model/types/RelationType';
 import { IconPicker } from '@/ui/input/components/IconPicker';
 import { Select } from '@/ui/input/components/Select';
@@ -32,7 +32,7 @@ export type SettingsDataModelFieldRelationFormValues = z.infer<
 >;
 
 type SettingsDataModelFieldRelationFormProps = {
-  fieldMetadataItem?: Pick<
+  fieldMetadataItem: Pick<
     FieldMetadataItem,
     'fromRelationMetadata' | 'toRelationMetadata' | 'type'
   >;
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/relation/SettingsDataModelFieldRelationSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationSettingsFormCard.tsx
similarity index 96%
rename from packages/twenty-front/src/modules/settings/data-model/fields/forms/components/relation/SettingsDataModelFieldRelationSettingsFormCard.tsx
rename to packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationSettingsFormCard.tsx
index f4f2b07d15..808153bd78 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/relation/SettingsDataModelFieldRelationSettingsFormCard.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationSettingsFormCard.tsx
@@ -8,8 +8,8 @@ import { RELATION_TYPES } from '@/settings/data-model/constants/RelationTypes';
 import {
   SettingsDataModelFieldRelationForm,
   SettingsDataModelFieldRelationFormValues,
-} from '@/settings/data-model/fields/forms/components/relation/SettingsDataModelFieldRelationForm';
-import { useRelationSettingsFormInitialValues } from '@/settings/data-model/fields/forms/hooks/useRelationSettingsFormInitialValues';
+} from '@/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm';
+import { useRelationSettingsFormInitialValues } from '@/settings/data-model/fields/forms/relation/hooks/useRelationSettingsFormInitialValues';
 import {
   SettingsDataModelFieldPreviewCard,
   SettingsDataModelFieldPreviewCardProps,
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/hooks/useRelationSettingsFormInitialValues.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/hooks/useRelationSettingsFormInitialValues.ts
similarity index 100%
rename from packages/twenty-front/src/modules/settings/data-model/fields/forms/hooks/useRelationSettingsFormInitialValues.ts
rename to packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/hooks/useRelationSettingsFormInitialValues.ts
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/select/SettingsDataModelFieldSelectForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
similarity index 95%
rename from packages/twenty-front/src/modules/settings/data-model/fields/forms/components/select/SettingsDataModelFieldSelectForm.tsx
rename to packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
index 691f497440..a405b34494 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/select/SettingsDataModelFieldSelectForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
@@ -1,4 +1,3 @@
-import { useEffect } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 import styled from '@emotion/styled';
 import { DropResult } from '@hello-pangea/dnd';
@@ -10,8 +9,8 @@ import {
   FieldMetadataItemOption,
 } from '@/object-metadata/types/FieldMetadataItem';
 import { selectOptionsSchema } from '@/object-metadata/validation-schemas/selectOptionsSchema';
-import { useSelectSettingsFormInitialValues } from '@/settings/data-model/fields/forms/hooks/useSelectSettingsFormInitialValues';
-import { generateNewSelectOption } from '@/settings/data-model/fields/forms/utils/generateNewSelectOption';
+import { useSelectSettingsFormInitialValues } from '@/settings/data-model/fields/forms/select/hooks/useSelectSettingsFormInitialValues';
+import { generateNewSelectOption } from '@/settings/data-model/fields/forms/select/utils/generateNewSelectOption';
 import { isSelectOptionDefaultValue } from '@/settings/data-model/utils/isSelectOptionDefaultValue';
 import { LightButton } from '@/ui/input/button/components/LightButton';
 import { CardContent } from '@/ui/layout/card/components/CardContent';
@@ -86,7 +85,6 @@ export const SettingsDataModelFieldSelectForm = ({
     setValue: setFormValue,
     watch: watchFormValue,
     getValues,
-    resetField,
   } = useFormContext<SettingsDataModelFieldSelectFormValues>();
 
   const handleDragEnd = (
@@ -168,11 +166,6 @@ export const SettingsDataModelFieldSelectForm = ({
     }
   };
 
-  // Reset defaultValue on mount or on field type change, so it doesn't conflict with other field types.
-  useEffect(() => {
-    resetField('defaultValue', { defaultValue: initialDefaultValue });
-  }, [initialDefaultValue, initialOptions, resetField, fieldMetadataItem.type]);
-
   return (
     <>
       <Controller
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/select/SettingsDataModelFieldSelectFormOptionRow.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
similarity index 99%
rename from packages/twenty-front/src/modules/settings/data-model/fields/forms/components/select/SettingsDataModelFieldSelectFormOptionRow.tsx
rename to packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
index 933e4e7e5d..bc438a6815 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/select/SettingsDataModelFieldSelectFormOptionRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
@@ -12,7 +12,7 @@ import {
 import { v4 } from 'uuid';
 
 import { FieldMetadataItemOption } from '@/object-metadata/types/FieldMetadataItem';
-import { getOptionValueFromLabel } from '@/settings/data-model/fields/forms/utils/getOptionValueFromLabel';
+import { getOptionValueFromLabel } from '@/settings/data-model/fields/forms/select/utils/getOptionValueFromLabel';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/select/SettingsDataModelFieldSelectSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectSettingsFormCard.tsx
similarity index 88%
rename from packages/twenty-front/src/modules/settings/data-model/fields/forms/components/select/SettingsDataModelFieldSelectSettingsFormCard.tsx
rename to packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectSettingsFormCard.tsx
index 28bc1f5dd9..2ab1b49c30 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/select/SettingsDataModelFieldSelectSettingsFormCard.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectSettingsFormCard.tsx
@@ -8,8 +8,8 @@ import {
   settingsDataModelFieldMultiSelectFormSchema,
   SettingsDataModelFieldSelectForm,
   settingsDataModelFieldSelectFormSchema,
-} from '@/settings/data-model/fields/forms/components/select/SettingsDataModelFieldSelectForm';
-import { useSelectSettingsFormInitialValues } from '@/settings/data-model/fields/forms/hooks/useSelectSettingsFormInitialValues';
+} from '@/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm';
+import { useSelectSettingsFormInitialValues } from '@/settings/data-model/fields/forms/select/hooks/useSelectSettingsFormInitialValues';
 import {
   SettingsDataModelFieldPreviewCard,
   SettingsDataModelFieldPreviewCardProps,
@@ -20,7 +20,7 @@ const selectOrMultiSelectFormSchema = z.union([
   settingsDataModelFieldMultiSelectFormSchema,
 ]);
 
-type SettingsDataModelFieldSettingsFormValues = z.infer<
+type SettingsDataModelFieldSelectOrMultiSelectFormValues = z.infer<
   typeof selectOrMultiSelectFormSchema
 >;
 
@@ -46,7 +46,7 @@ export const SettingsDataModelFieldSelectSettingsFormCard = ({
     });
 
   const { watch: watchFormValue } =
-    useFormContext<SettingsDataModelFieldSettingsFormValues>();
+    useFormContext<SettingsDataModelFieldSelectOrMultiSelectFormValues>();
 
   return (
     <SettingsDataModelPreviewFormCard
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/hooks/useSelectSettingsFormInitialValues.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/hooks/useSelectSettingsFormInitialValues.ts
new file mode 100644
index 0000000000..2d19e05074
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/hooks/useSelectSettingsFormInitialValues.ts
@@ -0,0 +1,49 @@
+import { useMemo } from 'react';
+import { useFormContext } from 'react-hook-form';
+import { v4 } from 'uuid';
+
+import {
+  FieldMetadataItem,
+  FieldMetadataItemOption,
+} from '@/object-metadata/types/FieldMetadataItem';
+import { SettingsDataModelFieldSelectFormValues } from '@/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm';
+import { getOptionValueFromLabel } from '@/settings/data-model/fields/forms/select/utils/getOptionValueFromLabel';
+
+const DEFAULT_OPTION: FieldMetadataItemOption = {
+  color: 'green',
+  id: v4(),
+  label: 'Option 1',
+  position: 0,
+  value: getOptionValueFromLabel('Option 1'),
+};
+
+export const useSelectSettingsFormInitialValues = ({
+  fieldMetadataItem,
+}: {
+  fieldMetadataItem?: Pick<FieldMetadataItem, 'defaultValue' | 'options'>;
+}) => {
+  const initialDefaultValue =
+    (fieldMetadataItem?.defaultValue as SettingsDataModelFieldSelectFormValues['defaultValue']) ??
+    null;
+  const initialOptions = useMemo(
+    () =>
+      fieldMetadataItem?.options?.length
+        ? [...fieldMetadataItem.options].sort(
+            (optionA, optionB) => optionA.position - optionB.position,
+          )
+        : [DEFAULT_OPTION],
+    [fieldMetadataItem?.options],
+  );
+
+  const { resetField } =
+    useFormContext<SettingsDataModelFieldSelectFormValues>();
+
+  const resetDefaultValueField = () =>
+    resetField('defaultValue', { defaultValue: initialDefaultValue });
+
+  return {
+    initialDefaultValue,
+    initialOptions,
+    resetDefaultValueField,
+  };
+};
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/__tests__/generateNewSelectOptionLabel.test.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/__tests__/generateNewSelectOptionLabel.test.ts
similarity index 85%
rename from packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/__tests__/generateNewSelectOptionLabel.test.ts
rename to packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/__tests__/generateNewSelectOptionLabel.test.ts
index 59c08d33bf..5c67f655a4 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/__tests__/generateNewSelectOptionLabel.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/__tests__/generateNewSelectOptionLabel.test.ts
@@ -1,4 +1,4 @@
-import { generateNewSelectOptionLabel } from '@/settings/data-model/fields/forms/utils/generateNewSelectOptionLabel';
+import { generateNewSelectOptionLabel } from '../generateNewSelectOptionLabel';
 
 describe('generateNewSelectOptionLabel', () => {
   it('generates a new select option label', () => {
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/__tests__/getOptionValueFromLabel.test.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/__tests__/getOptionValueFromLabel.test.ts
similarity index 90%
rename from packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/__tests__/getOptionValueFromLabel.test.ts
rename to packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/__tests__/getOptionValueFromLabel.test.ts
index 6a8fe3693c..07b60304ea 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/__tests__/getOptionValueFromLabel.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/__tests__/getOptionValueFromLabel.test.ts
@@ -1,4 +1,4 @@
-import { getOptionValueFromLabel } from '@/settings/data-model/fields/forms/utils/getOptionValueFromLabel';
+import { getOptionValueFromLabel } from '../getOptionValueFromLabel';
 
 describe('getOptionValueFromLabel', () => {
   it('should return the option value from the label', () => {
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/generateNewSelectOption.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/generateNewSelectOption.ts
similarity index 85%
rename from packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/generateNewSelectOption.ts
rename to packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/generateNewSelectOption.ts
index 3fe4f5baf6..2b8d955dc6 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/generateNewSelectOption.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/generateNewSelectOption.ts
@@ -2,8 +2,8 @@ import { getNextThemeColor } from 'twenty-ui';
 import { v4 } from 'uuid';
 
 import { FieldMetadataItemOption } from '@/object-metadata/types/FieldMetadataItem';
-import { generateNewSelectOptionLabel } from '@/settings/data-model/fields/forms/utils/generateNewSelectOptionLabel';
-import { getOptionValueFromLabel } from '@/settings/data-model/fields/forms/utils/getOptionValueFromLabel';
+import { generateNewSelectOptionLabel } from '@/settings/data-model/fields/forms/select/utils/generateNewSelectOptionLabel';
+import { getOptionValueFromLabel } from '@/settings/data-model/fields/forms/select/utils/getOptionValueFromLabel';
 
 export const generateNewSelectOption = (
   options: FieldMetadataItemOption[],
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/generateNewSelectOptionLabel.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/generateNewSelectOptionLabel.ts
similarity index 100%
rename from packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/generateNewSelectOptionLabel.ts
rename to packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/generateNewSelectOptionLabel.ts
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/getOptionValueFromLabel.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/getOptionValueFromLabel.ts
similarity index 100%
rename from packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/getOptionValueFromLabel.ts
rename to packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/getOptionValueFromLabel.ts
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
index 3b09a2113e..78fcf95781 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
@@ -215,16 +215,6 @@ export const SettingsObjectNewFieldStep2 = () => {
       } else {
         const createdMetadataField = await createMetadataField({
           ...formValues,
-          defaultValue:
-            formValues.type === FieldMetadataType.Currency &&
-            'defaultValue' in formValues
-              ? {
-                  ...formValues.defaultValue,
-                  amountMicros: null,
-                }
-              : 'defaultValue' in formValues
-                ? formValues.defaultValue
-                : undefined,
           objectMetadataId: activeObjectMetadataItem.id,
         });