From c89a07a20e520e102891b5c639d55a262dc46d9b Mon Sep 17 00:00:00 2001
From: guillim <guillaume@twenty.com>
Date: Wed, 20 Nov 2024 18:03:35 +0100
Subject: [PATCH] lint

---
 .../utils/computeDraftValueFromFieldValue.ts  | 14 +++----
 .../SettingsDataModelFieldAddressForm.tsx     | 37 ++++++++++---------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/packages/twenty-front/src/modules/object-record/record-field/utils/computeDraftValueFromFieldValue.ts b/packages/twenty-front/src/modules/object-record/record-field/utils/computeDraftValueFromFieldValue.ts
index 3625d46d7..40323ab5e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/utils/computeDraftValueFromFieldValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/utils/computeDraftValueFromFieldValue.ts
@@ -43,14 +43,14 @@ export const computeDraftValueFromFieldValue = <FieldValue>({
     } as unknown as FieldInputDraftValue<FieldValue>;
   }
 
-  if(isFieldAddress(fieldDefinition)){
-    if(
-      isFieldValueEmpty({ fieldValue, fieldDefinition })
-      && fieldDefinition.metadata.settings?.defaultCountry
-    ){
+  if (isFieldAddress(fieldDefinition)) {
+    if (
+      isFieldValueEmpty({ fieldValue, fieldDefinition }) &&
+      !!fieldDefinition.metadata.settings?.defaultCountry
+    ) {
       return {
-        ...fieldValue, 
-        addressCountry: fieldDefinition.metadata.settings.defaultCountry
+        ...fieldValue,
+        addressCountry: fieldDefinition.metadata.settings.defaultCountry,
       } as unknown as FieldInputDraftValue<FieldValue>;
     }
 
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressForm.tsx
index ea4a3ba5a..69dec74d9 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/components/SettingsDataModelFieldAddressForm.tsx
@@ -40,23 +40,24 @@ export const SettingsDataModelFieldAddressForm = ({
   fieldMetadataItem,
 }: SettingsDataModelFieldAddressFormProps) => {
   const { control } = useFormContext<SettingsDataModelFieldTextFormValues>();
-  const countries = useCountries().map(country => ({
+  const countries = useCountries().map((country) => ({
     label: country.countryName,
-    value: country.countryName
-  }))
+    value: country.countryName,
+  }));
   return (
-      <Controller
-        name="settings"
-        defaultValue={{
-          defaultCountry: fieldMetadataItem?.settings?.defaultCountry || 'United States',
-        }}
-        control={control}
-        render={({ field: { onChange, value } }) => {
-          const defaultCountry = value?.defaultCountry ?? 0;
+    <Controller
+      name="settings"
+      defaultValue={{
+        defaultCountry:
+          fieldMetadataItem?.settings?.defaultCountry || 'United States',
+      }}
+      control={control}
+      render={({ field: { onChange, value } }) => {
+        const defaultCountry = value?.defaultCountry ?? 0;
 
-          return (
-            <>
-              <SettingsOptionCardContentSelect
+        return (
+          <>
+            <SettingsOptionCardContentSelect
               Icon={IconMap}
               dropdownId="selectDefaultCountry"
               title="Default Country"
@@ -66,9 +67,9 @@ export const SettingsDataModelFieldAddressForm = ({
               disabled={disabled}
               options={countries}
             />
-            </>
-          );
-        }}
-      />
+          </>
+        );
+      }}
+    />
   );
 };