cleanup

src/components/Connection/GRDFConnect/GrdfConnectView.tsx

@@ -20,15 +20,14 @@ export enum GrdfStep {
 }
 
 export const GrdfConnectView = () => {
-  const [launchConnection, setLaunchConnection] = useState(false)
   const navigate = useNavigate()
+  const { data: instanceSettings } = useUserInstanceSettings()
   const { fluidStatus } = useAppSelector(state => state.ecolyo.global)
   const currentFluidStatus = fluidStatus[FluidType.GAS]
   const account = currentFluidStatus.connection.account
-  const { data: instanceSettings } = useUserInstanceSettings()
 
+  const [launchConnection, setLaunchConnection] = useState(false)
   const [currentStep, setCurrentStep] = useState<GrdfStep>(GrdfStep.Identity)
-
   const [formData, setFormData] = useState<AccountGRDFData>({
     lastname: '',
     firstname: '',

src/components/Connection/GRDFConnect/GrdfWaitConsent.tsx

@@ -16,8 +16,8 @@ export const GrdfWaitConsent = () => {
   const { t } = useI18n()
   const dispatch = useAppDispatch()
   const { fluidStatus } = useAppSelector(state => state.ecolyo.global)
-  const [emailSentOn, setEmailSentOn] = useState('')
   const { data: instanceSettings } = useUserInstanceSettings()
+  const [emailSentOn, setEmailSentOn] = useState('')
   const currentFluidStatus = fluidStatus[FluidType.GAS]
 
   useEffect(() => {
@@ -27,8 +27,8 @@ export const GrdfWaitConsent = () => {
   const updateKonnector = async () => {
     const updatedConnection: FluidConnection = {
       ...currentFluidStatus.connection,
+      // TODO : investigate is this is duplicate ?
       shouldLaunchKonnector: true,
-      // what does is updating does ?
       isUpdating: true,
     }
     dispatch(

src/components/Consumption/ConsumptionView.tsx

@@ -49,26 +49,24 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
   const currentFluidStatus = fluidStatus[fluidType]
   const dateChartService = new DateChartService()
 
-  const [openReleaseNoteModal, setOpenReleaseNoteModal] = useState<boolean>(
-    releaseNotes.show
-  )
-  const [openExpiredConsentModal, setOpenExpiredConsentModal] = useState(true)
-
   const isWaitingForConsent =
     fluidType === FluidType.GAS &&
     currentFluidStatus.status === FluidState.CHALLENGE_ASKED
 
   const [waitConsent, setWaitConsent] = useState(isWaitingForConsent)
+  const [openExpiredConsentModal, setOpenExpiredConsentModal] = useState(true)
+  const [openReleaseNoteModal, setOpenReleaseNoteModal] = useState<boolean>(
+    releaseNotes.show
+  )
+  const [consentExpiredFluids, setConsentExpiredFluids] = useState<FluidType[]>(
+    []
+  )
 
   /** Show wait consent modal when navigating and consent is "A valider" */
   useEffect(() => {
     setWaitConsent(isWaitingForConsent)
   }, [isWaitingForConsent])
 
-  const [consentExpiredFluids, setConsentExpiredFluids] = useState<FluidType[]>(
-    []
-  )
-
   const updateKey =
     fluidType !== FluidType.MULTIFLUID && currentFluidStatus.lastDataDate
       ? `${currentFluidStatus.lastDataDate.toLocaleString()} + ${
@@ -80,6 +78,19 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
       ? `${currentFluidStatus.lastDataDate.toLocaleString() + fluidType}`
       : ''
 
+  const getPartnerKey = (fluidType: FluidType): 'enedis' | 'egl' | 'grdf' => {
+    switch (fluidType) {
+      case FluidType.ELECTRICITY:
+        return 'enedis'
+      case FluidType.WATER:
+        return 'egl'
+      case FluidType.GAS:
+        return 'grdf'
+      default:
+        throw new Error('unknown fluidtype')
+    }
+  }
+
   const handleCloseReleaseNoteModal = useCallback(() => {
     setOpenReleaseNoteModal(false)
     dispatch(
@@ -94,19 +105,6 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
     }
   }, [dispatch, navigate, releaseNotes.notes, releaseNotes.redirectLink])
 
-  const getPartnerKey = (fluidType: FluidType): 'enedis' | 'egl' | 'grdf' => {
-    switch (fluidType) {
-      case FluidType.ELECTRICITY:
-        return 'enedis'
-      case FluidType.WATER:
-        return 'egl'
-      case FluidType.GAS:
-        return 'grdf'
-      default:
-        throw new Error('unknown fluidtype')
-    }
-  }
-
   const handleClosePartnerIssueModal = useCallback(
     async (fluidType: FluidType) => {
       const profileService = new ProfileService(client)
@@ -147,7 +145,7 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
   }
 
   useEffect(
-    /** Reset half-hour timestep for water & gas */
+    /** Reset half-hour timestep for water & gas & multifluid */
     function setDefaultTimeStep() {
       if (
         fluidType !== FluidType.ELECTRICITY &&
@@ -168,10 +166,10 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
     dispatch(setShowOfflineData(isFluidConnected))
   }, [dispatch, fluidStatus, fluidType])
 
+  /** Check if some fluids have expired consent error */
   useEffect(() => {
     let subscribed = true
     const expiredConsents: FluidType[] = []
-    // Check if some fluids have expired consent error
     for (const fluid of fluidStatus) {
       const error = fluid.connection.triggerState?.last_error
       if (error && getKonnectorUpdateError(error) === 'error_update_oauth') {