Merge branch 'fix/email-grdf-consent' into 'dev'

fix: wrong email for grdf consent request

See merge request !1285

src/components/Connection/GRDFConnect/GrdfConnectView.tsx

@@ -57,9 +57,15 @@ export const GrdfConnectView = () => {
     setGrdfState(prev => ({
       ...prev,
       ...createInitialGrdfState(formData),
-      email: instanceSettings.email ?? '',
     }))
-  }, [instanceSettings, formData])
+  }, [formData])
+
+  useEffect(() => {
+    setGrdfState(prev => ({
+      ...prev,
+      email: instanceSettings.email ?? prev.email,
+    }))
+  }, [instanceSettings])
 
   useEffect(() => {
     async function launchConnect() {
@@ -110,6 +116,7 @@ export const GrdfConnectView = () => {
         _type: FORM_DOCTYPE,
         firstName: grdfState.firstname,
         lastName: grdfState.lastname,
+        email: grdfState.email,
         pce: grdfState.pce,
         zipCode: grdfState.postalCode,
       })
@@ -124,6 +131,7 @@ export const GrdfConnectView = () => {
     formData,
     grdfState.firstname,
     grdfState.lastname,
+    grdfState.email,
     grdfState.pce,
     grdfState.postalCode,
     isNextValid,

src/components/Connection/useForm.tsx

@@ -12,6 +12,7 @@ export type QueryParams = (arg?: any) => {
 interface FormData {
   firstName: string
   lastName: string
+  email: string
   pdl: string
   pce: string
   zipCode: string
@@ -61,7 +62,7 @@ export const createInitialGrdfState = (
 ): AccountGRDFData => ({
   lastname: formData?.lastName ?? '',
   firstname: formData?.firstName ?? '',
+  email: formData?.email ?? '',
   pce: formData?.pce ?? '',
   postalCode: formData?.zipCode ?? '',
-  email: '',
 })