diff --git a/src/components/Connection/GRDFConnect/GrdfWaitConsent.tsx b/src/components/Connection/GRDFConnect/GrdfWaitConsent.tsx index ebf1c6c463984cfa8b7b4b6beecf8df08c410216..057aebf90c04486335ba1d20f38638240da26c77 100644 --- a/src/components/Connection/GRDFConnect/GrdfWaitConsent.tsx +++ b/src/components/Connection/GRDFConnect/GrdfWaitConsent.tsx @@ -1,10 +1,9 @@ import { Button } from '@material-ui/core' import GRDFMail from 'assets/icons/visu/onboarding/grdf-mail.svg' import StyledIcon from 'components/CommonKit/Icon/StyledIcon' -import useUserInstanceSettings from 'components/Hooks/useUserInstanceSettings' import { useI18n } from 'cozy-ui/transpiled/react/I18n' import { FluidType } from 'enums' -import { FluidConnection } from 'models' +import { AccountGRDFData, FluidConnection } from 'models' import React, { useEffect, useState } from 'react' import { updateFluidConnection } from 'store/global/global.slice' import { useAppDispatch, useAppSelector } from 'store/hooks' @@ -18,13 +17,9 @@ export const GrdfWaitConsent = ({ const { t } = useI18n() const dispatch = useAppDispatch() const { fluidStatus } = useAppSelector(state => state.ecolyo.global) - const { data: instanceSettings } = useUserInstanceSettings() - const [emailSentOn, setEmailSentOn] = useState('') const currentFluidStatus = fluidStatus[FluidType.GAS] - - useEffect(() => { - setEmailSentOn(instanceSettings.email || '') - }, [instanceSettings]) + const account = currentFluidStatus.connection.account + const [consentEmail, setConsentEmail] = useState('') const updateKonnector = async () => { const updatedConnection: FluidConnection = { @@ -41,6 +36,16 @@ export const GrdfWaitConsent = ({ ) } + useEffect(() => { + if (account?.auth) { + const auth = account.auth + const authData = auth as AccountGRDFData + if (authData.email) { + setConsentEmail(authData.email) + } + } + }, [account]) + return ( <div className="grdfWait"> <div className="text-18-normal"> @@ -49,7 +54,7 @@ export const GrdfWaitConsent = ({ <div className="text-16-normal"> {t('auth.grdfgrandlyon.waiting.mailDelay')} </div> - <span className="emailContainer">{emailSentOn}</span> + <span className="emailContainer">{consentEmail}</span> <StyledIcon size={80} icon={GRDFMail} /> <div className="text-18-normal"> <span className="text-18-bold green"> diff --git a/src/components/Konnector/ConnectionResult/ConnectionResult.tsx b/src/components/Konnector/ConnectionResult/ConnectionResult.tsx index 323e24e4e22a794a5ff70c86e9ea2a35e55144e7..6907cc99ff3dbfad069752f1dcf94c6ed76a43d3 100644 --- a/src/components/Konnector/ConnectionResult/ConnectionResult.tsx +++ b/src/components/Konnector/ConnectionResult/ConnectionResult.tsx @@ -171,9 +171,7 @@ const ConnectionResult = ({ } } - const consentError = - konnectorError === KonnectorUpdate.ERROR_CONSENT_FORM_GAS || - konnectorError === KonnectorUpdate.ERROR_UPDATE_OAUTH + const consentError = konnectorError === KonnectorUpdate.ERROR_UPDATE_OAUTH /** * Get Konnector state, possible values: