diff --git a/app.config.alpha.js b/app.config.alpha.js
index 23d023ab4c1ce3a1af1050e2868035172c3b4b22..596d9d432bb053d5e567ac249ca156f9806b0dc2 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 5bd0f5e6b525699766a85fbd403169d3b0dcc9f7..358e507e32ffad4257461581dc8d52d130121f36 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 10ca55a3767664acf807dd1c9ef2ddd966238fb6..3e0c112641f98fe2ed5ade04b3d31a797f3a9da7 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 b112c41fe0a6199b90b6ed222afb403f00c0964c..039e82fc1d73b8c1217e0e3ba66429b3cd276461 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 d5abc98edde52c87860876cb53a4f3298855bf3b..2159ee996e6ff1e157ee57e3972b8ca8d8817391 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 376b0652329d4d8b1fe3245b18e043981b96b269..77447511e0b33bc184d7737ebed60ff9a70242cb 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 afdf64117986538b49a5040f2f8ffcb84261bbee..98337ce197aa12cd3587f325904bbca779faa914 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 8e1dd62322162d56377207995842acffa2895eaa..8997a3568a96c54ce47c0ee2fcbdfd51b56546fe 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 98cee53cdff3296cd4912cdf9eaf6527f2396c9a..982d724b60e8cdad27141c496ddec2857f291e7f 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 8627d2e829103a606d1aad326bc89189d555cfc4..44b7181c45e1c3b1e8d299d3bfc23094b80ddc22 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 8daa3a4fbc0085fac1207bb915fbfecffbd05fb7..5b35affa4321f50e90f2e3970945b3bc1e88df62 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 2deb45ac4ad4b3d3cee5ee7c0c71f6ebc5e3767d..b147d31cf440dafc9f9cd73c09e4a28cd448649f 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 c4a3fbeb8ed1f7b4984448c3d98638767ecc13b0..ba17cd10a43b3aa68cc79e439dc1bf1d9c69948f 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 49f1099e26f860bd8afe3951f52768755bc5dabe..2274e2d987d098cbfb9e6c02e11b9ba60258612e 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 702caef22cd3a763508c52e9ed90179538e8ea95..8cb7b89ca7e3ee6f59a9c30b89a3a4099fb58279 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 e04845561012176f17a145ff8ff19956e448781c..f24bc9e81a17d8a907a1a98305094e6fd79c81d0 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 9ce4cd90f3c0e38d3fceae44c5f4aaf3f57acd7e..2326f69a18a33bd840366f0409255be7b6bd3582 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 cbd20d0dcb97f58925e18cc1a4e35c7ca092ee9d..a3207082fa69a5d0ee49f4bcf92aa7bf47a84057 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 1b2b0ba284ca5327dba7a542c1b9f12073215f67..5224c3346aa4564669fa58add021c5c9b5dcc125 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 ec38f627242e4390c7442297dd30f9ecd8ff48b0..f5cad1f946cd0de6d4fb192fed62d931a5184364 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 ab9d33e918e9369c2a78ed777cc6df0d861137ee..21cfb67c11be43c25e72274b0ad9b1fa6c280122 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 11b0a66908c3bf5338bcb071e7adcfc800ca0d47..371b1e57c542b68586cae370d9d4268e16db8f87 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 65929a7cb42a84d8f2b46a5014cd93893f342c94..a33312c7354909625a4f2c14918bfbce26bd2295 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 2ec549add6f76f5e1ece5bf527f729fb31829249..86e68adf0af015baa9af94f746ca2d45108c07bd 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 6d14c65d6f6b08b65c7e38ebce8ba2aa183ae21a..238f2d338d1aab160603704dfa7121bc14a3dea9 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 d481a4d2a81665e1c4dcf4e5a948fd6abb9fa2bf..9519e7e99752c02f3c2ee0f63afecbfd833e1c90 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 6336cc75b7e92c9d2cf094248d5b6b63f893628e..32ae1227f6abc76df05071428447d3c9a04a56a1 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 0a304978c8e1a5527c6aef4cea4956e1ccba3043..b9b4cee801ba40f5a8014e7f04d391e71d86cf5d 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 80236b17128106e6182305ff54c56fc882de0776..a3d3f4d67acf4f9a1c9f117be6444c18ceb95e43 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 980beac580f7ef4b6425b2c9dd910293c63685ff..6624aae9e1b3ff4bdb2380b052ab94320ec88208 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 ca1ba37a471045121bec1f1a9d1be1c60d5a0986..8e92291ead926ea84d3e21d875936e2f310ce18a 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 b9d5ff8cc8b6c48189cb9a1f2f6cbb305bc9cbed..9d9c0e9fc72aab0f6b80e2bb9a055fe3e1aa98ad 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 1e33a61329085affa7c19b006327cbb235a5dc19..ddae531e629c51015fb73b4e385313f97ae91cf8 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 47ce2ce2b5535aaef9a2251b151d6232058d011e..6e4bcedb48f4fd5464ad43fe1a8fa763659101db 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 6afe50b68b61a88da53b51ce27d2328a17f438c1..e956f006f55cc12f10ff93987397e9ec987738fd 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 871824baa987cc934fd9f2a6cbb0f883822ee7f0..3ef8f579fbebf4475a4b93debbd6bf1bb4f2b6f6 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 9302b9cd943a9abe3184bc380c06914348b28b7e..4ad15f3dc452e010bc3c62f4926141ef49146797 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 bfa9f22178273b13902c0c0cf78fe51310d8644f..668eb4e85347ac357817fadbc1188848c7f8ed74 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 18fc9e45fcdd2c985060cd31f7a6515e78beed38..710b50b34260c9918f952dd6ba6d0cc695ce9714 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 84c59fb729c26951e627bb8e16e6abb5d99494f6..5c043ccc5eb9424749ca7fb767bb20d57101bdac 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 e47408ad23520e872360a122ddf180e1e251e1d2..3e330fb29b9b7c3f66183e4f28c43cc3949dad6b 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 e669a5d07332862e775fade1c031464585c7361b..9e11a1b3af7dfba3954ebae2ce6267db42c0d186 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 c3dfb9703695d784cb91dbe93d4a03abff289095..38d535360f8a7667234e7fe9980bec0073e1c0a2 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 a3f76a0ceed0d1f76cb95adcf6df7c01383b3426..f61f2d4402989a5fe1a0e3e5de1caf520c08dd8f 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 5aebe397eed648346dea2183d75d1eb42a1130b1..59f7d4dcd2f8aaa19b90e84891a178bcffc97d34 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 d6890efa4474943a5a98fa95ce977035dbc6e5cc..cdce326b68db13739aa9fdbeebab575b5faec206 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 4bf07d365abfe830b7aba95841389a73b1fb2d81..10778e9ecb4b687db38c78aa7fe6178ad9db672c 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 9f2e6e5dbd8bf786d829691cdca6dc01e7d869bb..0b7bb4aff139e39a619041830a10b8206142ae63 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 e8d742296b8e6ad23d77b006e59dae91c437089e..77b94a6844c58f58a39ce4f33d09a3cb42521a04 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 b5b087ad3f39ba87e7758706c6581cb02e6216a4..5e879a5cd1e890cc8b4ce2f80143bd7cb7616a19 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 e6dd16f77facd44685da0743503f8994661458a7..8a703c146670b06884373cab7fdcf4be06817516 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 6ec0e550b0fb042da39dd822eadf0feb0cf5385c..761d01d449469faa7f29240f6d60359af9235dc2 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 11546e02eea4a27a97e478845edf43c1d7ad0562..c9a023fc47ad4bf616a637c4fa28b8744c0de744 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 4aaea811af86664831811cbc3e4d19219a5fa694..03e1b990581d3dfb13417329d5ee72d2e62c1020 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 00a82423b46d719e2c854355c4d4be3ffed23baf..2e585e6a7f3e701c5d50581246be3210117e5363 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 a82bd25f23d0c4ce508a7f8e1a8f31a321c411a9..9ffe2d19d0cdef5e4e0f418761f80d1df7538f2a 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 a2b02027cfe45ae4a19a47dc8ebc6d2dca8ab8c1..1772e89ff42cad50f04e69a7d50bc2b2f3eebe38 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 9eee50aa1a1310968066eaf09dcbc51884ff169d..e80bda11abbfde9f76b0601add74a3fa713cb757 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 9fc8b66bd622340ccb59b4c03dde027d912b9ece..6a2fccce49ef0223a3da74d504a2520ec936b3e3 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 a517038943eb0573b83e3a2c183a8c20874a8007..9450e052f8a28c8daeebbbeb3f00adabe959275d 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 69eaa4b64dd06bdbb1aad05a3893d3a0ed30bce4..6ec568182479006ce2b0692051151abcf923e5d2 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 c5513c1ef3fa9516d79d96f6f6338f8c0674d2c6..86efcf12d591964811923a9b982b963b0c45abb0 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 dd8b7fbdfc20ed56cddb82dfe43a08f3a4cb2e98..4874eaee45fa946607e3a3d1cd7efcb6ef1e6a38 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 4a6ffacf3c40c7e37edefbd4a17850a317ad8ee4..dba57dc00833286368cf785304f4713498147679 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 11007d24c1da41a0801b87ef401646ba4c4a66a6..eab7e13b49e302fd06c4851bf88aac47e540c354 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 9377278e20666b2d250966bfdae2446230b00954..b71bc2437545b116229465cbf2f7a4061b8edf93 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 fe02f644682aaaafa24fad8625051406f3c13871..fb64ac41b617dce10612d6692cebbef1de28c82f 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 f1e680ae2c54ba432b88a476a368a561f1a877f1..4594bec2e8c022f30e343ea80fda7800f28817b7 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 cef6acd8c784debd24d4757265284e0b0b00ca8b..04b194750ea7bf4b55ff0e79a04837c4f166ba35 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 348a7d9d6077effa0a4190e39b31f06bf02799cf..2aab5fb6d7410671eff7fdffbf227722cabc9605 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 14482e3c5bc62bc4738652ca9e5f385ea25f60dd..3132d25dad4af730f36e8a1f946cd529eec3d43d 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 6a515cd71baeab0f7dc8f0182a21e42013d8010f..25695cef1c98500a9f138555d1054d7cc976bdaf 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 b765c74730a02148aed03875c782c6299cde807c..7ce1a123f3dd2b3a0022acb1c83599b16b8e419e 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 4181b6a2ebccde40cdd799e5df89b08349f84fcf..adef58b74548389476dd0bb8091ee055eb481a6c 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 14f2db2dfc45fee0017b739e9b100517b3c5e9ef..e336163753a8e9fc10afd32e0fd41dbe9de6856f 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 12f759dc55119d8b30ae673e2f712832d2745a5f..30499b12e2959060c4529a247b2ebed526db0ee4 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 679d8ca0a069558a5214e2413d7e717f02f42ca0..4331448bb11135bb02fbd7323829c27f9358235c 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 030ed6ae736ae4fc95a9830cb25904989d127383..b69f82c0633574be35413988de5cf3a3de4fb474 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 d233665e12ecacb0436078ecd81839f41acd4d83..ca13f103c9b9e49161596d48110eab020b14facc 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 b61a39f2560b65b25bc4416b78d92da8b0b77e41..46ec8eb46a2586277643c61e846aab74c45d5c3e 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 bfa2adf669b49e918aaea35a329ded17f0b74871..7c1f57700326aa79c96f0ce1163b3b9d3933c277 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 976ab117515cd35e39e6c9c5681e1cd80173388e..9dfbb3d0df52e337a71b41478a4350b1889ef412 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 54538e998c97100782a69f08e9adec67e798a21c..eaa8d67195fbdaaea588bac2d525d34ba9d721a0 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 373de8b10fe165385f668fa85950654358b1bf44..2fbdf024ad98f3a766d0ec8f37213d22f0259b96 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 b1b1d28086b8651616c59080b59f48e073d4d705..0c99d1a3a71b9b90ec7e288a64ce212e139ac7e0 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 328d791c8489c74edc5a58433c139e16047d2f93..3f58c2ac72246a3ef6cecf97e8da1a27e3f8c4a6 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 e44d6484fb1368c6682a3b4666832c1367fc1c10..459de5914467eb9afd79a0154100b896ceefd453 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 aedd0ae584572d3fe31404503a00e86b336c3075..e0b34f0ec3f3592799701877b2745ce04043594f 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 10c3783167dfadf026429c797d88b2d8fadc3e0f..4001dd478a7dceb1714d6eefdebf93e65fc42d94 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 97ac7a1a5f389b4b409bc55a46fb8d4052a801c6..00d2985a6f20387d509ce152555f2685e4e207cf 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 3993af59ede7ee0f1331df44dd66af18e193434b..38c4ab1cf0f93e5e1070d742421559f626ed8851 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 e0ab6d225753f18c4b336200e5e58ed41beece17..ba1e99165961bccdb1b16ff15a912d39c6f2ee3b 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 e6abd217f67a318cb398c4a15dc6f7e230afbc2f..419d616a7a9bf21456aa830b98b649ec9590ef63 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 cb6325857acdc3db7bfc7e071ff3c0f75f155939..15d9da6e9de373e4106bd2a16985373407851ab9 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 412756216520f5113f5a1f71c9181360cebb7198..910d6dd0d2f798c972c8c2bd15a12a7218ddd51c 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 6b28de3796cfd74894268ca53e83d975ae5531fa..9905357d1e30d9ff543914b4e96ae07db5bf75db 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 e9fa30bf390b31f92145544d8874e2de635817c0..caeb21a2dc9b93a6f5473ed0b54f5d5b97619d76 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 daddf3c16433cf763b89ff273ca058b7feaab98b..469666600f0e86963c115e2f82dbd1d564d925ae 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 eab64499cd3bfdfcd56ac1e0e131613a806478bb..8fa20fd7cf2630ca631954a6764c20e493b26039 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 c41160d25732bac5a45416d1128c9ff9a16fecaf..6bd433f4919213f871dfca5a987f1b9f9b1a03a5 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 1a0ff36d5b6a42d5ed8ddc2b36007f5635b5c563..8e93c619c5f4f2e1ed050702aa534340bb9aaba0 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 27b1073dd4d645fca3bc29754fe5eaefdb03fda9..26ab115f3d3ee24d956d2d92d483972555f6295f 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 81990d9a416ef9422c4988835147792688ae8829..644d448fd590e1bea521abc5b0f196c226e663ba 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 9bb2aaf233436c894484424a6f618f0b259e1f25..640514c1dad200258f869dc55a37b3a0001dd219 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 8852f059e2fff1c9677acb69e7d37c964573d039..90cfc6c0a0e695e1e84f70b5c97955fef2669b7d 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 3cedb4649cc8a0e35800b3d50fad817fab7b45a6..9f1bb65ad4a75a3af83b56b8caa603feb174de2c 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 6de9ff9ce3c7632d6cc0f7e94b9581408027ae82..ea3bd2bf25c5fd32e270987bae2b015704c89421 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 904424ba61d16904d6c788a2fe0770ead1462b56..c016d8938fd90c8d9ac85e1c95ad6fb09c6fd7b2 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 c6cd58838d44a1c580f721e0db276f69e8e520d1..8e5fd37bd03404f1232befcd308b4cfe0f3236e9 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 58fd7a5954fe66606239bd09f0df3a4f70390948..ef7784cf8855bb95b5d48cc980c474f30ed77abe 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 93bbd7f6118c569254491cb1e22bd949b9bc34f7..b54a2f9fc40eeeaab177d02ef4a8bf8e064d8f39 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 246291866f230f0d6675eb1dfe3a4ed91aa2c397..c453578d42b9297a442a333b5f54c2a120ee29f4 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 b371ef2ae9562de3cda95a956ee90b9bc1fcfcae..0d3944d01c49f36ae917199b33d702c3a7524655 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 7b79865dec3e577616cd4c72a26ad0416f8d6dc4..8ec51c9d6fe7eae97ab70604d5e795e4ac9e2035 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 58988606516a277e9efb68559a440f7bb2e47677..4c42fea3fc920c5f6ff944c3f734f7447c14d9a7 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 6ede9dbdc54199016cf3717f459440d15105735f..d548f1340524edf6e0a5957d1feea21b47e3fc7f 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 84275d83bc6056bb85a120c6f190ee2847e001f4..ff7c1481a9cc6f01dea9d0e5c5a9daf5a186a462 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 1834608414a7e84f390927e8363ac624da88503d..c092103109d91c98ce47d26168de90998a4dd37e 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 b412c34a44895a829600d56bd286f9f0eb60fefb..7cdf129eeaeb24c33fa61990821566e3822e9aa9 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 9bf79a13482ddea17b480df0b2c8cea801f09e0f..cdccdd9750aa47d5395dd493cfa7ca928fcb9e91 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 5fdd7c022c339f8b01e15afed2a00c83ce8a349b..c61846e7e9e19f7a3eec242c602405746c1c1c52 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 e7cdc22c72e345c7a9989966f39c3751f11fbea1..84a928dcdea7f7f5e03fc000f3bb70d59f27c00e 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 9d24a0d2bfd91151d24226762d4b6bb63f878fb2..2579140a858f628e813c99bc4b9b4014927e3685 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 9a1c8df02b2537b8437226367d502066258269d1..4af5a9d40994e3e569a884f003b8290657193de9 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 2eb74c577ceddea56da2ee5306e0c63f876820e1..bb70374f39687ba73288543e89cf8b9bf2e1369e 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 13d4e02e9651ad48df2054bc9cb3efe584cf761c..8124169d7a6da85771fc34babf4d922a769866bd 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 eac9ba9bcd82b15968ed34a08aeb36b86f50c26b..d0696c7822d71c3f397c83ea5a1db3685a7100b3 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 00390b76c4a118c2f33820c0fd8755e923f9f4d1..35671df8602a7f24c3e49f859c6446b3739f6f98 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 d10e41da64fe2e422ea9b3a767ea30f198d404bc..1a185072e8ee090c3390842bbbcd7692f25139c2 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 c0aec753959902fa6697d74ec196de167d487857..e149a7c4324c91d9800f264733a4082674ade16b 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 9302b6be360e376f21cd1eacf9ffeab80de695ab..1a8ca9b8a57852fb3c1c5dc92fd7bc85c3bc0a7f 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 2c3c35247f8254d480c68843e29cc04757bb8d5e..8495f6616ec675652a5e738893e56230401cf61a 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 07be998ffe070da06a074117d7a28b891c5e0bd8..e9a446415d50e8c680620dd4f5983a41f2437f33 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 69296c020177a909d8e354410040bccab0cd60d9..c74c68c3b5a31ece0daaf62befb2bc232697559a 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 127642014faec613eb8798cc55e6be0803848fbc..04bf325167112608fd5994532ae21eddad8cbfd5 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 0f2f73c8d8ff3cec0c7882d4425683ba66266c7e..d0a1f04c6d5ca25e34771add9ad9c5b51eb71a45 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 f9584017073f82571905afd387ab6ae102ff97bd..b43d907b872b1458c83509dd9ce22c4521a6fd17 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 a31d03958e75df27bf91de38da7acdb762f2f669..385447bfb9cc0fcd628010007ebe995a1b57d475 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 04a5d172ef22a84b3bdf3855b2fa9874cb736d49..242cd490601b370fc48ed57060aeb89b86039eab 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 9e94a506506817a0345722a7ecdd80f9d532a58c..9d27584ff4298a7bdacc6e230789253eed619658 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 d4bf98789eecedaaa5b215ba2f34fc9cac53b734..afe099db8f59ab06d7cd33c6408b475254949971 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 f4f01a7f67017e02119a10983c3db5055d6aae3e..cfe2d0643d36ef31e5d92fba957af036c7438e80 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 87db1ca281596c8f7d95d1c0f6f7c10337c6c8a5..1532074626de3152e5c952d4bea05cd5e9e159e8 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 c543f5809667a2558d3044b8954173ee74fa3e29..192680150f0d1cd91d4ddd30319f9feda1cd4915 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 15ea7551493985e7fafc1612c667e6361810c296..f11e26b73177437144e975e510cf57f81a745652 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 a8a79137db1fc037a1e9f478d896a0229a288889..d0e7588f2e54478b620ec5f95915e0ec6b786843 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 fec5d9281ee4e4946d4f495562293e9b79611645..241cd54a9987fee3309ba022d03363a0a8ce0938 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 f6f54888929a9420023f7b050255492211417241..6cb1bdd7b2a2ed679c6f72855a5525a4cc945954 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 3b30e82a360e521b437dbe31b56fea011ca1b871..f84d639835334a30a8e19bcf51e627f78a823b4d 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 2d9af53b853e492e69ccd2bfdd3546e7e8e54965..2c5fceffbd11b61fbb1c5c1f3d6e486086bdabef 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 bcac7e89ca2ba93529cda6ecc61ebb036a995051..154bfef851e2d3d55570037b7dce35841a508f56 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 4c8fdbd4e5f1d88fb7733f0c9ecace7fdff84c28..292c3eba0118c4df484ed1d248c618b67e560ac1 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 95946d4ff711768cadf1dccd770494e42cad2b86..cb2308c8e088a66dc065180c7fa6e8aadfbcf810 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 788b2b8f42561dc40a70632b37708b16563bb210..daf57584765892879423ec486a95e32b98213a8b 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 db727e26414c3bc32b9640b17b46e500f9ff451f..3811cf41d02122d568f75059627d3a67ef0b20bb 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 3ce0d5e3868223f7c8a00f4ae713a34ab5a5e8a1..54f3a94981fb5c1268363fb60e56f70968ca1be1 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 fcc7ca4c8c3aa325be876b1975aaa462ba9e1adf..824cdfb09fe3bd295eddbe4ba881427177997ba8 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 472e416abd8ab2ee9a3d55bee9436ee07b7534cc..3903e80bccdfc267955e67bf3ab3875eae5b3476 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 62017f27e2c46c75bee2abcc64d42cf38768169d..213d71c273fb6421f9b5b672a59c2b77cdcb19f2 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 b8f32bd0a043b1cd9575b62e121e5eee5da51fbb..e41ab29105c560173544d6a994eaa31c3071ddc1 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 5f9855ca023ae44e37f1197e4ce746eaacbbb1c0..7d033074176a49e9aa8001a1a15153be6feac296 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 4ee6c5a0ece7327a2389fb34e43671577464ba52..62aa49fcdfd312b5c9b1f48ba4d42c5a71c64d3a 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 c79f7dc6f2652ce9c7d2b23ce5c48bcd7b8a602c..043b118826e19b7f95eafc562edddee5ef9dc803 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 b0c773391aff27f51d88031003a34f3fc65a593f..d092e7c69db04ab89f27b5e73a4fdb07a2398211 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 eb711a242a02d5794cca926962def5aa841d3afb..38dd790013a09b0f2876a3005320e523de40515b 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 0db3279e44b0dc4fb7e694b6cb10210a96ba6ba5..0967ef424bce6791893e9a57bb952f80fd536e93 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 7fe06c9f97f3428d9d696a64167737b0d08b6507..5e717326c8935395fdbb16f34c5b600f75dd7e55 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 cfda80f6d0607587eba13b20c72c0ba039aa4427..1e9bee4e14a790b0f90a275222314cf638a7610e 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 bd46e2391129350ea9b930c492e091614b6091f7..83687f7191a3e0a35fbfca2ecae29302c09c0eb0 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 6cd6e208121d089067285a3a363e1b3361009771..eccf99be8768779fca4eaff4b4f26a723323d0bc 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 ae7e808314d0b5193a975aeee5cc5973fd3659c9..2394d563d1d58e12d150170d19d9e73fc1b1a67b 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 08187ec483aa0eb76dc7850571df50832717ba5d..4e6a6d388bf0623fdccdbf26aba049a2e5975d2c 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 1accadc53a48197b600db8e2e01cb0ba9c26443d..a03221eb7381f73f201cd384710bac2ce7533eea 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 d445afddf0a7a92c1ea73d5d2f999400636fb706..878b0df70ff20a21b47e62b8cb371ddc4d16b8af 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 6665c67dce823688f5a7b9ea3e13eeab3e53547c..0d0b9b903351e5f2e9b31de9ca49d2fe21bb5dc2 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 c504f9869b488a896f9d30e8773a2f7dc5acaa1e..2536352fe46c394382248a611e53b056748d4a1b 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 69b682c0f1878c3f19e1fbfb24cc6d7acb59b755..cf028f828a3ae628bd1192333234d4c251508cd9 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 a3d19f98421c49f3de145633f8b23cdb12e20836..c1d2d227ce6d8c200344f1c4e25438f8341f23c3 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 01e769596b9fb367e39f479054f76e55b6ffa758..6eea6bfa56f7c29146325fa8e0746f3aaba3358a 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 eaf3ac35baebcafb3bd7b9d87682fb46a824e466..d1e2f3c9a049325545f8a5a3c0c6a20e82c8d521 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 8c44725272f38aa4d98c836e9a6a91ae78cdd410..069504500c8fe5b51eba5de82da88bde8fa86404 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 0a1f855ba4c2f6baa514bf5748bd78d8a4f35d15..590dae61334f4aaf5a027cf5fc3a9ed1107acbd9 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 2957f46199dafdb72428df2c46ee6521e925bdaa..dbb3be7527d383363280d27190c6d43381024adb 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 618e402dfb9298e34a6b677798f01f1a34aca5cc..7f3901487ce2cf808b519cfbc7e1ee27f4abbfcd 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 e78e403999fb843c453cfec1ac720fd9fd19825e..c48f2535c523c81097ea9d8035e1b60e3ac043be 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 09a59b3ad6f2c4400c8e5d3b941cb48303bdd597..f409995f4e50e0c3b354aa4d90d4efc15c8c0f71 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 12bfc03391b1477143d54cfad3f0d4d899c09db0..7448b0fe1b8820f68a7cffbc10047f7a28a715b1 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 4ed0ea21611cb52bb2e89bdb503f12ebae1906e0..3a5f15f44a8073bea2069c245bc55eae6f91d0a1 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 8979264f297f885402919ef57978e1fc3a61f431..cf2307bb942dc91f4cfc70603963583cd861db6f 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 40ddc77db05644fb4c019b09d13fa4275487a342..466dc382553606eaf85f62436abaf68067041d7d 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 74f7a6074e297b50f47d3d79084e1a5bf8ec3b47..430ede79307c0f2d2673c363ff39f860f7e6e36e 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 2e72db7c9615093a8c421e29dca55f409462391e..844fa0748a3415d23276f0b56e0fb98d804414e3 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 aaf620ab3fb3be1e99f334783fc68e3869d8c233..2f4a8a7864398235aa82c6f92c4c67ed0c7fa4ba 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 339db0b999eb4d0fe03ae8dba2b9f769e4b6103e..10addfe4a80f4664f740cfe8e5aa282f63fbe3d6 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 68d4505667297b693c06819215dd06def1435204..b67f09c8fb724dec1a27fe63beea7360c2d33c2b 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 37d5b0e857a6149245455eb7050387d3a7cd73ec..d38c43f890206a452748f08727539dcef79de78d 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 110127eaa48130bed884946382ed498ad7e9c892..1fc0e9b6615d78e35e6ae087f6c0cd743dece966 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 bbaa8a1a3fa6372c647b2921cf6c13313cebfc03..82f370ff97f789b294e8be179d09b83b63963654 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 ca0bb4cb5a4b2332a13ea7426ee0fc3ca468f28b..c5c3ca25685f5b87ba8ee1acc235e46a353ac539 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 2e84053ab5f1cae8aae6e07e3aacee54de4f49e1..2d6e2768acae8a6e6ef1bb94b507b07b8ddade2f 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 7cbc1450173a77ac70b91af551693721665c5f2f..6a70e106a964946b80af401e287ea5d5640a7752 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 4765a787c91f353db6d955bbbcbb7e4cf470389f..655f8b7538644022c0b213c692545ebe65583cd4 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 549f87c6f458230066fad718c225b89e13de259a..f4aabb01a55ccf0a6202d7b4b3a1bdb7b092d032 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 050435264382bd11622e9062e7184acd64272a03..5fcc3a4cca66ce4650372b9475779ec0a8373b4c 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 3a5819e39fdb79383cdb6e58350daa85ff7b085a..66bc6f0e6009b3cb8793e0358543e9432b7f2328 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 53959e6004d6ce511875f8f14688678e4859e696..fddfec7f83bffced787ac6520e854a05e72df09d 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 4a4ce3c02638700a4bde78e5cd29353716cda3cf..34efada3ebc2b9bb8f2fd9c6934e26e1b89f58f5 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 5a3815c37fa93c4374de8ec5a149cbc6bca97fd4..cda42cae7ee3eabc34ef76c58783116cf842b206 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 ff94b5340f401ba813c2cb636f177c61e352d9dd..228c9404b5e6161b1d9edf5bef1f865d33a1577e 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 51e15ffb123a7bff4ce1281e19950161ce68d4a5..8b08d1097edb46aa056c1db1b314e552fe4a4848 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 a06bc8a6698db1b24ef6e3958f8d64e02aaccd9b..ed48220aa3becce8f61d8dfa1dff8b07a5df0b52 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 c111d6fd16f630c914bb2362e27e2cc8b1ae66a1..2d5ab156c903db2a5152f53b29efa6fc621fd9d4 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 4735069aff9a4f38dedd1229190140c2016a5ef3..bedcdadeb749caa40f5645647404aaf1b8fa4d6e 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 9833fb12463075a8322aa54aa4efe8ba3ae44130..482be122bb3f285cc946b324309862b05900d216 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 eb8ef46cf11cb28f11cb5c9d90a023f11f6d6e8f..c589a65c5620091ecd17cf3797b82d0cfcb63f8b 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 ce271348d47933e93d7c6fa7374afe0faae50bcc..3047ecd4f42e64c8eb6be1c827184382562fb148 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 67379dd86b762c40fc032b2d5f149b45b33b7aad..8ffa09f17af88b424984f57a4daaafae76850dc2 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 71662a59115b9f27416a35431f9807b51db7b0f5..8980936c054ac964582ffc91de534c94a6c10b77 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 40646dc63bdf98987d663bd7ef7820cbf04d7480..d9ea84e23c6b4186e056fd005d70accc82809381 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 c08db15e0969e1435e0e027aaaa1df7dcc522801..3e0cebf6d2996fc42e411f6dca901cde7e71e795 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 8df276089282c281a1a94d1fbf6e61b9a8072aaa..9939d9acf35e8bf414a5a5409bbff905037e611b 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 ac723528428d2b3d828d14536b6b01b63b518976..8c92d82a0a7f35421ecc209b599b6d5c4079ffc0 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 a5debb195e059fabf8567d50e406887ea45b5c43..bf95bf17d4cc5e2b150745692bc2b3fc583f15f8 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 26eb95808c9f7de105296286f4865e3424f4e284..8cb5481971e6fc83c49d89160890c19a7a36eefd 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 c3a2444f5704888daa0eeb44d4e0ecd42bfcdbb2..b7a3fd566b52189d24f81ab8b24ebe03cdaadb56 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 9ac66d690a4ef290b5a3263676e5b30e4b3e28b6..d5a967aa7354c5721fa147f8ba4502f268070045 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 9a2c6fd14d664f99a0012268a3438a784aa75834..58c54bcba6c36cef86403df8c365971a7a7d78c3 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 668306c107dc461601ff8750aeaa0a75f6993611..253411f658140ee0f098bfbba47d82cc8c569236 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 b6186859507384142c042f203c65f2ad4276aedd..f4d0ae630c5857793bcbf8ba3f2b7ee673e203ed 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 ea24f0a3f3eabb5c1e5e7c9c5dcd1ff1c866ebf8..dca7d2e2d3f0f67c376bb6e57cf787069d7d67d6 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 7ee3c6ad01dc17cb8667f1d8b07039650342d707..06eb684e8cda10b88af807fc40287068ef99cc16 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 875565bcce2144fa3ba8cbfaae030449e8e6b294..6480d46280be12e53ea430b1690d11d4475e7353 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 29258cd1f3fa72e1fa161772f2963c19bd50bac8..c3c67e80910882800ecaa1c5160b82a9bf3f32a3 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 6f5d9e5b5b934c3d2ff2d6a85bf797428c2510c5..7c093d39f973d9e622c3c5855aa2c5fc311fcf10 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 0d32300e771140ca2d521e080d2d43cbce2f8161..ade89ea085183091c9eb27b7192d9a52cc99d8a1 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 037d4ebe9ccd92b00da869121ad3e3cb1e7bb416..02ef5015853296073d1fee881418debfea51057d 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/**/*"]
}