From 020f31ffb87dabf935cb9f7ad481a30a379788ae Mon Sep 17 00:00:00 2001
From: Bastien DUMONT <bdumont@grandlyon.com>
Date: Mon, 6 Mar 2023 16:39:10 +0000
Subject: [PATCH] chore: sort imports
---
app.config.alpha.js | 4 +-
app.config.js | 2 +-
konnector-dev-config.json | 2 +-
renovate.json | 4 +-
scripts/createDayDataFiles.js | 2 +-
scripts/server.js | 2 +-
src/components/Action/ActionChoose.tsx | 4 +-
src/components/Action/ActionList.tsx | 10 +--
src/components/Action/ActionModal.tsx | 17 ++--
src/components/Action/ActionOnGoing.tsx | 12 +--
src/components/Action/actionModal.scss | 2 +-
.../Analysis/AnalysisConsumptionRow.spec.tsx | 6 +-
.../Analysis/AnalysisConsumptionRow.tsx | 12 +--
src/components/Analysis/AnalysisView.tsx | 11 ++-
.../Analysis/ElecHalfHourChart.spec.tsx | 10 +--
src/components/Analysis/ElecHalfHourChart.tsx | 8 +-
.../ElecHalfHourMonthlyAnalysis.spec.tsx | 10 +--
.../Analysis/ElecInfoModal.spec.tsx | 2 +-
src/components/Analysis/ElecInfoModal.tsx | 8 +-
.../Analysis/MaxConsumptionCard.spec.tsx | 6 +-
.../Analysis/MonthlyAnalysis.spec.tsx | 11 +--
src/components/Analysis/PieChart.spec.tsx | 8 +-
src/components/Analysis/PieChart.tsx | 12 +--
.../Analysis/TotalAnalysisChart.spec.tsx | 13 ++-
.../Analysis/TotalAnalysisChart.tsx | 17 ++--
.../Challenge/ChallengeCard.spec.tsx | 6 +-
src/components/Challenge/ChallengeCard.tsx | 4 +-
.../Challenge/ChallengeCardLast.spec.tsx | 4 +-
.../Challenge/ChallengeCardLocked.spec.tsx | 4 +-
.../Challenge/ChallengeCardLocked.tsx | 8 +-
.../Challenge/ChallengeNoFluidModal.spec.tsx | 2 +-
.../Challenge/ChallengeNoFluidModal.tsx | 6 +-
.../Challenge/ChallengeView.spec.tsx | 4 +-
src/components/Challenge/StarsContainer.tsx | 4 +-
.../Challenge/challengeNoFluidModal.scss | 2 +-
src/components/Charts/AxisBottom.spec.tsx | 14 +--
src/components/Charts/AxisBottom.tsx | 11 ++-
src/components/Charts/AxisRight.spec.tsx | 2 +-
src/components/Charts/AxisRight.tsx | 4 +-
src/components/Charts/Bar.spec.tsx | 16 ++--
src/components/Charts/BarChart.tsx | 14 ++-
src/components/Charts/UncomingBar.tsx | 4 +-
.../CommonKit/Card/StyledBorderCard.spec.tsx | 2 +-
.../CommonKit/Card/StyledBorderCard.tsx | 2 +-
.../CommonKit/Card/StyledCard.spec.tsx | 4 +-
src/components/CommonKit/Card/StyledCard.tsx | 2 +-
.../Card/StyledEcogestureCard.spec.tsx | 2 +-
.../CommonKit/Card/StyledEcogestureCard.tsx | 2 +-
.../CommonKit/Card/StyledIconCard.spec.tsx | 4 +-
.../CommonKit/Card/StyledIconCard.tsx | 4 +-
.../StyledIconBorderedButton.spec.tsx | 2 +-
.../IconButton/StyledIconBorderedButton.tsx | 4 +-
.../IconButton/StyledIconButton.spec.tsx | 2 +-
.../CommonKit/IconButton/StyledIconButton.tsx | 4 +-
.../CommonKit/Switch/StyledSwitch.spec.tsx | 4 +-
.../CommonKit/Switch/StyledSwitch.tsx | 6 +-
.../Connection/ConnectionNotFound.spec.tsx | 6 +-
.../Connection/ConnectionNotFound.tsx | 4 +-
.../Connection/ConnectionResult.tsx | 4 +-
.../DeleteGRDFAccountModal.spec.tsx | 4 +-
.../Connection/DeleteGRDFAccountModal.tsx | 6 +-
.../SGEConnect/SgeModalHint.spec.tsx | 6 +-
.../SGEConnect/StepAddress.spec.tsx | 6 +-
.../SGEConnect/StepIdentityAndPdl.spec.tsx | 6 +-
.../ConsumptionVisualizer.tsx | 11 ++-
.../DataloadConsumptionVisualizer.spec.tsx | 13 ++-
.../DataloadConsumptionVisualizer.tsx | 10 +--
.../DataloadNoValue.spec.tsx | 10 +--
.../ConsumptionVisualizer/DataloadNoValue.tsx | 10 +--
.../DataloadSection.spec.tsx | 8 +-
.../ConsumptionVisualizer/DataloadSection.tsx | 13 ++-
.../DataloadSectionDetail.spec.tsx | 8 +-
.../DataloadSectionDetail.tsx | 12 +--
.../DataloadSectionValue.spec.tsx | 8 +-
.../DataloadSectionValue.tsx | 6 +-
.../EstimatedConsumptionModal.spec.tsx | 3 +-
.../InfoDataConsumptionVisualizer.spec.tsx | 14 +--
.../InfoDataConsumptionVisualizer.tsx | 12 +--
.../NoDataModal.spec.tsx | 3 +-
.../ConsumptionVisualizer/NoDataModal.tsx | 6 +-
.../DateNavigator/DateNavigator.spec.tsx | 10 +--
src/components/Duel/DuelBar.tsx | 19 ++--
src/components/Duel/DuelChart.tsx | 6 +-
src/components/Duel/DuelEmptyValueModal.tsx | 10 +--
src/components/Duel/DuelResultModal.tsx | 9 +-
src/components/Duel/DuelUnlocked.tsx | 15 ++--
src/components/Duel/duelChart.scss | 3 +-
src/components/Duel/duelEmptyValueModal.scss | 4 +-
src/components/Duel/lastDuelModal.spec.tsx | 2 +-
src/components/Duel/lastDuelModal.tsx | 8 +-
.../Ecogesture/EcogestureInitModal.tsx | 8 +-
.../Ecogesture/EcogestureList.spec.tsx | 10 +--
src/components/Ecogesture/EcogestureModal.tsx | 18 ++--
.../Ecogesture/EcogestureReinitModal.tsx | 10 +--
src/components/Ecogesture/EcogestureView.tsx | 2 +-
.../Ecogesture/EfficientyRating.spec.tsx | 4 +-
.../Ecogesture/EfficientyRating.tsx | 6 +-
.../EcogestureFormSingleChoice.spec.tsx | 11 ++-
.../EcogestureFormSingleChoice.tsx | 8 +-
.../EcogestureLaunchFormModal.spec.tsx | 4 +-
.../EcogestureLaunchFormModal.tsx | 8 +-
.../EcogestureSelectionModal.spec.tsx | 4 +-
.../EcogestureSelectionModal.tsx | 8 +-
.../Exploration/ExplorationOngoing.tsx | 11 ++-
.../Exploration/ExplorationView.spec.tsx | 10 +--
.../Export/exportDoneModal.spec.tsx | 8 +-
src/components/Export/exportDoneModal.tsx | 10 +--
.../Export/exportLoadingModal.spec.tsx | 8 +-
.../Export/exportStartModal.spec.tsx | 8 +-
src/components/Export/exportStartModal.tsx | 10 +--
.../Feedback/FeedbackModal.spec.tsx | 10 +--
src/components/FluidChart/FluidChartSwipe.tsx | 15 ++--
src/components/FormGlobal/FormProgress.tsx | 2 +-
src/components/GCU/GCUContent.spec.tsx | 4 +-
src/components/GCU/GCULink.spec.tsx | 4 +-
src/components/GCU/GCUView.spec.tsx | 4 +-
.../HalfHourNoData/HalfHourNoData.spec.tsx | 2 +-
.../HalfHourNoData/HalfHourNoData.tsx | 2 +-
src/components/Header/Header.tsx | 13 ++-
.../Home/ConsumptionDetails.spec.tsx | 12 +--
src/components/Home/ConsumptionDetails.tsx | 4 +-
src/components/Home/FluidButton.spec.tsx | 9 +-
src/components/Home/FluidButton.tsx | 5 +-
src/components/Home/FluidButtons.spec.tsx | 3 +-
src/components/Home/FluidButtons.tsx | 3 +-
src/components/Hooks/useExploration.spec.tsx | 4 +-
src/components/Hooks/useExploration.tsx | 8 +-
.../Hooks/useUserInstanceSettings.tsx | 4 +-
.../Konnector/KonnectorModal.spec.tsx | 9 +-
.../LegalNotice/LegalNoticeContent.spec.tsx | 4 +-
.../LegalNotice/LegalNoticeLink.spec.tsx | 4 +-
.../LegalNotice/LegalNoticeView.spec.tsx | 4 +-
src/components/Navbar/Navbar.spec.tsx | 6 +-
.../MatomoOptOut/MatomoOptOut.spec.tsx | 2 +-
.../Options/MatomoOptOut/MatomoOptOut.tsx | 2 +-
src/components/Options/OptionsView.spec.tsx | 4 +-
.../ProfileTypeOptions/ProfileTypeOptions.tsx | 27 +++---
.../ReportOptions/ReportOptions.spec.tsx | 12 +--
.../Options/ReportOptions/ReportOptions.tsx | 20 ++---
.../FluidPerformanceIndicator.tsx | 9 +-
.../PerformanceIndicatorContent.tsx | 23 +++--
.../ProfileType/ProfileTypeView.tsx | 9 +-
src/components/Quiz/QuizBegin.spec.tsx | 10 +--
src/components/Quiz/QuizBegin.tsx | 16 ++--
src/components/Quiz/QuizExplanationModal.tsx | 14 ++-
src/components/Quiz/QuizQuestionContent.tsx | 12 +--
src/components/Quiz/QuizView.spec.tsx | 8 +-
src/components/Splash/SplashRoot.spec.tsx | 7 +-
src/components/Splash/SplashScreen.spec.tsx | 4 +-
.../Splash/SplashScreenError.spec.tsx | 8 +-
src/components/Terms/CGUModal.spec.tsx | 4 +-
src/components/Terms/CGUModal.tsx | 10 +--
.../Terms/DataShareConsentContent.tsx | 4 +-
.../Terms/LegalNoticeModal.spec.tsx | 4 +-
src/components/Terms/LegalNoticeModal.tsx | 12 +--
.../Terms/MinorUpdateContent.spec.tsx | 2 +-
src/components/Terms/MinorUpdateContent.tsx | 2 +-
.../TimeStepSelector.spec.tsx | 18 ++--
.../TimeStepSelector/TimeStepSelector.tsx | 21 +++--
.../TotalConsumption.spec.tsx | 14 +--
.../TotalConsumption/TotalConsumption.tsx | 16 ++--
src/components/Version/Version.spec.tsx | 4 +-
src/components/Version/Version.tsx | 2 +-
src/constants/consumptionConstants/ecs.json | 26 +-----
src/doctypes/index.ts | 90 +++++++++----------
src/locales/en.json | 4 +-
src/migrations/migration.service.spec.ts | 10 +--
src/models/challenge.model.ts | 10 +--
src/models/duel.model.ts | 4 +-
src/models/exploration.model.ts | 2 +-
src/models/index.ts | 6 +-
src/models/profileEcogesture.model.ts | 2 +-
src/models/quiz.model.ts | 2 +-
src/notifications/base/footer.hbs | 26 +++---
src/notifications/base/header.hbs | 24 ++---
src/notifications/base/unsubscribe.hbs | 11 ++-
src/notifications/style.hbs | 56 ++++++------
src/services/account.service.spec.ts | 8 +-
src/services/action.service.spec.ts | 2 +-
src/services/challenge.service.spec.ts | 48 +++++-----
src/services/connection.service.spec.ts | 4 +-
src/services/connection.service.ts | 8 +-
.../consumptionValidator.service.spec.ts | 4 +-
src/services/consumptionValidator.service.ts | 2 +-
src/services/dateChart.service.spec.ts | 2 +-
src/services/duel.service.spec.ts | 16 ++--
src/services/ecogesture.service.spec.ts | 8 +-
.../enedisMonthlyAnalysisData.service.spec.ts | 6 +-
src/services/exploration.service.spec.ts | 10 +--
src/services/exploration.service.ts | 2 +-
src/services/initialization.service.spec.ts | 10 +--
src/services/konnector.service.spec.ts | 6 +-
src/services/konnectorStatus.service.spec.ts | 4 +-
src/services/konnectorStatus.service.ts | 4 +-
src/services/mail.service.spec.ts | 2 +-
src/services/profileEcogesture.service.ts | 2 +-
.../profileTypeEntity.service.spec.ts | 6 +-
src/services/quiz.service.spec.ts | 36 ++++----
src/services/quiz.service.ts | 18 ++--
src/services/terms.service.spec.ts | 1 -
src/services/timePeriod.service.spec.ts | 4 +-
src/services/timePeriod.service.ts | 2 +-
src/services/triggers.service.spec.ts | 4 +-
src/services/usageEvent.service.spec.ts | 8 +-
src/store/challenge/challenge.action.spec.ts | 12 +--
src/store/challenge/challenge.reducer.spec.ts | 20 ++---
src/store/challenge/challenge.reducer.ts | 10 +--
src/store/chart/chart.action.spec.ts | 18 ++--
src/store/chart/chart.reducer.spec.ts | 16 ++--
src/store/chart/chart.reducer.ts | 14 +--
src/store/global/global.action.spec.ts | 20 ++---
src/store/modal/modal.action.spec.ts | 2 +-
src/store/modal/modal.reducer.spec.ts | 4 +-
src/store/modal/modal.reducer.ts | 4 +-
src/store/profile/profile.actions.ts | 2 +-
.../profileEcogesture.action.spec.ts | 2 +-
.../profileEcogesture.actions.ts | 6 +-
.../profileEcogesture.reducer.spec.ts | 4 +-
.../profileEcogesture.reducer.ts | 2 +-
.../profileType/profileType.actions.spec.ts | 2 +-
src/store/profileType/profileType.actions.ts | 4 +-
.../profileType/profileType.reducer.spec.ts | 6 +-
src/store/profileType/profileType.reducer.ts | 16 ++--
src/styles/base/_breakpoint.scss | 13 ++-
src/styles/components/_expansion-panel.scss | 6 +-
src/targets/mobile/DOCS.md | 1 +
src/targets/services/aggregatorUsageEvents.ts | 34 +++----
src/targets/services/consumptionAlert.ts | 14 +--
src/types/cozy-client.d.ts | 2 +-
src/utils/date.spec.ts | 8 +-
src/utils/date.ts | 4 +-
src/utils/hash.spec.ts | 2 +-
src/utils/picto.spec.ts | 30 +++----
src/utils/picto.ts | 42 ++++-----
src/utils/utils.spec.ts | 2 +-
tsconfig.json | 15 +---
236 files changed, 987 insertions(+), 1074 deletions(-)
diff --git a/app.config.alpha.js b/app.config.alpha.js
index 23d023ab4..596d9d432 100644
--- a/app.config.alpha.js
+++ b/app.config.alpha.js
@@ -13,7 +13,7 @@ const { target, addAnalyzer } = require('cozy-scripts/config/webpack.vars')
const configs = [
require('cozy-scripts/config/webpack.config.base'),
require('cozy-scripts/config/webpack.config.chunks'),
- //require('cozy-scripts/config/webpack.config.react'),
+ // require('cozy-scripts/config/webpack.config.react'),
require('./app.config.react'), // Override the react config
require('cozy-scripts/config/webpack.config.cozy-ui'),
require('cozy-scripts/config/webpack.config.cozy-ui.react'),
@@ -31,6 +31,6 @@ const configs = [
configs.push(require('./app.config.environment.alpha'))
-//module.exports = merge.apply(null, configs)
+// module.exports = merge.apply(null, configs)
// eslint-disable-next-line prefer-spread
module.exports = [merge.apply(null, configs)] // cozy builder expects an array
diff --git a/app.config.js b/app.config.js
index 5bd0f5e6b..358e507e3 100644
--- a/app.config.js
+++ b/app.config.js
@@ -37,6 +37,6 @@ if (environment === 'production') {
configs.push(require('./app.config.environment.dev'))
}
-//module.exports = merge.apply(null, configs)
+// module.exports = merge.apply(null, configs)
// eslint-disable-next-line prefer-spread
module.exports = [merge.apply(null, configs)] // cozy builder expects an array
diff --git a/konnector-dev-config.json b/konnector-dev-config.json
index 10ca55a37..3e0c11264 100644
--- a/konnector-dev-config.json
+++ b/konnector-dev-config.json
@@ -1,4 +1,4 @@
{
"COZY_URL": "http://cozy.tools:8080",
"fields": {}
-}
\ No newline at end of file
+}
diff --git a/renovate.json b/renovate.json
index b112c41fe..039e82fc1 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,7 +1,5 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
- "extends": [
- "local>systemes-dinformation/renovate/renovate-config"
- ],
+ "extends": ["local>systemes-dinformation/renovate/renovate-config"],
"labels": ["dependencies"]
}
diff --git a/scripts/createDayDataFiles.js b/scripts/createDayDataFiles.js
index d5abc98ed..2159ee996 100644
--- a/scripts/createDayDataFiles.js
+++ b/scripts/createDayDataFiles.js
@@ -11,7 +11,7 @@ function getRandomInt(min, max) {
const maxValue = Math.floor(max * 100)
// NOSONAR
const result =
- (Math.floor(Math.random() * (maxValue - minValue)) + minValue) / 100 //NOSONAR
+ (Math.floor(Math.random() * (maxValue - minValue)) + minValue) / 100 // NOSONAR
return result
}
diff --git a/scripts/server.js b/scripts/server.js
index 376b06523..77447511e 100644
--- a/scripts/server.js
+++ b/scripts/server.js
@@ -8,7 +8,7 @@ const process = (request, response) => {
console.log('Listening on port 8081...')
http
- .createServer(function(request, response) {
+ .createServer(function (request, response) {
const requestStart = Date.now()
let errorMessage = null
diff --git a/src/components/Action/ActionChoose.tsx b/src/components/Action/ActionChoose.tsx
index afdf64117..98337ce19 100644
--- a/src/components/Action/ActionChoose.tsx
+++ b/src/components/Action/ActionChoose.tsx
@@ -1,7 +1,7 @@
-import React, { useState } from 'react'
-import { Ecogesture, UserChallenge } from 'models'
import ActionBegin from 'components/Action/ActionBegin'
import ActionList from 'components/Action/ActionList'
+import { Ecogesture, UserChallenge } from 'models'
+import React, { useState } from 'react'
import './actionChoose.scss'
interface ActionChooseProps {
diff --git a/src/components/Action/ActionList.tsx b/src/components/Action/ActionList.tsx
index 8e1dd6232..8997a3568 100644
--- a/src/components/Action/ActionList.tsx
+++ b/src/components/Action/ActionList.tsx
@@ -1,11 +1,11 @@
-import React, { useState, useEffect } from 'react'
+import ActionCard from 'components/Action/ActionCard'
import { Client, useClient } from 'cozy-client'
-import { useSelector } from 'react-redux'
import { Ecogesture } from 'models'
-import './actionBegin.scss'
-import { AppStore } from 'store'
+import React, { useEffect, useState } from 'react'
+import { useSelector } from 'react-redux'
import ActionService from 'services/action.service'
-import ActionCard from 'components/Action/ActionCard'
+import { AppStore } from 'store'
+import './actionBegin.scss'
interface ActionListProps {
setSelectedAction: React.Dispatch<React.SetStateAction<Ecogesture | null>>
diff --git a/src/components/Action/ActionModal.tsx b/src/components/Action/ActionModal.tsx
index 98cee53cd..982d724b6 100644
--- a/src/components/Action/ActionModal.tsx
+++ b/src/components/Action/ActionModal.tsx
@@ -1,17 +1,16 @@
-import React, { useCallback } from 'react'
-import './actionModal.scss'
+import Button from '@material-ui/core/Button'
+import Dialog from '@material-ui/core/Dialog'
+import chronoMini from 'assets/icons/visu/action/chrono-mini.svg'
import { useClient } from 'cozy-client'
-import { useDispatch } from 'react-redux'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { Ecogesture, UserChallenge } from 'models'
+import Icon from 'cozy-ui/transpiled/react/Icon'
import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { Ecogesture, UserChallenge } from 'models'
+import React, { useCallback } from 'react'
+import { useDispatch } from 'react-redux'
import ChallengeService from 'services/challenge.service'
-
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import Button from '@material-ui/core/Button'
-import Dialog from '@material-ui/core/Dialog'
import { updateUserChallengeList } from 'store/challenge/challenge.actions'
-import chronoMini from 'assets/icons/visu/action/chrono-mini.svg'
+import './actionModal.scss'
interface ActionModalProps {
open: boolean
diff --git a/src/components/Action/ActionOnGoing.tsx b/src/components/Action/ActionOnGoing.tsx
index 8627d2e82..44b7181c4 100644
--- a/src/components/Action/ActionOnGoing.tsx
+++ b/src/components/Action/ActionOnGoing.tsx
@@ -1,12 +1,12 @@
-import React, { useCallback, useState } from 'react'
-import { UserAction } from 'models'
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { Button } from '@material-ui/core'
-import { DateTime } from 'luxon'
-import './actionOnGoing.scss'
import ClockIcon from 'assets/icons/visu/action/duration-clock.svg'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import EcogestureModal from 'components/Ecogesture/EcogestureModal'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { DateTime } from 'luxon'
+import { UserAction } from 'models'
+import React, { useCallback, useState } from 'react'
+import './actionOnGoing.scss'
interface ActionOnGoingProps {
userAction: UserAction
diff --git a/src/components/Action/actionModal.scss b/src/components/Action/actionModal.scss
index 8daa3a4fb..5b35affa4 100644
--- a/src/components/Action/actionModal.scss
+++ b/src/components/Action/actionModal.scss
@@ -22,4 +22,4 @@
#accessibility-title {
display: none;
-}
\ No newline at end of file
+}
diff --git a/src/components/Analysis/AnalysisConsumptionRow.spec.tsx b/src/components/Analysis/AnalysisConsumptionRow.spec.tsx
index 2deb45ac4..b147d31cf 100644
--- a/src/components/Analysis/AnalysisConsumptionRow.spec.tsx
+++ b/src/components/Analysis/AnalysisConsumptionRow.spec.tsx
@@ -1,8 +1,8 @@
-import React from 'react'
-import { mount } from 'enzyme'
-import { mockMonthlyForecastJanuaryTestProfile1 } from '../../../tests/__mocks__/profileType.mock'
import { FluidType } from 'enum/fluid.enum'
+import { mount } from 'enzyme'
import { MonthlyForecast } from 'models'
+import React from 'react'
+import { mockMonthlyForecastJanuaryTestProfile1 } from '../../../tests/__mocks__/profileType.mock'
import AnalysisConsumptionRow from './AnalysisConsumptionRow'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/Analysis/AnalysisConsumptionRow.tsx b/src/components/Analysis/AnalysisConsumptionRow.tsx
index c4a3fbeb8..ba17cd10a 100644
--- a/src/components/Analysis/AnalysisConsumptionRow.tsx
+++ b/src/components/Analysis/AnalysisConsumptionRow.tsx
@@ -1,14 +1,14 @@
-import React from 'react'
+import EuroIcon from 'assets/icons/ico/euro-icon.svg'
import classNames from 'classnames'
-import './analysisConsumptionRow.scss'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { getPicto } from 'utils/picto'
-import { formatNumberValues } from 'utils/utils'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import EuroIcon from 'assets/icons/ico/euro-icon.svg'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { FluidType } from 'enum/fluid.enum'
import { MonthlyForecast } from 'models'
+import React from 'react'
import ConverterService from 'services/converter.service'
+import { getPicto } from 'utils/picto'
+import { formatNumberValues } from 'utils/utils'
+import './analysisConsumptionRow.scss'
interface AnalysisConsumptionRowProps {
fluid: FluidType
diff --git a/src/components/Analysis/AnalysisView.tsx b/src/components/Analysis/AnalysisView.tsx
index 49f1099e2..2274e2d98 100644
--- a/src/components/Analysis/AnalysisView.tsx
+++ b/src/components/Analysis/AnalysisView.tsx
@@ -1,9 +1,3 @@
-import React, { useCallback, useEffect, useState } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-import { AppStore } from 'store'
-import { toggleAnalysisNotification } from 'store/global/global.actions'
-import { updateProfile } from 'store/profile/profile.actions'
-
import MonthlyAnalysis from 'components/Analysis/MonthlyAnalysis'
import Content from 'components/Content/Content'
import DateNavigator from 'components/DateNavigator/DateNavigator'
@@ -12,8 +6,13 @@ import Header from 'components/Header/Header'
import { useClient } from 'cozy-client'
import { UsageEventType } from 'enum/usageEvent.enum'
import { DateTime } from 'luxon'
+import React, { useCallback, useEffect, useState } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
import { useLocation } from 'react-router-dom'
import UsageEventService from 'services/usageEvent.service'
+import { AppStore } from 'store'
+import { toggleAnalysisNotification } from 'store/global/global.actions'
+import { updateProfile } from 'store/profile/profile.actions'
import './analysisView.scss'
const AnalysisView: React.FC = () => {
diff --git a/src/components/Analysis/ElecHalfHourChart.spec.tsx b/src/components/Analysis/ElecHalfHourChart.spec.tsx
index 702caef22..8cb7b89ca 100644
--- a/src/components/Analysis/ElecHalfHourChart.spec.tsx
+++ b/src/components/Analysis/ElecHalfHourChart.spec.tsx
@@ -1,12 +1,12 @@
-import React from 'react'
import { mount } from 'enzyme'
-import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { DateTime } from 'luxon'
+import React from 'react'
+import * as reactRedux from 'react-redux'
import { Provider } from 'react-redux'
import configureStore from 'redux-mock-store'
-import ElecHalfHourChart from './ElecHalfHourChart'
-import * as reactRedux from 'react-redux'
-import { DateTime } from 'luxon'
import { dataLoadArray } from '../../../tests/__mocks__/datachartData.mock'
+import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import ElecHalfHourChart from './ElecHalfHourChart'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Analysis/ElecHalfHourChart.tsx b/src/components/Analysis/ElecHalfHourChart.tsx
index e04845561..f24bc9e81 100644
--- a/src/components/Analysis/ElecHalfHourChart.tsx
+++ b/src/components/Analysis/ElecHalfHourChart.tsx
@@ -1,12 +1,12 @@
-import React, { useEffect, useRef, useState } from 'react'
-import Bar from 'components/Charts/Bar'
import AxisBottom from 'components/Charts/AxisBottom'
import AxisRight from 'components/Charts/AxisRight'
-import { FluidType } from 'enum/fluid.enum'
+import Bar from 'components/Charts/Bar'
import { scaleBand, ScaleBand, scaleLinear, ScaleLinear } from 'd3-scale'
-import { DateTime } from 'luxon'
+import { FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
+import { DateTime } from 'luxon'
import { Dataload } from 'models'
+import React, { useEffect, useRef, useState } from 'react'
import './elecHalfHourMonthlyAnalysis.scss'
interface ElecHalfHourChartProps {
diff --git a/src/components/Analysis/ElecHalfHourMonthlyAnalysis.spec.tsx b/src/components/Analysis/ElecHalfHourMonthlyAnalysis.spec.tsx
index 9ce4cd90f..2326f69a1 100644
--- a/src/components/Analysis/ElecHalfHourMonthlyAnalysis.spec.tsx
+++ b/src/components/Analysis/ElecHalfHourMonthlyAnalysis.spec.tsx
@@ -1,16 +1,16 @@
-import React from 'react'
+import { IconButton } from '@material-ui/core'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
-import { waitForComponentToPaint } from '../../../tests/__mocks__/testUtils'
import { DateTime } from 'luxon'
-import ElecHalfHourMonthlyAnalysis from './ElecHalfHourMonthlyAnalysis'
-import { IconButton } from '@material-ui/core'
+import { PerformanceIndicator } from 'models'
+import React from 'react'
import {
mockDataLoadEnedisAnalysis,
mockEnedisMonthlyAnalysisArray,
} from '../../../tests/__mocks__/enedisMonthlyAnalysisData.mock'
-import { PerformanceIndicator } from 'models'
import { allLastFluidPrices } from '../../../tests/__mocks__/fluidPrice.mock'
+import { waitForComponentToPaint } from '../../../tests/__mocks__/testUtils'
+import ElecHalfHourMonthlyAnalysis from './ElecHalfHourMonthlyAnalysis'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Analysis/ElecInfoModal.spec.tsx b/src/components/Analysis/ElecInfoModal.spec.tsx
index cbd20d0dc..a3207082f 100644
--- a/src/components/Analysis/ElecInfoModal.spec.tsx
+++ b/src/components/Analysis/ElecInfoModal.spec.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
+import React from 'react'
import ElecInfoModal from './ElecInfoModal'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/Analysis/ElecInfoModal.tsx b/src/components/Analysis/ElecInfoModal.tsx
index 1b2b0ba28..5224c3346 100644
--- a/src/components/Analysis/ElecInfoModal.tsx
+++ b/src/components/Analysis/ElecInfoModal.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import Dialog from '@material-ui/core/Dialog'
import { IconButton } from '@material-ui/core'
-import Icon from 'cozy-ui/transpiled/react/Icon'
+import Dialog from '@material-ui/core/Dialog'
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 React from 'react'
import './elecInfoModal.scss'
interface ElecInfoModalProps {
diff --git a/src/components/Analysis/MaxConsumptionCard.spec.tsx b/src/components/Analysis/MaxConsumptionCard.spec.tsx
index ec38f6272..f5cad1f94 100644
--- a/src/components/Analysis/MaxConsumptionCard.spec.tsx
+++ b/src/components/Analysis/MaxConsumptionCard.spec.tsx
@@ -1,12 +1,12 @@
-import React from 'react'
+import { FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
import { DateTime } from 'luxon'
+import React from 'react'
import * as reactRedux from 'react-redux'
-import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
import { Provider } from 'react-redux'
import configureStore from 'redux-mock-store'
+import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
import MaxConsumptionCard from './MaxConsumptionCard'
-import { FluidType } from 'enum/fluid.enum'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Analysis/MonthlyAnalysis.spec.tsx b/src/components/Analysis/MonthlyAnalysis.spec.tsx
index ab9d33e91..21cfb67c1 100644
--- a/src/components/Analysis/MonthlyAnalysis.spec.tsx
+++ b/src/components/Analysis/MonthlyAnalysis.spec.tsx
@@ -1,15 +1,12 @@
-import React from 'react'
-import { mount } from 'enzyme'
-
import MonthlyAnalysis from 'components/Analysis/MonthlyAnalysis'
+import { mount } from 'enzyme'
import { DateTime } from 'luxon'
-
+import React from 'react'
import * as reactRedux from 'react-redux'
-import { userChallengeExplo1OnGoing } from '../../../tests/__mocks__/userChallengeData.mock'
-
-import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
import { Provider } from 'react-redux'
import configureStore from 'redux-mock-store'
+import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { userChallengeExplo1OnGoing } from '../../../tests/__mocks__/userChallengeData.mock'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Analysis/PieChart.spec.tsx b/src/components/Analysis/PieChart.spec.tsx
index 11b0a6690..371b1e57c 100644
--- a/src/components/Analysis/PieChart.spec.tsx
+++ b/src/components/Analysis/PieChart.spec.tsx
@@ -1,12 +1,12 @@
-import React from 'react'
+import { DataloadState } from 'enum/dataload.enum'
import { mount } from 'enzyme'
import { DateTime } from 'luxon'
-import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { DataloadValueDetail } from 'models'
+import React from 'react'
import { Provider } from 'react-redux'
import configureStore from 'redux-mock-store'
+import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
import PieChart from './PieChart'
-import { DataloadValueDetail } from 'models'
-import { DataloadState } from 'enum/dataload.enum'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Analysis/PieChart.tsx b/src/components/Analysis/PieChart.tsx
index 65929a7cb..a33312c73 100644
--- a/src/components/Analysis/PieChart.tsx
+++ b/src/components/Analysis/PieChart.tsx
@@ -1,12 +1,12 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react'
-import './totalAnalysisChart.scss'
-import * as d3 from 'd3'
+import EstimatedConsumptionModal from 'components/ConsumptionVisualizer/EstimatedConsumptionModal'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { formatNumberValues } from 'utils/utils'
+import * as d3 from 'd3'
import { DateTime } from 'luxon'
-import { convertDateToMonthString } from 'utils/date'
-import EstimatedConsumptionModal from 'components/ConsumptionVisualizer/EstimatedConsumptionModal'
import { DataloadValueDetail } from 'models'
+import React, { useCallback, useEffect, useRef, useState } from 'react'
+import { convertDateToMonthString } from 'utils/date'
+import { formatNumberValues } from 'utils/utils'
+import './totalAnalysisChart.scss'
interface PieProps {
innerRadius: number
diff --git a/src/components/Analysis/TotalAnalysisChart.spec.tsx b/src/components/Analysis/TotalAnalysisChart.spec.tsx
index 2ec549add..86e68adf0 100644
--- a/src/components/Analysis/TotalAnalysisChart.spec.tsx
+++ b/src/components/Analysis/TotalAnalysisChart.spec.tsx
@@ -1,18 +1,17 @@
-import React from 'react'
+import { DataloadState } from 'enum/dataload.enum'
+import { FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
import { DateTime } from 'luxon'
-
+import { Datachart } from 'models'
+import React from 'react'
+import { act } from 'react-dom/test-utils'
import { Provider } from 'react-redux'
-import TotalAnalysisChart from './TotalAnalysisChart'
-import { FluidType } from 'enum/fluid.enum'
import { graphMonthData } from '../../../tests/__mocks__/datachartData.mock'
-import { act } from 'react-dom/test-utils'
import {
createMockStore,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
-import { Datachart } from 'models'
-import { DataloadState } from 'enum/dataload.enum'
+import TotalAnalysisChart from './TotalAnalysisChart'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Analysis/TotalAnalysisChart.tsx b/src/components/Analysis/TotalAnalysisChart.tsx
index 6d14c65d6..238f2d338 100644
--- a/src/components/Analysis/TotalAnalysisChart.tsx
+++ b/src/components/Analysis/TotalAnalysisChart.tsx
@@ -1,18 +1,17 @@
-import React, { useState, useEffect } from 'react'
-import './analysisView.scss'
-import { DateTime } from 'luxon'
import { useClient } from 'cozy-client'
-import ConsumptionDataManager from 'services/consumption.service'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Icon from 'cozy-ui/transpiled/react/Icon'
import { FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
+import { DateTime } from 'luxon'
import { DataloadValueDetail, TimePeriod } from 'models'
-import PieChart from './PieChart'
-import './totalAnalysisChart.scss'
+import React, { useEffect, useState } from 'react'
+import ConsumptionDataManager from 'services/consumption.service'
import { getNavPicto } from 'utils/picto'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-
import { formatNumberValues } from 'utils/utils'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import './analysisView.scss'
+import PieChart from './PieChart'
+import './totalAnalysisChart.scss'
interface TotalAnalysisChartProps {
analysisDate: DateTime
diff --git a/src/components/Challenge/ChallengeCard.spec.tsx b/src/components/Challenge/ChallengeCard.spec.tsx
index d481a4d2a..9519e7e99 100644
--- a/src/components/Challenge/ChallengeCard.spec.tsx
+++ b/src/components/Challenge/ChallengeCard.spec.tsx
@@ -1,10 +1,10 @@
-import React from 'react'
import { shallow } from 'enzyme'
+import React from 'react'
+import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
import ChallengeCard from './ChallengeCard'
import ChallengeCardLocked from './ChallengeCardLocked'
-import ChallengeCardUnlocked from './ChallengeCardUnlocked'
import ChallengeCardOnGoing from './ChallengeCardOnGoing'
-import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
+import ChallengeCardUnlocked from './ChallengeCardUnlocked'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Challenge/ChallengeCard.tsx b/src/components/Challenge/ChallengeCard.tsx
index 6336cc75b..32ae1227f 100644
--- a/src/components/Challenge/ChallengeCard.tsx
+++ b/src/components/Challenge/ChallengeCard.tsx
@@ -1,12 +1,12 @@
import { UserChallengeState } from 'enum/userChallenge.enum'
import { UserChallenge } from 'models'
import React from 'react'
+import './challengeCard.scss'
import ChallengeCardDone from './ChallengeCardDone'
+import ChallengeCardLast from './ChallengeCardLast'
import ChallengeCardLocked from './ChallengeCardLocked'
import ChallengeCardOnGoing from './ChallengeCardOnGoing'
import ChallengeCardUnlocked from './ChallengeCardUnlocked'
-import './challengeCard.scss'
-import ChallengeCardLast from './ChallengeCardLast'
interface ChallengeCardProps {
userChallenge?: UserChallenge
diff --git a/src/components/Challenge/ChallengeCardLast.spec.tsx b/src/components/Challenge/ChallengeCardLast.spec.tsx
index 0a304978c..b9b4cee80 100644
--- a/src/components/Challenge/ChallengeCardLast.spec.tsx
+++ b/src/components/Challenge/ChallengeCardLast.spec.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
import { mount } from 'enzyme'
-import ChallengeCardLast from './ChallengeCardLast'
+import React from 'react'
import { Provider } from 'react-redux'
import configureStore from 'redux-mock-store'
import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import ChallengeCardLast from './ChallengeCardLast'
// Value coming from jest.config
declare let __SAU_IDEA_DIRECT_LINK__: string
diff --git a/src/components/Challenge/ChallengeCardLocked.spec.tsx b/src/components/Challenge/ChallengeCardLocked.spec.tsx
index 80236b171..a3d3f4d67 100644
--- a/src/components/Challenge/ChallengeCardLocked.spec.tsx
+++ b/src/components/Challenge/ChallengeCardLocked.spec.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
import { shallow } from 'enzyme'
-import ChallengeCardLocked from './ChallengeCardLocked'
+import React from 'react'
import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
+import ChallengeCardLocked from './ChallengeCardLocked'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Challenge/ChallengeCardLocked.tsx b/src/components/Challenge/ChallengeCardLocked.tsx
index 980beac58..6624aae9e 100644
--- a/src/components/Challenge/ChallengeCardLocked.tsx
+++ b/src/components/Challenge/ChallengeCardLocked.tsx
@@ -1,10 +1,10 @@
-import React from 'react'
-import './challengeCardLocked.scss'
-import { UserChallenge } from 'models'
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import challengeLockedIcon from 'assets/icons/visu/challenge/challengeLocked.svg'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { UserChallenge } from 'models'
+import React from 'react'
import { getChallengeTitleWithLineReturn } from 'utils/utils'
+import './challengeCardLocked.scss'
interface ChallengeCardLockedProps {
userChallenge: UserChallenge
diff --git a/src/components/Challenge/ChallengeNoFluidModal.spec.tsx b/src/components/Challenge/ChallengeNoFluidModal.spec.tsx
index ca1ba37a4..8e92291ea 100644
--- a/src/components/Challenge/ChallengeNoFluidModal.spec.tsx
+++ b/src/components/Challenge/ChallengeNoFluidModal.spec.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
import { shallow } from 'enzyme'
+import React from 'react'
import ChallengeNoFluidModal from './ChallengeNoFluidModal'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/Challenge/ChallengeNoFluidModal.tsx b/src/components/Challenge/ChallengeNoFluidModal.tsx
index b9d5ff8cc..9d9c0e9fc 100644
--- a/src/components/Challenge/ChallengeNoFluidModal.tsx
+++ b/src/components/Challenge/ChallengeNoFluidModal.tsx
@@ -1,8 +1,8 @@
-import React from 'react'
-import './challengeNoFluidModal.scss'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Button from '@material-ui/core/Button'
import Dialog from '@material-ui/core/Dialog'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import React from 'react'
+import './challengeNoFluidModal.scss'
interface ChallengeNoFluidModalProps {
open: boolean
diff --git a/src/components/Challenge/ChallengeView.spec.tsx b/src/components/Challenge/ChallengeView.spec.tsx
index 1e33a6132..ddae531e6 100644
--- a/src/components/Challenge/ChallengeView.spec.tsx
+++ b/src/components/Challenge/ChallengeView.spec.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
+import ChallengeView from 'components/Challenge/ChallengeView'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
-import ChallengeView from 'components/Challenge/ChallengeView'
+import React from 'react'
import * as reactRedux from 'react-redux'
import { challengeStateDataFull } from '../../../tests/__mocks__/challengeStateData.mock'
import {
diff --git a/src/components/Challenge/StarsContainer.tsx b/src/components/Challenge/StarsContainer.tsx
index 47ce2ce2b..6e4bcedb4 100644
--- a/src/components/Challenge/StarsContainer.tsx
+++ b/src/components/Challenge/StarsContainer.tsx
@@ -1,7 +1,7 @@
-import React, { useEffect, useState } from 'react'
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import starIcon from 'assets/icons/visu/challenge/star.svg'
import starFilled from 'assets/icons/visu/challenge/starFilled.svg'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import React, { useEffect, useState } from 'react'
interface StarsContainerProps {
result: number
diff --git a/src/components/Challenge/challengeNoFluidModal.scss b/src/components/Challenge/challengeNoFluidModal.scss
index 6afe50b68..e956f006f 100644
--- a/src/components/Challenge/challengeNoFluidModal.scss
+++ b/src/components/Challenge/challengeNoFluidModal.scss
@@ -36,4 +36,4 @@
#accessibility-title {
display: none;
-}
\ No newline at end of file
+}
diff --git a/src/components/Charts/AxisBottom.spec.tsx b/src/components/Charts/AxisBottom.spec.tsx
index 871824baa..3ef8f579f 100644
--- a/src/components/Charts/AxisBottom.spec.tsx
+++ b/src/components/Charts/AxisBottom.spec.tsx
@@ -1,16 +1,16 @@
-import React from 'react'
-import AxisBottom from './AxisBottom'
+import { scaleBand, ScaleBand } from 'd3-scale'
+import { TimeStep } from 'enum/timeStep.enum'
import { mount } from 'enzyme'
-import { Provider } from 'react-redux'
+import { DateTime } from 'luxon'
+import React from 'react'
import * as reactRedux from 'react-redux'
+import { Provider } from 'react-redux'
+import { graphData } from '../../../tests/__mocks__/datachartData.mock'
import {
createMockStore,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
-import { graphData } from '../../../tests/__mocks__/datachartData.mock'
-import { TimeStep } from 'enum/timeStep.enum'
-import { DateTime } from 'luxon'
-import { scaleBand, ScaleBand } from 'd3-scale'
+import AxisBottom from './AxisBottom'
const mockXScale: ScaleBand<string> = scaleBand()
.domain(['0', '10'])
diff --git a/src/components/Charts/AxisBottom.tsx b/src/components/Charts/AxisBottom.tsx
index 9302b9cd9..4ad15f3dc 100644
--- a/src/components/Charts/AxisBottom.tsx
+++ b/src/components/Charts/AxisBottom.tsx
@@ -1,13 +1,12 @@
-import React from 'react'
-import { useSelector } from 'react-redux'
-import { AppStore } from 'store'
-import { DateTime } from 'luxon'
import { ScaleBand } from 'd3-scale'
-
import { TimeStep } from 'enum/timeStep.enum'
+import { capitalize } from 'lodash'
+import { DateTime } from 'luxon'
import { Dataload } from 'models'
+import React from 'react'
+import { useSelector } from 'react-redux'
import DateChartService from 'services/dateChart.service'
-import { capitalize } from 'lodash'
+import { AppStore } from 'store'
interface TextTypeProps {
index: number
diff --git a/src/components/Charts/AxisRight.spec.tsx b/src/components/Charts/AxisRight.spec.tsx
index bfa9f2217..668eb4e85 100644
--- a/src/components/Charts/AxisRight.spec.tsx
+++ b/src/components/Charts/AxisRight.spec.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
import { scaleLinear } from 'd3'
import { FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
+import React from 'react'
import AxisRight from './AxisRight'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/Charts/AxisRight.tsx b/src/components/Charts/AxisRight.tsx
index 18fc9e45f..710b50b34 100644
--- a/src/components/Charts/AxisRight.tsx
+++ b/src/components/Charts/AxisRight.tsx
@@ -1,9 +1,9 @@
-import React, { useEffect, useRef } from 'react'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { select, selectAll } from 'd3-selection'
import { axisRight } from 'd3-axis'
import { ScaleLinear } from 'd3-scale'
+import { select, selectAll } from 'd3-selection'
import { FluidType } from 'enum/fluid.enum'
+import React, { useEffect, useRef } from 'react'
interface AxisRightProps {
yScale: ScaleLinear<number, number>
diff --git a/src/components/Charts/Bar.spec.tsx b/src/components/Charts/Bar.spec.tsx
index 84c59fb72..5c043ccc5 100644
--- a/src/components/Charts/Bar.spec.tsx
+++ b/src/components/Charts/Bar.spec.tsx
@@ -1,18 +1,18 @@
-import React from 'react'
+import { scaleBand, ScaleBand, scaleLinear } from 'd3'
+import { FluidType } from 'enum/fluid.enum'
+import { TimeStep } from 'enum/timeStep.enum'
import { mount } from 'enzyme'
-import { Provider } from 'react-redux'
+import { DateTime } from 'luxon'
+import React from 'react'
import * as reactRedux from 'react-redux'
+import { Provider } from 'react-redux'
+import * as chartActions from 'store/chart/chart.actions'
+import { graphData } from '../../../tests/__mocks__/datachartData.mock'
import {
createMockStore,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
-import * as chartActions from 'store/chart/chart.actions'
import Bar from './Bar'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { graphData } from '../../../tests/__mocks__/datachartData.mock'
-import { DateTime } from 'luxon'
-import { scaleBand, ScaleBand, scaleLinear } from 'd3'
const mockXScale: ScaleBand<string> = scaleBand()
.domain(
diff --git a/src/components/Charts/BarChart.tsx b/src/components/Charts/BarChart.tsx
index e47408ad2..3e330fb29 100644
--- a/src/components/Charts/BarChart.tsx
+++ b/src/components/Charts/BarChart.tsx
@@ -1,15 +1,13 @@
-import React from 'react'
+import AxisBottom from 'components/Charts/AxisBottom'
+import AxisRight from 'components/Charts/AxisRight'
+import Bar from 'components/Charts/Bar'
import { scaleBand, ScaleBand, scaleLinear, ScaleLinear } from 'd3-scale'
-import { DateTime } from 'luxon'
-
+import { DataloadState } from 'enum/dataload.enum'
import { FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
+import { DateTime } from 'luxon'
import { Datachart } from 'models'
-
-import Bar from 'components/Charts/Bar'
-import AxisBottom from 'components/Charts/AxisBottom'
-import AxisRight from 'components/Charts/AxisRight'
-import { DataloadState } from 'enum/dataload.enum'
+import React from 'react'
export interface BarChartProps {
chartData: Datachart
diff --git a/src/components/Charts/UncomingBar.tsx b/src/components/Charts/UncomingBar.tsx
index e669a5d07..9e11a1b3a 100644
--- a/src/components/Charts/UncomingBar.tsx
+++ b/src/components/Charts/UncomingBar.tsx
@@ -1,8 +1,8 @@
-import React, { useState } from 'react'
import { ScaleBand, ScaleLinear } from 'd3-scale'
-import { DateTime } from 'luxon'
import { detect } from 'detect-browser'
+import { DateTime } from 'luxon'
import { Dataload } from 'models'
+import React, { useState } from 'react'
interface BarProps {
index: number
diff --git a/src/components/CommonKit/Card/StyledBorderCard.spec.tsx b/src/components/CommonKit/Card/StyledBorderCard.spec.tsx
index c3dfb9703..38d535360 100644
--- a/src/components/CommonKit/Card/StyledBorderCard.spec.tsx
+++ b/src/components/CommonKit/Card/StyledBorderCard.spec.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
import { mount } from 'enzyme'
+import React from 'react'
import StyledBorderCard from './StyledBorderCard'
describe('StyledBorderCard component test', () => {
diff --git a/src/components/CommonKit/Card/StyledBorderCard.tsx b/src/components/CommonKit/Card/StyledBorderCard.tsx
index a3f76a0ce..f61f2d440 100644
--- a/src/components/CommonKit/Card/StyledBorderCard.tsx
+++ b/src/components/CommonKit/Card/StyledBorderCard.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
import CardActionArea, {
CardActionAreaProps,
} from '@material-ui/core/CardActionArea'
import CardContent from '@material-ui/core/CardContent'
import { withStyles } from '@material-ui/core/styles'
+import React from 'react'
const CardBase = withStyles({
root: {
diff --git a/src/components/CommonKit/Card/StyledCard.spec.tsx b/src/components/CommonKit/Card/StyledCard.spec.tsx
index 5aebe397e..59f7d4dcd 100644
--- a/src/components/CommonKit/Card/StyledCard.spec.tsx
+++ b/src/components/CommonKit/Card/StyledCard.spec.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
+import { FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
+import React from 'react'
import StyledCard from './StyledCard'
-import { FluidType } from 'enum/fluid.enum'
describe('StyledCard component test', () => {
it('should render correctly Electricty StyledCard', () => {
diff --git a/src/components/CommonKit/Card/StyledCard.tsx b/src/components/CommonKit/Card/StyledCard.tsx
index d6890efa4..cdce326b6 100644
--- a/src/components/CommonKit/Card/StyledCard.tsx
+++ b/src/components/CommonKit/Card/StyledCard.tsx
@@ -1,10 +1,10 @@
-import React, { ReactNode } from 'react'
import CardActionArea, {
CardActionAreaProps,
} from '@material-ui/core/CardActionArea'
import CardContent from '@material-ui/core/CardContent'
import { withStyles } from '@material-ui/core/styles'
import { FluidType } from 'enum/fluid.enum'
+import React, { ReactNode } from 'react'
const CardBase = withStyles({
root: {
diff --git a/src/components/CommonKit/Card/StyledEcogestureCard.spec.tsx b/src/components/CommonKit/Card/StyledEcogestureCard.spec.tsx
index 4bf07d365..10778e9ec 100644
--- a/src/components/CommonKit/Card/StyledEcogestureCard.spec.tsx
+++ b/src/components/CommonKit/Card/StyledEcogestureCard.spec.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
import { mount } from 'enzyme'
+import React from 'react'
import StyledEcogestureCard from './StyledEcogestureCard'
describe('StyledEcogestureCard component test', () => {
diff --git a/src/components/CommonKit/Card/StyledEcogestureCard.tsx b/src/components/CommonKit/Card/StyledEcogestureCard.tsx
index 9f2e6e5db..0b7bb4aff 100644
--- a/src/components/CommonKit/Card/StyledEcogestureCard.tsx
+++ b/src/components/CommonKit/Card/StyledEcogestureCard.tsx
@@ -1,9 +1,9 @@
-import React, { ReactNode } from 'react'
import CardActionArea, {
CardActionAreaProps,
} from '@material-ui/core/CardActionArea'
import CardContent from '@material-ui/core/CardContent'
import { withStyles } from '@material-ui/core/styles'
+import React, { ReactNode } from 'react'
const CardBase = withStyles({
root: {
diff --git a/src/components/CommonKit/Card/StyledIconCard.spec.tsx b/src/components/CommonKit/Card/StyledIconCard.spec.tsx
index e8d742296..77b94a684 100644
--- a/src/components/CommonKit/Card/StyledIconCard.spec.tsx
+++ b/src/components/CommonKit/Card/StyledIconCard.spec.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
+import { FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
+import React from 'react'
import StyledIconCard from './StyledIconCard'
-import { FluidType } from 'enum/fluid.enum'
describe('StyledIconCard component test', () => {
it('it should render correctly StyledIconCard', () => {
diff --git a/src/components/CommonKit/Card/StyledIconCard.tsx b/src/components/CommonKit/Card/StyledIconCard.tsx
index b5b087ad3..5e879a5cd 100644
--- a/src/components/CommonKit/Card/StyledIconCard.tsx
+++ b/src/components/CommonKit/Card/StyledIconCard.tsx
@@ -1,12 +1,12 @@
-import React, { ReactNode } from 'react'
import CardActionArea, {
CardActionAreaProps,
} from '@material-ui/core/CardActionArea'
import CardContent from '@material-ui/core/CardContent'
+import Grid from '@material-ui/core/Grid'
import { withStyles } from '@material-ui/core/styles'
import { FluidType } from 'enum/fluid.enum'
+import React, { ReactNode } from 'react'
import { getPicto } from 'utils/picto'
-import Grid from '@material-ui/core/Grid'
import StyledIcon from '../Icon/StyledIcon'
const CardBase = withStyles({
diff --git a/src/components/CommonKit/IconButton/StyledIconBorderedButton.spec.tsx b/src/components/CommonKit/IconButton/StyledIconBorderedButton.spec.tsx
index e6dd16f77..8a703c146 100644
--- a/src/components/CommonKit/IconButton/StyledIconBorderedButton.spec.tsx
+++ b/src/components/CommonKit/IconButton/StyledIconBorderedButton.spec.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
import { shallow } from 'enzyme'
+import React from 'react'
import StyledIconBorderedButton from './StyledIconBorderedButton'
describe('StyledIconBorderedButton component test', () => {
diff --git a/src/components/CommonKit/IconButton/StyledIconBorderedButton.tsx b/src/components/CommonKit/IconButton/StyledIconBorderedButton.tsx
index 6ec0e550b..761d01d44 100644
--- a/src/components/CommonKit/IconButton/StyledIconBorderedButton.tsx
+++ b/src/components/CommonKit/IconButton/StyledIconBorderedButton.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
-import { withStyles } from '@material-ui/core/styles'
import IconButton, { IconButtonProps } from '@material-ui/core/IconButton'
+import { withStyles } from '@material-ui/core/styles'
import StyledIconProps from 'components/CommonKit/Icon/StyledIcon'
+import React from 'react'
const IconButtonBase = withStyles({
root: {
diff --git a/src/components/CommonKit/IconButton/StyledIconButton.spec.tsx b/src/components/CommonKit/IconButton/StyledIconButton.spec.tsx
index 11546e02e..c9a023fc4 100644
--- a/src/components/CommonKit/IconButton/StyledIconButton.spec.tsx
+++ b/src/components/CommonKit/IconButton/StyledIconButton.spec.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
import { shallow } from 'enzyme'
+import React from 'react'
import StyledIconButton from './StyledIconButton'
describe('StyledIconButton component test', () => {
diff --git a/src/components/CommonKit/IconButton/StyledIconButton.tsx b/src/components/CommonKit/IconButton/StyledIconButton.tsx
index 4aaea811a..03e1b9905 100644
--- a/src/components/CommonKit/IconButton/StyledIconButton.tsx
+++ b/src/components/CommonKit/IconButton/StyledIconButton.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
-import { withStyles } from '@material-ui/core/styles'
import IconButton, { IconButtonProps } from '@material-ui/core/IconButton'
+import { withStyles } from '@material-ui/core/styles'
import StyledIconProps from 'components/CommonKit/Icon/StyledIcon'
+import React from 'react'
const IconButtonBase = withStyles({
root: {
diff --git a/src/components/CommonKit/Switch/StyledSwitch.spec.tsx b/src/components/CommonKit/Switch/StyledSwitch.spec.tsx
index 00a82423b..2e585e6a7 100644
--- a/src/components/CommonKit/Switch/StyledSwitch.spec.tsx
+++ b/src/components/CommonKit/Switch/StyledSwitch.spec.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
+import { FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
+import React from 'react'
import StyledSwitch from './StyledSwitch'
-import { FluidType } from 'enum/fluid.enum'
describe('StyledSwitch component test', () => {
it('should render correctly electricty StyledSwitch', () => {
diff --git a/src/components/CommonKit/Switch/StyledSwitch.tsx b/src/components/CommonKit/Switch/StyledSwitch.tsx
index a82bd25f2..9ffe2d19d 100644
--- a/src/components/CommonKit/Switch/StyledSwitch.tsx
+++ b/src/components/CommonKit/Switch/StyledSwitch.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
-import { FluidType } from 'enum/fluid.enum'
-import Switch, { SwitchProps } from '@material-ui/core/Switch'
import { withStyles } from '@material-ui/core/styles'
+import Switch, { SwitchProps } from '@material-ui/core/Switch'
+import { FluidType } from 'enum/fluid.enum'
+import React from 'react'
const SwitchBase = withStyles({
root: {
diff --git a/src/components/Connection/ConnectionNotFound.spec.tsx b/src/components/Connection/ConnectionNotFound.spec.tsx
index a2b02027c..1772e89ff 100644
--- a/src/components/Connection/ConnectionNotFound.spec.tsx
+++ b/src/components/Connection/ConnectionNotFound.spec.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
-import { shallow, mount } from 'enzyme'
-import ConnectionNotFound from 'components/Connection/ConnectionNotFound'
import Button from '@material-ui/core/Button'
+import ConnectionNotFound from 'components/Connection/ConnectionNotFound'
+import { mount, shallow } from 'enzyme'
+import React from 'react'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Connection/ConnectionNotFound.tsx b/src/components/Connection/ConnectionNotFound.tsx
index 9eee50aa1..e80bda11a 100644
--- a/src/components/Connection/ConnectionNotFound.tsx
+++ b/src/components/Connection/ConnectionNotFound.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Button from '@material-ui/core/Button'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import React from 'react'
import './connectionNotFound.scss'
interface ConnectionNotFoundProps {
konnectorSlug: string
diff --git a/src/components/Connection/ConnectionResult.tsx b/src/components/Connection/ConnectionResult.tsx
index 9fc8b66bd..6a2fccce4 100644
--- a/src/components/Connection/ConnectionResult.tsx
+++ b/src/components/Connection/ConnectionResult.tsx
@@ -11,7 +11,7 @@ import {
AccountSgeData,
FluidConnection,
FluidStatus,
- Trigger
+ Trigger,
} from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import { useDispatch } from 'react-redux'
@@ -21,7 +21,7 @@ import TriggerService from 'services/triggers.service'
import {
setShouldRefreshConsent,
updatedFluidConnection,
- updateSgeStore
+ updateSgeStore,
} from 'store/global/global.actions'
import { getKonnectorUpdateError } from 'utils/utils'
import './connectionResult.scss'
diff --git a/src/components/Connection/DeleteGRDFAccountModal.spec.tsx b/src/components/Connection/DeleteGRDFAccountModal.spec.tsx
index a51703894..9450e052f 100644
--- a/src/components/Connection/DeleteGRDFAccountModal.spec.tsx
+++ b/src/components/Connection/DeleteGRDFAccountModal.spec.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
+import { Button } from '@material-ui/core'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
-import { Button } from '@material-ui/core'
+import React from 'react'
import DeleteGRDFAccountModal from './DeleteGRDFAccountModal'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/Connection/DeleteGRDFAccountModal.tsx b/src/components/Connection/DeleteGRDFAccountModal.tsx
index 69eaa4b64..6ec568182 100644
--- a/src/components/Connection/DeleteGRDFAccountModal.tsx
+++ b/src/components/Connection/DeleteGRDFAccountModal.tsx
@@ -1,10 +1,10 @@
-import React, { useCallback } from 'react'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { Button, IconButton } from '@material-ui/core'
import Dialog from '@material-ui/core/Dialog'
import CloseIcon from 'assets/icons/ico/close.svg'
import GrdfIcon from 'assets/icons/ico/consent-outdated-grdf.svg'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { Button, IconButton } from '@material-ui/core'
+import React, { useCallback } from 'react'
import './deleteGRDFAccountModal.scss'
interface DeleteGRDFAccountModalProps {
diff --git a/src/components/Connection/SGEConnect/SgeModalHint.spec.tsx b/src/components/Connection/SGEConnect/SgeModalHint.spec.tsx
index c5513c1ef..86efcf12d 100644
--- a/src/components/Connection/SGEConnect/SgeModalHint.spec.tsx
+++ b/src/components/Connection/SGEConnect/SgeModalHint.spec.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
import { mount } from 'enzyme'
-import configureStore from 'redux-mock-store'
+import toJson from 'enzyme-to-json'
+import React from 'react'
import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
import { globalStateData } from '../../../../tests/__mocks__/globalStateData.mock'
-import toJson from 'enzyme-to-json'
import SgeModalHint from './SgeModalHint'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/Connection/SGEConnect/StepAddress.spec.tsx b/src/components/Connection/SGEConnect/StepAddress.spec.tsx
index dd8b7fbdf..4874eaee4 100644
--- a/src/components/Connection/SGEConnect/StepAddress.spec.tsx
+++ b/src/components/Connection/SGEConnect/StepAddress.spec.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
import { mount } from 'enzyme'
-import configureStore from 'redux-mock-store'
+import toJson from 'enzyme-to-json'
+import React from 'react'
import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
import { globalStateData } from '../../../../tests/__mocks__/globalStateData.mock'
-import toJson from 'enzyme-to-json'
import StepAddress from './StepAddress'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/Connection/SGEConnect/StepIdentityAndPdl.spec.tsx b/src/components/Connection/SGEConnect/StepIdentityAndPdl.spec.tsx
index 4a6ffacf3..dba57dc00 100644
--- a/src/components/Connection/SGEConnect/StepIdentityAndPdl.spec.tsx
+++ b/src/components/Connection/SGEConnect/StepIdentityAndPdl.spec.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
import { mount } from 'enzyme'
-import configureStore from 'redux-mock-store'
+import toJson from 'enzyme-to-json'
+import React from 'react'
import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
import { globalStateData } from '../../../../tests/__mocks__/globalStateData.mock'
-import toJson from 'enzyme-to-json'
import StepIdentityAndPdl from './StepIdentityAndPdl'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/ConsumptionVisualizer/ConsumptionVisualizer.tsx b/src/components/ConsumptionVisualizer/ConsumptionVisualizer.tsx
index 11007d24c..eab7e13b4 100644
--- a/src/components/ConsumptionVisualizer/ConsumptionVisualizer.tsx
+++ b/src/components/ConsumptionVisualizer/ConsumptionVisualizer.tsx
@@ -1,12 +1,11 @@
-import React from 'react'
-import './consumptionVisualizer.scss'
-import { useSelector } from 'react-redux'
-import { AppStore } from 'store'
+import DataloadConsumptionVisualizer from 'components/ConsumptionVisualizer/DataloadConsumptionVisualizer'
import { FluidType } from 'enum/fluid.enum'
import { DateTime } from 'luxon'
import { Dataload } from 'models'
-
-import DataloadConsumptionVisualizer from 'components/ConsumptionVisualizer/DataloadConsumptionVisualizer'
+import React from 'react'
+import { useSelector } from 'react-redux'
+import { AppStore } from 'store'
+import './consumptionVisualizer.scss'
import InfoDataConsumptionVisualizer from './InfoDataConsumptionVisualizer'
interface ConsumptionVisualizerProps {
diff --git a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx
index 9377278e2..b71bc2437 100644
--- a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.spec.tsx
@@ -1,18 +1,17 @@
-import React from 'react'
+import { FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
+import { Dataload } from 'models'
+import React from 'react'
import { Provider } from 'react-redux'
-
+import { BrowserRouter as Router } from 'react-router-dom'
import configureStore from 'redux-mock-store'
+import UsageEventService from 'services/usageEvent.service'
+import { baseDataLoad } from '../../../tests/__mocks__/datachartData.mock'
import {
mockInitialChartState,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
import DataloadConsumptionVisualizer from './DataloadConsumptionVisualizer'
-import { FluidType } from 'enum/fluid.enum'
-import { baseDataLoad } from '../../../tests/__mocks__/datachartData.mock'
-import { Dataload } from 'models'
-import { BrowserRouter as Router } from 'react-router-dom'
-import UsageEventService from 'services/usageEvent.service'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx
index fe02f6446..fb64ac41b 100644
--- a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx
@@ -1,13 +1,13 @@
+import { DataloadSectionType, DataloadState } from 'enum/dataload.enum'
+import { FluidType } from 'enum/fluid.enum'
+import { Dataload } from 'models'
import React, { useCallback, useState } from 'react'
-import './dataloadConsumptionVisualizer.scss'
import { useSelector } from 'react-redux'
import { AppStore } from 'store'
-import { Dataload } from 'models'
-import { FluidType } from 'enum/fluid.enum'
-import EstimatedConsumptionModal from './EstimatedConsumptionModal'
+import './dataloadConsumptionVisualizer.scss'
import DataloadNoValue from './DataloadNoValue'
-import { DataloadSectionType, DataloadState } from 'enum/dataload.enum'
import DataloadSection from './DataloadSection'
+import EstimatedConsumptionModal from './EstimatedConsumptionModal'
interface DataloadConsumptionVisualizerProps {
fluidType: FluidType
diff --git a/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx b/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx
index f1e680ae2..4594bec2e 100644
--- a/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadNoValue.spec.tsx
@@ -1,11 +1,11 @@
-import React from 'react'
+import { DataloadState } from 'enum/dataload.enum'
+import { FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
-import { FluidType } from 'enum/fluid.enum'
-import DataloadNoValue from './DataloadNoValue'
-import { baseDataLoad } from '../../../tests/__mocks__/datachartData.mock'
-import { DataloadState } from 'enum/dataload.enum'
import { Dataload } from 'models'
+import React from 'react'
+import { baseDataLoad } from '../../../tests/__mocks__/datachartData.mock'
+import DataloadNoValue from './DataloadNoValue'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/ConsumptionVisualizer/DataloadNoValue.tsx b/src/components/ConsumptionVisualizer/DataloadNoValue.tsx
index cef6acd8c..04b194750 100644
--- a/src/components/ConsumptionVisualizer/DataloadNoValue.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadNoValue.tsx
@@ -1,10 +1,10 @@
-import React, { useCallback } from 'react'
-import './consumptionVisualizer.scss'
-import { FluidType } from 'enum/fluid.enum'
-import { Dataload } from 'models'
+import classNames from 'classnames'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { DataloadState } from 'enum/dataload.enum'
-import classNames from 'classnames'
+import { FluidType } from 'enum/fluid.enum'
+import { Dataload } from 'models'
+import React, { useCallback } from 'react'
+import './consumptionVisualizer.scss'
interface DataloadNoValueProps {
dataload: Dataload
diff --git a/src/components/ConsumptionVisualizer/DataloadSection.spec.tsx b/src/components/ConsumptionVisualizer/DataloadSection.spec.tsx
index 348a7d9d6..2aab5fb6d 100644
--- a/src/components/ConsumptionVisualizer/DataloadSection.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSection.spec.tsx
@@ -1,10 +1,10 @@
-import React from 'react'
+import { DataloadSectionType } from 'enum/dataload.enum'
+import { FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
-import { FluidType } from 'enum/fluid.enum'
-import { baseDataLoad } from '../../../tests/__mocks__/datachartData.mock'
-import { DataloadSectionType } from 'enum/dataload.enum'
import { Dataload } from 'models'
+import React from 'react'
+import { baseDataLoad } from '../../../tests/__mocks__/datachartData.mock'
import DataloadSection from './DataloadSection'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/ConsumptionVisualizer/DataloadSection.tsx b/src/components/ConsumptionVisualizer/DataloadSection.tsx
index 14482e3c5..3132d25da 100644
--- a/src/components/ConsumptionVisualizer/DataloadSection.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSection.tsx
@@ -1,13 +1,12 @@
-import React from 'react'
-import './consumptionVisualizer.scss'
-import { FluidType } from 'enum/fluid.enum'
-import { Dataload } from 'models'
+import classNames from 'classnames'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { DataloadSectionType } from 'enum/dataload.enum'
-import classNames from 'classnames'
-
-import DataloadSectionValue from './DataloadSectionValue'
+import { FluidType } from 'enum/fluid.enum'
+import { Dataload } from 'models'
+import React from 'react'
+import './consumptionVisualizer.scss'
import DataloadSectionDetail from './DataloadSectionDetail'
+import DataloadSectionValue from './DataloadSectionValue'
interface DataloadSectionProps {
dataload: Dataload
diff --git a/src/components/ConsumptionVisualizer/DataloadSectionDetail.spec.tsx b/src/components/ConsumptionVisualizer/DataloadSectionDetail.spec.tsx
index 6a515cd71..25695cef1 100644
--- a/src/components/ConsumptionVisualizer/DataloadSectionDetail.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSectionDetail.spec.tsx
@@ -1,10 +1,10 @@
-import React from 'react'
+import { DataloadSectionType, DataloadState } from 'enum/dataload.enum'
+import { FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
-import { FluidType } from 'enum/fluid.enum'
-import { baseDataLoad } from '../../../tests/__mocks__/datachartData.mock'
-import { DataloadSectionType, DataloadState } from 'enum/dataload.enum'
import { Dataload } from 'models'
+import React from 'react'
+import { baseDataLoad } from '../../../tests/__mocks__/datachartData.mock'
import DataloadSectionDetail from './DataloadSectionDetail'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx b/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx
index b765c7473..7ce1a123f 100644
--- a/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSectionDetail.tsx
@@ -1,17 +1,17 @@
-import React, { useCallback } from 'react'
import classNames from 'classnames'
-import { NavLink } from 'react-router-dom'
import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { getNavPicto } from 'utils/picto'
-import { Dataload } from 'models'
-import { FluidType } from 'enum/fluid.enum'
import { DataloadSectionType, DataloadState } from 'enum/dataload.enum'
+import { FluidType } from 'enum/fluid.enum'
import { UsageEventType } from 'enum/usageEvent.enum'
+import { Dataload } from 'models'
+import React, { useCallback } from 'react'
+import { NavLink } from 'react-router-dom'
import ConverterService from 'services/converter.service'
-import { formatNumberValues } from 'utils/utils'
import UsageEventService from 'services/usageEvent.service'
+import { getNavPicto } from 'utils/picto'
+import { formatNumberValues } from 'utils/utils'
interface DataloadSectionDetailProps {
dataload: Dataload
diff --git a/src/components/ConsumptionVisualizer/DataloadSectionValue.spec.tsx b/src/components/ConsumptionVisualizer/DataloadSectionValue.spec.tsx
index 4181b6a2e..adef58b74 100644
--- a/src/components/ConsumptionVisualizer/DataloadSectionValue.spec.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSectionValue.spec.tsx
@@ -1,13 +1,13 @@
-import React from 'react'
+import { DataloadSectionType } from 'enum/dataload.enum'
+import { FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
-import { FluidType } from 'enum/fluid.enum'
+import { Dataload } from 'models'
+import React from 'react'
import {
baseDataLoad,
baseMultiFluidDataLoad,
} from '../../../tests/__mocks__/datachartData.mock'
-import { DataloadSectionType } from 'enum/dataload.enum'
-import { Dataload } from 'models'
import DataloadSectionValue from './DataloadSectionValue'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/ConsumptionVisualizer/DataloadSectionValue.tsx b/src/components/ConsumptionVisualizer/DataloadSectionValue.tsx
index 14f2db2df..e33616375 100644
--- a/src/components/ConsumptionVisualizer/DataloadSectionValue.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadSectionValue.tsx
@@ -1,8 +1,8 @@
-import React from 'react'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { Dataload } from 'models'
-import { FluidType } from 'enum/fluid.enum'
import { DataloadSectionType } from 'enum/dataload.enum'
+import { FluidType } from 'enum/fluid.enum'
+import { Dataload } from 'models'
+import React from 'react'
import { formatNumberValues } from 'utils/utils'
interface DataloadSectionValueProps {
diff --git a/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.spec.tsx b/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.spec.tsx
index 12f759dc5..30499b12e 100644
--- a/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.spec.tsx
+++ b/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.spec.tsx
@@ -1,7 +1,6 @@
-import React from 'react'
import { mount } from 'enzyme'
+import React from 'react'
import { Provider } from 'react-redux'
-
import configureStore from 'redux-mock-store'
import { mockInitialEcolyoState } from '../../../tests/__mocks__/store'
import EstimatedConsumptionModal from './EstimatedConsumptionModal'
diff --git a/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.spec.tsx b/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.spec.tsx
index 679d8ca0a..4331448bb 100644
--- a/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.spec.tsx
+++ b/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.spec.tsx
@@ -1,19 +1,19 @@
-import React from 'react'
+import { DataloadState } from 'enum/dataload.enum'
+import { FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
-import { Provider } from 'react-redux'
+import { DateTime } from 'luxon'
+import { Dataload } from 'models'
+import React from 'react'
import * as reactRedux from 'react-redux'
+import { Provider } from 'react-redux'
+import { baseDataLoad } from '../../../tests/__mocks__/datachartData.mock'
import {
createMockStore,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
-import { FluidType } from 'enum/fluid.enum'
-import { Dataload } from 'models'
-import { DateTime } from 'luxon'
import InfoDataConsumptionVisualizer from './InfoDataConsumptionVisualizer'
-import { DataloadState } from 'enum/dataload.enum'
import NoDataModal from './NoDataModal'
-import { baseDataLoad } from '../../../tests/__mocks__/datachartData.mock'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.tsx b/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.tsx
index 030ed6ae7..b69f82c06 100644
--- a/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.tsx
+++ b/src/components/ConsumptionVisualizer/InfoDataConsumptionVisualizer.tsx
@@ -1,14 +1,14 @@
-import React, { useCallback, useState } from 'react'
-import './infoDataConsumptionVisualizer.scss'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { useDispatch, useSelector } from 'react-redux'
+import { DataloadState } from 'enum/dataload.enum'
+import { FluidType } from 'enum/fluid.enum'
import { DateTime } from 'luxon'
import { Dataload } from 'models'
-import { FluidType } from 'enum/fluid.enum'
+import React, { useCallback, useState } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+import DateChartService from 'services/dateChart.service'
import { AppStore } from 'store'
import { setCurrentIndex, setSelectedDate } from 'store/chart/chart.actions'
-import DateChartService from 'services/dateChart.service'
-import { DataloadState } from 'enum/dataload.enum'
+import './infoDataConsumptionVisualizer.scss'
import NoDataModal from './NoDataModal'
interface InfoDataConsumptionVisualizerProps {
diff --git a/src/components/ConsumptionVisualizer/NoDataModal.spec.tsx b/src/components/ConsumptionVisualizer/NoDataModal.spec.tsx
index d233665e1..ca13f103c 100644
--- a/src/components/ConsumptionVisualizer/NoDataModal.spec.tsx
+++ b/src/components/ConsumptionVisualizer/NoDataModal.spec.tsx
@@ -1,7 +1,6 @@
-import React from 'react'
import { mount } from 'enzyme'
+import React from 'react'
import { Provider } from 'react-redux'
-
import configureStore from 'redux-mock-store'
import { mockInitialEcolyoState } from '../../../tests/__mocks__/store'
import NoDataModal from './NoDataModal'
diff --git a/src/components/ConsumptionVisualizer/NoDataModal.tsx b/src/components/ConsumptionVisualizer/NoDataModal.tsx
index b61a39f25..46ec8eb46 100644
--- a/src/components/ConsumptionVisualizer/NoDataModal.tsx
+++ b/src/components/ConsumptionVisualizer/NoDataModal.tsx
@@ -1,10 +1,10 @@
-import React from 'react'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { Button, IconButton } from '@material-ui/core'
import Dialog from '@material-ui/core/Dialog'
import CloseIcon from 'assets/icons/ico/close.svg'
import QuestionIcon from 'assets/icons/ico/questionMark.svg'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import { Button, IconButton } from '@material-ui/core'
+import React from 'react'
import './noDataModal.scss'
interface NoDataModalProps {
diff --git a/src/components/DateNavigator/DateNavigator.spec.tsx b/src/components/DateNavigator/DateNavigator.spec.tsx
index bfa2adf66..7c1f57700 100644
--- a/src/components/DateNavigator/DateNavigator.spec.tsx
+++ b/src/components/DateNavigator/DateNavigator.spec.tsx
@@ -1,14 +1,14 @@
-import React from 'react'
+import { IconButton } from '@material-ui/core'
import { mount } from 'enzyme'
import { DateTime } from 'luxon'
-import * as reactRedux from 'react-redux'
+import React from 'react'
import { act } from 'react-dom/test-utils'
-import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import * as reactRedux from 'react-redux'
import { Provider } from 'react-redux'
import configureStore from 'redux-mock-store'
-import DateNavigator from './DateNavigator'
+import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
import { mockInitialChartState } from '../../../tests/__mocks__/store'
-import { IconButton } from '@material-ui/core'
+import DateNavigator from './DateNavigator'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Duel/DuelBar.tsx b/src/components/Duel/DuelBar.tsx
index 976ab1175..9dfbb3d0d 100644
--- a/src/components/Duel/DuelBar.tsx
+++ b/src/components/Duel/DuelBar.tsx
@@ -1,18 +1,15 @@
-import React from 'react'
-import { useSelector } from 'react-redux'
-import { AppStore } from 'store'
-
-import { scaleBand, ScaleBand, scaleLinear, ScaleLinear } from 'd3-scale'
-import { DateTime } from 'luxon'
-
-import { TimeStep } from 'enum/timeStep.enum'
-import { Dataload, UserChallenge } from 'models'
-
-import Bar from 'components/Charts/Bar'
import AxisBottom from 'components/Charts/AxisBottom'
import AxisRight from 'components/Charts/AxisRight'
+import Bar from 'components/Charts/Bar'
import UncomingBar from 'components/Charts/UncomingBar'
+import { scaleBand, ScaleBand, scaleLinear, ScaleLinear } from 'd3-scale'
import { FluidType } from 'enum/fluid.enum'
+import { TimeStep } from 'enum/timeStep.enum'
+import { DateTime } from 'luxon'
+import { Dataload, UserChallenge } from 'models'
+import React from 'react'
+import { useSelector } from 'react-redux'
+import { AppStore } from 'store'
export interface BarChartProps {
userChallenge: UserChallenge
diff --git a/src/components/Duel/DuelChart.tsx b/src/components/Duel/DuelChart.tsx
index 54538e998..eaa8d6719 100644
--- a/src/components/Duel/DuelChart.tsx
+++ b/src/components/Duel/DuelChart.tsx
@@ -1,8 +1,8 @@
-import React, { useState, useEffect } from 'react'
-import './duelChart.scss'
+import DuelBar from 'components/Duel/DuelBar'
import { TimeStep } from 'enum/timeStep.enum'
import { Dataload, UserChallenge } from 'models'
-import DuelBar from 'components/Duel/DuelBar'
+import React, { useEffect, useState } from 'react'
+import './duelChart.scss'
interface DuelChartProps {
userChallenge: UserChallenge
diff --git a/src/components/Duel/DuelEmptyValueModal.tsx b/src/components/Duel/DuelEmptyValueModal.tsx
index 373de8b10..2fbdf024a 100644
--- a/src/components/Duel/DuelEmptyValueModal.tsx
+++ b/src/components/Duel/DuelEmptyValueModal.tsx
@@ -1,13 +1,11 @@
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import React, { useEffect, useState } from 'react'
-import './duelEmptyValueModal.scss'
-
import Button from '@material-ui/core/Button'
import Dialog from '@material-ui/core/Dialog'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-
import defaultIcon from 'assets/icons/visu/duelResult/default.svg'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import React, { useEffect, useState } from 'react'
import { importIconById } from 'utils/utils'
+import './duelEmptyValueModal.scss'
interface DuelEmptyValueModalProps {
open: boolean
diff --git a/src/components/Duel/DuelResultModal.tsx b/src/components/Duel/DuelResultModal.tsx
index b1b1d2808..0c99d1a3a 100644
--- a/src/components/Duel/DuelResultModal.tsx
+++ b/src/components/Duel/DuelResultModal.tsx
@@ -1,14 +1,13 @@
+import Button from '@material-ui/core/Button'
+import Dialog from '@material-ui/core/Dialog'
+import defaultIcon from 'assets/icons/visu/duelResult/default.svg'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Icon from 'cozy-ui/transpiled/react/Icon'
import { UserChallenge } from 'models/challenge.model'
import React, { useEffect, useState } from 'react'
import { formatNumberValues, importIconById } from 'utils/utils'
import './duelResultModal.scss'
-import Button from '@material-ui/core/Button'
-import Dialog from '@material-ui/core/Dialog'
-import defaultIcon from 'assets/icons/visu/duelResult/default.svg'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-
interface DuelResultModalProps {
open: boolean
userChallenge: UserChallenge
diff --git a/src/components/Duel/DuelUnlocked.tsx b/src/components/Duel/DuelUnlocked.tsx
index 328d791c8..3f58c2ac7 100644
--- a/src/components/Duel/DuelUnlocked.tsx
+++ b/src/components/Duel/DuelUnlocked.tsx
@@ -1,21 +1,20 @@
+import Button from '@material-ui/core/Button'
+import defaultDuelIcon from 'assets/icons/visu/challenge/CHALLENGE0001.svg'
+import defaultIcon from 'assets/icons/visu/duel/default.svg'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { UsageEventType } from 'enum/usageEvent.enum'
+import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
import { UserChallenge } from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import { useDispatch } from 'react-redux'
import ChallengeService from 'services/challenge.service'
+import UsageEventService from 'services/usageEvent.service'
import { setChallengeConsumption } from 'store/challenge/challenge.actions'
import { formatNumberValues, importIconById } from 'utils/utils'
import './duelUnlocked.scss'
-import Button from '@material-ui/core/Button'
-import defaultDuelIcon from 'assets/icons/visu/challenge/CHALLENGE0001.svg'
-import defaultIcon from 'assets/icons/visu/duel/default.svg'
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
-import UsageEventService from 'services/usageEvent.service'
-
interface DuelUnlockedProps {
userChallenge: UserChallenge
}
diff --git a/src/components/Duel/duelChart.scss b/src/components/Duel/duelChart.scss
index e44d6484f..459de5914 100644
--- a/src/components/Duel/duelChart.scss
+++ b/src/components/Duel/duelChart.scss
@@ -1,8 +1,7 @@
@import '../../styles/base/color';
@import '../../styles/base/breakpoint';
-
.chart-root {
margin-bottom: 1rem;
max-width: 400px;
-}
\ No newline at end of file
+}
diff --git a/src/components/Duel/duelEmptyValueModal.scss b/src/components/Duel/duelEmptyValueModal.scss
index aedd0ae58..e0b34f0ec 100644
--- a/src/components/Duel/duelEmptyValueModal.scss
+++ b/src/components/Duel/duelEmptyValueModal.scss
@@ -7,7 +7,7 @@
align-items: center;
padding: 1.5rem 0.5rem;
text-align: center;
- .modal-empty-value-title{
+ .modal-empty-value-title {
margin: 2rem 0 1rem;
}
@@ -18,4 +18,4 @@
#accessibility-title {
display: none;
-}
\ No newline at end of file
+}
diff --git a/src/components/Duel/lastDuelModal.spec.tsx b/src/components/Duel/lastDuelModal.spec.tsx
index 10c378316..4001dd478 100644
--- a/src/components/Duel/lastDuelModal.spec.tsx
+++ b/src/components/Duel/lastDuelModal.spec.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
import { mount } from 'enzyme'
+import React from 'react'
import { act } from 'react-dom/test-utils'
import LastDuelModal from './lastDuelModal'
diff --git a/src/components/Duel/lastDuelModal.tsx b/src/components/Duel/lastDuelModal.tsx
index 97ac7a1a5..00d2985a6 100644
--- a/src/components/Duel/lastDuelModal.tsx
+++ b/src/components/Duel/lastDuelModal.tsx
@@ -1,10 +1,10 @@
-import React from 'react'
-import './lastDuelModal.scss'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Dialog from '@material-ui/core/Dialog'
-import star from 'assets/icons/visu/duel/star.svg'
import CloseIcon from 'assets/icons/ico/close.svg'
+import star from 'assets/icons/visu/duel/star.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import React from 'react'
+import './lastDuelModal.scss'
interface LastDuelModalProps {
open: boolean
diff --git a/src/components/Ecogesture/EcogestureInitModal.tsx b/src/components/Ecogesture/EcogestureInitModal.tsx
index 3993af59e..38c4ab1cf 100644
--- a/src/components/Ecogesture/EcogestureInitModal.tsx
+++ b/src/components/Ecogesture/EcogestureInitModal.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
-import Dialog from '@material-ui/core/Dialog'
import { Button, IconButton } from '@material-ui/core'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Dialog from '@material-ui/core/Dialog'
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 React from 'react'
import './ecogestureInitModal.scss'
interface EcogestureInitModalProps {
open: boolean
diff --git a/src/components/Ecogesture/EcogestureList.spec.tsx b/src/components/Ecogesture/EcogestureList.spec.tsx
index e0ab6d225..ba1e99165 100644
--- a/src/components/Ecogesture/EcogestureList.spec.tsx
+++ b/src/components/Ecogesture/EcogestureList.spec.tsx
@@ -1,14 +1,14 @@
-import React from 'react'
-import { mount } from 'enzyme'
+import { Button, MenuItem } from '@material-ui/core'
import EcogestureList from 'components/Ecogesture/EcogestureList'
+import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
+import React from 'react'
import { Provider } from 'react-redux'
+import { BrowserRouter } from 'react-router-dom'
import configureStore from 'redux-mock-store'
import { challengeStateData } from '../../../tests/__mocks__/challengeStateData.mock'
-import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
import { ecogesturesData } from '../../../tests/__mocks__/ecogesturesData.mock'
-import { BrowserRouter } from 'react-router-dom'
-import { Button, MenuItem } from '@material-ui/core'
+import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
import { waitForComponentToPaint } from '../../../tests/__mocks__/testUtils'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/Ecogesture/EcogestureModal.tsx b/src/components/Ecogesture/EcogestureModal.tsx
index e6abd217f..419d616a7 100644
--- a/src/components/Ecogesture/EcogestureModal.tsx
+++ b/src/components/Ecogesture/EcogestureModal.tsx
@@ -1,22 +1,20 @@
+import Button from '@material-ui/core/Button'
+import Dialog from '@material-ui/core/Dialog'
+import IconButton from '@material-ui/core/IconButton'
+import CloseIcon from 'assets/icons/ico/close.svg'
+import defaultIcon from 'assets/icons/visu/ecogesture/default.svg'
import classNames from 'classnames'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import useExploration from 'components/Hooks/useExploration'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import { Ecogesture } from 'models'
import React, { useEffect, useState } from 'react'
import { useSelector } from 'react-redux'
import { AppStore } from 'store'
import { getPicto } from 'utils/picto'
import { importIconById } from 'utils/utils'
import './ecogestureModal.scss'
-
-import { Ecogesture } from 'models'
-
-import Button from '@material-ui/core/Button'
-import Dialog from '@material-ui/core/Dialog'
-import IconButton from '@material-ui/core/IconButton'
-import CloseIcon from 'assets/icons/ico/close.svg'
-import defaultIcon from 'assets/icons/visu/ecogesture/default.svg'
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import Icon from 'cozy-ui/transpiled/react/Icon'
import EfficientyRating from './EfficientyRating'
interface EcogestureModalProps {
diff --git a/src/components/Ecogesture/EcogestureReinitModal.tsx b/src/components/Ecogesture/EcogestureReinitModal.tsx
index cb6325857..15d9da6e9 100644
--- a/src/components/Ecogesture/EcogestureReinitModal.tsx
+++ b/src/components/Ecogesture/EcogestureReinitModal.tsx
@@ -1,11 +1,11 @@
-import React from 'react'
-import Dialog from '@material-ui/core/Dialog'
import { Button, IconButton } from '@material-ui/core'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Dialog from '@material-ui/core/Dialog'
import CloseIcon from 'assets/icons/ico/close.svg'
-import './ecogestureReinitModal.scss'
import warningIcon from 'assets/icons/ico/warn-orange.svg'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import React from 'react'
+import './ecogestureReinitModal.scss'
interface EcogestureReinitModalProps {
open: boolean
handleCloseClick: () => void
diff --git a/src/components/Ecogesture/EcogestureView.tsx b/src/components/Ecogesture/EcogestureView.tsx
index 412756216..910d6dd0d 100644
--- a/src/components/Ecogesture/EcogestureView.tsx
+++ b/src/components/Ecogesture/EcogestureView.tsx
@@ -135,7 +135,7 @@ const EcogestureView: React.FC = () => {
return (
<>
{t(`ecogesture.title_tab_${_tab}`)}
- <br></br>
+ <br />
{_tab === EcogestureStatus.OBJECTIVE &&
`(${objectiveEcogestureList.length})`}
{_tab === EcogestureStatus.DOING && `(${doingEcogestureList.length})`}
diff --git a/src/components/Ecogesture/EfficientyRating.spec.tsx b/src/components/Ecogesture/EfficientyRating.spec.tsx
index 6b28de379..9905357d1 100644
--- a/src/components/Ecogesture/EfficientyRating.spec.tsx
+++ b/src/components/Ecogesture/EfficientyRating.spec.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
-import { mount } from 'enzyme'
import EfficientyRating from 'components/Ecogesture/EfficientyRating'
+import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
+import React from 'react'
import { Provider } from 'react-redux'
import configureStore from 'redux-mock-store'
import { challengeStateData } from '../../../tests/__mocks__/challengeStateData.mock'
diff --git a/src/components/Ecogesture/EfficientyRating.tsx b/src/components/Ecogesture/EfficientyRating.tsx
index e9fa30bf3..caeb21a2d 100644
--- a/src/components/Ecogesture/EfficientyRating.tsx
+++ b/src/components/Ecogesture/EfficientyRating.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import thunderFilled from 'assets/icons/visu/thunderFilled.svg'
import thunderEmpty from 'assets/icons/visu/thunderEmpty.svg'
+import thunderFilled from 'assets/icons/visu/thunderFilled.svg'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import React from 'react'
interface EfficientyRatingProps {
result: number
diff --git a/src/components/EcogestureForm/EcogestureFormSingleChoice.spec.tsx b/src/components/EcogestureForm/EcogestureFormSingleChoice.spec.tsx
index daddf3c16..469666600 100644
--- a/src/components/EcogestureForm/EcogestureFormSingleChoice.spec.tsx
+++ b/src/components/EcogestureForm/EcogestureFormSingleChoice.spec.tsx
@@ -1,18 +1,17 @@
/* eslint-disable react/display-name */
+import { Button } from '@material-ui/core'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
import React from 'react'
import { Provider } from 'react-redux'
-import {
- createMockStore,
- mockInitialEcolyoState,
-} from '../../../tests/__mocks__/store'
-
-import { Button } from '@material-ui/core'
import {
mockEcogestureAnswer,
mockProfileEcogesture,
} from '../../../tests/__mocks__/profileEcogesture.mock'
+import {
+ createMockStore,
+ mockInitialEcolyoState,
+} from '../../../tests/__mocks__/store'
import { waitForComponentToPaint } from '../../../tests/__mocks__/testUtils'
import EcogestureFormSingleChoice from './EcogestureFormSingleChoice'
diff --git a/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx b/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
index eab64499c..8fa20fd7c 100644
--- a/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
+++ b/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
@@ -1,17 +1,17 @@
-import React, { useCallback, useEffect, useState } from 'react'
-import 'components/ProfileType/profileTypeForm.scss'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import classNames from 'classnames'
import FormNavigation from 'components/FormGlobal/FormNavigation'
+import 'components/ProfileType/profileTypeForm.scss'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { EcogestureStepForm } from 'enum/ecogestureForm.enum'
import {
ProfileEcogesture,
ProfileEcogestureAnswer,
ProfileEcogestureAnswerChoices,
} from 'models/profileEcogesture.model'
-import './ecogestureFormSingleChoice.scss'
+import React, { useCallback, useEffect, useState } from 'react'
import { useSelector } from 'react-redux'
import { AppStore } from 'store'
+import './ecogestureFormSingleChoice.scss'
interface EcogestureFormSingleChoiceProps {
step: EcogestureStepForm
viewedStep: EcogestureStepForm
diff --git a/src/components/EcogestureForm/EcogestureLaunchFormModal.spec.tsx b/src/components/EcogestureForm/EcogestureLaunchFormModal.spec.tsx
index c41160d25..6bd433f49 100644
--- a/src/components/EcogestureForm/EcogestureLaunchFormModal.spec.tsx
+++ b/src/components/EcogestureForm/EcogestureLaunchFormModal.spec.tsx
@@ -1,8 +1,8 @@
-import React from 'react'
+import { Button } from '@material-ui/core'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
+import React from 'react'
import EcogestureLaunchFormModal from './EcogestureLaunchFormModal'
-import { Button } from '@material-ui/core'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/EcogestureForm/EcogestureLaunchFormModal.tsx b/src/components/EcogestureForm/EcogestureLaunchFormModal.tsx
index 1a0ff36d5..8e93c619c 100644
--- a/src/components/EcogestureForm/EcogestureLaunchFormModal.tsx
+++ b/src/components/EcogestureForm/EcogestureLaunchFormModal.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
-import Dialog from '@material-ui/core/Dialog'
import { Button, IconButton } from '@material-ui/core'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Dialog from '@material-ui/core/Dialog'
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 React from 'react'
import './ecogestureLaunchFormModal.scss'
interface EcogestureLaunchFormModalProps {
diff --git a/src/components/EcogestureSelection/EcogestureSelectionModal.spec.tsx b/src/components/EcogestureSelection/EcogestureSelectionModal.spec.tsx
index 27b1073dd..26ab115f3 100644
--- a/src/components/EcogestureSelection/EcogestureSelectionModal.spec.tsx
+++ b/src/components/EcogestureSelection/EcogestureSelectionModal.spec.tsx
@@ -1,8 +1,8 @@
-import React from 'react'
+import { Button } from '@material-ui/core'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
+import React from 'react'
import EcogestureSelectionModal from './EcogestureSelectionModal'
-import { Button } from '@material-ui/core'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/EcogestureSelection/EcogestureSelectionModal.tsx b/src/components/EcogestureSelection/EcogestureSelectionModal.tsx
index 81990d9a4..644d448fd 100644
--- a/src/components/EcogestureSelection/EcogestureSelectionModal.tsx
+++ b/src/components/EcogestureSelection/EcogestureSelectionModal.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
-import Dialog from '@material-ui/core/Dialog'
import { Button, IconButton } from '@material-ui/core'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Dialog from '@material-ui/core/Dialog'
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 React from 'react'
import './ecogestureSelectionModal.scss'
interface EcogestureSelectionModalProps {
diff --git a/src/components/Exploration/ExplorationOngoing.tsx b/src/components/Exploration/ExplorationOngoing.tsx
index 9bb2aaf23..640514c1d 100644
--- a/src/components/Exploration/ExplorationOngoing.tsx
+++ b/src/components/Exploration/ExplorationOngoing.tsx
@@ -1,13 +1,9 @@
-import { Client, useClient } from 'cozy-client'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import React, { useCallback } from 'react'
-import { useDispatch } from 'react-redux'
-import './explorationOngoing.scss'
-
import Button from '@material-ui/core/Button'
import explorationIcon from 'assets/icons/visu/exploration/shield.svg'
import StarsContainer from 'components/Challenge/StarsContainer'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import { Client, useClient } from 'cozy-client'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { UsageEventType } from 'enum/usageEvent.enum'
import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
import {
@@ -15,10 +11,13 @@ import {
UserExplorationType,
} from 'enum/userExploration.enum'
import { UserChallenge } from 'models'
+import React, { useCallback } from 'react'
+import { useDispatch } from 'react-redux'
import { useNavigate } from 'react-router-dom'
import ChallengeService from 'services/challenge.service'
import UsageEventService from 'services/usageEvent.service'
import { updateUserChallengeList } from 'store/challenge/challenge.actions'
+import './explorationOngoing.scss'
interface ExplorationOngoingProps {
userChallenge: UserChallenge
diff --git a/src/components/Exploration/ExplorationView.spec.tsx b/src/components/Exploration/ExplorationView.spec.tsx
index 8852f059e..90cfc6c0a 100644
--- a/src/components/Exploration/ExplorationView.spec.tsx
+++ b/src/components/Exploration/ExplorationView.spec.tsx
@@ -1,13 +1,13 @@
-import React from 'react'
+import { UserExplorationState } from 'enum/userExploration.enum'
import { shallow } from 'enzyme'
+import React from 'react'
import * as reactRedux from 'react-redux'
-import ExplorationView from './ExplorationView'
-import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
import { challengeStateData } from '../../../tests/__mocks__/challengeStateData.mock'
-import ExplorationFinished from './ExplorationFinished'
+import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
import ExplorationError from './ExplorationError'
+import ExplorationFinished from './ExplorationFinished'
import ExplorationOngoing from './ExplorationOngoing'
-import { UserExplorationState } from 'enum/userExploration.enum'
+import ExplorationView from './ExplorationView'
jest.mock('components/Header/CozyBar', () => 'mock-cozybar')
jest.mock('components/Header/Header', () => 'mock-header')
diff --git a/src/components/Export/exportDoneModal.spec.tsx b/src/components/Export/exportDoneModal.spec.tsx
index 3cedb4649..9f1bb65ad 100644
--- a/src/components/Export/exportDoneModal.spec.tsx
+++ b/src/components/Export/exportDoneModal.spec.tsx
@@ -1,13 +1,13 @@
-import React from 'react'
-import { Provider } from 'react-redux'
+import { Button } from '@material-ui/core'
+import ExportDoneModal from 'components/Export/exportDoneModal'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
+import React from 'react'
+import { Provider } from 'react-redux'
import {
createMockStore,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
-import { Button } from '@material-ui/core'
-import ExportDoneModal from 'components/Export/exportDoneModal'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Export/exportDoneModal.tsx b/src/components/Export/exportDoneModal.tsx
index 6de9ff9ce..ea3bd2bf2 100644
--- a/src/components/Export/exportDoneModal.tsx
+++ b/src/components/Export/exportDoneModal.tsx
@@ -1,12 +1,12 @@
-import React from 'react'
-import './exportDoneModal.scss'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { Button, IconButton } from '@material-ui/core'
import Dialog from '@material-ui/core/Dialog'
import CloseIcon from 'assets/icons/ico/close.svg'
-import { Button, IconButton } from '@material-ui/core'
-import Icon from 'cozy-ui/transpiled/react/Icon'
import exportDone from 'assets/icons/ico/exportDone.svg'
import warnCross from 'assets/icons/ico/warn-cross.svg'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import React from 'react'
+import './exportDoneModal.scss'
interface ExportDoneModalProps {
open: boolean
diff --git a/src/components/Export/exportLoadingModal.spec.tsx b/src/components/Export/exportLoadingModal.spec.tsx
index 904424ba6..c016d8938 100644
--- a/src/components/Export/exportLoadingModal.spec.tsx
+++ b/src/components/Export/exportLoadingModal.spec.tsx
@@ -1,13 +1,13 @@
-import React from 'react'
-import { Provider } from 'react-redux'
+import { Button } from '@material-ui/core'
+import ExportLoadingModal from 'components/Export/exportLoadingModal'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
+import React from 'react'
+import { Provider } from 'react-redux'
import {
createMockStore,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
-import { Button } from '@material-ui/core'
-import ExportLoadingModal from 'components/Export/exportLoadingModal'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Export/exportStartModal.spec.tsx b/src/components/Export/exportStartModal.spec.tsx
index c6cd58838..8e5fd37bd 100644
--- a/src/components/Export/exportStartModal.spec.tsx
+++ b/src/components/Export/exportStartModal.spec.tsx
@@ -1,13 +1,13 @@
-import React from 'react'
-import { Provider } from 'react-redux'
+import { Button } from '@material-ui/core'
+import ExportStartModal from 'components/Export/exportStartModal'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
+import React from 'react'
+import { Provider } from 'react-redux'
import {
createMockStore,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
-import { Button } from '@material-ui/core'
-import ExportStartModal from 'components/Export/exportStartModal'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Export/exportStartModal.tsx b/src/components/Export/exportStartModal.tsx
index 58fd7a595..ef7784cf8 100644
--- a/src/components/Export/exportStartModal.tsx
+++ b/src/components/Export/exportStartModal.tsx
@@ -1,11 +1,11 @@
-import React from 'react'
-import './exportStartModal.scss'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { Button, IconButton } from '@material-ui/core'
import Dialog from '@material-ui/core/Dialog'
import CloseIcon from 'assets/icons/ico/close.svg'
-import { Button, IconButton } from '@material-ui/core'
-import Icon from 'cozy-ui/transpiled/react/Icon'
import download from 'assets/icons/ico/download.svg'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import React from 'react'
+import './exportStartModal.scss'
interface ExportStartModalProps {
open: boolean
diff --git a/src/components/Feedback/FeedbackModal.spec.tsx b/src/components/Feedback/FeedbackModal.spec.tsx
index 93bbd7f61..b54a2f9fc 100644
--- a/src/components/Feedback/FeedbackModal.spec.tsx
+++ b/src/components/Feedback/FeedbackModal.spec.tsx
@@ -1,15 +1,15 @@
+import FeedbackModal from 'components/Feedback/FeedbackModal'
+import { mount } from 'enzyme'
import React from 'react'
-import { BrowserRouter } from 'react-router-dom'
+import { act } from 'react-dom/test-utils'
import * as reactRedux from 'react-redux'
import { Provider } from 'react-redux'
-import { mount } from 'enzyme'
-import FeedbackModal from 'components/Feedback/FeedbackModal'
-import { userChallengeExplo1OnGoing } from '../../../tests/__mocks__/userChallengeData.mock'
+import { BrowserRouter } from 'react-router-dom'
import {
createMockStore,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
-import { act } from 'react-dom/test-utils'
+import { userChallengeExplo1OnGoing } from '../../../tests/__mocks__/userChallengeData.mock'
// Value coming from jest.config
declare let __SAU_LINK__: string
diff --git a/src/components/FluidChart/FluidChartSwipe.tsx b/src/components/FluidChart/FluidChartSwipe.tsx
index 246291866..c453578d4 100644
--- a/src/components/FluidChart/FluidChartSwipe.tsx
+++ b/src/components/FluidChart/FluidChartSwipe.tsx
@@ -1,15 +1,14 @@
-import React, { useState, useEffect, useRef } from 'react'
-import './fluidChartSwipe.scss'
+import FluidChartSlide from 'components/FluidChart/FluidChartSlide'
+import { FluidType } from 'enum/fluid.enum'
+import { DateTime } from 'luxon'
+import React, { useEffect, useRef, useState } from 'react'
import { useDispatch, useSelector } from 'react-redux'
-import { AppStore } from 'store'
-import { setCurrentIndex, setSelectedDate } from 'store/chart/chart.actions'
import SwipeableViews from 'react-swipeable-views'
import { virtualize } from 'react-swipeable-views-utils'
-import { DateTime } from 'luxon'
-
-import { FluidType } from 'enum/fluid.enum'
-import FluidChartSlide from 'components/FluidChart/FluidChartSlide'
import DateChartService from 'services/dateChart.service'
+import { AppStore } from 'store'
+import { setCurrentIndex, setSelectedDate } from 'store/chart/chart.actions'
+import './fluidChartSwipe.scss'
const VirtualizeSwipeableViews = virtualize(SwipeableViews)
diff --git a/src/components/FormGlobal/FormProgress.tsx b/src/components/FormGlobal/FormProgress.tsx
index b371ef2ae..0d3944d01 100644
--- a/src/components/FormGlobal/FormProgress.tsx
+++ b/src/components/FormGlobal/FormProgress.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
import 'components/FormGlobal/formProgress.scss'
import { ProfileTypeStepForm } from 'enum/profileType.enum'
import { SgeStep } from 'enum/sgeStep.enum'
+import React from 'react'
interface FormProgressProps {
step: ProfileTypeStepForm | SgeStep
diff --git a/src/components/GCU/GCUContent.spec.tsx b/src/components/GCU/GCUContent.spec.tsx
index 7b79865de..8ec51c9d6 100644
--- a/src/components/GCU/GCUContent.spec.tsx
+++ b/src/components/GCU/GCUContent.spec.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
-import { shallow } from 'enzyme'
import GCUContent from 'components/GCU/GCUContent'
+import { shallow } from 'enzyme'
+import React from 'react'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/GCU/GCULink.spec.tsx b/src/components/GCU/GCULink.spec.tsx
index 589886065..4c42fea3f 100644
--- a/src/components/GCU/GCULink.spec.tsx
+++ b/src/components/GCU/GCULink.spec.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
-import { shallow } from 'enzyme'
import LegalNoticeLink from 'components/LegalNotice/LegalNoticeLink'
+import { shallow } from 'enzyme'
+import React from 'react'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/GCU/GCUView.spec.tsx b/src/components/GCU/GCUView.spec.tsx
index 6ede9dbdc..d548f1340 100644
--- a/src/components/GCU/GCUView.spec.tsx
+++ b/src/components/GCU/GCUView.spec.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
-import { shallow } from 'enzyme'
import GCUView from 'components/GCU/GCUView'
+import { shallow } from 'enzyme'
+import React from 'react'
jest.mock('components/Header/CozyBar', () => 'mock-cozybar')
jest.mock('components/Header/Header', () => 'mock-header')
diff --git a/src/components/HalfHourNoData/HalfHourNoData.spec.tsx b/src/components/HalfHourNoData/HalfHourNoData.spec.tsx
index 84275d83b..ff7c1481a 100644
--- a/src/components/HalfHourNoData/HalfHourNoData.spec.tsx
+++ b/src/components/HalfHourNoData/HalfHourNoData.spec.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
import { mount } from 'enzyme'
+import React from 'react'
import HalfHourNoData from './HalfHourNoData'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/HalfHourNoData/HalfHourNoData.tsx b/src/components/HalfHourNoData/HalfHourNoData.tsx
index 183460841..c09210310 100644
--- a/src/components/HalfHourNoData/HalfHourNoData.tsx
+++ b/src/components/HalfHourNoData/HalfHourNoData.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
import { IuseI18n, useI18n } from 'cozy-ui/transpiled/react/I18n'
+import React from 'react'
import './halfHourNoData.scss'
const HalfHourNoData = () => {
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index b412c34a4..7cdf129ee 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -1,16 +1,15 @@
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import React, { useCallback, useEffect, useRef } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-import { AppStore } from 'store'
-import { updateModalIsFeedbacksOpen } from 'store/modal/modal.actions'
-import './header.scss'
-
import IconButton from '@material-ui/core/IconButton'
import BackArrowIcon from 'assets/icons/ico/back-arrow.svg'
import FeedbackIcon from 'assets/icons/ico/feedback.svg'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
import { ScreenType } from 'enum/screen.enum'
+import React, { useCallback, useEffect, useRef } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
import { useNavigate } from 'react-router-dom'
+import { AppStore } from 'store'
+import { updateModalIsFeedbacksOpen } from 'store/modal/modal.actions'
+import './header.scss'
interface HeaderProps {
/** translation key used as t('key.value') */
diff --git a/src/components/Home/ConsumptionDetails.spec.tsx b/src/components/Home/ConsumptionDetails.spec.tsx
index 9bf79a134..cdccdd975 100644
--- a/src/components/Home/ConsumptionDetails.spec.tsx
+++ b/src/components/Home/ConsumptionDetails.spec.tsx
@@ -1,17 +1,17 @@
-import React from 'react'
+import { FluidType } from 'enum/fluid.enum'
+import { TimeStep } from 'enum/timeStep.enum'
import { mount } from 'enzyme'
-import ConsumptionDetails from './ConsumptionDetails'
+import React from 'react'
import * as reactRedux from 'react-redux'
-import { TimeStep } from 'enum/timeStep.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { Provider } from 'react-redux'
+import { BrowserRouter } from 'react-router-dom'
import {
createMockStore,
mockInitialChartState,
mockInitialEcolyoState,
mockInitialGlobalState,
} from '../../../tests/__mocks__/store'
-import { Provider } from 'react-redux'
-import { BrowserRouter } from 'react-router-dom'
+import ConsumptionDetails from './ConsumptionDetails'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Home/ConsumptionDetails.tsx b/src/components/Home/ConsumptionDetails.tsx
index 5fdd7c022..c61846e7e 100644
--- a/src/components/Home/ConsumptionDetails.tsx
+++ b/src/components/Home/ConsumptionDetails.tsx
@@ -1,10 +1,10 @@
+import TotalConsumption from 'components/TotalConsumption/TotalConsumption'
+import { FluidType } from 'enum/fluid.enum'
import React from 'react'
import { useSelector } from 'react-redux'
import { AppStore } from 'store'
import { convertDateToShortDateString } from 'utils/date'
import './consumptionDetails.scss'
-import TotalConsumption from 'components/TotalConsumption/TotalConsumption'
-import { FluidType } from 'enum/fluid.enum'
interface ConsumptionDetailsProps {
fluidType: FluidType
}
diff --git a/src/components/Home/FluidButton.spec.tsx b/src/components/Home/FluidButton.spec.tsx
index e7cdc22c7..84a928dcd 100644
--- a/src/components/Home/FluidButton.spec.tsx
+++ b/src/components/Home/FluidButton.spec.tsx
@@ -1,16 +1,15 @@
+import { FluidState, FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
+import { GlobalState } from 'models'
import React from 'react'
import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
+import UsageEventService from 'services/usageEvent.service'
import {
createMockStore,
mockInitialEcolyoState,
mockInitialGlobalState,
} from '../../../tests/__mocks__/store'
-
-import { FluidState, FluidType } from 'enum/fluid.enum'
-import { GlobalState } from 'models'
-import configureStore from 'redux-mock-store'
-import UsageEventService from 'services/usageEvent.service'
import FluidButton from './FluidButton'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/Home/FluidButton.tsx b/src/components/Home/FluidButton.tsx
index 9d24a0d2b..2579140a8 100644
--- a/src/components/Home/FluidButton.tsx
+++ b/src/components/Home/FluidButton.tsx
@@ -1,12 +1,11 @@
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import React, { useCallback, useEffect, useState } from 'react'
-
import ErrorNotif from 'assets/icons/ico/notif_error.svg'
import PartnerIssueNotif from 'assets/icons/ico/notif_maintenance.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useClient } from 'cozy-client'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { FluidState, FluidType } from 'enum/fluid.enum'
import { UsageEventType } from 'enum/usageEvent.enum'
+import React, { useCallback, useEffect, useState } from 'react'
import { useSelector } from 'react-redux'
import { useNavigate } from 'react-router-dom'
import DateChartService from 'services/dateChart.service'
diff --git a/src/components/Home/FluidButtons.spec.tsx b/src/components/Home/FluidButtons.spec.tsx
index 9a1c8df02..4af5a9d40 100644
--- a/src/components/Home/FluidButtons.spec.tsx
+++ b/src/components/Home/FluidButtons.spec.tsx
@@ -1,3 +1,4 @@
+import { FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
import React from 'react'
import { Provider } from 'react-redux'
@@ -5,8 +6,6 @@ import {
createMockStore,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
-
-import { FluidType } from 'enum/fluid.enum'
import FluidButtons from './FluidButtons'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/Home/FluidButtons.tsx b/src/components/Home/FluidButtons.tsx
index 2eb74c577..bb70374f3 100644
--- a/src/components/Home/FluidButtons.tsx
+++ b/src/components/Home/FluidButtons.tsx
@@ -1,6 +1,5 @@
-import React from 'react'
-
import { FluidType } from 'enum/fluid.enum'
+import React from 'react'
import FluidButton from './FluidButton'
import './fluidButtons.scss'
diff --git a/src/components/Hooks/useExploration.spec.tsx b/src/components/Hooks/useExploration.spec.tsx
index 13d4e02e9..8124169d7 100644
--- a/src/components/Hooks/useExploration.spec.tsx
+++ b/src/components/Hooks/useExploration.spec.tsx
@@ -1,7 +1,7 @@
-import * as reactRedux from 'react-redux'
-import { renderHook, act } from '@testing-library/react-hooks'
+import { act, renderHook } from '@testing-library/react-hooks'
import useExploration from 'components/Hooks/useExploration'
import { UserExplorationID } from 'enum/userExploration.enum'
+import * as reactRedux from 'react-redux'
import { userChallengeExplo1OnGoing } from '../../../tests/__mocks__/userChallengeData.mock'
const dispatchMock = jest.fn()
diff --git a/src/components/Hooks/useExploration.tsx b/src/components/Hooks/useExploration.tsx
index eac9ba9bc..d0696c782 100644
--- a/src/components/Hooks/useExploration.tsx
+++ b/src/components/Hooks/useExploration.tsx
@@ -1,11 +1,11 @@
-import { useState, useEffect, Dispatch, SetStateAction } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
import { Client, useClient } from 'cozy-client'
+import { UserExplorationState } from 'enum/userExploration.enum'
import { ChallengeState, UserExploration } from 'models'
-import { AppStore } from 'store'
+import { Dispatch, SetStateAction, useEffect, useState } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
import ExplorationService from 'services/exploration.service'
+import { AppStore } from 'store'
import { updateUserChallengeList } from 'store/challenge/challenge.actions'
-import { UserExplorationState } from 'enum/userExploration.enum'
import { toggleChallengeExplorationNotification } from 'store/global/global.actions'
const useExploration = (): [string, Dispatch<SetStateAction<string>>] => {
diff --git a/src/components/Hooks/useUserInstanceSettings.tsx b/src/components/Hooks/useUserInstanceSettings.tsx
index 00390b76c..35671df86 100644
--- a/src/components/Hooks/useUserInstanceSettings.tsx
+++ b/src/components/Hooks/useUserInstanceSettings.tsx
@@ -1,7 +1,7 @@
-import { useState, useEffect } from 'react'
-import get from 'lodash/get'
import { useClient } from 'cozy-client'
+import get from 'lodash/get'
import { UserInstanceSettings, UserInstanceSettingsAttributes } from 'models'
+import { useEffect, useState } from 'react'
const useUserInstanceSettings = (): UserInstanceSettings => {
const client = useClient()
diff --git a/src/components/Konnector/KonnectorModal.spec.tsx b/src/components/Konnector/KonnectorModal.spec.tsx
index d10e41da6..1a185072e 100644
--- a/src/components/Konnector/KonnectorModal.spec.tsx
+++ b/src/components/Konnector/KonnectorModal.spec.tsx
@@ -1,15 +1,14 @@
+import { Button } from '@material-ui/core'
+import { FluidType } from 'enum/fluid.enum'
+import { KonnectorError } from 'enum/konnectorError.enum'
import { mount } from 'enzyme'
+import toJson from 'enzyme-to-json'
import React from 'react'
import { Provider } from 'react-redux'
import {
createMockStore,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
-
-import { Button } from '@material-ui/core'
-import { FluidType } from 'enum/fluid.enum'
-import { KonnectorError } from 'enum/konnectorError.enum'
-import toJson from 'enzyme-to-json'
import { waitForComponentToPaint } from '../../../tests/__mocks__/testUtils'
import KonnectorModal from './KonnectorModal'
diff --git a/src/components/LegalNotice/LegalNoticeContent.spec.tsx b/src/components/LegalNotice/LegalNoticeContent.spec.tsx
index c0aec7539..e149a7c43 100644
--- a/src/components/LegalNotice/LegalNoticeContent.spec.tsx
+++ b/src/components/LegalNotice/LegalNoticeContent.spec.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
-import { shallow } from 'enzyme'
import LegalNoticeContent from 'components/LegalNotice/LegalNoticeContent'
+import { shallow } from 'enzyme'
+import React from 'react'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/LegalNotice/LegalNoticeLink.spec.tsx b/src/components/LegalNotice/LegalNoticeLink.spec.tsx
index 9302b6be3..1a8ca9b8a 100644
--- a/src/components/LegalNotice/LegalNoticeLink.spec.tsx
+++ b/src/components/LegalNotice/LegalNoticeLink.spec.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
-import { shallow } from 'enzyme'
import GCULink from 'components/GCU/GCULink'
+import { shallow } from 'enzyme'
+import React from 'react'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/LegalNotice/LegalNoticeView.spec.tsx b/src/components/LegalNotice/LegalNoticeView.spec.tsx
index 2c3c35247..8495f6616 100644
--- a/src/components/LegalNotice/LegalNoticeView.spec.tsx
+++ b/src/components/LegalNotice/LegalNoticeView.spec.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
-import { shallow } from 'enzyme'
import LegalNoticeView from 'components/LegalNotice/LegalNoticeView'
+import { shallow } from 'enzyme'
+import React from 'react'
jest.mock('components/Header/CozyBar', () => 'mock-cozybar')
jest.mock('components/Header/Header', () => 'mock-header')
diff --git a/src/components/Navbar/Navbar.spec.tsx b/src/components/Navbar/Navbar.spec.tsx
index 07be998ff..e9a446415 100644
--- a/src/components/Navbar/Navbar.spec.tsx
+++ b/src/components/Navbar/Navbar.spec.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
+import Navbar from 'components/Navbar/Navbar'
import { mount } from 'enzyme'
-import { BrowserRouter } from 'react-router-dom'
+import React from 'react'
import { Provider } from 'react-redux'
+import { BrowserRouter } from 'react-router-dom'
import configureStore from 'redux-mock-store'
-import Navbar from 'components/Navbar/Navbar'
import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/Options/MatomoOptOut/MatomoOptOut.spec.tsx b/src/components/Options/MatomoOptOut/MatomoOptOut.spec.tsx
index 69296c020..c74c68c3b 100644
--- a/src/components/Options/MatomoOptOut/MatomoOptOut.spec.tsx
+++ b/src/components/Options/MatomoOptOut/MatomoOptOut.spec.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
import { shallow } from 'enzyme'
+import React from 'react'
import MatomoOptOut from './MatomoOptOut'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/Options/MatomoOptOut/MatomoOptOut.tsx b/src/components/Options/MatomoOptOut/MatomoOptOut.tsx
index 127642014..04bf32516 100644
--- a/src/components/Options/MatomoOptOut/MatomoOptOut.tsx
+++ b/src/components/Options/MatomoOptOut/MatomoOptOut.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import React from 'react'
import './matomoOptOut.scss'
declare let __PIWIK_TRACKER_URL__: string
diff --git a/src/components/Options/OptionsView.spec.tsx b/src/components/Options/OptionsView.spec.tsx
index 0f2f73c8d..d0a1f04c6 100644
--- a/src/components/Options/OptionsView.spec.tsx
+++ b/src/components/Options/OptionsView.spec.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
-import { shallow } from 'enzyme'
import OptionsView from 'components/Options/OptionsView'
+import { shallow } from 'enzyme'
+import React from 'react'
jest.mock('components/Header/CozyBar', () => 'mock-cozybar')
jest.mock('components/Header/Header', () => 'mock-header')
diff --git a/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx b/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx
index f95840170..b43d907b8 100644
--- a/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx
+++ b/src/components/Options/ProfileTypeOptions/ProfileTypeOptions.tsx
@@ -1,30 +1,29 @@
-import Button from '@material-ui/core/Button'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { FluidType } from 'enum/fluid.enum'
-import {
- HousingType,
- IndividualOrCollective,
- OutsideFacingWalls,
- ThreeChoicesAnswer,
-} from 'enum/profileType.enum'
-import React, { useCallback, useState } from 'react'
-import { useSelector } from 'react-redux'
-import { AppStore } from 'store'
-import './profileTypeOptions.scss'
-
import {
Accordion,
AccordionDetails,
AccordionSummary,
} from '@material-ui/core'
+import Button from '@material-ui/core/Button'
import chevronDown from 'assets/icons/ico/chevron-down.svg'
import profileIcon from 'assets/icons/ico/profile.svg'
import StyledCard from 'components/CommonKit/Card/StyledCard'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import useExploration from 'components/Hooks/useExploration'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
+import { FluidType } from 'enum/fluid.enum'
+import {
+ HousingType,
+ IndividualOrCollective,
+ OutsideFacingWalls,
+ ThreeChoicesAnswer,
+} from 'enum/profileType.enum'
import { UserExplorationID } from 'enum/userExploration.enum'
+import React, { useCallback, useState } from 'react'
+import { useSelector } from 'react-redux'
import { useNavigate } from 'react-router-dom'
+import { AppStore } from 'store'
+import './profileTypeOptions.scss'
const ProfileTypeOptions: React.FC = () => {
const profile = useSelector((state: AppStore) => state.ecolyo.profile)
diff --git a/src/components/Options/ReportOptions/ReportOptions.spec.tsx b/src/components/Options/ReportOptions/ReportOptions.spec.tsx
index a31d03958..385447bfb 100644
--- a/src/components/Options/ReportOptions/ReportOptions.spec.tsx
+++ b/src/components/Options/ReportOptions/ReportOptions.spec.tsx
@@ -1,15 +1,15 @@
-import React from 'react'
+import { Button } from '@material-ui/core'
+import StyledSwitch from 'components/CommonKit/Switch/StyledSwitch'
+import ReportOptions from 'components/Options/ReportOptions/ReportOptions'
+import { FluidState, FluidType } from 'enum/fluid.enum'
import { mount } from 'enzyme'
+import React from 'react'
import { Provider } from 'react-redux'
-import ReportOptions from 'components/Options/ReportOptions/ReportOptions'
+import * as profileActions from 'store/profile/profile.actions'
import {
createMockStore,
mockInitialEcolyoState,
} from '../../../../tests/__mocks__/store'
-import * as profileActions from 'store/profile/profile.actions'
-import { Button } from '@material-ui/core'
-import StyledSwitch from 'components/CommonKit/Switch/StyledSwitch'
-import { FluidState, FluidType } from 'enum/fluid.enum'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Options/ReportOptions/ReportOptions.tsx b/src/components/Options/ReportOptions/ReportOptions.tsx
index 04a5d172e..242cd4906 100644
--- a/src/components/Options/ReportOptions/ReportOptions.tsx
+++ b/src/components/Options/ReportOptions/ReportOptions.tsx
@@ -1,17 +1,17 @@
-import React, { useCallback, useEffect, useState } from 'react'
-import './reportOptions.scss'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { useSelector, useDispatch } from 'react-redux'
-import { AppStore } from 'store'
-import { useClient } from 'cozy-client'
-import { updateProfile } from 'store/profile/profile.actions'
import { Button } from '@material-ui/core'
import StyledSwitch from 'components/CommonKit/Switch/StyledSwitch'
-import ConsumptionDataManager from 'services/consumption.service'
+import { useClient } from 'cozy-client'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { FluidState, FluidType } from 'enum/fluid.enum'
+import { TimeStep } from 'enum/timeStep.enum'
import { DateTime } from 'luxon'
import { Dataload, TimePeriod } from 'models'
-import { TimeStep } from 'enum/timeStep.enum'
-import { FluidState, FluidType } from 'enum/fluid.enum'
+import React, { useCallback, useEffect, useState } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+import ConsumptionDataManager from 'services/consumption.service'
+import { AppStore } from 'store'
+import { updateProfile } from 'store/profile/profile.actions'
+import './reportOptions.scss'
const ReportOptions: React.FC = () => {
const { t } = useI18n()
diff --git a/src/components/PerformanceIndicator/FluidPerformanceIndicator.tsx b/src/components/PerformanceIndicator/FluidPerformanceIndicator.tsx
index 9e94a5065..9d27584ff 100644
--- a/src/components/PerformanceIndicator/FluidPerformanceIndicator.tsx
+++ b/src/components/PerformanceIndicator/FluidPerformanceIndicator.tsx
@@ -1,13 +1,12 @@
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { DateTime } from 'luxon'
-import React from 'react'
-import './fluidPerformanceIndicator.scss'
-
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { FluidType } from 'enum/fluid.enum'
+import { DateTime } from 'luxon'
import { PerformanceIndicator } from 'models'
+import React from 'react'
import { getPicto } from 'utils/picto'
import { formatNumberValues, getPreviousMonthName } from 'utils/utils'
+import './fluidPerformanceIndicator.scss'
interface FluidPerformanceIndicatorProps {
performanceIndicator: PerformanceIndicator
diff --git a/src/components/PerformanceIndicator/PerformanceIndicatorContent.tsx b/src/components/PerformanceIndicator/PerformanceIndicatorContent.tsx
index d4bf98789..afe099db8 100644
--- a/src/components/PerformanceIndicator/PerformanceIndicatorContent.tsx
+++ b/src/components/PerformanceIndicator/PerformanceIndicatorContent.tsx
@@ -1,21 +1,18 @@
-import React from 'react'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-
-import { TimeStep } from 'enum/timeStep.enum'
-import { PerformanceIndicator } from 'models'
-import { formatNumberValues } from 'utils/utils'
-
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import PileIcon from 'assets/icons/ico/coins.svg'
-
+import ErrorIndicatorIcon from 'assets/icons/visu/indicator/error.svg'
import GreenIndicatorIcon from 'assets/icons/visu/indicator/green.svg'
-import RedIndicatorIcon from 'assets/icons/visu/indicator/red.svg'
import GreyIndicatorIcon from 'assets/icons/visu/indicator/grey.svg'
-import ErrorIndicatorIcon from 'assets/icons/visu/indicator/error.svg'
+import RedIndicatorIcon from 'assets/icons/visu/indicator/red.svg'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { FluidType } from 'enum/fluid.enum'
-import './fluidPerformanceIndicator.scss'
-import { convertDateToMonthString } from 'utils/date'
+import { TimeStep } from 'enum/timeStep.enum'
import { DateTime } from 'luxon'
+import { PerformanceIndicator } from 'models'
+import React from 'react'
+import { convertDateToMonthString } from 'utils/date'
+import { formatNumberValues } from 'utils/utils'
+import './fluidPerformanceIndicator.scss'
interface PerformanceIndicatorContentProps {
performanceIndicator: PerformanceIndicator
diff --git a/src/components/ProfileType/ProfileTypeView.tsx b/src/components/ProfileType/ProfileTypeView.tsx
index f4f01a7f6..cfe2d0643 100644
--- a/src/components/ProfileType/ProfileTypeView.tsx
+++ b/src/components/ProfileType/ProfileTypeView.tsx
@@ -1,15 +1,13 @@
import Content from 'components/Content/Content'
+import EcogestureFormEquipment from 'components/EcogestureForm/EcogestureFormEquipment'
import CozyBar from 'components/Header/CozyBar'
import Header from 'components/Header/Header'
import ProfileTypeFinished from 'components/ProfileType/ProfileTypeFinished'
-import ProfileTypeFormSingleChoice from 'components/ProfileType/ProfileTypeFormSingleChoice'
-import 'components/ProfileType/profileTypeView.scss'
-import React, { useCallback, useEffect, useState } from 'react'
-
-import EcogestureFormEquipment from 'components/EcogestureForm/EcogestureFormEquipment'
import ProfileTypeFormMultiChoice from 'components/ProfileType/ProfileTypeFormMultiChoice'
import ProfileTypeFormNumber from 'components/ProfileType/ProfileTypeFormNumber'
import ProfileTypeFormNumberSelection from 'components/ProfileType/ProfileTypeFormNumberSelection'
+import ProfileTypeFormSingleChoice from 'components/ProfileType/ProfileTypeFormSingleChoice'
+import 'components/ProfileType/profileTypeView.scss'
import { FluidType } from 'enum/fluid.enum'
import {
ConstructionYear,
@@ -28,6 +26,7 @@ import {
import { DateTime } from 'luxon'
import { ProfileEcogesture } from 'models/profileEcogesture.model'
import { ProfileType, ProfileTypeAnswer } from 'models/profileType.model'
+import React, { useCallback, useEffect, useState } from 'react'
import { useSelector } from 'react-redux'
import ProfileTypeFormService from 'services/profileTypeForm.service'
import { AppStore } from 'store'
diff --git a/src/components/Quiz/QuizBegin.spec.tsx b/src/components/Quiz/QuizBegin.spec.tsx
index 87db1ca28..153207462 100644
--- a/src/components/Quiz/QuizBegin.spec.tsx
+++ b/src/components/Quiz/QuizBegin.spec.tsx
@@ -1,13 +1,13 @@
-import React from 'react'
+import Button from '@material-ui/core/Button'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
import { mount } from 'enzyme'
+import React from 'react'
import { Provider } from 'react-redux'
import configureStore from 'redux-mock-store'
-import QuizBegin from './QuizBegin'
import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
-import Button from '@material-ui/core/Button'
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import QuizBegin from './QuizBegin'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Quiz/QuizBegin.tsx b/src/components/Quiz/QuizBegin.tsx
index c543f5809..192680150 100644
--- a/src/components/Quiz/QuizBegin.tsx
+++ b/src/components/Quiz/QuizBegin.tsx
@@ -1,16 +1,16 @@
-import React from 'react'
-import './quizBegin.scss'
-import { Client, useClient } from 'cozy-client'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import quizIcon from 'assets/icons/visu/quiz/questionMark.svg'
import Button from '@material-ui/core/Button'
+import quizIcon from 'assets/icons/visu/quiz/questionMark.svg'
+import StarsContainer from 'components/Challenge/StarsContainer'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import { useDispatch } from 'react-redux'
+import { Client, useClient } from 'cozy-client'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
+import { UserChallenge } from 'models'
+import React from 'react'
+import { useDispatch } from 'react-redux'
import ChallengeService from 'services/challenge.service'
import { updateUserChallengeList } from 'store/challenge/challenge.actions'
-import { UserChallenge } from 'models'
-import StarsContainer from 'components/Challenge/StarsContainer'
+import './quizBegin.scss'
interface QuizBeginProps {
userChallenge: UserChallenge
diff --git a/src/components/Quiz/QuizExplanationModal.tsx b/src/components/Quiz/QuizExplanationModal.tsx
index 15ea75514..f11e26b73 100644
--- a/src/components/Quiz/QuizExplanationModal.tsx
+++ b/src/components/Quiz/QuizExplanationModal.tsx
@@ -1,14 +1,12 @@
-import React, { useState, useEffect } from 'react'
-import './quizExplanationModal.scss'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { QuestionEntity } from 'models'
-
+import Button from '@material-ui/core/Button'
+import Dialog from '@material-ui/core/Dialog'
import correctAnswer from 'assets/icons/ico/correctAnswer.svg'
import wrongAnswer from 'assets/icons/ico/wrongAnswer.svg'
-
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import Icon from 'cozy-ui/transpiled/react/Icon'
-import Button from '@material-ui/core/Button'
-import Dialog from '@material-ui/core/Dialog'
+import { QuestionEntity } from 'models'
+import React, { useEffect, useState } from 'react'
+import './quizExplanationModal.scss'
interface QuizExplanationModalProps {
open: boolean
diff --git a/src/components/Quiz/QuizQuestionContent.tsx b/src/components/Quiz/QuizQuestionContent.tsx
index a8a79137d..d0e7588f2 100644
--- a/src/components/Quiz/QuizQuestionContent.tsx
+++ b/src/components/Quiz/QuizQuestionContent.tsx
@@ -1,17 +1,17 @@
-import React, { Dispatch, SetStateAction, useCallback, useState } from 'react'
-import './quizQuestion.scss'
+import Button from '@material-ui/core/Button'
import CloseIcon from 'assets/icons/ico/close.svg'
import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
-import Button from '@material-ui/core/Button'
import QuizExplanationModal from 'components/Quiz/QuizExplanationModal'
+import { Client, useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
import { Answer, UserChallenge, UserQuiz } from 'models'
+import React, { Dispatch, SetStateAction, useCallback, useState } from 'react'
+import { useDispatch } from 'react-redux'
import ChallengeService from 'services/challenge.service'
import QuizService from 'services/quiz.service'
-import { Client, useClient } from 'cozy-client'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
import { updateUserChallengeList } from 'store/challenge/challenge.actions'
-import { useDispatch } from 'react-redux'
+import './quizQuestion.scss'
interface QuizQuestionContent {
userChallenge: UserChallenge
diff --git a/src/components/Quiz/QuizView.spec.tsx b/src/components/Quiz/QuizView.spec.tsx
index fec5d9281..241cd54a9 100644
--- a/src/components/Quiz/QuizView.spec.tsx
+++ b/src/components/Quiz/QuizView.spec.tsx
@@ -1,13 +1,13 @@
-import React from 'react'
-import { shallow } from 'enzyme'
import QuizView from 'components/Quiz/QuizView'
-import * as reactRedux from 'react-redux'
import { UserQuizState } from 'enum/userQuiz.enum'
+import { shallow } from 'enzyme'
+import React from 'react'
+import * as reactRedux from 'react-redux'
import { challengeStateData } from '../../../tests/__mocks__/challengeStateData.mock'
import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
import QuizBegin from './QuizBegin'
-import QuizQuestion from './QuizQuestion'
import QuizFinish from './QuizFinish'
+import QuizQuestion from './QuizQuestion'
jest.mock('components/Header/CozyBar', () => 'mock-cozybar')
jest.mock('components/Header/Header', () => 'mock-header')
diff --git a/src/components/Splash/SplashRoot.spec.tsx b/src/components/Splash/SplashRoot.spec.tsx
index f6f548889..6cb1bdd7b 100644
--- a/src/components/Splash/SplashRoot.spec.tsx
+++ b/src/components/Splash/SplashRoot.spec.tsx
@@ -1,10 +1,9 @@
-import React from 'react'
import { mount } from 'enzyme'
-import SplashRoot from './SplashRoot'
-import * as reactRedux from 'react-redux'
import toJson from 'enzyme-to-json'
-
+import React from 'react'
+import * as reactRedux from 'react-redux'
import { userChallengeExplo1OnGoing } from '../../../tests/__mocks__/userChallengeData.mock'
+import SplashRoot from './SplashRoot'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Splash/SplashScreen.spec.tsx b/src/components/Splash/SplashScreen.spec.tsx
index 3b30e82a3..f84d63983 100644
--- a/src/components/Splash/SplashScreen.spec.tsx
+++ b/src/components/Splash/SplashScreen.spec.tsx
@@ -1,8 +1,8 @@
-import React from 'react'
import { mount } from 'enzyme'
-import SplashScreen from './SplashScreen'
import toJson from 'enzyme-to-json'
import { InitSteps } from 'models/initialisationSteps.model'
+import React from 'react'
+import SplashScreen from './SplashScreen'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Splash/SplashScreenError.spec.tsx b/src/components/Splash/SplashScreenError.spec.tsx
index 2d9af53b8..2c5fceffb 100644
--- a/src/components/Splash/SplashScreenError.spec.tsx
+++ b/src/components/Splash/SplashScreenError.spec.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
-import { mount } from 'enzyme'
-import SplashScreenError from './SplashScreenError'
import Button from '@material-ui/core/Button'
-import { InitStepsErrors } from 'models/initialisationSteps.model'
+import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
+import { InitStepsErrors } from 'models/initialisationSteps.model'
+import React from 'react'
+import SplashScreenError from './SplashScreenError'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Terms/CGUModal.spec.tsx b/src/components/Terms/CGUModal.spec.tsx
index bcac7e89c..154bfef85 100644
--- a/src/components/Terms/CGUModal.spec.tsx
+++ b/src/components/Terms/CGUModal.spec.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
import { mount } from 'enzyme'
-import CGUModal from './CGUModal'
import toJson from 'enzyme-to-json'
+import React from 'react'
+import CGUModal from './CGUModal'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Terms/CGUModal.tsx b/src/components/Terms/CGUModal.tsx
index 4c8fdbd4e..292c3eba0 100644
--- a/src/components/Terms/CGUModal.tsx
+++ b/src/components/Terms/CGUModal.tsx
@@ -1,11 +1,11 @@
+import { Button, IconButton } from '@material-ui/core'
+import Dialog from '@material-ui/core/Dialog'
+import CloseIcon from 'assets/icons/ico/close.svg'
import GCUContent from 'components/GCU/GCUContent'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Icon from 'cozy-ui/transpiled/react/Icon'
import React from 'react'
import './termsView.scss'
-import Dialog from '@material-ui/core/Dialog'
-import { Button, IconButton } from '@material-ui/core'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import CloseIcon from 'assets/icons/ico/close.svg'
interface CGUModalProps {
open: boolean
diff --git a/src/components/Terms/DataShareConsentContent.tsx b/src/components/Terms/DataShareConsentContent.tsx
index 95946d4ff..cb2308c8e 100644
--- a/src/components/Terms/DataShareConsentContent.tsx
+++ b/src/components/Terms/DataShareConsentContent.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import './termsView.scss'
+import React from 'react'
import { useSelector } from 'react-redux'
import { AppStore } from 'store'
import { decoreText } from 'utils/decoreText'
+import './termsView.scss'
const DataShareConsentContent: React.FC = () => {
const { t } = useI18n()
diff --git a/src/components/Terms/LegalNoticeModal.spec.tsx b/src/components/Terms/LegalNoticeModal.spec.tsx
index 788b2b8f4..daf575847 100644
--- a/src/components/Terms/LegalNoticeModal.spec.tsx
+++ b/src/components/Terms/LegalNoticeModal.spec.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
import { mount } from 'enzyme'
-import LegalNoticeModal from './LegalNoticeModal'
import toJson from 'enzyme-to-json'
+import React from 'react'
+import LegalNoticeModal from './LegalNoticeModal'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/Terms/LegalNoticeModal.tsx b/src/components/Terms/LegalNoticeModal.tsx
index db727e264..3811cf41d 100644
--- a/src/components/Terms/LegalNoticeModal.tsx
+++ b/src/components/Terms/LegalNoticeModal.tsx
@@ -1,11 +1,11 @@
-import React from 'react'
-import LegalNoticeContent from 'components/LegalNotice/LegalNoticeContent'
-import './termsView.scss'
-import Dialog from '@material-ui/core/Dialog'
import { Button, IconButton } from '@material-ui/core'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Dialog from '@material-ui/core/Dialog'
import CloseIcon from 'assets/icons/ico/close.svg'
+import LegalNoticeContent from 'components/LegalNotice/LegalNoticeContent'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import React from 'react'
+import './termsView.scss'
interface LegalNoticeModalProps {
open: boolean
diff --git a/src/components/Terms/MinorUpdateContent.spec.tsx b/src/components/Terms/MinorUpdateContent.spec.tsx
index 3ce0d5e38..54f3a9498 100644
--- a/src/components/Terms/MinorUpdateContent.spec.tsx
+++ b/src/components/Terms/MinorUpdateContent.spec.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
import { mount } from 'enzyme'
import toJson from 'enzyme-to-json'
+import React from 'react'
import MinorUpdateContent from './MinorUpdateContent'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/Terms/MinorUpdateContent.tsx b/src/components/Terms/MinorUpdateContent.tsx
index fcc7ca4c8..824cdfb09 100644
--- a/src/components/Terms/MinorUpdateContent.tsx
+++ b/src/components/Terms/MinorUpdateContent.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import React from 'react'
import './termsView.scss'
interface MinorUpdateContentProps {
diff --git a/src/components/TimeStepSelector/TimeStepSelector.spec.tsx b/src/components/TimeStepSelector/TimeStepSelector.spec.tsx
index 472e416ab..3903e80bc 100644
--- a/src/components/TimeStepSelector/TimeStepSelector.spec.tsx
+++ b/src/components/TimeStepSelector/TimeStepSelector.spec.tsx
@@ -1,18 +1,18 @@
-import React from 'react'
+import { Button } from '@material-ui/core'
+import TimeStepSelector from 'components/TimeStepSelector/TimeStepSelector'
+import { FluidType } from 'enum/fluid.enum'
+import { TimeStep } from 'enum/timeStep.enum'
import { mount } from 'enzyme'
-import { Provider } from 'react-redux'
+import { DateTime } from 'luxon'
+import React from 'react'
import * as reactRedux from 'react-redux'
-import TimeStepSelector from 'components/TimeStepSelector/TimeStepSelector'
+import { Provider } from 'react-redux'
+import UsageEventService from 'services/usageEvent.service'
+import * as chartActions from 'store/chart/chart.actions'
import {
createMockStore,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
-import * as chartActions from 'store/chart/chart.actions'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { DateTime } from 'luxon'
-import UsageEventService from 'services/usageEvent.service'
-import { Button } from '@material-ui/core'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/TimeStepSelector/TimeStepSelector.tsx b/src/components/TimeStepSelector/TimeStepSelector.tsx
index 62017f27e..213d71c27 100644
--- a/src/components/TimeStepSelector/TimeStepSelector.tsx
+++ b/src/components/TimeStepSelector/TimeStepSelector.tsx
@@ -1,22 +1,21 @@
-import React from 'react'
-import './timeStepSelector.scss'
+import { Button } from '@material-ui/core'
+import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { FluidType } from 'enum/fluid.enum'
+import { TimeStep } from 'enum/timeStep.enum'
+import { UsageEventType } from 'enum/usageEvent.enum'
+import { DateTime } from 'luxon'
+import React from 'react'
import { useDispatch, useSelector } from 'react-redux'
+import DateChartService from 'services/dateChart.service'
+import UsageEventService from 'services/usageEvent.service'
import { AppStore } from 'store'
import {
setCurrentIndex,
setCurrentTimeStep,
setSelectedDate,
} from 'store/chart/chart.actions'
-import { Button } from '@material-ui/core'
-
-import DateChartService from 'services/dateChart.service'
-import { FluidType } from 'enum/fluid.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { useClient } from 'cozy-client'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import UsageEventService from 'services/usageEvent.service'
-import { DateTime } from 'luxon'
+import './timeStepSelector.scss'
interface TimeStepSelectorProps {
fluidType: FluidType
diff --git a/src/components/TotalConsumption/TotalConsumption.spec.tsx b/src/components/TotalConsumption/TotalConsumption.spec.tsx
index b8f32bd0a..e41ab2910 100644
--- a/src/components/TotalConsumption/TotalConsumption.spec.tsx
+++ b/src/components/TotalConsumption/TotalConsumption.spec.tsx
@@ -1,14 +1,14 @@
-import React from 'react'
-import { mount } from 'enzyme'
import { FluidType } from 'enum/fluid.enum'
-import TotalConsumption from './TotalConsumption'
-import { mockInitialChartState } from '../../../tests/__mocks__/store'
-import { graphData } from '../../../tests/__mocks__/datachartData.mock'
-import { Provider } from 'react-redux'
-import configureStore from 'redux-mock-store'
import { TimeStep } from 'enum/timeStep.enum'
+import { mount } from 'enzyme'
import { Dataload } from 'models'
+import React from 'react'
import { act } from 'react-dom/test-utils'
+import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
+import { graphData } from '../../../tests/__mocks__/datachartData.mock'
+import { mockInitialChartState } from '../../../tests/__mocks__/store'
+import TotalConsumption from './TotalConsumption'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
diff --git a/src/components/TotalConsumption/TotalConsumption.tsx b/src/components/TotalConsumption/TotalConsumption.tsx
index 5f9855ca0..7d0330741 100644
--- a/src/components/TotalConsumption/TotalConsumption.tsx
+++ b/src/components/TotalConsumption/TotalConsumption.tsx
@@ -1,16 +1,16 @@
-import React, { useEffect, useState } from 'react'
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import PileIcon from 'assets/icons/ico/coins.svg'
-import './totalConsumption.scss'
-import { Dataload } from 'models'
-import { FluidType } from 'enum/fluid.enum'
-import ConverterService from 'services/converter.service'
-import { formatNumberValues } from 'utils/utils'
-import ConsumptionService from 'services/consumption.service'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import { useClient } from 'cozy-client'
+import { FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
+import { Dataload } from 'models'
+import React, { useEffect, useState } from 'react'
import { useSelector } from 'react-redux'
+import ConsumptionService from 'services/consumption.service'
+import ConverterService from 'services/converter.service'
import { AppStore } from 'store'
+import { formatNumberValues } from 'utils/utils'
+import './totalConsumption.scss'
interface TotalConsumptionProps {
actualData: Dataload[]
diff --git a/src/components/Version/Version.spec.tsx b/src/components/Version/Version.spec.tsx
index 4ee6c5a0e..62aa49fcd 100644
--- a/src/components/Version/Version.spec.tsx
+++ b/src/components/Version/Version.spec.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
-import { shallow } from 'enzyme'
import Version from 'components/Version/Version'
+import { shallow } from 'enzyme'
+import React from 'react'
describe('Version component', () => {
it('should be rendered correctly', () => {
diff --git a/src/components/Version/Version.tsx b/src/components/Version/Version.tsx
index c79f7dc6f..043b11882 100644
--- a/src/components/Version/Version.tsx
+++ b/src/components/Version/Version.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
import { Client, useClient } from 'cozy-client'
+import React from 'react'
import './version.scss'
const Version: React.FC = () => {
diff --git a/src/constants/consumptionConstants/ecs.json b/src/constants/consumptionConstants/ecs.json
index b0c773391..d092e7c69 100644
--- a/src/constants/consumptionConstants/ecs.json
+++ b/src/constants/consumptionConstants/ecs.json
@@ -38,34 +38,12 @@
}
],
"mensual_repartition": [
- 111,
- 120,
- 111,
- 106,
- 103,
- 93,
- 84,
- 72,
- 92,
- 103,
- 104,
- 101
+ 111, 120, 111, 106, 103, 93, 84, 72, 92, 103, 104, 101
],
"cold_water_temperature": [11, 11, 12, 15, 17, 19, 21, 20, 17, 15, 12, 13],
"hot_water_temperature": 40,
"solar_coverage": [
- 0.19,
- 0.33,
- 0.36,
- 0.6,
- 0.61,
- 0.73,
- 0.92,
- 0.81,
- 0.67,
- 0.46,
- 0.24,
- 0.25
+ 0.19, 0.33, 0.36, 0.6, 0.61, 0.73, 0.92, 0.81, 0.67, 0.46, 0.24, 0.25
],
"efficiency_production_distribution": {
"appartment": 0.55,
diff --git a/src/doctypes/index.ts b/src/doctypes/index.ts
index eb711a242..38dd79001 100644
--- a/src/doctypes/index.ts
+++ b/src/doctypes/index.ts
@@ -1,34 +1,31 @@
-import { ENEDIS_DAY_DOCTYPE } from './com-grandlyon-enedis-day'
-import { GRDF_DAY_DOCTYPE } from './com-grandlyon-grdf-day'
-import { EGL_DAY_DOCTYPE } from './com-grandlyon-egl-day'
-
-import { KONNECTORS_DOCTYPE } from './io-cozy-konnectors'
-import { ACCOUNTS_DOCTYPE } from './io-cozy-accounts'
-import { JOBS_DOCTYPE } from './io-cozy-jobs'
-import { TERMS_DOCTYPE } from './io-cozy-terms'
-
+import { CHALLENGE_DOCTYPE } from './com-grandlyon-ecolyo-challenge'
+import { DUEL_DOCTYPE } from './com-grandlyon-ecolyo-duel'
import { ECOGESTURE_DOCTYPE } from './com-grandlyon-ecolyo-ecogesture'
+import { EXPLORATION_DOCTYPE } from './com-grandlyon-ecolyo-exploration'
+import { FLUIDPRICES_DOCTYPE } from './com-grandlyon-ecolyo-fluidsprices'
import { PROFILE_DOCTYPE } from './com-grandlyon-ecolyo-profile'
+import { PROFILEECOGESTURE_DOCTYPE } from './com-grandlyon-ecolyo-profileecogesture'
import { PROFILETYPE_DOCTYPE } from './com-grandlyon-ecolyo-profiletype'
-import { SCHEMAS_DOCTYPE } from './com-grandlyon-ecolyo-schemas'
-
-import { CHALLENGE_DOCTYPE } from './com-grandlyon-ecolyo-challenge'
-import { USERCHALLENGE_DOCTYPE } from './com-grandlyon-ecolyo-userchallenge'
-import { DUEL_DOCTYPE } from './com-grandlyon-ecolyo-duel'
import { QUIZ_DOCTYPE } from './com-grandlyon-ecolyo-quiz'
-import { FLUIDPRICES_DOCTYPE } from './com-grandlyon-ecolyo-fluidsprices'
+import { SCHEMAS_DOCTYPE } from './com-grandlyon-ecolyo-schemas'
import { USAGEEVENT_DOCTYPE } from './com-grandlyon-ecolyo-usageevent'
-import { EXPLORATION_DOCTYPE } from './com-grandlyon-ecolyo-exploration'
-import { ENEDIS_YEAR_DOCTYPE } from './com-grandlyon-enedis-year'
-import { ENEDIS_MONTH_DOCTYPE } from './com-grandlyon-enedis-month'
-import { ENEDIS_MINUTE_DOCTYPE } from './com-grandlyon-enedis-minute'
-import { GRDF_YEAR_DOCTYPE } from './com-grandlyon-grdf-year'
-import { GRDF_MONTH_DOCTYPE } from './com-grandlyon-grdf-month'
-import { EGL_YEAR_DOCTYPE } from './com-grandlyon-egl-year'
+import { USERCHALLENGE_DOCTYPE } from './com-grandlyon-ecolyo-userchallenge'
+import { EGL_DAY_DOCTYPE } from './com-grandlyon-egl-day'
import { EGL_MONTH_DOCTYPE } from './com-grandlyon-egl-month'
-import { ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE } from './com-grandlyon-enedis-monthly-analysis-data'
+import { EGL_YEAR_DOCTYPE } from './com-grandlyon-egl-year'
+import { ENEDIS_DAY_DOCTYPE } from './com-grandlyon-enedis-day'
import { ENEDIS_MAXPOWER_DOCTYPE } from './com-grandlyon-enedis-maxpower'
-import { PROFILEECOGESTURE_DOCTYPE } from './com-grandlyon-ecolyo-profileecogesture'
+import { ENEDIS_MINUTE_DOCTYPE } from './com-grandlyon-enedis-minute'
+import { ENEDIS_MONTH_DOCTYPE } from './com-grandlyon-enedis-month'
+import { ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE } from './com-grandlyon-enedis-monthly-analysis-data'
+import { ENEDIS_YEAR_DOCTYPE } from './com-grandlyon-enedis-year'
+import { GRDF_DAY_DOCTYPE } from './com-grandlyon-grdf-day'
+import { GRDF_MONTH_DOCTYPE } from './com-grandlyon-grdf-month'
+import { GRDF_YEAR_DOCTYPE } from './com-grandlyon-grdf-year'
+import { ACCOUNTS_DOCTYPE } from './io-cozy-accounts'
+import { JOBS_DOCTYPE } from './io-cozy-jobs'
+import { KONNECTORS_DOCTYPE } from './io-cozy-konnectors'
+import { TERMS_DOCTYPE } from './io-cozy-terms'
// the documents schema, necessary for CozyClient
const doctypes = {
@@ -190,37 +187,32 @@ const doctypes = {
export default doctypes
// export all doctypes for the application
-export * from './com-grandlyon-enedis-minute'
+export * from './com-grandlyon-ecolyo-challenge'
+export * from './com-grandlyon-ecolyo-duel'
+export * from './com-grandlyon-ecolyo-ecogesture'
+export * from './com-grandlyon-ecolyo-exploration'
+export * from './com-grandlyon-ecolyo-fluidsprices'
+export * from './com-grandlyon-ecolyo-profile'
+export * from './com-grandlyon-ecolyo-profileecogesture'
+export * from './com-grandlyon-ecolyo-profiletype'
+export * from './com-grandlyon-ecolyo-quiz'
+export * from './com-grandlyon-ecolyo-schemas'
+export * from './com-grandlyon-ecolyo-usageevent'
+export * from './com-grandlyon-ecolyo-userchallenge'
+export * from './com-grandlyon-egl-day'
+export * from './com-grandlyon-egl-month'
+export * from './com-grandlyon-egl-year'
export * from './com-grandlyon-enedis-day'
+export * from './com-grandlyon-enedis-maxpower'
+export * from './com-grandlyon-enedis-minute'
export * from './com-grandlyon-enedis-month'
-export * from './com-grandlyon-enedis-year'
export * from './com-grandlyon-enedis-monthly-analysis-data'
-export * from './com-grandlyon-enedis-maxpower'
-
+export * from './com-grandlyon-enedis-year'
export * from './com-grandlyon-grdf-day'
export * from './com-grandlyon-grdf-month'
export * from './com-grandlyon-grdf-year'
-
-export * from './com-grandlyon-egl-day'
-export * from './com-grandlyon-egl-month'
-export * from './com-grandlyon-egl-year'
-
-export * from './io-cozy-konnectors'
export * from './io-cozy-accounts'
-export * from './io-cozy-triggers'
export * from './io-cozy-jobs'
+export * from './io-cozy-konnectors'
export * from './io-cozy-terms'
-
-export * from './com-grandlyon-ecolyo-ecogesture'
-export * from './com-grandlyon-ecolyo-profile'
-export * from './com-grandlyon-ecolyo-profiletype'
-export * from './com-grandlyon-ecolyo-schemas'
-export * from './com-grandlyon-ecolyo-fluidsprices'
-
-export * from './com-grandlyon-ecolyo-challenge'
-export * from './com-grandlyon-ecolyo-userchallenge'
-export * from './com-grandlyon-ecolyo-duel'
-export * from './com-grandlyon-ecolyo-quiz'
-export * from './com-grandlyon-ecolyo-exploration'
-export * from './com-grandlyon-ecolyo-usageevent'
-export * from './com-grandlyon-ecolyo-profileecogesture'
+export * from './io-cozy-triggers'
diff --git a/src/locales/en.json b/src/locales/en.json
index 0db3279e4..0967ef424 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,3 +1 @@
-{
-
-}
+{}
diff --git a/src/migrations/migration.service.spec.ts b/src/migrations/migration.service.spec.ts
index 7fe06c9f9..5e717326c 100644
--- a/src/migrations/migration.service.spec.ts
+++ b/src/migrations/migration.service.spec.ts
@@ -1,13 +1,13 @@
+import { Client, QueryResult } from 'cozy-client'
import { PROFILE_DOCTYPE } from 'doctypes'
import { Profile } from 'models'
+import { Notes } from 'models/releaseNotes.model'
+import { Schema } from 'models/schema.models'
import mockClient from '../../tests/__mocks__/client'
-import { MigrationService } from './migration.service'
-import { Migration, MigrationResult } from './migration.type'
import * as Migrate from './migration'
import { MIGRATION_RESULT_FAILED } from './migration.data'
-import { Client, QueryResult } from 'cozy-client'
-import { Notes } from 'models/releaseNotes.model'
-import { Schema } from 'models/schema.models'
+import { MigrationService } from './migration.service'
+import { Migration, MigrationResult } from './migration.type'
const migrateSpy = jest.spyOn(Migrate, 'migrate')
describe('Migration service', () => {
diff --git a/src/models/challenge.model.ts b/src/models/challenge.model.ts
index cfda80f6d..1e9bee4e1 100644
--- a/src/models/challenge.model.ts
+++ b/src/models/challenge.model.ts
@@ -4,15 +4,15 @@ import {
} from 'enum/userChallenge.enum'
import { DateTime } from 'luxon'
import {
- UserDuel,
- UserDuelEntity,
Dataload,
- UserQuiz,
- UserExploration,
Relation,
+ UserAction,
UserActionEntity,
+ UserDuel,
+ UserDuelEntity,
+ UserExploration,
+ UserQuiz,
} from 'models'
-import { UserAction } from 'models'
export interface ChallengeState {
userChallengeList: UserChallenge[]
diff --git a/src/models/duel.model.ts b/src/models/duel.model.ts
index bd46e2391..83687f719 100644
--- a/src/models/duel.model.ts
+++ b/src/models/duel.model.ts
@@ -1,6 +1,6 @@
-import { DateTime, Duration } from 'luxon'
-import { UserDuelState } from 'enum/userDuel.enum'
import { FluidType } from 'enum/fluid.enum'
+import { UserDuelState } from 'enum/userDuel.enum'
+import { DateTime, Duration } from 'luxon'
export interface DuelEntity {
id: string
diff --git a/src/models/exploration.model.ts b/src/models/exploration.model.ts
index 6cd6e2081..eccf99be8 100644
--- a/src/models/exploration.model.ts
+++ b/src/models/exploration.model.ts
@@ -1,9 +1,9 @@
/* eslint-disable camelcase */
+import { FluidType } from 'enum/fluid.enum'
import {
UserExplorationState,
UserExplorationType,
} from 'enum/userExploration.enum'
-import { FluidType } from 'enum/fluid.enum'
import { DateTime } from 'luxon'
export interface ExplorationEntity {
diff --git a/src/models/index.ts b/src/models/index.ts
index ae7e80831..2394d563d 100644
--- a/src/models/index.ts
+++ b/src/models/index.ts
@@ -1,6 +1,6 @@
export * from './account.model'
-export * from './analysis.model'
export * from './action.model'
+export * from './analysis.model'
export * from './challenge.model'
export * from './chart.model'
export * from './config.model'
@@ -19,10 +19,8 @@ export * from './profile.model'
export * from './profileType.model'
export * from './quiz.model'
export * from './relation.model'
-export * from './analysis.model'
-export * from './timePeriod.model'
export * from './term.model'
+export * from './timePeriod.model'
export * from './trigger.model'
export * from './usageEvent.model'
export * from './userInstanceSettings.model'
-export * from './fluidPrice.model'
diff --git a/src/models/profileEcogesture.model.ts b/src/models/profileEcogesture.model.ts
index 08187ec48..4e6a6d388 100644
--- a/src/models/profileEcogesture.model.ts
+++ b/src/models/profileEcogesture.model.ts
@@ -2,8 +2,8 @@ import { EquipmentType } from 'enum/ecogesture.enum'
import { ProfileEcogestureAnswerType } from 'enum/ecogestureForm.enum'
import { FluidType } from 'enum/fluid.enum'
import {
- IndividualOrCollective,
HotWaterEquipment,
+ IndividualOrCollective,
WarmingType,
} from 'enum/profileType.enum'
diff --git a/src/models/quiz.model.ts b/src/models/quiz.model.ts
index 1accadc53..a03221eb7 100644
--- a/src/models/quiz.model.ts
+++ b/src/models/quiz.model.ts
@@ -1,9 +1,9 @@
+import { TimeStep } from 'enum/timeStep.enum'
import {
CustomQuestionType,
UserQuestionState,
UserQuizState,
} from 'enum/userQuiz.enum'
-import { TimeStep } from 'enum/timeStep.enum'
import { DateTime } from 'luxon'
export interface Answer {
diff --git a/src/notifications/base/footer.hbs b/src/notifications/base/footer.hbs
index d445afddf..878b0df70 100644
--- a/src/notifications/base/footer.hbs
+++ b/src/notifications/base/footer.hbs
@@ -1,24 +1,30 @@
-<mj-section background-color="black">
+<mj-section background-color='black'>
<mj-section>
- <mj-column vertical-align="middle">
- <mj-image src="{{baseUrl}}/assets/logo-grandlyon.png" alt="logo-grandlyon">
+ <mj-column vertical-align='middle'>
+ <mj-image
+ src='{{baseUrl}}/assets/logo-grandlyon.png'
+ alt='logo-grandlyon'
+ >
</mj-image>
</mj-column>
- <mj-column vertical-align="middle">
- <mj-image src="{{baseUrl}}/assets/logo-gouv.png" alt="logo-gouvernement">
+ <mj-column vertical-align='middle'>
+ <mj-image src='{{baseUrl}}/assets/logo-gouv.png' alt='logo-gouvernement'>
</mj-image>
</mj-column>
- <mj-column vertical-align="middle" >
- <mj-image src="{{baseUrl}}/assets/logo-territoire.png" alt="logo-territoire">
+ <mj-column vertical-align='middle'>
+ <mj-image
+ src='{{baseUrl}}/assets/logo-territoire.png'
+ alt='logo-territoire'
+ >
</mj-image>
</mj-column>
- <mj-column vertical-align="middle">
- <mj-image src="{{baseUrl}}/assets/logo-tiga-white.png" alt="logo-tiga" >
+ <mj-column vertical-align='middle'>
+ <mj-image src='{{baseUrl}}/assets/logo-tiga-white.png' alt='logo-tiga'>
</mj-image>
</mj-column>
</mj-section>
-</mj-section>
+</mj-section>
\ No newline at end of file
diff --git a/src/notifications/base/header.hbs b/src/notifications/base/header.hbs
index 6665c67dc..0d0b9b903 100644
--- a/src/notifications/base/header.hbs
+++ b/src/notifications/base/header.hbs
@@ -1,19 +1,19 @@
-<mj-section css-class="background" padding="17px" align="center">
+<mj-section css-class='background' padding='17px' align='center'>
<mj-social
- css-class="button-with-icon"
- icon-size="36px"
- mode="horizontal"
- font-size="24px"
- font-weight="normal"
+ css-class='button-with-icon'
+ icon-size='36px'
+ mode='horizontal'
+ font-size='24px'
+ font-weight='normal'
>
<mj-social-element
- color="white"
- src="{{baseUrl}}/assets/ecolyo-icon.png"
- name="ecolyo"
- padding="0 10px 0 0"
- align="center"
+ color='white'
+ src='{{baseUrl}}/assets/ecolyo-icon.png'
+ name='ecolyo'
+ padding='0 10px 0 0'
+ align='center'
>
{{title}}
</mj-social-element>
</mj-social>
-</mj-section>
+</mj-section>
\ No newline at end of file
diff --git a/src/notifications/base/unsubscribe.hbs b/src/notifications/base/unsubscribe.hbs
index c504f9869..2536352fe 100644
--- a/src/notifications/base/unsubscribe.hbs
+++ b/src/notifications/base/unsubscribe.hbs
@@ -1,8 +1,11 @@
-<mj-section background-color="black">
+<mj-section background-color='black'>
<mj-column>
- <mj-text color="white" align="center" css-class="small">
+ <mj-text color='white' align='center' css-class='small'>
Vous ne souhaitez plus recevoir d'email d'Ecolyo ?
- <a href="{{unsubscribeUrl}}" style="color: #E3B82A; font-weight: 900 !important;">Se désinscrire</a>
+ <a
+ href='{{unsubscribeUrl}}'
+ style='color: #E3B82A; font-weight: 900 !important;'
+ >Se désinscrire</a>
</mj-text>
</mj-column>
-</mj-section>
+</mj-section>
\ No newline at end of file
diff --git a/src/notifications/style.hbs b/src/notifications/style.hbs
index 69b682c0f..cf028f828 100644
--- a/src/notifications/style.hbs
+++ b/src/notifications/style.hbs
@@ -1,7 +1,7 @@
<mj-style>
- .main div{ line-height: 23.4px !important; font-family: 'Lato', sans-serif !important; }
- .main .background{ background: radial-gradient(96.2% 96.2% at 50% 3.8%,
- #343641 0%, #1B1C22 100%) !important; }
+ .main div{ line-height: 23.4px !important; font-family: 'Lato', sans-serif
+ !important; } .main .background{ background: radial-gradient(96.2% 96.2% at
+ 50% 3.8%, #343641 0%, #1B1C22 100%) !important; }
</mj-style>
<mj-style>
.small div{ font-weight: 400 !important; font-size: 13px !important;
@@ -17,10 +17,11 @@
<mj-style>
.button table { background-color: #F1C017 !important; margin: 10px !important;
} .button-with-icon td { padding-right: 1px !important; } .button-with-icon
- table { background-color: #F1C017 !important; margin-left: 10px !important; margin-right: 10px !important; }
- .button-with-icon span { vertical-align: middle !important; }
- .button-with-icon a { vertical-align: middle !important; padding-right: 10px !important;}
- .button-with-icon a img { padding-top: 20px !important;}
+ table { background-color: #F1C017 !important; margin-left: 10px !important;
+ margin-right: 10px !important; } .button-with-icon span { vertical-align:
+ middle !important; } .button-with-icon a { vertical-align: middle !important;
+ padding-right: 10px !important;} .button-with-icon a img { padding-top: 20px
+ !important;}
</mj-style>
<mj-style>
.custom-link a { color: #F1C017 !important; text-decoration: none !important;
@@ -32,28 +33,23 @@
12px!important }
</mj-style>
<mj-attributes>
- <mj-all font-family="Lato, sans-serif" font-size="16px" />
+ <mj-all font-family='Lato, sans-serif' font-size='16px'></mj-all>
</mj-attributes>
-<mj-font name="Lato" href="https://fonts.googleapis.com/css?family=Lato" />
-<mj-style>
- @font-face {
- font-family: 'Lato';
- font-style: normal;
- font-weight: 400;
- src: local('Lato Regular'), local('Lato-Regular'), url(https://fonts.gstatic.com/s/lato/v13/8qcEw_nrk_5HEcCpYdJu8BTbgVql8nDJpwnrE27mub0.woff2) format('woff2');
- unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
- }
- @font-face {
- font-family: 'Lato';
- font-style: normal;
- font-weight: 400;
- src: local('Lato Regular'), local('Lato-Regular'), url(https://fonts.gstatic.com/s/lato/v13/MDadn8DQ_3oT6kvnUq_2r_esZW2xOQ-xsNqO47m55DA.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215;
- }
- @font-face {
- font-family: 'Lato-Bold';
- font-style: normal;
- font-weight: 800;
- src: asset-url('Lato-Bold.woff2') format('woff2');
- }
+<mj-font
+ name='Lato'
+ href='https://fonts.googleapis.com/css?family=Lato'
+></mj-font>
+<mj-style>
+ @font-face { font-family: 'Lato'; font-style: normal; font-weight: 400; src:
+ local('Lato Regular'), local('Lato-Regular'),
+ url(https://fonts.gstatic.com/s/lato/v13/8qcEw_nrk_5HEcCpYdJu8BTbgVql8nDJpwnrE27mub0.woff2)
+ format('woff2'); unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB,
+ U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; } @font-face { font-family: 'Lato';
+ font-style: normal; font-weight: 400; src: local('Lato Regular'),
+ local('Lato-Regular'),
+ url(https://fonts.gstatic.com/s/lato/v13/MDadn8DQ_3oT6kvnUq_2r_esZW2xOQ-xsNqO47m55DA.woff2)
+ format('woff2'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6,
+ U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215; } @font-face {
+ font-family: 'Lato-Bold'; font-style: normal; font-weight: 800; src:
+ asset-url('Lato-Bold.woff2') format('woff2'); }
</mj-style>
\ No newline at end of file
diff --git a/src/services/account.service.spec.ts b/src/services/account.service.spec.ts
index a3d19f984..c1d2d227c 100644
--- a/src/services/account.service.spec.ts
+++ b/src/services/account.service.spec.ts
@@ -1,14 +1,14 @@
/* eslint-disable camelcase */
import { QueryResult } from 'cozy-client'
-import { AccountAuthData, Account } from 'models'
-import mockClient from '../../tests/__mocks__/client'
-import AccountService from './account.service'
+import * as harvestLibAccounts from 'cozy-harvest-lib/dist/connections/accounts'
+import { Account, AccountAuthData } from 'models'
import { accountsData } from '../../tests/__mocks__/accountsData.mock'
+import mockClient from '../../tests/__mocks__/client'
import { konnectorsData } from '../../tests/__mocks__/konnectorsData.mock'
import { triggersEnedisData } from '../../tests/__mocks__/triggersData.mock'
+import AccountService from './account.service'
jest.mock('cozy-harvest-lib/dist/connections/accounts')
-import * as harvestLibAccounts from 'cozy-harvest-lib/dist/connections/accounts'
const mockHavestLibAccounts = harvestLibAccounts as jest.Mocked<
typeof harvestLibAccounts
>
diff --git a/src/services/action.service.spec.ts b/src/services/action.service.spec.ts
index 01e769596..6eea6bfa5 100644
--- a/src/services/action.service.spec.ts
+++ b/src/services/action.service.spec.ts
@@ -2,6 +2,7 @@ import { Season } from 'enum/ecogesture.enum'
import { UserActionState } from 'enum/userAction.enum'
import { DateTime } from 'luxon'
import { Ecogesture, UserAction } from 'models'
+import * as utils from 'utils/utils'
import {
AllEcogestureData,
defaultEcogestureData,
@@ -10,7 +11,6 @@ import {
import mockClient from '../../tests/__mocks__/client'
import { userChallengeData } from '../../tests/__mocks__/userChallengeData.mock'
import ActionService from './action.service'
-import * as utils from 'utils/utils'
const mockgetAllUserChallengeEntities = jest.fn()
jest.mock('./challenge.service', () => {
diff --git a/src/services/challenge.service.spec.ts b/src/services/challenge.service.spec.ts
index eaf3ac35b..d1e2f3c9a 100644
--- a/src/services/challenge.service.spec.ts
+++ b/src/services/challenge.service.spec.ts
@@ -1,40 +1,34 @@
/* eslint-disable camelcase */
import { QueryResult } from 'cozy-client'
-import {
- DuelEntity,
- ChallengeEntity,
- UserChallenge,
- QuizEntity,
- ExplorationEntity,
- Dataload,
-} from 'models'
+import { DataloadState } from 'enum/dataload.enum'
+import { UserActionState } from 'enum/userAction.enum'
import {
UserChallengeState,
UserChallengeSuccess,
+ UserChallengeUpdateFlag,
} from 'enum/userChallenge.enum'
-import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
-import ChallengeService from './challenge.service'
+import { UserDuelState } from 'enum/userDuel.enum'
+import { cloneDeep } from 'lodash'
+import { DateTime, Duration } from 'luxon'
import {
- userChallengeData,
- userChallengeDefault,
- userChallengeExplo1OnGoing,
- userChallengeExplo4,
- userChallengeExplo4_0,
-} from '../../tests/__mocks__/userChallengeData.mock'
-import mockClient from '../../tests/__mocks__/client'
+ ChallengeEntity,
+ Dataload,
+ DuelEntity,
+ ExplorationEntity,
+ QuizEntity,
+ UserChallenge,
+} from 'models'
import {
allChallengeEntityData,
challengeEntityData,
} from '../../tests/__mocks__/challengeEntity.mock'
+import mockClient from '../../tests/__mocks__/client'
+import { graphData } from '../../tests/__mocks__/datachartData.mock'
import {
allDuelEntity,
duelData,
duelEntity,
} from '../../tests/__mocks__/duelData.mock'
-import { DateTime, Duration } from 'luxon'
-import { graphData } from '../../tests/__mocks__/datachartData.mock'
-import { UserDuelState } from 'enum/userDuel.enum'
-import { quizEntity, userQuiz } from '../../tests/__mocks__/quizData.mock'
import {
explorationDefault,
explorationEntity,
@@ -47,9 +41,15 @@ import {
UserExplorationUnlocked,
} from '../../tests/__mocks__/explorationData.mock'
import { fluidStatusData } from '../../tests/__mocks__/fluidStatusData.mock'
-import { cloneDeep } from 'lodash'
-import { UserActionState } from 'enum/userAction.enum'
-import { DataloadState } from 'enum/dataload.enum'
+import { quizEntity, userQuiz } from '../../tests/__mocks__/quizData.mock'
+import {
+ userChallengeData,
+ userChallengeDefault,
+ userChallengeExplo1OnGoing,
+ userChallengeExplo4,
+ userChallengeExplo4_0,
+} from '../../tests/__mocks__/userChallengeData.mock'
+import ChallengeService from './challenge.service'
const mockGetExplorationEntityById = jest.fn()
const mockParseExplorationEntityToUserExploration = jest.fn()
diff --git a/src/services/connection.service.spec.ts b/src/services/connection.service.spec.ts
index 8c4472527..069504500 100644
--- a/src/services/connection.service.spec.ts
+++ b/src/services/connection.service.spec.ts
@@ -1,8 +1,8 @@
-import ConnectionService from './connection.service'
+import { accountsData } from '../../tests/__mocks__/accountsData.mock'
import mockClient from '../../tests/__mocks__/client'
import { konnectorsData } from '../../tests/__mocks__/konnectorsData.mock'
-import { accountsData } from '../../tests/__mocks__/accountsData.mock'
import { triggersData } from '../../tests/__mocks__/triggersData.mock'
+import ConnectionService from './connection.service'
const mockGetKonnector = jest.fn()
jest.mock('./konnector.service', () => {
diff --git a/src/services/connection.service.ts b/src/services/connection.service.ts
index 0a1f855ba..590dae613 100644
--- a/src/services/connection.service.ts
+++ b/src/services/connection.service.ts
@@ -1,4 +1,6 @@
+import * as Sentry from '@sentry/react'
import { Client } from 'cozy-client'
+import logger from 'cozy-logger'
import {
Account,
AccountAuthData,
@@ -6,12 +8,10 @@ import {
Konnector,
Trigger,
} from 'models'
+import { SgeStore } from 'models/sgeStore.model'
import AccountService from 'services/account.service'
-import TriggerService from 'services/triggers.service'
import KonnectorService from 'services/konnector.service'
-import { SgeStore } from 'models/sgeStore.model'
-import logger from 'cozy-logger'
-import * as Sentry from '@sentry/react'
+import TriggerService from 'services/triggers.service'
import logApp from 'utils/logger'
const logStack = logger.namespace('connectionService')
diff --git a/src/services/consumptionValidator.service.spec.ts b/src/services/consumptionValidator.service.spec.ts
index 2957f4619..dbb3be752 100644
--- a/src/services/consumptionValidator.service.spec.ts
+++ b/src/services/consumptionValidator.service.spec.ts
@@ -1,8 +1,8 @@
-import ConsumptionValidatorService from './consumptionValidator.service'
+import { FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
import { DateTime } from 'luxon'
-import { FluidType } from 'enum/fluid.enum'
import { TimePeriod } from 'models'
+import ConsumptionValidatorService from './consumptionValidator.service'
const mockTimePeriod: TimePeriod = {
startDate: DateTime.fromISO('2020-10-01T00:00:00.000Z', { zone: 'utc' }),
diff --git a/src/services/consumptionValidator.service.ts b/src/services/consumptionValidator.service.ts
index 618e402df..7f3901487 100644
--- a/src/services/consumptionValidator.service.ts
+++ b/src/services/consumptionValidator.service.ts
@@ -1,7 +1,7 @@
import { FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
-import { TimePeriod } from 'models'
import { Interval } from 'luxon'
+import { TimePeriod } from 'models'
export default class ConsumptionValidatorService {
public ValidateGetGraphData(
diff --git a/src/services/dateChart.service.spec.ts b/src/services/dateChart.service.spec.ts
index e78e40399..c48f2535c 100644
--- a/src/services/dateChart.service.spec.ts
+++ b/src/services/dateChart.service.spec.ts
@@ -1,7 +1,7 @@
-import DateChartService from './dateChart.service'
import { TimeStep } from 'enum/timeStep.enum'
import { DateTime } from 'luxon'
import { TimePeriod } from 'models'
+import DateChartService from './dateChart.service'
const localSpy = jest.spyOn(DateTime, 'local')
diff --git a/src/services/duel.service.spec.ts b/src/services/duel.service.spec.ts
index 09a59b3ad..f409995f4 100644
--- a/src/services/duel.service.spec.ts
+++ b/src/services/duel.service.spec.ts
@@ -2,22 +2,22 @@ import { QueryResult } from 'cozy-client'
import { FluidType } from 'enum/fluid.enum'
import { UserDuelState } from 'enum/userDuel.enum'
import { DateTime, Duration } from 'luxon'
-import { UserDuel, DuelEntity } from 'models'
+import { DuelEntity, UserDuel } from 'models'
+import DuelService from 'services/duel.service'
+import mockClient from '../../tests/__mocks__/client'
+import {
+ fullGraphData,
+ graphData,
+} from '../../tests/__mocks__/datachartData.mock'
import {
- duelData,
allDuelData,
+ duelData,
duelEntity,
} from '../../tests/__mocks__/duelData.mock'
-import mockClient from '../../tests/__mocks__/client'
import {
fluidStatusConnectedData,
fluidStatusData,
} from '../../tests/__mocks__/fluidStatusData.mock'
-import DuelService from 'services/duel.service'
-import {
- fullGraphData,
- graphData,
-} from '../../tests/__mocks__/datachartData.mock'
const mockGetPerformanceIndicators = jest.fn()
const mockGetGraphData = jest.fn()
diff --git a/src/services/ecogesture.service.spec.ts b/src/services/ecogesture.service.spec.ts
index 12bfc0339..7448b0fe1 100644
--- a/src/services/ecogesture.service.spec.ts
+++ b/src/services/ecogesture.service.spec.ts
@@ -1,6 +1,8 @@
import { QueryResult } from 'cozy-client'
+import { EquipmentType } from 'enum/ecogesture.enum'
+import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
import { Ecogesture } from 'models'
-import EcogestureService from './ecogesture.service'
+import { ProfileEcogesture } from 'models/profileEcogesture.model'
import mockClient from '../../tests/__mocks__/client'
import {
BoilerEcogesture,
@@ -9,10 +11,8 @@ import {
ecogesturesECSData,
ecogesturesHeatingData,
} from '../../tests/__mocks__/ecogesturesData.mock'
-import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
import { mockProfileEcogesture } from '../../tests/__mocks__/profileEcogesture.mock'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
-import { EquipmentType } from 'enum/ecogesture.enum'
+import EcogestureService from './ecogesture.service'
describe('Ecogesture service', () => {
const ecogestureService = new EcogestureService(mockClient)
diff --git a/src/services/enedisMonthlyAnalysisData.service.spec.ts b/src/services/enedisMonthlyAnalysisData.service.spec.ts
index 4ed0ea216..3a5f15f44 100644
--- a/src/services/enedisMonthlyAnalysisData.service.spec.ts
+++ b/src/services/enedisMonthlyAnalysisData.service.spec.ts
@@ -1,14 +1,14 @@
import { QueryResult } from 'cozy-client'
-import mockClient from '../../tests/__mocks__/client'
-import EnedisMonthlyAnalysisDataService from './enedisMonthlyAnalysisData.service'
import { EnedisMonthlyAnalysisData } from 'models/enedisMonthlyAnalysis'
+import { MaxPowerEntity } from 'models/maxPower.model'
+import mockClient from '../../tests/__mocks__/client'
import {
maxPowerData,
mockDataLoadEnedisAnalysis,
mockEnedisMonthlyAnalysis,
mockEnedisMonthlyAnalysisArray,
} from '../../tests/__mocks__/enedisMonthlyAnalysisData.mock'
-import { MaxPowerEntity } from 'models/maxPower.model'
+import EnedisMonthlyAnalysisDataService from './enedisMonthlyAnalysisData.service'
describe('Enedis Monthly Analysis service', () => {
const emas = new EnedisMonthlyAnalysisDataService(mockClient)
diff --git a/src/services/exploration.service.spec.ts b/src/services/exploration.service.spec.ts
index 8979264f2..cf2307bb9 100644
--- a/src/services/exploration.service.spec.ts
+++ b/src/services/exploration.service.spec.ts
@@ -1,19 +1,19 @@
import { QueryResult } from 'cozy-client'
-import { UserExploration, ExplorationEntity, UserChallenge } from 'models'
+import { UserExplorationState } from 'enum/userExploration.enum'
+import { ExplorationEntity, UserChallenge, UserExploration } from 'models'
+import mockClient from '../../tests/__mocks__/client'
import {
allExplorationEntities,
explorationEntity,
- UserExplorationUnlocked,
UserExplorationDone,
UserExplorationStarted,
+ UserExplorationUnlocked,
} from '../../tests/__mocks__/explorationData.mock'
-import mockClient from '../../tests/__mocks__/client'
-import ExplorationService from './exploration.service'
import {
userChallengeExplo1OnGoing,
userChallengeExplo2OnGoing,
} from '../../tests/__mocks__/userChallengeData.mock'
-import { UserExplorationState } from 'enum/userExploration.enum'
+import ExplorationService from './exploration.service'
describe('Exploration service', () => {
const explorationService = new ExplorationService(mockClient)
diff --git a/src/services/exploration.service.ts b/src/services/exploration.service.ts
index 40ddc77db..466dc3825 100644
--- a/src/services/exploration.service.ts
+++ b/src/services/exploration.service.ts
@@ -1,4 +1,4 @@
-import { Client, QueryDefinition, QueryResult, Q } from 'cozy-client'
+import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
import { EXPLORATION_DOCTYPE } from 'doctypes'
import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum'
import {
diff --git a/src/services/initialization.service.spec.ts b/src/services/initialization.service.spec.ts
index 74f7a6074..430ede793 100644
--- a/src/services/initialization.service.spec.ts
+++ b/src/services/initialization.service.spec.ts
@@ -1,19 +1,16 @@
import { QueryResult } from 'cozy-client'
-import { DateTime } from 'luxon'
-import { UserChallenge } from 'models'
-import mockClient from '../../tests/__mocks__/client'
-import InitializationService from './initialization.service'
-
import challengeEntityData from 'db/challengeEntity.json'
import duelEntityData from 'db/duelEntity.json'
import ecogestureData from 'db/ecogestureData.json'
import explorationEntityData from 'db/explorationEntity.json'
import quizEntityData from 'db/quizEntity.json'
-
import { FluidType } from 'enum/fluid.enum'
+import { DateTime } from 'luxon'
+import { UserChallenge } from 'models'
import { getActualAnalysisDate } from 'utils/date'
import { hashFile } from 'utils/hash'
import { allChallengeEntityData } from '../../tests/__mocks__/challengeEntity.mock'
+import mockClient from '../../tests/__mocks__/client'
import { graphData } from '../../tests/__mocks__/datachartData.mock'
import { allDuelEntity } from '../../tests/__mocks__/duelData.mock'
import { ecogesturesData } from '../../tests/__mocks__/ecogesturesData.mock'
@@ -27,6 +24,7 @@ import {
mockUpToDateTerm,
} from '../../tests/__mocks__/termsData.mock'
import { userChallengeData } from '../../tests/__mocks__/userChallengeData.mock'
+import InitializationService from './initialization.service'
const mockCreateIndexKonnector = jest.fn()
jest.mock('./konnector.service', () => {
diff --git a/src/services/konnector.service.spec.ts b/src/services/konnector.service.spec.ts
index 2e72db7c9..844fa0748 100644
--- a/src/services/konnector.service.spec.ts
+++ b/src/services/konnector.service.spec.ts
@@ -1,11 +1,11 @@
-import KonnectorService from './konnector.service'
+import { QueryResult } from 'cozy-client'
import { Konnector } from 'models'
-import mockClient from '../../tests/__mocks__/client'
import { accountsData } from '../../tests/__mocks__/accountsData.mock'
+import mockClient from '../../tests/__mocks__/client'
import { konnectorsData } from '../../tests/__mocks__/konnectorsData.mock'
import { triggersData } from '../../tests/__mocks__/triggersData.mock'
import { triggerStateData } from '../../tests/__mocks__/triggerStateData.mock'
-import { QueryResult } from 'cozy-client'
+import KonnectorService from './konnector.service'
const mockGetTrigger = jest.fn()
const mockFetchTriggerState = jest.fn()
diff --git a/src/services/konnectorStatus.service.spec.ts b/src/services/konnectorStatus.service.spec.ts
index aaf620ab3..2f4a8a786 100644
--- a/src/services/konnectorStatus.service.spec.ts
+++ b/src/services/konnectorStatus.service.spec.ts
@@ -1,6 +1,6 @@
-import KonnectorStatusService from './konnectorStatus.service'
-import mockClient from '../../tests/__mocks__/client'
import { accountsData } from '../../tests/__mocks__/accountsData.mock'
+import mockClient from '../../tests/__mocks__/client'
+import KonnectorStatusService from './konnectorStatus.service'
const mockGetAccountByType = jest.fn()
jest.mock('./account.service', () => {
diff --git a/src/services/konnectorStatus.service.ts b/src/services/konnectorStatus.service.ts
index 339db0b99..10addfe4a 100644
--- a/src/services/konnectorStatus.service.ts
+++ b/src/services/konnectorStatus.service.ts
@@ -1,7 +1,7 @@
import { Client } from 'cozy-client'
-import ConfigService from 'services/fluidConfig.service'
-import AccountService from 'services/account.service'
import { FluidType } from 'enum/fluid.enum'
+import AccountService from 'services/account.service'
+import ConfigService from 'services/fluidConfig.service'
export default class KonnectorStatusService {
private _client: Client
diff --git a/src/services/mail.service.spec.ts b/src/services/mail.service.spec.ts
index 68d450566..b67f09c8f 100644
--- a/src/services/mail.service.spec.ts
+++ b/src/services/mail.service.spec.ts
@@ -1,5 +1,5 @@
-import MailService from './mail.service'
import mockClient from '../../tests/__mocks__/client'
+import MailService from './mail.service'
describe('Mail service', () => {
const mailService = new MailService()
diff --git a/src/services/profileEcogesture.service.ts b/src/services/profileEcogesture.service.ts
index 37d5b0e85..d38c43f89 100644
--- a/src/services/profileEcogesture.service.ts
+++ b/src/services/profileEcogesture.service.ts
@@ -1,4 +1,4 @@
-import { Client, QueryDefinition, QueryResult, Q } from 'cozy-client'
+import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
import { PROFILEECOGESTURE_DOCTYPE } from 'doctypes'
import { ProfileEcogesture } from 'models/profileEcogesture.model'
diff --git a/src/services/profileTypeEntity.service.spec.ts b/src/services/profileTypeEntity.service.spec.ts
index 110127eaa..1fc0e9b66 100644
--- a/src/services/profileTypeEntity.service.spec.ts
+++ b/src/services/profileTypeEntity.service.spec.ts
@@ -1,8 +1,8 @@
-import ProfileTypeEntityService from './profileTypeEntity.service'
import { QueryResult } from 'cozy-client'
-import { profileTypeData } from '../../tests/__mocks__/profileType.mock'
-import mockClient from '../../tests/__mocks__/client'
import { ProfileType } from 'models'
+import mockClient from '../../tests/__mocks__/client'
+import { profileTypeData } from '../../tests/__mocks__/profileType.mock'
+import ProfileTypeEntityService from './profileTypeEntity.service'
describe('UserProfileTypeEntity service', () => {
const pteService = new ProfileTypeEntityService(mockClient)
diff --git a/src/services/quiz.service.spec.ts b/src/services/quiz.service.spec.ts
index bbaa8a1a3..82f370ff9 100644
--- a/src/services/quiz.service.spec.ts
+++ b/src/services/quiz.service.spec.ts
@@ -1,12 +1,26 @@
import { QueryResult } from 'cozy-client'
+import { FluidType } from 'enum/fluid.enum'
+import { TimeStep } from 'enum/timeStep.enum'
import {
- UserQuiz,
- QuizEntity,
- UserQuestion,
+ CustomQuestionType,
+ UserQuestionState,
+ UserQuizState,
+} from 'enum/userQuiz.enum'
+import { DateTime } from 'luxon'
+import {
+ CustomQuestionEntity,
QuestionEntity,
+ QuizEntity,
UserCustomQuestion,
- CustomQuestionEntity,
+ UserQuestion,
+ UserQuiz,
} from 'models'
+import mockClient from '../../tests/__mocks__/client'
+import {
+ fullMonthGraphData,
+ graphData,
+ graphMonthData,
+} from '../../tests/__mocks__/datachartData.mock'
import {
allQuizEntities,
customQuestionEntity,
@@ -17,21 +31,7 @@ import {
UserQuizReseted,
UserQuizStarted,
} from '../../tests/__mocks__/quizData.mock'
-import mockClient from '../../tests/__mocks__/client'
import QuizService from './quiz.service'
-import {
- CustomQuestionType,
- UserQuestionState,
- UserQuizState,
-} from 'enum/userQuiz.enum'
-import { TimeStep } from 'enum/timeStep.enum'
-import { FluidType } from 'enum/fluid.enum'
-import { DateTime } from 'luxon'
-import {
- fullMonthGraphData,
- graphData,
- graphMonthData,
-} from '../../tests/__mocks__/datachartData.mock'
const localSpy = jest.spyOn(DateTime, 'local')
diff --git a/src/services/quiz.service.ts b/src/services/quiz.service.ts
index ca0bb4cb5..c5c3ca256 100644
--- a/src/services/quiz.service.ts
+++ b/src/services/quiz.service.ts
@@ -1,7 +1,13 @@
-import { Client, QueryDefinition, QueryResult, Q } from 'cozy-client'
+import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
import { QUIZ_DOCTYPE } from 'doctypes'
import { FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
+import {
+ CustomQuestionType,
+ UserQuestionState,
+ UserQuizState,
+} from 'enum/userQuiz.enum'
+import { shuffle } from 'lodash'
import { DateTime } from 'luxon'
import {
Answer,
@@ -15,15 +21,9 @@ import {
UserQuestion,
UserQuiz,
} from 'models'
-import ConsumptionDataManager from './consumption.service'
-import {
- CustomQuestionType,
- UserQuestionState,
- UserQuizState,
-} from 'enum/userQuiz.enum'
-import { shuffle } from 'lodash'
-import { formatNumberValues } from 'utils/utils'
import logApp from 'utils/logger'
+import { formatNumberValues } from 'utils/utils'
+import ConsumptionDataManager from './consumption.service'
export default class QuizService {
private readonly _client: Client
diff --git a/src/services/terms.service.spec.ts b/src/services/terms.service.spec.ts
index 2e84053ab..2d6e2768a 100644
--- a/src/services/terms.service.spec.ts
+++ b/src/services/terms.service.spec.ts
@@ -8,7 +8,6 @@ import {
mockTermsData,
mockUpToDateTerm,
} from '../../tests/__mocks__/termsData.mock'
-
import TermsService from './terms.service'
const localSpy = jest.spyOn(DateTime, 'local')
diff --git a/src/services/timePeriod.service.spec.ts b/src/services/timePeriod.service.spec.ts
index 7cbc14501..6a70e106a 100644
--- a/src/services/timePeriod.service.spec.ts
+++ b/src/services/timePeriod.service.spec.ts
@@ -1,8 +1,8 @@
-import TimePeriodService from './timePeriod.service'
+import { FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
import { DateTime } from 'luxon'
import { TimePeriod } from 'models'
-import { FluidType } from 'enum/fluid.enum'
+import TimePeriodService from './timePeriod.service'
const randomDate = DateTime.fromISO('2020-10-10T08:00:00.000Z', {
zone: 'utc',
diff --git a/src/services/timePeriod.service.ts b/src/services/timePeriod.service.ts
index 4765a787c..655f8b753 100644
--- a/src/services/timePeriod.service.ts
+++ b/src/services/timePeriod.service.ts
@@ -1,6 +1,6 @@
-import { DateTime } from 'luxon'
import { FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
+import { DateTime } from 'luxon'
import { TimePeriod } from 'models'
import ConfigService from 'services/fluidConfig.service'
diff --git a/src/services/triggers.service.spec.ts b/src/services/triggers.service.spec.ts
index 549f87c6f..f4aabb01a 100644
--- a/src/services/triggers.service.spec.ts
+++ b/src/services/triggers.service.spec.ts
@@ -1,11 +1,11 @@
import { QueryResult } from 'cozy-client'
import { Trigger, TriggerState } from 'models'
-import mockClient from '../../tests/__mocks__/client'
-import TriggerService from './triggers.service'
import { accountsData } from '../../tests/__mocks__/accountsData.mock'
+import mockClient from '../../tests/__mocks__/client'
import { konnectorsData } from '../../tests/__mocks__/konnectorsData.mock'
import { triggersData } from '../../tests/__mocks__/triggersData.mock'
import { triggerStateData } from '../../tests/__mocks__/triggerStateData.mock'
+import TriggerService from './triggers.service'
const mockCreateTrigger = jest.fn()
jest.mock('cozy-harvest-lib/dist/connections/triggers', () => {
diff --git a/src/services/usageEvent.service.spec.ts b/src/services/usageEvent.service.spec.ts
index 050435264..5fcc3a4cc 100644
--- a/src/services/usageEvent.service.spec.ts
+++ b/src/services/usageEvent.service.spec.ts
@@ -1,8 +1,8 @@
+import { QueryResult } from 'cozy-client'
+import { UsageEventType } from 'enum/usageEvent.enum'
import { DateTime } from 'luxon'
-import mockClient from '../../tests/__mocks__/client'
-import UsageEventService from './usageEvent.service'
import { AddEventParams, UsageEventEntity } from 'models'
-import { QueryResult } from 'cozy-client'
+import mockClient from '../../tests/__mocks__/client'
import {
allUsageEventsData,
connectionAttemptEGLError,
@@ -12,7 +12,7 @@ import {
usageEventData,
usageEventEntityData,
} from '../../tests/__mocks__/usageEventsData.mock'
-import { UsageEventType } from 'enum/usageEvent.enum'
+import UsageEventService from './usageEvent.service'
const localSpy = jest.spyOn(DateTime, 'local')
diff --git a/src/store/challenge/challenge.action.spec.ts b/src/store/challenge/challenge.action.spec.ts
index 3a5819e39..66bc6f0e6 100644
--- a/src/store/challenge/challenge.action.spec.ts
+++ b/src/store/challenge/challenge.action.spec.ts
@@ -1,14 +1,14 @@
+import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
import {
+ setChallengeConsumption,
+ setUserChallengeList,
+ SET_CHALLENGE_CONSUMPTION,
SET_USER_CHALLENGE_LIST,
- UPDATE_USER_CHALLENGE_LIST,
+ unlockNextUserChallenge,
UNLOCK_NEXT_USER_CHALLENGE,
- SET_CHALLENGE_CONSUMPTION,
- setUserChallengeList,
updateUserChallengeList,
- unlockNextUserChallenge,
- setChallengeConsumption,
+ UPDATE_USER_CHALLENGE_LIST,
} from './challenge.actions'
-import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock'
describe('challenge actions', () => {
it('should create an action to set userChallengeList', () => {
diff --git a/src/store/challenge/challenge.reducer.spec.ts b/src/store/challenge/challenge.reducer.spec.ts
index 53959e600..fddfec7f8 100644
--- a/src/store/challenge/challenge.reducer.spec.ts
+++ b/src/store/challenge/challenge.reducer.spec.ts
@@ -1,18 +1,18 @@
-import { challengeReducer } from './challenge.reducer'
-import {
- SET_USER_CHALLENGE_LIST,
- UPDATE_USER_CHALLENGE_LIST,
- UNLOCK_NEXT_USER_CHALLENGE,
- SET_CHALLENGE_CONSUMPTION,
-} from './challenge.actions'
-import { Dataload, ChallengeState, UserChallenge } from 'models'
import { UserChallengeState } from 'enum/userChallenge.enum'
+import { DateTime } from 'luxon'
+import { ChallengeState, Dataload, UserChallenge } from 'models'
+import { mockInitialChallengeState } from '../../../tests/__mocks__/store'
import {
userChallengeData,
userChallengeDefault,
} from '../../../tests/__mocks__/userChallengeData.mock'
-import { DateTime } from 'luxon'
-import { mockInitialChallengeState } from '../../../tests/__mocks__/store'
+import {
+ SET_CHALLENGE_CONSUMPTION,
+ SET_USER_CHALLENGE_LIST,
+ UNLOCK_NEXT_USER_CHALLENGE,
+ UPDATE_USER_CHALLENGE_LIST,
+} from './challenge.actions'
+import { challengeReducer } from './challenge.reducer'
describe('challenge reducer', () => {
it('should return the initial state', () => {
diff --git a/src/store/challenge/challenge.reducer.ts b/src/store/challenge/challenge.reducer.ts
index 4a4ce3c02..34efada3e 100644
--- a/src/store/challenge/challenge.reducer.ts
+++ b/src/store/challenge/challenge.reducer.ts
@@ -1,13 +1,13 @@
+import { UserChallengeState } from 'enum/userChallenge.enum'
+import { ChallengeState } from 'models'
import { Reducer } from 'redux'
import {
+ ChallengeActionTypes,
+ SET_CHALLENGE_CONSUMPTION,
SET_USER_CHALLENGE_LIST,
- UPDATE_USER_CHALLENGE_LIST,
UNLOCK_NEXT_USER_CHALLENGE,
- SET_CHALLENGE_CONSUMPTION,
- ChallengeActionTypes,
+ UPDATE_USER_CHALLENGE_LIST,
} from './challenge.actions'
-import { ChallengeState } from 'models'
-import { UserChallengeState } from 'enum/userChallenge.enum'
const initialState: ChallengeState = {
userChallengeList: [],
diff --git a/src/store/chart/chart.action.spec.ts b/src/store/chart/chart.action.spec.ts
index 5a3815c37..cda42cae7 100644
--- a/src/store/chart/chart.action.spec.ts
+++ b/src/store/chart/chart.action.spec.ts
@@ -1,20 +1,20 @@
import { TimeStep } from 'enum/timeStep.enum'
import { DateTime } from 'luxon'
+import { graphData } from '../../../tests/__mocks__/datachartData.mock'
import {
- SET_CURRENT_TIMESTEP,
- SET_SELECTED_DATE,
- SET_CURRENT_INDEX,
- SET_CURRENT_DATACHART,
- SET_LOADING,
- setCurrentTimeStep,
- setSelectedDate,
- setCurrentIndex,
setCurrentDatachart,
setCurrentDatachartIndex,
+ setCurrentIndex,
+ setCurrentTimeStep,
setLoading,
+ setSelectedDate,
+ SET_CURRENT_DATACHART,
SET_CURRENT_DATACHART_INDEX,
+ SET_CURRENT_INDEX,
+ SET_CURRENT_TIMESTEP,
+ SET_LOADING,
+ SET_SELECTED_DATE,
} from './chart.actions'
-import { graphData } from '../../../tests/__mocks__/datachartData.mock'
describe('chart actions', () => {
it('should create an action to set selected date', () => {
diff --git a/src/store/chart/chart.reducer.spec.ts b/src/store/chart/chart.reducer.spec.ts
index ff94b5340..228c9404b 100644
--- a/src/store/chart/chart.reducer.spec.ts
+++ b/src/store/chart/chart.reducer.spec.ts
@@ -1,16 +1,16 @@
-import { chartReducer } from './chart.reducer'
+import { TimeStep } from 'enum/timeStep.enum'
+import { DateTime } from 'luxon'
+import { graphData } from '../../../tests/__mocks__/datachartData.mock'
+import { mockInitialChartState } from '../../../tests/__mocks__/store'
import {
- SET_CURRENT_TIMESTEP,
- SET_SELECTED_DATE,
- SET_CURRENT_INDEX,
SET_CURRENT_DATACHART,
SET_CURRENT_DATACHART_INDEX,
+ SET_CURRENT_INDEX,
+ SET_CURRENT_TIMESTEP,
SET_LOADING,
+ SET_SELECTED_DATE,
} from './chart.actions'
-import { DateTime } from 'luxon'
-import { TimeStep } from 'enum/timeStep.enum'
-import { mockInitialChartState } from '../../../tests/__mocks__/store'
-import { graphData } from '../../../tests/__mocks__/datachartData.mock'
+import { chartReducer } from './chart.reducer'
describe('chart reducer', () => {
it('should return the initial state', () => {
diff --git a/src/store/chart/chart.reducer.ts b/src/store/chart/chart.reducer.ts
index 51e15ffb1..8b08d1097 100644
--- a/src/store/chart/chart.reducer.ts
+++ b/src/store/chart/chart.reducer.ts
@@ -1,16 +1,16 @@
+import { TimeStep } from 'enum/timeStep.enum'
+import { DateTime } from 'luxon'
+import { ChartState } from 'models/chart.model'
import { Reducer } from 'redux'
import {
- SET_SELECTED_DATE,
- SET_CURRENT_TIMESTEP,
- SET_CURRENT_INDEX,
+ ChartActionTypes,
SET_CURRENT_DATACHART,
SET_CURRENT_DATACHART_INDEX,
+ SET_CURRENT_INDEX,
+ SET_CURRENT_TIMESTEP,
SET_LOADING,
- ChartActionTypes,
+ SET_SELECTED_DATE,
} from 'store/chart/chart.actions'
-import { ChartState } from 'models/chart.model'
-import { TimeStep } from 'enum/timeStep.enum'
-import { DateTime } from 'luxon'
const initialState: ChartState = {
selectedDate: DateTime.local().endOf('minute').setZone('utc', {
diff --git a/src/store/global/global.action.spec.ts b/src/store/global/global.action.spec.ts
index a06bc8a66..ed48220aa 100644
--- a/src/store/global/global.action.spec.ts
+++ b/src/store/global/global.action.spec.ts
@@ -2,20 +2,20 @@ import { ScreenType } from 'enum/screen.enum'
import { mockCustomPopup } from '../../../tests/__mocks__/customPopup.mock'
import { mockInitialGlobalState } from '../../../tests/__mocks__/store'
import {
+ changeScreenType,
CHANGE_SCREEN_TYPE,
- TOGGLE_CHALLENGE_EXPLORATION_NOTIFICATION,
- TOGGLE_CHALLENGE_ACTION_NOTIFICATION,
- TOGGLE_CHALLENGE_DUEL_NOTIFICATION,
- TOGGLE_ANALYSIS_NOTIFICATION,
+ setCustomPopup,
+ setFluidStatus,
+ SET_CUSTOM_POPUP,
SET_FLUID_STATUS,
- changeScreenType,
- toggleChallengeExplorationNotification,
+ toggleAnalysisNotification,
toggleChallengeActionNotification,
toggleChallengeDuelNotification,
- toggleAnalysisNotification,
- setFluidStatus,
- SET_CUSTOM_POPUP,
- setCustomPopup,
+ toggleChallengeExplorationNotification,
+ TOGGLE_ANALYSIS_NOTIFICATION,
+ TOGGLE_CHALLENGE_ACTION_NOTIFICATION,
+ TOGGLE_CHALLENGE_DUEL_NOTIFICATION,
+ TOGGLE_CHALLENGE_EXPLORATION_NOTIFICATION,
} from './global.actions'
describe('global actions', () => {
diff --git a/src/store/modal/modal.action.spec.ts b/src/store/modal/modal.action.spec.ts
index c111d6fd1..2d5ab156c 100644
--- a/src/store/modal/modal.action.spec.ts
+++ b/src/store/modal/modal.action.spec.ts
@@ -1,6 +1,6 @@
import {
- UPDATE_MODAL_ISFEEDBACKSOPEN,
updateModalIsFeedbacksOpen,
+ UPDATE_MODAL_ISFEEDBACKSOPEN,
} from './modal.actions'
describe('modal actions', () => {
diff --git a/src/store/modal/modal.reducer.spec.ts b/src/store/modal/modal.reducer.spec.ts
index 4735069af..bedcdadeb 100644
--- a/src/store/modal/modal.reducer.spec.ts
+++ b/src/store/modal/modal.reducer.spec.ts
@@ -1,6 +1,6 @@
-import { modalReducer } from './modal.reducer'
-import { UPDATE_MODAL_ISFEEDBACKSOPEN } from './modal.actions'
import { mockInitialModalState } from '../../../tests/__mocks__/store'
+import { UPDATE_MODAL_ISFEEDBACKSOPEN } from './modal.actions'
+import { modalReducer } from './modal.reducer'
describe('modal reducer', () => {
it('should return the initial state', () => {
diff --git a/src/store/modal/modal.reducer.ts b/src/store/modal/modal.reducer.ts
index 9833fb124..482be122b 100644
--- a/src/store/modal/modal.reducer.ts
+++ b/src/store/modal/modal.reducer.ts
@@ -1,9 +1,9 @@
+import { ModalState } from 'models'
import { Reducer } from 'redux'
import {
- UPDATE_MODAL_ISFEEDBACKSOPEN,
ModalActionTypes,
+ UPDATE_MODAL_ISFEEDBACKSOPEN,
} from 'store/modal/modal.actions'
-import { ModalState } from 'models'
const initialState: ModalState = {
isFeedbacksOpen: false,
diff --git a/src/store/profile/profile.actions.ts b/src/store/profile/profile.actions.ts
index eb8ef46cf..c589a65c5 100644
--- a/src/store/profile/profile.actions.ts
+++ b/src/store/profile/profile.actions.ts
@@ -1,7 +1,7 @@
import { Client } from 'cozy-client'
import { Profile } from 'models'
-import ProfileService from 'services/profile.service'
import { Dispatch } from 'react'
+import ProfileService from 'services/profile.service'
import { AppStore } from 'store'
export const UPDATE_PROFILE = 'UPDATE_PROFILE'
diff --git a/src/store/profileEcogesture/profileEcogesture.action.spec.ts b/src/store/profileEcogesture/profileEcogesture.action.spec.ts
index ce271348d..3047ecd4f 100644
--- a/src/store/profileEcogesture/profileEcogesture.action.spec.ts
+++ b/src/store/profileEcogesture/profileEcogesture.action.spec.ts
@@ -1,8 +1,8 @@
+import { mockProfileEcogesture } from '../../../tests/__mocks__/profileEcogesture.mock'
import {
createMockStore,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
-import { mockProfileEcogesture } from '../../../tests/__mocks__/profileEcogesture.mock'
import {
updateProfileEcogesture,
UPDATE_PROFILEECOGESTURE,
diff --git a/src/store/profileEcogesture/profileEcogesture.actions.ts b/src/store/profileEcogesture/profileEcogesture.actions.ts
index 67379dd86..8ffa09f17 100644
--- a/src/store/profileEcogesture/profileEcogesture.actions.ts
+++ b/src/store/profileEcogesture/profileEcogesture.actions.ts
@@ -1,9 +1,9 @@
import { Client } from 'cozy-client'
-import { Dispatch } from 'react'
-import { AppStore } from 'store'
-import { ProfileEcogesture } from 'models/profileEcogesture.model'
import { PROFILEECOGESTURE_DOCTYPE } from 'doctypes/com-grandlyon-ecolyo-profileecogesture'
+import { ProfileEcogesture } from 'models/profileEcogesture.model'
+import { Dispatch } from 'react'
import ProfileEcogestureService from 'services/profileEcogesture.service'
+import { AppStore } from 'store'
export const UPDATE_PROFILEECOGESTURE = 'UPDATE_PROFILEECOGESTURE'
export const CREATE_NEW_PROFILEECOGESTURE = 'CREATE_NEW_PROFILEECOGESTURE'
diff --git a/src/store/profileEcogesture/profileEcogesture.reducer.spec.ts b/src/store/profileEcogesture/profileEcogesture.reducer.spec.ts
index 71662a591..8980936c0 100644
--- a/src/store/profileEcogesture/profileEcogesture.reducer.spec.ts
+++ b/src/store/profileEcogesture/profileEcogesture.reducer.spec.ts
@@ -1,9 +1,9 @@
-import { profileEcogestureReducer } from './profileEcogesture.reducer'
-import { UPDATE_PROFILEECOGESTURE } from './profileEcogesture.actions'
import {
mockProfileEcogesture,
mockProfileEcogestureUpdated,
} from '../../../tests/__mocks__/profileEcogesture.mock'
+import { UPDATE_PROFILEECOGESTURE } from './profileEcogesture.actions'
+import { profileEcogestureReducer } from './profileEcogesture.reducer'
describe('profileEcogesture reducer', () => {
it('should return the initial state', () => {
diff --git a/src/store/profileEcogesture/profileEcogesture.reducer.ts b/src/store/profileEcogesture/profileEcogesture.reducer.ts
index 40646dc63..d9ea84e23 100644
--- a/src/store/profileEcogesture/profileEcogesture.reducer.ts
+++ b/src/store/profileEcogesture/profileEcogesture.reducer.ts
@@ -1,6 +1,6 @@
-import { Reducer } from 'redux'
import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
import { ProfileEcogesture } from 'models/profileEcogesture.model'
+import { Reducer } from 'redux'
import {
CREATE_NEW_PROFILEECOGESTURE,
ProfileEcogestureActionTypes,
diff --git a/src/store/profileType/profileType.actions.spec.ts b/src/store/profileType/profileType.actions.spec.ts
index c08db15e0..3e0cebf6d 100644
--- a/src/store/profileType/profileType.actions.spec.ts
+++ b/src/store/profileType/profileType.actions.spec.ts
@@ -1,9 +1,9 @@
-import { UPDATE_PROFILETYPE, updateProfileType } from './profileType.actions'
import { profileTypeData } from '../../../tests/__mocks__/profileType.mock'
import {
createMockStore,
mockInitialEcolyoState,
} from '../../../tests/__mocks__/store'
+import { updateProfileType, UPDATE_PROFILETYPE } from './profileType.actions'
const mockUpdateProfileType = jest.fn()
jest.mock('services/profileTypeEntity.service', () => {
diff --git a/src/store/profileType/profileType.actions.ts b/src/store/profileType/profileType.actions.ts
index 8df276089..9939d9acf 100644
--- a/src/store/profileType/profileType.actions.ts
+++ b/src/store/profileType/profileType.actions.ts
@@ -1,9 +1,9 @@
import { Client } from 'cozy-client'
+import { PROFILETYPE_DOCTYPE } from 'doctypes'
import { ProfileType } from 'models'
import { Dispatch } from 'react'
-import { AppStore } from 'store'
-import { PROFILETYPE_DOCTYPE } from 'doctypes'
import ProfileTypeEntityService from 'services/profileTypeEntity.service'
+import { AppStore } from 'store'
export const UPDATE_PROFILETYPE = 'UPDATE_PROFILETYPE'
export const CREATE_NEW_PROFILETYPE = 'CREATE_NEW_PROFILETYPE'
diff --git a/src/store/profileType/profileType.reducer.spec.ts b/src/store/profileType/profileType.reducer.spec.ts
index ac7235284..8c92d82a0 100644
--- a/src/store/profileType/profileType.reducer.spec.ts
+++ b/src/store/profileType/profileType.reducer.spec.ts
@@ -1,7 +1,7 @@
-import { profileTypeReducer } from './profileType.reducer'
-import { UPDATE_PROFILETYPE } from './profileType.actions'
-import { mockInitialProfileTypeState } from '../../../tests/__mocks__/store'
import { profileTypeData } from '../../../tests/__mocks__/profileType.mock'
+import { mockInitialProfileTypeState } from '../../../tests/__mocks__/store'
+import { UPDATE_PROFILETYPE } from './profileType.actions'
+import { profileTypeReducer } from './profileType.reducer'
describe('profile reducer', () => {
it('should return the initial state', () => {
diff --git a/src/store/profileType/profileType.reducer.ts b/src/store/profileType/profileType.reducer.ts
index a5debb195..bf95bf17d 100644
--- a/src/store/profileType/profileType.reducer.ts
+++ b/src/store/profileType/profileType.reducer.ts
@@ -1,10 +1,4 @@
-import { Reducer } from 'redux'
-import {
- UPDATE_PROFILETYPE,
- CREATE_NEW_PROFILETYPE,
-} from 'store/profileType/profileType.actions'
-import { ProfileType } from 'models'
-import { DateTime } from 'luxon'
+import { FluidType } from 'enum/fluid.enum'
import {
ConstructionYear,
Floor,
@@ -16,7 +10,13 @@ import {
ThreeChoicesAnswer,
WarmingType,
} from 'enum/profileType.enum'
-import { FluidType } from 'enum/fluid.enum'
+import { DateTime } from 'luxon'
+import { ProfileType } from 'models'
+import { Reducer } from 'redux'
+import {
+ CREATE_NEW_PROFILETYPE,
+ UPDATE_PROFILETYPE,
+} from 'store/profileType/profileType.actions'
import { ProfileTypeActionTypes } from './profileType.actions'
const initialState: ProfileType = {
diff --git a/src/styles/base/_breakpoint.scss b/src/styles/base/_breakpoint.scss
index 26eb95808..8cb548197 100644
--- a/src/styles/base/_breakpoint.scss
+++ b/src/styles/base/_breakpoint.scss
@@ -5,10 +5,9 @@ $width-tablet: 1023px;
$width-desktop: 1200px;
$width-large-desktop: 1201px;
-
-$small-phone: "only screen and (max-width : #{$width-small-phone})";
-$phone: "only screen and (max-width : #{$width-phone})";
-$large-phone: "only screen and (max-width : #{$width-large-phone})";
-$tablet: "only screen and (max-width : #{$width-tablet})";
-$desktop: "only screen and (max-width : #{$width-desktop})";
-$large-desktop: "only screen and (min-width : #{$width-large-desktop})";
+$small-phone: 'only screen and (max-width : #{$width-small-phone})';
+$phone: 'only screen and (max-width : #{$width-phone})';
+$large-phone: 'only screen and (max-width : #{$width-large-phone})';
+$tablet: 'only screen and (max-width : #{$width-tablet})';
+$desktop: 'only screen and (max-width : #{$width-desktop})';
+$large-desktop: 'only screen and (min-width : #{$width-large-desktop})';
diff --git a/src/styles/components/_expansion-panel.scss b/src/styles/components/_expansion-panel.scss
index c3a2444f5..b7a3fd566 100644
--- a/src/styles/components/_expansion-panel.scss
+++ b/src/styles/components/_expansion-panel.scss
@@ -1,6 +1,6 @@
@import '../base/color';
-div.expansion-panel-root{
+div.expansion-panel-root {
margin: 1.2rem 0;
color: $grey-bright;
background: $grey-linear-gradient-background;
@@ -18,7 +18,7 @@ div.expansion-panel-root{
border: 1px solid $red-primary;
}
}
-div.expansion-panel-summary{
+div.expansion-panel-summary {
padding: 0.25rem 1.2rem;
min-height: 4rem;
&.Mui-focused {
@@ -49,4 +49,4 @@ div.expansion-panel-content {
}
div.expansion-panel-details {
padding: 0 1.2rem 1.2rem;
-}
\ No newline at end of file
+}
diff --git a/src/targets/mobile/DOCS.md b/src/targets/mobile/DOCS.md
index 9ac66d690..d5a967aa7 100644
--- a/src/targets/mobile/DOCS.md
+++ b/src/targets/mobile/DOCS.md
@@ -1,2 +1,3 @@
# Mobile development documentation
+
[Cozy Docs](https://cozy.github.io/cozy-docs-v3/en/dev/cordova/)
diff --git a/src/targets/services/aggregatorUsageEvents.ts b/src/targets/services/aggregatorUsageEvents.ts
index 9a2c6fd14..58c54bcba 100644
--- a/src/targets/services/aggregatorUsageEvents.ts
+++ b/src/targets/services/aggregatorUsageEvents.ts
@@ -1,27 +1,27 @@
-import logger from 'cozy-logger'
+import * as Sentry from '@sentry/react'
import { Client } from 'cozy-client'
-import { runService } from './service'
-import UsageEventService from 'services/usageEvent.service'
-import ProfileService from 'services/profile.service'
-import ConsumptionService from 'services/consumption.service'
-import { FluidStatus, PerformanceIndicator, UsageEvent } from 'models'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import { DateTime } from 'luxon'
-import { toNumber, uniq } from 'lodash'
-import FluidService from 'services/fluid.service'
+import logger from 'cozy-logger'
+import { DaccEvent } from 'enum/dacc.enum'
import { FluidState, FluidType } from 'enum/fluid.enum'
-import { getFluidType } from 'utils/utils'
+import { FluidSlugType } from 'enum/fluidSlug.enum'
+import { WarmingType } from 'enum/profileType.enum'
import { TimeStep } from 'enum/timeStep.enum'
-import EnvironmentService from 'services/environment.service'
-import { DaccEvent } from 'enum/dacc.enum'
+import { UsageEventType } from 'enum/usageEvent.enum'
import { UsageEventProperties } from 'enum/usageEventProperties.enum'
-import ChallengeService from 'services/challenge.service'
import { UserChallengeState } from 'enum/userChallenge.enum'
+import { toNumber, uniq } from 'lodash'
+import { DateTime } from 'luxon'
+import { FluidStatus, PerformanceIndicator, UsageEvent } from 'models'
+import ChallengeService from 'services/challenge.service'
+import ConsumptionService from 'services/consumption.service'
+import EnvironmentService from 'services/environment.service'
+import FluidService from 'services/fluid.service'
+import ProfileService from 'services/profile.service'
import ProfileTypeEntityService from 'services/profileTypeEntity.service'
import TermsService from 'services/terms.service'
-import { WarmingType } from 'enum/profileType.enum'
-import { FluidSlugType } from 'enum/fluidSlug.enum'
-import * as Sentry from '@sentry/react'
+import UsageEventService from 'services/usageEvent.service'
+import { getFluidType } from 'utils/utils'
+import { runService } from './service'
const logStack = logger.namespace('aggregatorUsageEvents')
diff --git a/src/targets/services/consumptionAlert.ts b/src/targets/services/consumptionAlert.ts
index 668306c10..253411f65 100644
--- a/src/targets/services/consumptionAlert.ts
+++ b/src/targets/services/consumptionAlert.ts
@@ -1,16 +1,16 @@
-import logger from 'cozy-logger'
import { Client } from 'cozy-client'
+import logger from 'cozy-logger'
+import { FluidType } from 'enum/fluid.enum'
import get from 'lodash/get'
-import { runService } from './service'
-import ProfileService from 'services/profile.service'
-import MailService from 'services/mail.service'
import { DateTime } from 'luxon'
-const consumptionLimit = require('notifications/consumptionLimit.hbs')
import mjml2html from 'mjml'
-import { FluidType } from 'enum/fluid.enum'
import ConsumptionService from 'services/consumption.service'
-import { getPreviousMonthName } from 'utils/utils'
import EnvironmentService from 'services/environment.service'
+import MailService from 'services/mail.service'
+import ProfileService from 'services/profile.service'
+import { getPreviousMonthName } from 'utils/utils'
+import { runService } from './service'
+const consumptionLimit = require('notifications/consumptionLimit.hbs')
const logStack = logger.namespace('alert')
diff --git a/src/types/cozy-client.d.ts b/src/types/cozy-client.d.ts
index b61868595..f4d0ae630 100644
--- a/src/types/cozy-client.d.ts
+++ b/src/types/cozy-client.d.ts
@@ -1,5 +1,5 @@
+import { RealtimePlugin, TRealtimePlugin } from 'cozy-realtime'
import * as CozyStackClient from 'cozy-stack-client'
-import { TRealtimePlugin, RealtimePlugin } from 'cozy-realtime'
import { TDoctype } from 'doctypes'
import { Relation } from 'models'
diff --git a/src/utils/date.spec.ts b/src/utils/date.spec.ts
index ea24f0a3f..dca7d2e2d 100644
--- a/src/utils/date.spec.ts
+++ b/src/utils/date.spec.ts
@@ -5,13 +5,13 @@ import { Dataload } from 'models'
import { graphData } from '../../tests/__mocks__/datachartData.mock'
import {
compareDates,
- isLastDateReached,
- isLastPeriodReached,
- getLagDays,
convertDateToMonthString,
+ convertDateToMonthYearString,
convertDateToShortDateString,
getActualAnalysisDate,
- convertDateToMonthYearString,
+ getLagDays,
+ isLastDateReached,
+ isLastPeriodReached,
} from './date'
describe('date utils', () => {
diff --git a/src/utils/date.ts b/src/utils/date.ts
index 7ee3c6ad0..06eb684e8 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -1,6 +1,6 @@
-import { DateTime } from 'luxon'
-import { TimeStep } from 'enum/timeStep.enum'
import { FluidType } from 'enum/fluid.enum'
+import { TimeStep } from 'enum/timeStep.enum'
+import { DateTime } from 'luxon'
import { Dataload } from 'models'
export function compareDates(dateA: DateTime, dateB: DateTime) {
diff --git a/src/utils/hash.spec.ts b/src/utils/hash.spec.ts
index 875565bcc..6480d4628 100644
--- a/src/utils/hash.spec.ts
+++ b/src/utils/hash.spec.ts
@@ -1,5 +1,5 @@
-import { hashFile } from './hash'
import { ecogesturesData } from '../../tests/__mocks__/ecogesturesData.mock'
+import { hashFile } from './hash'
describe('hash utilis test', () => {
describe('hashFile test', () => {
diff --git a/src/utils/picto.spec.ts b/src/utils/picto.spec.ts
index 29258cd1f..c3c67e809 100644
--- a/src/utils/picto.spec.ts
+++ b/src/utils/picto.spec.ts
@@ -1,23 +1,23 @@
-import { FluidType } from 'enum/fluid.enum'
-import ElecIcon from '../assets/icons/visu/elec.svg'
-import WaterIcon from '../assets/icons/visu/water.svg'
-import GasIcon from '../assets/icons/visu/gas.svg'
-import ElecSmallIcon from '../assets/icons/visu/elec-small.svg'
-import WaterSmallIcon from '../assets/icons/visu/water-small.svg'
-import GasSmallIcon from '../assets/icons/visu/gas-small.svg'
import AddElecIcon from 'assets/icons/ico/add-elec.svg'
-import AddWaterIcon from 'assets/icons/ico/add-water.svg'
import AddGasIcon from 'assets/icons/ico/add-gas.svg'
+import AddWaterIcon from 'assets/icons/ico/add-water.svg'
+import iconEglWhiteLogo from 'assets/icons/visu/egl-logo-white.svg'
+import iconEglLogo from 'assets/icons/visu/egl-logo.svg'
import ElecParamIcon from 'assets/icons/visu/elec-param.svg'
-import WaterParamIcon from 'assets/icons/visu/water-param.svg'
-import GasParamIcon from 'assets/icons/visu/gas-param.svg'
-import MultiIcon from 'assets/icons/visu/multi-icon.svg'
-import iconEnedisLogo from 'assets/icons/visu/enedis-logo.svg'
import iconEnedisWhiteLogo from 'assets/icons/visu/enedis-logo-white.svg'
-import iconGrdfLogo from 'assets/icons/visu/grdf-logo.svg'
+import iconEnedisLogo from 'assets/icons/visu/enedis-logo.svg'
+import GasParamIcon from 'assets/icons/visu/gas-param.svg'
import iconGrdfWhiteLogo from 'assets/icons/visu/grdf-logo-white.svg'
-import iconEglLogo from 'assets/icons/visu/egl-logo.svg'
-import iconEglWhiteLogo from 'assets/icons/visu/egl-logo-white.svg'
+import iconGrdfLogo from 'assets/icons/visu/grdf-logo.svg'
+import MultiIcon from 'assets/icons/visu/multi-icon.svg'
+import WaterParamIcon from 'assets/icons/visu/water-param.svg'
+import { FluidType } from 'enum/fluid.enum'
+import ElecSmallIcon from '../assets/icons/visu/elec-small.svg'
+import ElecIcon from '../assets/icons/visu/elec.svg'
+import GasSmallIcon from '../assets/icons/visu/gas-small.svg'
+import GasIcon from '../assets/icons/visu/gas.svg'
+import WaterSmallIcon from '../assets/icons/visu/water-small.svg'
+import WaterIcon from '../assets/icons/visu/water.svg'
import { getAddPicto, getParamPicto, getPartnerPicto, getPicto } from './picto'
describe('picto utilis test', () => {
diff --git a/src/utils/picto.ts b/src/utils/picto.ts
index 6f5d9e5b5..7c093d39f 100644
--- a/src/utils/picto.ts
+++ b/src/utils/picto.ts
@@ -1,30 +1,30 @@
-import ElecIcon from '../assets/icons/visu/elec.svg'
-import ElecUnactive from '../assets/icons/visu/elec-grey.svg'
-import WaterIcon from '../assets/icons/visu/water.svg'
-import WaterUnactive from '../assets/icons/visu/water-grey.svg'
-import GasIcon from '../assets/icons/visu/gas.svg'
-import GasUnactive from '../assets/icons/visu/gas-grey.svg'
-import ElecSmallIcon from '../assets/icons/visu/elec-small.svg'
-import WaterSmallIcon from '../assets/icons/visu/water-small.svg'
-import GasSmallIcon from '../assets/icons/visu/gas-small.svg'
import AddElecIcon from 'assets/icons/ico/add-elec.svg'
-import AddWaterIcon from 'assets/icons/ico/add-water.svg'
import AddGasIcon from 'assets/icons/ico/add-gas.svg'
-import ElecParamIcon from 'assets/icons/visu/elec-param.svg'
-import Multi from 'assets/icons/visu/multi.svg'
-import MultiUnactive from 'assets/icons/visu/multi-grey.svg'
-import DisconnectedActive from 'assets/icons/visu/disconnected.svg'
+import AddWaterIcon from 'assets/icons/ico/add-water.svg'
import Disconnected from 'assets/icons/visu/disconnected-grey.svg'
-import WaterParamIcon from 'assets/icons/visu/water-param.svg'
-import GasParamIcon from 'assets/icons/visu/gas-param.svg'
-import iconEnedisLogo from 'assets/icons/visu/enedis-logo.svg'
+import DisconnectedActive from 'assets/icons/visu/disconnected.svg'
+import iconEglWhiteLogo from 'assets/icons/visu/egl-logo-white.svg'
+import iconEglLogo from 'assets/icons/visu/egl-logo.svg'
+import ElecParamIcon from 'assets/icons/visu/elec-param.svg'
import iconEnedisWhiteLogo from 'assets/icons/visu/enedis-logo-white.svg'
-import iconGrdfLogo from 'assets/icons/visu/grdf-logo.svg'
+import iconEnedisLogo from 'assets/icons/visu/enedis-logo.svg'
+import GasParamIcon from 'assets/icons/visu/gas-param.svg'
import iconGrdfWhiteLogo from 'assets/icons/visu/grdf-logo-white.svg'
-import iconEglLogo from 'assets/icons/visu/egl-logo.svg'
-import iconEglWhiteLogo from 'assets/icons/visu/egl-logo-white.svg'
-import { FluidType } from '../enum/fluid.enum'
+import iconGrdfLogo from 'assets/icons/visu/grdf-logo.svg'
+import MultiUnactive from 'assets/icons/visu/multi-grey.svg'
+import Multi from 'assets/icons/visu/multi.svg'
+import WaterParamIcon from 'assets/icons/visu/water-param.svg'
import ConfigService from 'services/fluidConfig.service'
+import ElecUnactive from '../assets/icons/visu/elec-grey.svg'
+import ElecSmallIcon from '../assets/icons/visu/elec-small.svg'
+import ElecIcon from '../assets/icons/visu/elec.svg'
+import GasUnactive from '../assets/icons/visu/gas-grey.svg'
+import GasSmallIcon from '../assets/icons/visu/gas-small.svg'
+import GasIcon from '../assets/icons/visu/gas.svg'
+import WaterUnactive from '../assets/icons/visu/water-grey.svg'
+import WaterSmallIcon from '../assets/icons/visu/water-small.svg'
+import WaterIcon from '../assets/icons/visu/water.svg'
+import { FluidType } from '../enum/fluid.enum'
/**
* Return an icon corresponding to FuildType enum
diff --git a/src/utils/utils.spec.ts b/src/utils/utils.spec.ts
index 0d32300e7..ade89ea08 100644
--- a/src/utils/utils.spec.ts
+++ b/src/utils/utils.spec.ts
@@ -1,6 +1,6 @@
-import { DateTime } from 'luxon'
import { Season } from 'enum/ecogesture.enum'
import { FluidType } from 'enum/fluid.enum'
+import { DateTime } from 'luxon'
import {
formatNumberValues,
getChallengeTitleWithLineReturn,
diff --git a/tsconfig.json b/tsconfig.json
index 037d4ebe9..02ef50158 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,19 +14,10 @@
"isolatedModules": true,
"noEmit": true,
"jsx": "react",
- "lib": [
- "esnext",
- "dom"
- ],
+ "lib": ["esnext", "dom"],
"paths": {
- "*": [
- "*",
- "../node_modules/*",
- "types/*"
- ]
+ "*": ["*", "../node_modules/*", "types/*"]
}
},
- "include": [
- "src/**/*", "tests/**/*"
- ]
+ "include": ["src/**/*", "tests/**/*"]
}
--
GitLab