Fix

twentyhq · Dec 19, 2024 · b78da0c · b78da0c
1 parent 8b47d16
commit b78da0c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/...ata-model/fields/forms/number/components/SettingsDataModelFieldNumberSettingsFormCard.tsx b/...ata-model/fields/forms/number/components/SettingsDataModelFieldNumberSettingsFormCard.tsx
@@ -7,6 +7,7 @@ import {
   SettingsDataModelFieldPreviewCard,
   SettingsDataModelFieldPreviewCardProps,
 } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewCard';
+import { useFormContext } from 'react-hook-form';
 
 type SettingsDataModelFieldNumberSettingsFormCardProps = {
   disabled?: boolean;
@@ -26,11 +27,18 @@ export const SettingsDataModelFieldNumberSettingsFormCard = ({
   fieldMetadataItem,
   objectMetadataItem,
 }: SettingsDataModelFieldNumberSettingsFormCardProps) => {
+  const { watch } = useFormContext();
+
   return (
     <SettingsDataModelPreviewFormCard
       preview={
         <StyledFieldPreviewCard
-          fieldMetadataItem={fieldMetadataItem}
+          fieldMetadataItem={{
+            icon: watch('icon'),
+            label: watch('label') || 'New Field',
+            settings: watch('settings') || null,
+            type: fieldMetadataItem.type,
+          }}
           objectMetadataItem={objectMetadataItem}
         />
       }

diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
@@ -211,12 +211,7 @@ export const SettingsObjectFieldEdit = () => {
                 />
               )}
               <SettingsDataModelFieldSettingsFormCard
-                fieldMetadataItem={{
-                  icon: formConfig.watch('icon'),
-                  label: formConfig.watch('label') || 'New Field',
-                  settings: formConfig.watch('settings') || null,
-                  type: fieldMetadataItem.type,
-                }}
+                fieldMetadataItem={fieldMetadataItem}
                 objectMetadataItem={objectMetadataItem}
               />
             </Section>