From 819af22356342b33c0e8dfbcc843caaa5ffc4f3a Mon Sep 17 00:00:00 2001
From: Pierre Ecarlat <pecarlat@grandlyon.com>
Date: Fri, 12 Apr 2024 12:31:43 +0000
Subject: [PATCH] feat: GRDF consent email
---
.../GRDFConnect/GrdfWaitConsent.tsx | 23 +++++++++++--------
.../ConnectionResult/ConnectionResult.tsx | 4 +---
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/components/Connection/GRDFConnect/GrdfWaitConsent.tsx b/src/components/Connection/GRDFConnect/GrdfWaitConsent.tsx
index ebf1c6c46..057aebf90 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 323e24e4e..6907cc99f 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:
--
GitLab