diff --git a/src/components/Consumption/ConsumptionDetails/ConsumptionDetails.tsx b/src/components/Consumption/ConsumptionDetails/ConsumptionDetails.tsx index 01c5077addf3b167981450552b80adeb48e86a91..d74c3bf9c519405750a6acce40e17bb5a896a874 100644 --- a/src/components/Consumption/ConsumptionDetails/ConsumptionDetails.tsx +++ b/src/components/Consumption/ConsumptionDetails/ConsumptionDetails.tsx @@ -13,30 +13,27 @@ const ConsumptionDetails = ({ fluidType }: { fluidType: FluidType }) => { ) return ( - <> - <div className="consumption-details-root"> - <div className="consumption-details-content"> - <div className="consumption-details-header text-16-normal-uppercase details-title"> - {convertDateToShortDateString( - currentDatachart.actualData, - currentTimeStep - )} - {showCompare && ( - <div className="consumption-details-header compare"> - {t('consumption.compared')} - {currentTimeStep === TimeStep.DAY && ' '} - {currentTimeStep !== TimeStep.DAY && ' AU '} - {convertDateToShortDateString( - currentDatachart.comparisonData, - currentTimeStep - )} - </div> - )} - </div> - <TotalConsumption fluidType={fluidType} /> + <div className="consumption-details-root"> + <div className="consumption-details-content"> + <div className="consumption-details-header text-16-normal-uppercase details-title"> + {convertDateToShortDateString( + currentDatachart.actualData, + currentTimeStep + )} + {showCompare && ( + <div className="consumption-details-header compare"> + {t('consumption.compared')} + {currentTimeStep === TimeStep.DAY ? ' ' : ' AU '} + {convertDateToShortDateString( + currentDatachart.comparisonData, + currentTimeStep + )} + </div> + )} </div> + <TotalConsumption fluidType={fluidType} /> </div> - </> + </div> ) } diff --git a/src/components/FluidChart/FluidChart.tsx b/src/components/FluidChart/FluidChart.tsx index 17845f2450995f2b49ccd9d93865dab45673475a..908daec4451c91d102c11f5c2f0e3ac6a9f0aa9f 100644 --- a/src/components/FluidChart/FluidChart.tsx +++ b/src/components/FluidChart/FluidChart.tsx @@ -145,7 +145,7 @@ const FluidChart = ({ fluidType, setActive }: FluidChartProps) => { <div className="lastValidData"> <Button className="btnText" onClick={moveToDate}> {t('consumption_visualizer.last_valid_data', { - date: currentFluidStatus?.lastDataDate?.toFormat('dd/MM/yy') || '-', + date: currentFluidStatus?.lastDataDate?.toFormat('dd/MM/yy') ?? '-', })} </Button> <p>{t('auth.warningOfflineData')}</p> diff --git a/src/components/Splash/SplashRoot.tsx b/src/components/Splash/SplashRoot.tsx index 7613a7daf3da01bf3dd98cfa73722e4a997b2dc6..5084ce80f6fe7c35724b079f97dee58d16cefd8e 100644 --- a/src/components/Splash/SplashRoot.tsx +++ b/src/components/Splash/SplashRoot.tsx @@ -37,7 +37,6 @@ import { setUserChallengeList, updateUserChallengeList, } from 'store/challenge/challenge.slice' -import { setSelectedDate } from 'store/chart/chart.slice' import { setFluidStatus, showReleaseNotes, @@ -256,16 +255,12 @@ const SplashRoot = ({ fadeTimer = 1000, children }: SplashRootProps) => { const fluidStatus = await initializationService.initFluidStatus() if (subscribed) { dispatch(setFluidStatus(fluidStatus)) - const refDate = DateTime.fromISO('0001-01-01') let lastDataDate: DateTime | null = DateTime.fromISO('0001-01-01') for (const fluid of fluidStatus) { if (fluid.lastDataDate && fluid.lastDataDate > lastDataDate) { lastDataDate = fluid.lastDataDate } } - if (lastDataDate > refDate) { - dispatch(setSelectedDate(lastDataDate)) - } } // Init Challenge const userChallengeList = diff --git a/src/components/Splash/SplashScreen.tsx b/src/components/Splash/SplashScreen.tsx index 6b71828829fa2a0fc85950a92fe5cb4ee53eed22..8a23eaa2b89f00dd3b71e7e6adb902c8fb441e91 100644 --- a/src/components/Splash/SplashScreen.tsx +++ b/src/components/Splash/SplashScreen.tsx @@ -13,28 +13,26 @@ const SplashScreen = ({ initStep }: { initStep: InitSteps }) => { return progress - 90 /* hack to make the progress bar start way left */ } return ( - <> - <div className="splash-content"> - <div className="splash-loader"> - <img src={logoLoading} alt="Chargement" /> - <span>Ecolyo</span> - <div className="splash-progress"> - <div className="splash-progress-bar-container"> - <div - className="splash-progress-bar-content" - style={{ left: `${getProgress()}%` }} - /> - </div> + <div className="splash-content"> + <div className="splash-loader"> + <img src={logoLoading} alt="Chargement" /> + <span>Ecolyo</span> + <div className="splash-progress"> + <div className="splash-progress-bar-container"> + <div + className="splash-progress-bar-content" + style={{ left: `${getProgress()}%` }} + /> </div> </div> - <div className="step-label text-18-normal"> - {t(`splashscreen.step.${initStep}`)} - </div> - <div className="splash-logos-container"> - <img src={logos} alt="ensemble de logos" /> - </div> </div> - </> + <div className="step-label text-18-normal"> + {t(`splashscreen.step.${initStep}`)} + </div> + <div className="splash-logos-container"> + <img src={logos} alt="ensemble de logos" /> + </div> + </div> ) }