diff --git a/src/components/Connection/GRDFConnect/GrdfConnectView.tsx b/src/components/Connection/GRDFConnect/GrdfConnectView.tsx index 814ca90071e866715b1af485de8572aa0bc60c5a..6ab30c622d79200d845cffc7a0d18561c5220f09 100644 --- a/src/components/Connection/GRDFConnect/GrdfConnectView.tsx +++ b/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, diff --git a/src/components/Connection/useForm.tsx b/src/components/Connection/useForm.tsx index 1bf3be72089103ee22d8a0d8ac7efc1e38370a88..90d7c2d3920c75fb5143576e11e87adeb2ee816b 100644 --- a/src/components/Connection/useForm.tsx +++ b/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: '', })