diff --git a/src/components/Connection/GRDFConnect/GrdfWaitConsent.tsx b/src/components/Connection/GRDFConnect/GrdfWaitConsent.tsx index 361ef2f0571e256217144ec323e85564dfb09e8e..ebf1c6c463984cfa8b7b4b6beecf8df08c410216 100644 --- a/src/components/Connection/GRDFConnect/GrdfWaitConsent.tsx +++ b/src/components/Connection/GRDFConnect/GrdfWaitConsent.tsx @@ -10,7 +10,11 @@ import { updateFluidConnection } from 'store/global/global.slice' import { useAppDispatch, useAppSelector } from 'store/hooks' import './GrdfWaitConsent.scss' -export const GrdfWaitConsent = () => { +export const GrdfWaitConsent = ({ + showRelaunch, +}: { + showRelaunch: boolean +}) => { const { t } = useI18n() const dispatch = useAppDispatch() const { fluidStatus } = useAppSelector(state => state.ecolyo.global) @@ -54,9 +58,11 @@ export const GrdfWaitConsent = () => { <br /> <span>{t('auth.grdfgrandlyon.waiting.comeback')}</span> </div> - <Button className="btnPrimary" onClick={updateKonnector}> - {t('auth.grdfgrandlyon.waiting.button_done')} - </Button> + {showRelaunch && ( + <Button className="btnPrimary" onClick={updateKonnector}> + {t('auth.grdfgrandlyon.waiting.button_done')} + </Button> + )} </div> ) } diff --git a/src/components/Consumption/ConsumptionView.tsx b/src/components/Consumption/ConsumptionView.tsx index 3bfe524ba8711f78e2dd2da5448789d59ea5dc55..0510564bcbfedd6db98123654b1274e249bd651d 100644 --- a/src/components/Consumption/ConsumptionView.tsx +++ b/src/components/Consumption/ConsumptionView.tsx @@ -226,7 +226,7 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => { <FluidButtons activeFluid={fluidType} key={updateKey} /> {isWaitingForConsent ? ( - <GrdfWaitConsent /> + <GrdfWaitConsent showRelaunch={true} /> ) : ( <> {showOfflineData && ( diff --git a/src/components/Ecogesture/__snapshots__/EcogestureTabsView.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/EcogestureTabsView.spec.tsx.snap index e3dd070242df6df5363f2accb2d8049b3b2a91f5..30c44f9bce136b639fbec30736694471afb98bac 100644 --- a/src/components/Ecogesture/__snapshots__/EcogestureTabsView.spec.tsx.snap +++ b/src/components/Ecogesture/__snapshots__/EcogestureTabsView.spec.tsx.snap @@ -369,6 +369,9 @@ exports[`EcogestureView component should render empty list 1`] = ` > ecogesture.emptyList.btn1 </span> + <span + class="MuiTouchRipple-root" + /> </button> <button aria-label="ecogesture.emptyList.btn2" @@ -381,6 +384,9 @@ exports[`EcogestureView component should render empty list 1`] = ` > ecogesture.emptyList.btn2 </span> + <span + class="MuiTouchRipple-root" + /> </button> </div> </div> @@ -432,6 +438,9 @@ exports[`EcogestureView component should render empty list 1`] = ` > ecogesture.emptyList.btn1 </span> + <span + class="MuiTouchRipple-root" + /> </button> <button aria-label="ecogesture.emptyList.btn2" @@ -444,6 +453,9 @@ exports[`EcogestureView component should render empty list 1`] = ` > ecogesture.emptyList.btn2 </span> + <span + class="MuiTouchRipple-root" + /> </button> </div> </div> diff --git a/src/components/Konnector/KonnectorModal.tsx b/src/components/Konnector/KonnectorModal.tsx index 5d89e4ee4ef6cecd19cf262529240c9b95458f5f..c03c05a0b7ab2e09db97db9756b03cedcd68b4f0 100644 --- a/src/components/Konnector/KonnectorModal.tsx +++ b/src/components/Konnector/KonnectorModal.tsx @@ -4,6 +4,7 @@ import EnedisIcon from 'assets/icons/ico/consent-outdated-enedis.svg' import errorIcon from 'assets/icons/visu/data-nok.svg' import successIcon from 'assets/icons/visu/data-ok.svg' import classNames from 'classnames' +import { GrdfWaitConsent } from 'components/Connection/GRDFConnect/GrdfWaitConsent' import Loader from 'components/Loader/Loader' import connectionWaitingText from 'constants/connectionWaitingText.json' import firstConnectionWaitingText from 'constants/firstConnectionWaitingText.json' @@ -263,8 +264,15 @@ const KonnectorModal = ({ </div> </div> )} + {/* Wait consent alert */} + {error === KonnectorError.CHALLENGE_ASKED && + fluidType === FluidType.GAS && ( + <GrdfWaitConsent showRelaunch={false} /> + )} + {error !== KonnectorError.LOGIN_FAILED && error !== KonnectorError.TERMS_VERSION_MISMATCH && + error !== KonnectorError.CHALLENGE_ASKED && error !== KonnectorError.USER_ACTION_NEEDED_ACCOUNT_REMOVED && ( // DEFAULT CASE