Skip to content
Snippets Groups Projects
Commit 017eeeb1 authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

fix: add wait consent modal

parent 719ef087
No related branches found
No related tags found
1 merge request!11623.0 Release
......@@ -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>
)
}
......@@ -226,7 +226,7 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
<FluidButtons activeFluid={fluidType} key={updateKey} />
{isWaitingForConsent ? (
<GrdfWaitConsent />
<GrdfWaitConsent showRelaunch={true} />
) : (
<>
{showOfflineData && (
......
......@@ -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>
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment