diff --git a/src/components/Action/ActionBegin.tsx b/src/components/Action/ActionBegin.tsx
index 52b1c8a3f7d5733d24ea840c4fede9e526357f86..42e2a26338cf2f90b16967e164e80ffd5c0bda9b 100644
--- a/src/components/Action/ActionBegin.tsx
+++ b/src/components/Action/ActionBegin.tsx
@@ -36,9 +36,6 @@ const ActionBegin = ({
const toggleLaunchModal = useCallback(() => {
setOpenLaunchModal(prev => !prev)
}, [])
- const goToList = useCallback(() => {
- setShowList(true)
- }, [setShowList])
useEffect(() => {
let subscribed = true
@@ -117,7 +114,7 @@ const ActionBegin = ({
{t('action.apply')}
</Button>
<Button
- onClick={goToList}
+ onClick={() => setShowList(true)}
classes={{
root: 'btn-secondary-negative',
label: 'text-16-normal',
diff --git a/src/components/Action/ActionView.tsx b/src/components/Action/ActionView.tsx
index ba49a638363016e9d2efe67c77781bb41b593ed5..a530002f1434620308a785df104f08747b0f0f7c 100644
--- a/src/components/Action/ActionView.tsx
+++ b/src/components/Action/ActionView.tsx
@@ -6,15 +6,12 @@ import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
import { UserActionState } from 'enum/userAction.enum'
import { UserChallenge } from 'models'
-import React, { useCallback, useState } from 'react'
+import React, { useState } from 'react'
import { useAppSelector } from 'store/hooks'
const ActionView = () => {
const { currentChallenge } = useAppSelector(state => state.ecolyo.challenge)
const [headerHeight, setHeaderHeight] = useState<number>(0)
- const defineHeaderHeight = useCallback((height: number) => {
- setHeaderHeight(height)
- }, [])
const renderAction = (challenge: UserChallenge) => {
switch (challenge.action.state) {
@@ -33,11 +30,11 @@ const ActionView = () => {
<>
<CozyBar titleKey={'common.title_action'} displayBackArrow={true} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_action'}
displayBackArrow={true}
/>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
{currentChallenge && renderAction(currentChallenge)}
</Content>
</>
diff --git a/src/components/Action/__snapshots__/ActionView.spec.tsx.snap b/src/components/Action/__snapshots__/ActionView.spec.tsx.snap
index ec1ba3e6c35f9cfd16362702059d7640b08b3c70..1136e5081d41803e638e3814c6f018eb3c839794 100644
--- a/src/components/Action/__snapshots__/ActionView.spec.tsx.snap
+++ b/src/components/Action/__snapshots__/ActionView.spec.tsx.snap
@@ -24,7 +24,7 @@ exports[`ActionView component should render ActionChoose component 1`] = `
setHeaderHeight={[Function]}
/>
<mock-content
- height={0}
+ heightOffset={0}
>
<ActionChoose
userChallenge={
diff --git a/src/components/Analysis/AnalysisView.tsx b/src/components/Analysis/AnalysisView.tsx
index dea8806b2a678843e5cf493f6c984f6d83c84f5f..650eee647d3f009aaf0577b08f8dbf0e753246c2 100644
--- a/src/components/Analysis/AnalysisView.tsx
+++ b/src/components/Analysis/AnalysisView.tsx
@@ -28,9 +28,6 @@ const AnalysisView = () => {
} = useAppSelector(state => state.ecolyo)
const dispatch = useAppDispatch()
const [headerHeight, setHeaderHeight] = useState<number>(0)
- const defineHeaderHeight = useCallback((height: number) => {
- setHeaderHeight(height)
- }, [])
const dateChartService = new DateChartService()
@@ -121,7 +118,7 @@ const AnalysisView = () => {
<>
<CozyBar titleKey={'common.title_analysis'} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_analysis'}
>
<DateNavigator
@@ -134,7 +131,7 @@ const AnalysisView = () => {
timeStep={TimeStep.MONTH}
/>
</Header>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
<MonthlyAnalysis
saveLastScrollPosition={saveLastScrollPosition}
scrollPosition={scrollPosition}
diff --git a/src/components/Challenge/ChallengeView.tsx b/src/components/Challenge/ChallengeView.tsx
index daa50f41730a2e2c0763447f85e99fc92da13176..0817c84b311d971f116a9d6af49545463d8c5da9 100644
--- a/src/components/Challenge/ChallengeView.tsx
+++ b/src/components/Challenge/ChallengeView.tsx
@@ -26,9 +26,6 @@ const ChallengeView = () => {
const [isLastDuelDone, setIsLastDuelDone] = useState<boolean>(false)
const [containerTranslation, setContainerTranslation] =
useState<number>(marginPx)
- const defineHeaderHeight = (height: number) => {
- setHeaderHeight(height)
- }
const resetValues = () => {
// Method used to cancel a swipe on a simple click
@@ -110,10 +107,10 @@ const ChallengeView = () => {
<>
<CozyBar titleKey={'common.title_challenge'} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_challenge'}
/>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
<div
className="challengeSlider"
onClick={resetValues}
diff --git a/src/components/Challenge/__snapshots__/ChallengeView.spec.tsx.snap b/src/components/Challenge/__snapshots__/ChallengeView.spec.tsx.snap
index 5b7b889d71ab7c6a096b771181cb0862a3a228c0..7736d9c4a786f8ec1dd48586ae88ad01b4aefce4 100644
--- a/src/components/Challenge/__snapshots__/ChallengeView.spec.tsx.snap
+++ b/src/components/Challenge/__snapshots__/ChallengeView.spec.tsx.snap
@@ -22,7 +22,7 @@ exports[`ChallengeView component should be rendered correctly 1`] = `
setHeaderHeight={[Function]}
/>
<mock-content
- height={0}
+ heightOffset={0}
>
<div
className="challengeSlider"
diff --git a/src/components/CommonKit/ErrorPage/ErrorPage.tsx b/src/components/CommonKit/ErrorPage/ErrorPage.tsx
index 69136c0867bc9beab069d7499a636c7e74920492..2a0c99ac1de5a80f148ceea51c8be5a24c047fa9 100644
--- a/src/components/CommonKit/ErrorPage/ErrorPage.tsx
+++ b/src/components/CommonKit/ErrorPage/ErrorPage.tsx
@@ -5,7 +5,7 @@ import Content from 'components/Content/Content'
import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import React, { useCallback, useState } from 'react'
+import React, { useState } from 'react'
import { useNavigate } from 'react-router-dom'
import './errorPage.scss'
@@ -15,31 +15,25 @@ interface ErrorPageProps {
}
const ErrorPage = ({ text, returnPage }: ErrorPageProps) => {
- const navigate = useNavigate()
const { t } = useI18n()
-
+ const navigate = useNavigate()
const [headerHeight, setHeaderHeight] = useState<number>(0)
- const defineHeaderHeight = (height: number) => {
- setHeaderHeight(height)
- }
- const handleClick = useCallback(() => {
- navigate(`/${returnPage}`)
- }, [navigate, returnPage])
+
return (
<>
<CozyBar titleKey={'error_page.main'} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'error_page.main'}
/>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
<div className="error-container">
<StyledIcon className="profile-icon" icon={BearIcon} size={250} />
<div className="text-18-bold head">{text}</div>
<Button
aria-label={t('error_page.back')}
- onClick={handleClick}
+ onClick={() => navigate(`/${returnPage}`)}
variant={'contained'}
classes={{
root: 'btn-highlight',
diff --git a/src/components/CommonKit/ErrorPage/__snapshots__/ErrorPage.spec.tsx.snap b/src/components/CommonKit/ErrorPage/__snapshots__/ErrorPage.spec.tsx.snap
index 0a6cf7c486a3fe065d5147bd4485e517afecd444..e8c666f6a39b70bc1c9e123bca3043ce0813fc60 100644
--- a/src/components/CommonKit/ErrorPage/__snapshots__/ErrorPage.spec.tsx.snap
+++ b/src/components/CommonKit/ErrorPage/__snapshots__/ErrorPage.spec.tsx.snap
@@ -21,7 +21,7 @@ exports[`ErrorPage component should be rendered correctly 1`] = `
/>
</Component>
<Component
- height={0}
+ heightOffset={0}
>
<div
id="content"
diff --git a/src/components/Connection/FormOAuth.tsx b/src/components/Connection/FormOAuth.tsx
index 46df15916adea9eb0e8dffe7401e2fa016abefc2..471fe2eb922cd7c12e52e133962ca9a430c99fae 100644
--- a/src/components/Connection/FormOAuth.tsx
+++ b/src/components/Connection/FormOAuth.tsx
@@ -50,10 +50,6 @@ const FormOAuth = ({ konnector, onSuccess, fluidStatus }: FormOAuthProps) => {
[endOAuth, onSuccess]
)
- const handleOAuthCancel = useCallback(() => {
- endOAuth()
- }, [endOAuth])
-
const isWaiting = status === WAITING
useEffect(() => {
@@ -88,7 +84,7 @@ const FormOAuth = ({ konnector, onSuccess, fluidStatus }: FormOAuthProps) => {
konnector={konnector}
redirectSlug={client.appMetadata.slug}
onSuccess={handleAccountId}
- onCancel={handleOAuthCancel}
+ onCancel={endOAuth}
t={t}
/>
)}
diff --git a/src/components/Connection/PartnerConnectModal/EpglConnectModal.tsx b/src/components/Connection/PartnerConnectModal/EpglConnectModal.tsx
index 2442a5f028eedcb7d50f775c3f0e900789192002..d9f2fe1210227c5ca75970d545dc67459f712019 100644
--- a/src/components/Connection/PartnerConnectModal/EpglConnectModal.tsx
+++ b/src/components/Connection/PartnerConnectModal/EpglConnectModal.tsx
@@ -3,7 +3,7 @@ import CloseIcon from 'assets/icons/ico/close.svg'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
import { Step } from 'models/step.model'
-import React, { useCallback, useEffect, useState } from 'react'
+import React, { useEffect, useState } from 'react'
import './PartnerConnectModal.scss'
import EpglCreateAccount from './Steps/EpglCreateAccount'
import EpglDoYouHaveAccount from './Steps/EpglDoYouHaveAccount'
@@ -36,29 +36,24 @@ const EpglConnectModal = ({
}
}, [open])
- const goToCreateAccountStep = useCallback(() => {
- setCurrentStep(StepEnum.CreateAccount)
- }, [])
- const goToDoYouHaveAccountStep = useCallback(() => {
- setCurrentStep(StepEnum.DoYouHaveAccount)
- }, [])
- const handleGoToPartnerSite = useCallback(() => {
+ const handleGoToPartnerSite = () => {
goToPartnerSite()
setHasCreatedAccount(true)
setShowForm(true)
handleCloseClick()
- }, [goToPartnerSite, handleCloseClick, setHasCreatedAccount, setShowForm])
- const handleShowForm = useCallback(() => {
+ }
+
+ const handleShowForm = () => {
setShowForm(true)
handleCloseClick()
- }, [handleCloseClick, setShowForm])
+ }
const steps: Record<StepEnum, Step> = {
[StepEnum.DoYouHaveAccount]: {
content: <EpglDoYouHaveAccount />,
leftButton: (
<Button
- onClick={goToCreateAccountStep}
+ onClick={() => setCurrentStep(StepEnum.CreateAccount)}
classes={{
root: 'btn-profile-back',
label: 'text-16-bold',
@@ -83,7 +78,7 @@ const EpglConnectModal = ({
content: <EpglCreateAccount />,
leftButton: (
<Button
- onClick={goToDoYouHaveAccountStep}
+ onClick={() => setCurrentStep(StepEnum.DoYouHaveAccount)}
classes={{
root: 'btn-profile-back',
label: 'text-16-bold',
diff --git a/src/components/Connection/PartnerConnectModal/GrdfConnectModal.tsx b/src/components/Connection/PartnerConnectModal/GrdfConnectModal.tsx
index 871172766e322945ed6fc05f0f6b36b2c9c7a249..ee371a7136a8906c914b1110bdd5b6b269fb6190 100644
--- a/src/components/Connection/PartnerConnectModal/GrdfConnectModal.tsx
+++ b/src/components/Connection/PartnerConnectModal/GrdfConnectModal.tsx
@@ -5,7 +5,7 @@ import FormOAuth from 'components/Connection/FormOAuth'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { FluidStatus, Konnector } from 'models'
import { Step } from 'models/step.model'
-import React, { useCallback, useEffect, useState } from 'react'
+import React, { useEffect, useState } from 'react'
import './PartnerConnectModal.scss'
import GrdfCreateAccount from './Steps/GrdfCreateAccount'
import GrdfDoYouHaveAccount from './Steps/GrdfDoYouHaveAccount'
@@ -48,32 +48,21 @@ const GrdfConnectModal = ({
}
}, [showForm, open])
- const goToCreateAccountStep = useCallback(() => {
- setCurrentStep(StepEnum.CreateAccount)
- }, [])
- const goToGiveConsentStep = useCallback(() => {
- setCurrentStep(StepEnum.GiveConsent)
- }, [])
- const goToDoYouHaveAccountStep = useCallback(() => {
- setCurrentStep(StepEnum.DoYouHaveAccount)
- }, [])
- const handleGoToPartnerSite = useCallback(() => {
+ const handleGoToPartnerSite = () => {
goToPartnerSite()
setShowForm(true)
handleCloseClick()
- }, [goToPartnerSite, handleCloseClick, setShowForm])
- const handleGiveConsentPrevious = useCallback(
- () =>
- showForm ? handleCloseClick() : setCurrentStep(StepEnum.DoYouHaveAccount),
- [handleCloseClick, showForm]
- )
+ }
+ const handleGiveConsentPrevious = () => {
+ showForm ? handleCloseClick() : setCurrentStep(StepEnum.DoYouHaveAccount)
+ }
const steps: Record<StepEnum, Step> = {
[StepEnum.DoYouHaveAccount]: {
content: <GrdfDoYouHaveAccount />,
leftButton: (
<Button
- onClick={goToCreateAccountStep}
+ onClick={() => setCurrentStep(StepEnum.CreateAccount)}
classes={{
root: 'btn-profile-back',
label: 'text-16-bold',
@@ -84,7 +73,7 @@ const GrdfConnectModal = ({
),
rightButton: (
<Button
- onClick={goToGiveConsentStep}
+ onClick={() => setCurrentStep(StepEnum.GiveConsent)}
classes={{
root: 'btn-profile-next',
label: 'text-16-bold',
@@ -98,7 +87,7 @@ const GrdfConnectModal = ({
content: <GrdfCreateAccount />,
leftButton: (
<Button
- onClick={goToDoYouHaveAccountStep}
+ onClick={() => setCurrentStep(StepEnum.DoYouHaveAccount)}
classes={{
root: 'btn-profile-back',
label: 'text-16-bold',
diff --git a/src/components/Connection/SGEConnect/SgeConnectView.tsx b/src/components/Connection/SGEConnect/SgeConnectView.tsx
index f4e08fb845bda0a3a374cbfb4ab5dc83083a74b4..2a0377228b4825e83a487267810d5208ea1a04f5 100644
--- a/src/components/Connection/SGEConnect/SgeConnectView.tsx
+++ b/src/components/Connection/SGEConnect/SgeConnectView.tsx
@@ -32,9 +32,6 @@ const SgeConnectView = () => {
sgeConnect.currentStep
)
const [headerHeight, setHeaderHeight] = useState<number>(0)
- const defineHeaderHeight = useCallback((height: number) => {
- setHeaderHeight(height)
- }, [])
const isNextValid = useCallback(() => {
switch (currentStep) {
@@ -133,11 +130,11 @@ const SgeConnectView = () => {
<>
<CozyBar titleKey={'common.title_sge_connect'} displayBackArrow={true} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_sge_connect'}
displayBackArrow={true}
/>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
<div className="sge-view">
<div className="sge-container">
<FormProgress step={currentStep} formType={'sge'} />
diff --git a/src/components/Connection/SGEConnect/__snapshots__/SgeConnectView.spec.tsx.snap b/src/components/Connection/SGEConnect/__snapshots__/SgeConnectView.spec.tsx.snap
index 03e2a662a5bfbfc1209389f0aa60d02644b1d099..bb15318abb0f109f78635f41beaacffceda9c42d 100644
--- a/src/components/Connection/SGEConnect/__snapshots__/SgeConnectView.spec.tsx.snap
+++ b/src/components/Connection/SGEConnect/__snapshots__/SgeConnectView.spec.tsx.snap
@@ -301,7 +301,7 @@ exports[`SgeConnectView component should be rendered correctly 1`] = `
</div>
</Header>
<mock-content
- height={-48}
+ heightOffset={-48}
>
<div
className="sge-view"
diff --git a/src/components/Content/Content.tsx b/src/components/Content/Content.tsx
index 85212d7f316c6577f4fe141f22c35ceab9db2464..9597e8229fd05ab5a08ecbb983fc73570b21c81f 100644
--- a/src/components/Content/Content.tsx
+++ b/src/components/Content/Content.tsx
@@ -6,15 +6,10 @@ import { useAppDispatch, useAppSelector } from 'store/hooks'
import './content.scss'
interface ContentProps {
children: React.ReactNode
- height?: number
- background?: string
+ heightOffset?: number
}
-const Content = ({
- children,
- height = 0,
- background = 'inherit',
-}: ContentProps) => {
+const Content = ({ children, heightOffset = 0 }: ContentProps) => {
const dispatch = useAppDispatch()
const { screenType } = useAppSelector(state => state.ecolyo.global)
@@ -49,13 +44,12 @@ const Content = ({
<div
className={'content-view'}
style={{
- marginTop: height,
+ marginTop: heightOffset,
paddingBottom: 0,
minHeight:
screenType !== ScreenType.DESKTOP
- ? `calc(100vh - ${height}px - ${cozyBarHeight}px - ${cozyNavHeight}px - env(safe-area-inset-top) - env(safe-area-inset-bottom) - env(safe-area-inset-bottom))`
+ ? `calc(100vh - ${heightOffset}px - ${cozyBarHeight}px - ${cozyNavHeight}px - env(safe-area-inset-top) - env(safe-area-inset-bottom) - env(safe-area-inset-bottom))`
: `unset`,
- background: background,
}}
>
{children}
diff --git a/src/components/Duel/DuelOngoing.tsx b/src/components/Duel/DuelOngoing.tsx
index 97804bdf20a5ee721eaeacbc616e0cd9448488df..179dc70f9952787382e26cd497f12b830663d85c 100644
--- a/src/components/Duel/DuelOngoing.tsx
+++ b/src/components/Duel/DuelOngoing.tsx
@@ -99,10 +99,6 @@ const DuelOngoing = ({ userChallenge, isFinished }: DuelOngoingProps) => {
navigate,
])
- const setLastResult = useCallback(async () => {
- navigate('/challenges')
- }, [navigate])
-
useEffect(() => {
let subscribed = true
async function setChallengeResult() {
@@ -208,7 +204,10 @@ const DuelOngoing = ({ userChallenge, isFinished }: DuelOngoingProps) => {
win={winChallenge}
handleCloseClick={setResult}
/>
- <LastDuelModal open={isLastDuel} handleCloseClick={setLastResult} />
+ <LastDuelModal
+ open={isLastDuel}
+ handleCloseClick={() => navigate('/challenges')}
+ />
</>
)
}
diff --git a/src/components/Duel/DuelView.tsx b/src/components/Duel/DuelView.tsx
index 4704f47a8d46699418944fba7bba51854ade6bcf..dbf94aeeb5035414a5fff872c00fc786cd9fb9ce 100644
--- a/src/components/Duel/DuelView.tsx
+++ b/src/components/Duel/DuelView.tsx
@@ -6,13 +6,14 @@ import Header from 'components/Header/Header'
import { UserChallengeState } from 'enum/userChallenge.enum'
import { UserDuelState } from 'enum/userDuel.enum'
import { UserChallenge } from 'models'
-import React, { useCallback, useState } from 'react'
+import React, { useState } from 'react'
import { useLocation, useNavigate } from 'react-router-dom'
import { useAppSelector } from 'store/hooks'
import DuelEmptyValueModal from './DuelEmptyValueModal'
import DuelOngoing from './DuelOngoing'
const DuelView = () => {
+ const navigate = useNavigate()
const { userChallengeList } = useAppSelector(state => state.ecolyo.challenge)
const [headerHeight, setHeaderHeight] = useState<number>(0)
const id = new URLSearchParams(useLocation().search).get('id')
@@ -20,10 +21,6 @@ const DuelView = () => {
challenge => challenge.id === id
)
- const navigate = useNavigate()
- const defineHeaderHeight = useCallback((height: number) => {
- setHeaderHeight(height)
- }, [])
const goBackToChallenge = () => {
navigate('/challenges')
}
@@ -51,11 +48,11 @@ const DuelView = () => {
<>
<CozyBar titleKey={'common.title_duel'} displayBackArrow={true} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_duel'}
displayBackArrow={true}
/>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
<div>
{challengeToDisplay &&
(challengeToDisplay.state === UserChallengeState.DUEL ||
diff --git a/src/components/Ecogesture/EcogestureView.tsx b/src/components/Ecogesture/EcogestureView.tsx
index b20ef129288c2b1310657050c1cc1268fbfcee11..fa44a5f18273307023189d2571d31aa032bd3a07 100644
--- a/src/components/Ecogesture/EcogestureView.tsx
+++ b/src/components/Ecogesture/EcogestureView.tsx
@@ -38,10 +38,6 @@ const TabPanel = ({ children, tab, value }: TabPanelProps) => {
}
const EcogestureView = () => {
- const [headerHeight, setHeaderHeight] = useState<number>(0)
- const defineHeaderHeight = (height: number) => {
- setHeaderHeight(height)
- }
const { t } = useI18n()
const client = useClient()
const tab = new URLSearchParams(useLocation().search).get('tab')
@@ -50,6 +46,7 @@ const EcogestureView = () => {
state => state.ecolyo
)
+ const [headerHeight, setHeaderHeight] = useState<number>(0)
const [tabValue, setTabValue] = useState<EcogestureTab>(
tab ? parseInt(tab) : EcogestureTab.OBJECTIVE
)
@@ -178,7 +175,7 @@ const EcogestureView = () => {
<>
<CozyBar titleKey={'common.title_ecogestures'} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_ecogestures'}
>
<Tabs
@@ -219,7 +216,7 @@ const EcogestureView = () => {
</Tabs>
</Header>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
{isLoading && (
<div className="loaderContainer">
<Loader text={t('ecogestures.loading')} />
diff --git a/src/components/Ecogesture/SingleEcogesture.tsx b/src/components/Ecogesture/SingleEcogesture.tsx
index 385db2a333c917d9758c5fa0c302b583422ff782..72525b837ff9f5fb62d3130895f51fbf0b2364c9 100644
--- a/src/components/Ecogesture/SingleEcogesture.tsx
+++ b/src/components/Ecogesture/SingleEcogesture.tsx
@@ -49,9 +49,6 @@ const SingleEcogesture = () => {
)
const { currentChallenge } = useAppSelector(state => state.ecolyo.challenge)
const [headerHeight, setHeaderHeight] = useState<number>(0)
- const defineHeaderHeight = (height: number) => {
- setHeaderHeight(height)
- }
const [, setValidExploration] = useExploration()
const toggleMoreDetail = () => {
setIsMoreDetail(prev => !prev)
@@ -123,11 +120,11 @@ const SingleEcogesture = () => {
<>
<CozyBar titleKey={'common.title_ecogesture'} displayBackArrow={true} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_ecogesture'}
displayBackArrow={true}
/>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
{isLoading && (
<div className="loaderContainer">
<Loader />
diff --git a/src/components/Ecogesture/__snapshots__/EcogestureView.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/EcogestureView.spec.tsx.snap
index dfb1e8a5a948fa096235cffba7361bb2c3087206..4369c61f413e7e47d274c4a0391e3fb4cd9596f1 100644
--- a/src/components/Ecogesture/__snapshots__/EcogestureView.spec.tsx.snap
+++ b/src/components/Ecogesture/__snapshots__/EcogestureView.spec.tsx.snap
@@ -565,7 +565,7 @@ exports[`EcogestureView component should be rendered correctly 1`] = `
</WithStyles(ForwardRef(Tabs))>
</mock-header>
<mock-content
- height={0}
+ heightOffset={0}
>
<TabPanel
tab={0}
diff --git a/src/components/Ecogesture/__snapshots__/SingleEcogesture.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/SingleEcogesture.spec.tsx.snap
index 031efb6101e9a404125892a2b52c39d58e84ef2f..f8389c76650b7ea698c0cecba84ce9db7d413844 100644
--- a/src/components/Ecogesture/__snapshots__/SingleEcogesture.spec.tsx.snap
+++ b/src/components/Ecogesture/__snapshots__/SingleEcogesture.spec.tsx.snap
@@ -32,7 +32,7 @@ exports[`SingleEcogesture component should be rendered correctly 1`] = `
/>
</Component>
<Component
- height={0}
+ heightOffset={0}
>
<div
id="content"
diff --git a/src/components/EcogestureForm/EcogestureFormView.tsx b/src/components/EcogestureForm/EcogestureFormView.tsx
index 553f9b3af8b51971ce2c6845b535a5d20d52fbdf..ba87afbd40c52949de63f0f80523c62bcd6cba43 100644
--- a/src/components/EcogestureForm/EcogestureFormView.tsx
+++ b/src/components/EcogestureForm/EcogestureFormView.tsx
@@ -31,9 +31,6 @@ const EcogestureFormView = () => {
const dispatch: Dispatch<AppActionsTypes> = useDispatch()
const navigate = useNavigate()
const [headerHeight, setHeaderHeight] = useState<number>(0)
- const defineHeaderHeight = (height: number) => {
- setHeaderHeight(height)
- }
const shouldOpenModal = new URLSearchParams(useLocation().search).get('modal')
const [step, setStep] = useState<EcogestureStepForm>(
@@ -99,10 +96,10 @@ const EcogestureFormView = () => {
<>
<CozyBar titleKey={'common.title_ecogestures'} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_ecogestures'}
/>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
{isLoading && (
<div className="loaderContainer">
<Loader />
diff --git a/src/components/EcogestureForm/__snapshots__/EcogestureFormView.spec.tsx.snap b/src/components/EcogestureForm/__snapshots__/EcogestureFormView.spec.tsx.snap
index 304c1fdddbaa8721f125a341cc1ab6837f54a958..b343a1c9654cf7eae93c8fa31497c0ca862cc0a1 100644
--- a/src/components/EcogestureForm/__snapshots__/EcogestureFormView.spec.tsx.snap
+++ b/src/components/EcogestureForm/__snapshots__/EcogestureFormView.spec.tsx.snap
@@ -22,7 +22,7 @@ exports[`EcogestureFormView component should be rendered correctly 1`] = `
setHeaderHeight={[Function]}
/>
<mock-content
- height={0}
+ heightOffset={0}
>
<EcogestureFormSingleChoice
answerType={
diff --git a/src/components/EcogestureSelection/EcogestureSelection.tsx b/src/components/EcogestureSelection/EcogestureSelection.tsx
index 6449919bd4b44564dbd4a4f18082e348291acd0a..04d8e343b17466d884102879d37ae8e2c1701461 100644
--- a/src/components/EcogestureSelection/EcogestureSelection.tsx
+++ b/src/components/EcogestureSelection/EcogestureSelection.tsx
@@ -29,10 +29,6 @@ const EcogestureSelection = () => {
const [openEcogestureSelectionModal, setOpenEcogestureSelectionModal] =
useState(false)
- const defineHeaderHeight = useCallback((height: number) => {
- setHeaderHeight(height)
- }, [])
-
const ecogestureService = useMemo(
() => new EcogestureService(client),
[client]
@@ -137,7 +133,7 @@ const EcogestureSelection = () => {
backFunction={() => navigate('/ecogestures')}
/>
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_ecogestures_choice'}
displayBackArrow={true}
>
@@ -147,7 +143,7 @@ const EcogestureSelection = () => {
: ''}
</div>
</Header>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
{isLoading && (
<div className="loaderContainer">
<Loader />
diff --git a/src/components/EcogestureSelection/EcogestureSelectionEnd.tsx b/src/components/EcogestureSelection/EcogestureSelectionEnd.tsx
index 5742708e628210bb7da4a06b1722d91068c76b96..27c356afb667820e493cf7d7857d2169d057857e 100644
--- a/src/components/EcogestureSelection/EcogestureSelectionEnd.tsx
+++ b/src/components/EcogestureSelection/EcogestureSelectionEnd.tsx
@@ -2,7 +2,7 @@ import { Button } from '@material-ui/core'
import icon from 'assets/icons/visu/profileType/finish.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import React, { useCallback } from 'react'
+import React from 'react'
import { useNavigate } from 'react-router-dom'
import './ecogestureSelectionEnd.scss'
@@ -10,9 +10,6 @@ const EcogestureSelectionEnd = () => {
const { t } = useI18n()
const navigate = useNavigate()
- const goToObjectives = useCallback(() => {
- navigate('/ecogestures?tab=0')
- }, [navigate])
return (
<div className="eg-selection-end-container">
<div className="content">
@@ -34,7 +31,7 @@ const EcogestureSelectionEnd = () => {
root: 'btn-highlight',
label: 'text-16-bold',
}}
- onClick={goToObjectives}
+ onClick={() => navigate('/ecogestures?tab=0')}
>
{t('ecogesture_selection.button_ok')}
</Button>
diff --git a/src/components/EcogestureSelection/EcogestureSelectionRestart.tsx b/src/components/EcogestureSelection/EcogestureSelectionRestart.tsx
index 33a68a477c8096ced33c5fd8c2f1eb5ca96e1d11..f404b7108857c32943c918fb91d47c3596253aa2 100644
--- a/src/components/EcogestureSelection/EcogestureSelectionRestart.tsx
+++ b/src/components/EcogestureSelection/EcogestureSelectionRestart.tsx
@@ -2,7 +2,7 @@ import { Button } from '@material-ui/core'
import icon from 'assets/icons/visu/ecogesture/ECOGESTURE0001.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import React, { useCallback } from 'react'
+import React from 'react'
import { useNavigate } from 'react-router-dom'
import './ecogestureSelectionRestart.scss'
@@ -18,10 +18,6 @@ const EcogestureSelectionRestart = ({
const { t } = useI18n()
const navigate = useNavigate()
- const goToObjectives = useCallback(() => {
- navigate('/ecogestures?tab=0')
- }, [navigate])
-
return (
<div className="eg-selection-restart-container">
<div className="content">
@@ -45,7 +41,7 @@ const EcogestureSelectionRestart = ({
root: 'btn-secondary-negative',
label: 'text-16-normal',
}}
- onClick={goToObjectives}
+ onClick={() => navigate('/ecogestures?tab=0')}
>
{t('ecogesture_selection.button_go_to_ecogesture')}
</Button>
diff --git a/src/components/EcogestureSelection/__snapshots__/EcogestureSelection.spec.tsx.snap b/src/components/EcogestureSelection/__snapshots__/EcogestureSelection.spec.tsx.snap
index c8243370cab5d05087c5de4eae6e0cf05ee7827c..ef4f90c15e5bb534fa71ff9a2f542ed39a4cae65 100644
--- a/src/components/EcogestureSelection/__snapshots__/EcogestureSelection.spec.tsx.snap
+++ b/src/components/EcogestureSelection/__snapshots__/EcogestureSelection.spec.tsx.snap
@@ -31,7 +31,7 @@ exports[`EcogestureSelection component should be rendered correctly 1`] = `
</div>
</mock-header>
<mock-content
- height={0}
+ heightOffset={0}
>
<mock-ecogestureselectiondetail
ecogesture={
diff --git a/src/components/Exploration/ExplorationError.tsx b/src/components/Exploration/ExplorationError.tsx
index efd22f0f0d8e0d33f211531c73bada580a55ac1c..64702698d0f084c5ca80cc343423d7c7bf800726 100644
--- a/src/components/Exploration/ExplorationError.tsx
+++ b/src/components/Exploration/ExplorationError.tsx
@@ -1,6 +1,6 @@
import Button from '@material-ui/core/Button'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import React, { useCallback } from 'react'
+import React from 'react'
import { useNavigate } from 'react-router-dom'
import './explorationError.scss'
@@ -8,10 +8,6 @@ const ExplorationError = () => {
const { t } = useI18n()
const navigate = useNavigate()
- const goBack = useCallback(() => {
- navigate(-1)
- }, [navigate])
-
return (
<div className="exploration-error-container">
<div className="exploration-error-message">
@@ -20,7 +16,7 @@ const ExplorationError = () => {
<div className="exploration-error-button">
<Button
aria-label={t('exploration.accessibility.button_go_back')}
- onClick={goBack}
+ onClick={() => navigate(-1)}
classes={{
root: 'btn-secondary-negative',
label: 'text-16-normal',
diff --git a/src/components/Exploration/ExplorationOngoing.tsx b/src/components/Exploration/ExplorationOngoing.tsx
index 62d7c23a94d2e84ab72336de3fd6ab5d82e5145e..2132bae32b766d0f520e623e0441003dd7b1f2e3 100644
--- a/src/components/Exploration/ExplorationOngoing.tsx
+++ b/src/components/Exploration/ExplorationOngoing.tsx
@@ -11,7 +11,7 @@ import {
UserExplorationType,
} from 'enum/userExploration.enum'
import { UserChallenge } from 'models'
-import React, { useCallback } from 'react'
+import React from 'react'
import { useNavigate } from 'react-router-dom'
import ChallengeService from 'services/challenge.service'
import UsageEventService from 'services/usageEvent.service'
@@ -28,9 +28,6 @@ const ExplorationOngoing = ({ userChallenge }: ExplorationOngoingProps) => {
const client: Client = useClient()
const dispatch = useAppDispatch()
const navigate = useNavigate()
- const goBack = useCallback(() => {
- navigate(-1)
- }, [navigate])
const startExploration = async () => {
if (userChallenge.exploration.state !== UserExplorationState.ONGOING) {
const challengeService = new ChallengeService(client)
@@ -75,7 +72,7 @@ const ExplorationOngoing = ({ userChallenge }: ExplorationOngoingProps) => {
</Button>
<Button
aria-label={t('exploration.accessibility.button_already_done')}
- onClick={goBack}
+ onClick={() => navigate(-1)}
classes={{
root: 'btn-secondary-negative',
label: 'text-16-normal',
diff --git a/src/components/Exploration/ExplorationView.tsx b/src/components/Exploration/ExplorationView.tsx
index d10e22917db5fa37290119019f879bc3266a898f..2d58bc6475404177f973cbc0b45df1081d3c43c4 100644
--- a/src/components/Exploration/ExplorationView.tsx
+++ b/src/components/Exploration/ExplorationView.tsx
@@ -3,7 +3,7 @@ import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
import { UserExplorationState } from 'enum/userExploration.enum'
import { UserChallenge } from 'models'
-import React, { useCallback, useState } from 'react'
+import React, { useState } from 'react'
import { useAppSelector } from 'store/hooks'
import ExplorationError from './ExplorationError'
import ExplorationFinished from './ExplorationFinished'
@@ -13,10 +13,6 @@ const ExplorationView = () => {
const { currentChallenge } = useAppSelector(state => state.ecolyo.challenge)
const [headerHeight, setHeaderHeight] = useState<number>(0)
- const defineHeaderHeight = useCallback((height: number) => {
- setHeaderHeight(height)
- }, [])
-
const renderExploration = (challenge: UserChallenge) => {
switch (challenge.exploration.state) {
case UserExplorationState.UNLOCKED:
@@ -34,11 +30,11 @@ const ExplorationView = () => {
<>
<CozyBar titleKey={'common.title_exploration'} displayBackArrow={true} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_exploration'}
displayBackArrow={true}
/>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
{currentChallenge && renderExploration(currentChallenge)}
</Content>
</>
diff --git a/src/components/Home/ConsumptionView.tsx b/src/components/Home/ConsumptionView.tsx
index ce5b641c76ce330fb79b4be6a4948987ea5f8799..d7766c73227bc1d0c51fee244fb2e8111743fe25 100644
--- a/src/components/Home/ConsumptionView.tsx
+++ b/src/components/Home/ConsumptionView.tsx
@@ -80,10 +80,6 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
? `${fluidStatus[fluidType].lastDataDate!.toLocaleString() + fluidType}`
: ''
- const defineHeaderHeight = useCallback((height: number) => {
- setHeaderHeight(height)
- }, [])
-
const handleCloseReleaseNoteModal = useCallback(() => {
setOpenReleaseNoteModal(false)
dispatch(
@@ -224,7 +220,7 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
<>
<CozyBar titleKey={'common.title_consumption'} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_consumption'}
>
<DateNavigator
@@ -236,7 +232,7 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
timeStep={currentTimeStep}
/>
</Header>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
<FluidButtons activeFluid={fluidType} key={updateKey} />
{openReleaseNoteModal && (
diff --git a/src/components/Konnector/KonnectorViewerList.tsx b/src/components/Konnector/KonnectorViewerList.tsx
index 98acb829e127253d0af0a3a047fb85355349ded3..36e108c2496c5f3e5a8b8e61c387c0153abd19d8 100644
--- a/src/components/Konnector/KonnectorViewerList.tsx
+++ b/src/components/Konnector/KonnectorViewerList.tsx
@@ -3,7 +3,7 @@ import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
import { FluidType } from 'enum/fluid.enum'
import { FluidStatus } from 'models'
-import React, { useCallback } from 'react'
+import React from 'react'
import { useNavigate } from 'react-router-dom'
import { useAppSelector } from 'store/hooks'
import { getAddPicto } from 'utils/picto'
@@ -14,12 +14,10 @@ const KonnectorViewerList = () => {
const { t } = useI18n()
const { fluidStatus } = useAppSelector(state => state.ecolyo.global)
const navigate = useNavigate()
- const goToFluid = useCallback(
- fluidType => {
- navigate(`/consumption/${getFluidName(fluidType)}`)
- },
- [navigate]
- )
+ const goToFluid = (fluidType: FluidType) => {
+ navigate(`/consumption/${getFluidName(fluidType)}`)
+ }
+
return (
<>
{fluidStatus.map((fluidStatusItem: FluidStatus, key: number) => (
diff --git a/src/components/Options/GCU/GCUView.tsx b/src/components/Options/GCU/GCUView.tsx
index 999dd89a81f7d9e778f1b4d088eb1839b2e6a73f..d698b8e628d15c55f3e4819cbcb3f3d0f5480877 100644
--- a/src/components/Options/GCU/GCUView.tsx
+++ b/src/components/Options/GCU/GCUView.tsx
@@ -2,24 +2,20 @@ import Content from 'components/Content/Content'
import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
import GCUContent from 'components/Options/GCU/GCUContent'
-import React, { useCallback, useState } from 'react'
+import React, { useState } from 'react'
const GCUView = () => {
const [headerHeight, setHeaderHeight] = useState<number>(0)
- const defineHeaderHeight = useCallback((height: number) => {
- setHeaderHeight(height)
- }, [])
-
return (
<>
<CozyBar titleKey={'common.title_gcu'} displayBackArrow={true} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_gcu'}
displayBackArrow={true}
/>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
<GCUContent />
</Content>
</>
diff --git a/src/components/Options/GCU/__snapshots__/GCUView.spec.tsx.snap b/src/components/Options/GCU/__snapshots__/GCUView.spec.tsx.snap
index bcc93b8a7020797f0037ffa7d0db41ef8be7f3e6..da0d5940a8758e3b30a5de6b21f6bcc5fcede716 100644
--- a/src/components/Options/GCU/__snapshots__/GCUView.spec.tsx.snap
+++ b/src/components/Options/GCU/__snapshots__/GCUView.spec.tsx.snap
@@ -12,7 +12,7 @@ exports[`GCUView component should be rendered correctly 1`] = `
setHeaderHeight={[Function]}
/>
<mock-content
- height={0}
+ heightOffset={0}
>
<GCUContent />
</mock-content>
diff --git a/src/components/Options/LegalNotice/LegalNoticeView.tsx b/src/components/Options/LegalNotice/LegalNoticeView.tsx
index cd7b6723a5498a27ed20706681863cee96b2e2b9..7d86ded1a2a36aee0c98879b7b9e6b98f744f573 100644
--- a/src/components/Options/LegalNotice/LegalNoticeView.tsx
+++ b/src/components/Options/LegalNotice/LegalNoticeView.tsx
@@ -1,25 +1,22 @@
import Content from 'components/Content/Content'
import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
-import React, { useCallback, useState } from 'react'
+import React, { useState } from 'react'
import LegalNoticeContent from './LegalNoticeContent'
import './legalNoticeView.scss'
const LegalNoticeView = () => {
const [headerHeight, setHeaderHeight] = useState<number>(0)
- const defineHeaderHeight = useCallback((height: number) => {
- setHeaderHeight(height)
- }, [])
return (
<>
<CozyBar titleKey={'common.title_legal_notice'} displayBackArrow={true} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_legal_notice'}
displayBackArrow={true}
/>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
<LegalNoticeContent />
</Content>
</>
diff --git a/src/components/Options/LegalNotice/__snapshots__/LegalNoticeView.spec.tsx.snap b/src/components/Options/LegalNotice/__snapshots__/LegalNoticeView.spec.tsx.snap
index 52b42634ccd99ef5cc0458c03738dcb536858289..e3e3b81e15207a38e46063d71dbfbf700c247024 100644
--- a/src/components/Options/LegalNotice/__snapshots__/LegalNoticeView.spec.tsx.snap
+++ b/src/components/Options/LegalNotice/__snapshots__/LegalNoticeView.spec.tsx.snap
@@ -12,7 +12,7 @@ exports[`LegalNoticeView component should be rendered correctly 1`] = `
setHeaderHeight={[Function]}
/>
<mock-content
- height={0}
+ heightOffset={0}
>
<LegalNoticeContent />
</mock-content>
diff --git a/src/components/Options/OptionsView.tsx b/src/components/Options/OptionsView.tsx
index baf6819f2a0d51d74d764ef10397e1041f650cc2..5d36989a80a07edd8c6f91cee3faca1d2ee1350d 100644
--- a/src/components/Options/OptionsView.tsx
+++ b/src/components/Options/OptionsView.tsx
@@ -15,18 +15,15 @@ import Version from './Version/Version'
const OptionsView = () => {
const [headerHeight, setHeaderHeight] = useState<number>(0)
- const defineHeaderHeight = (height: number) => {
- setHeaderHeight(height)
- }
return (
<>
<CozyBar titleKey={'common.title_options'} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_options'}
/>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
<ProfileTypeOptions />
<ExportData />
<ReportOptions />
diff --git a/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx b/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx
index a09e959c0b0abfd6094496edc987e8eb72e009c1..4d18cfef7cf227e5c3baf84bd81a1bae6043cd10 100644
--- a/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx
+++ b/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx
@@ -19,7 +19,7 @@ import {
ThreeChoicesAnswer,
} from 'enum/profileType.enum'
import { UserExplorationID } from 'enum/userExploration.enum'
-import React, { useCallback, useState } from 'react'
+import React, { useState } from 'react'
import { useNavigate } from 'react-router-dom'
import { useAppSelector } from 'store/hooks'
import './profileTypeOptions.scss'
@@ -38,9 +38,9 @@ const ProfileTypeOptions = () => {
setActive(prev => !prev)
}
- const goToForm = useCallback(() => {
+ const goToForm = () => {
navigate('/profileType')
- }, [navigate])
+ }
return (
<div className="profile-type-root">
diff --git a/src/components/Options/Unsubscribe/UnSubscribe.tsx b/src/components/Options/Unsubscribe/UnSubscribe.tsx
index ed3637f2680f9ddc8eeecc274bfab6fa21ccd612..ef117a084e2901471ecd8b52b97a1961ca479dae 100644
--- a/src/components/Options/Unsubscribe/UnSubscribe.tsx
+++ b/src/components/Options/Unsubscribe/UnSubscribe.tsx
@@ -16,9 +16,6 @@ const UnSubscribe = () => {
const navigate = useNavigate()
const dispatch = useAppDispatch()
const [headerHeight, setHeaderHeight] = useState<number>(0)
- const defineHeaderHeight = (height: number) => {
- setHeaderHeight(height)
- }
const unSubscribe = async () => {
dispatch(updateProfile({ sendAnalysisNotification: false }))
navigate('/consumption')
@@ -28,10 +25,10 @@ const UnSubscribe = () => {
<>
<CozyBar titleKey={'common.title_analysis'} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_analysis'}
/>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
<div className="unsubscribe-container">
<StyledIcon className="profile-icon" icon={BearIcon} size={250} />
diff --git a/src/components/Options/Unsubscribe/__snapshots__/UnSubscribe.spec.tsx.snap b/src/components/Options/Unsubscribe/__snapshots__/UnSubscribe.spec.tsx.snap
index d06e84f78e27bb05e0db7fe618368590e8998070..40c3d3fdda5a5cfb783e05aea5a2f54acc3b0be4 100644
--- a/src/components/Options/Unsubscribe/__snapshots__/UnSubscribe.spec.tsx.snap
+++ b/src/components/Options/Unsubscribe/__snapshots__/UnSubscribe.spec.tsx.snap
@@ -22,7 +22,7 @@ exports[`UnSubscribe component should be rendered correctly 1`] = `
setHeaderHeight={[Function]}
/>
<mock-content
- height={0}
+ heightOffset={0}
>
<div
className="unsubscribe-container"
diff --git a/src/components/Options/__snapshots__/OptionsView.spec.tsx.snap b/src/components/Options/__snapshots__/OptionsView.spec.tsx.snap
index 7690e522649c43dadd5304904535270c4c2e1086..5417b10551f0928cbf257528d9c345106e34b077 100644
--- a/src/components/Options/__snapshots__/OptionsView.spec.tsx.snap
+++ b/src/components/Options/__snapshots__/OptionsView.spec.tsx.snap
@@ -10,7 +10,7 @@ exports[`OptionsView component should be rendered correctly 1`] = `
setHeaderHeight={[Function]}
/>
<mock-content
- height={0}
+ heightOffset={0}
>
<ProfileTypeOptions />
<ExportData />
diff --git a/src/components/ProfileType/ProfileTypeView.tsx b/src/components/ProfileType/ProfileTypeView.tsx
index 5fdbf3506f4211fd50454ecdee96c16d3e2f1b1b..127369ad7d817948c4bc1ebdb4e103c16c89a5c0 100644
--- a/src/components/ProfileType/ProfileTypeView.tsx
+++ b/src/components/ProfileType/ProfileTypeView.tsx
@@ -73,10 +73,6 @@ const ProfileTypeView = () => {
const [isLoading, setIsLoading] = useState<boolean>(true)
const [viewedStep, setViewedStep] = useState<number>(-1)
- const defineHeaderHeight = useCallback((height: number) => {
- setHeaderHeight(height)
- }, [])
-
// if ecogesture profile is completed, update default profileType
useEffect(() => {
if (profile.isProfileEcogestureCompleted) {
@@ -229,11 +225,11 @@ const ProfileTypeView = () => {
<>
<CozyBar titleKey={'common.title_profiletype'} displayBackArrow={true} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_profiletype'}
displayBackArrow={true}
/>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
<div className={'profile-type-container'}>
{isLoading && <Loader />}
{!isLoading && (
diff --git a/src/components/Quiz/QuizView.tsx b/src/components/Quiz/QuizView.tsx
index 05caa6e913ef82f0a7642b6b458cd935bf1f86c9..9bb016762c88166083bbfa82235f578d2ceeb2bd 100644
--- a/src/components/Quiz/QuizView.tsx
+++ b/src/components/Quiz/QuizView.tsx
@@ -3,7 +3,7 @@ import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
import { UserQuizState } from 'enum/userQuiz.enum'
import { UserChallenge } from 'models'
-import React, { useCallback, useState } from 'react'
+import React, { useState } from 'react'
import { useAppSelector } from 'store/hooks'
import QuizBegin from './QuizBegin'
import QuizFinish from './QuizFinish'
@@ -13,10 +13,6 @@ const QuizView = () => {
const { currentChallenge } = useAppSelector(state => state.ecolyo.challenge)
const [headerHeight, setHeaderHeight] = useState<number>(0)
- const defineHeaderHeight = useCallback((height: number) => {
- setHeaderHeight(height)
- }, [])
-
const renderQuiz = (challenge: UserChallenge) => {
switch (challenge.quiz.state) {
case UserQuizState.UNLOCKED:
@@ -34,11 +30,11 @@ const QuizView = () => {
<>
<CozyBar titleKey={'common.title_quiz'} displayBackArrow={true} />
<Header
- setHeaderHeight={defineHeaderHeight}
+ setHeaderHeight={setHeaderHeight}
desktopTitleKey={'common.title_quiz'}
displayBackArrow={true}
/>
- <Content height={headerHeight}>
+ <Content heightOffset={headerHeight}>
{currentChallenge && renderQuiz(currentChallenge)}
</Content>
</>