Merge pull request #399 from EnMarche/EM-921-no-birthdate-return-null

Fix birthdate issue
parti-renaissance · May 28, 2021 · 7e9e962 · 7e9e962
2 parents fb3a1a8 + d16aa48
commit 7e9e962
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/pages/Profile/Profile.tsx b/src/pages/Profile/Profile.tsx
@@ -86,10 +86,8 @@ export const Profile: FunctionComponent = () => {
     causeSubscription,
     coalitionSubscription,
     gender: gender === null ? GENDERS[0].value : gender,
-    birthday:
-      birthdate === undefined || birthdate === null
-        ? null
-        : format(new Date(birthdate), 'yyyy-MM-dd'),
+    // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
+    birthday: birthdate ? format(new Date(birthdate), 'yyyy-MM-dd') : null,
     phoneNumber: phone !== null && phone !== undefined ? phone.number : null,
     phoneCountry: findPhoneCountryByRegion(
       phoneCountries,

diff --git a/src/pages/Profile/hooks/useUpdateUserProfile.ts b/src/pages/Profile/hooks/useUpdateUserProfile.ts
@@ -32,7 +32,7 @@ type UpdateUserProfilePayload = {
   last_name?: string;
   phone?: { number?: string; country?: string };
   gender?: string;
-  birthdate?: string;
+  birthdate?: string | null;
   coalition_subscription?: boolean;
   cause_subscription?: boolean;
 };
@@ -68,7 +68,8 @@ export const useUpdateUserProfile = (userId?: string) => {
           first_name: values.firstName,
           last_name: values.lastName,
           gender: values.gender === GENDERS[0].value ? undefined : values.gender,
-          birthdate: values.birthday,
+          // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
+          birthdate: values.birthday ? values.birthday : null,
           phone:
             values.phoneNumber !== null
               ? {

diff --git a/src/pages/Profile/hooks/useValidateForm.ts b/src/pages/Profile/hooks/useValidateForm.ts
@@ -15,7 +15,7 @@ export interface ProfileFormValues {
   phoneNumber?: string;
   phoneCountry?: PhoneCountry;
   gender?: string;
-  birthday?: string;
+  birthday?: string | null;
   coalitionSubscription?: boolean;
   causeSubscription?: boolean;
 }
@@ -26,7 +26,7 @@ type ErrorForm = {
   email?: string;
   phoneNumber?: string;
   gender?: string;
-  birthday?: string;
+  birthday?: string | null;
 };
 
 export const useValidateForm = () => {