diff --git a/src/components/Home/ConsumptionView.spec.tsx b/src/components/Home/ConsumptionView.spec.tsx index 8f43dca34dedbc5d211e3bbab6e3ba8678264448..2999134ba5b3aa3bdb4b0024b447e1c6d185f485 100644 --- a/src/components/Home/ConsumptionView.spec.tsx +++ b/src/components/Home/ConsumptionView.spec.tsx @@ -1,24 +1,20 @@ -import React from 'react' +import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner' +import { FluidState, FluidType } from 'enum/fluid.enum' +import { TimeStep } from 'enum/timeStep.enum' import { mount } from 'enzyme' -import { Provider } from 'react-redux' +import { FluidStatus } from 'models' +import React from 'react' import * as reactRedux from 'react-redux' +import { Provider } from 'react-redux' +import * as chartActions from 'store/chart/chart.actions' +import { mockTestProfile1 } from '../../../tests/__mocks__/profileType.mock' import { createMockStore, mockExpiredElec, mockExpiredGas, mockInitialEcolyoState, } from '../../../tests/__mocks__/store' -import * as chartActions from 'store/chart/chart.actions' -import { FluidState, FluidType } from 'enum/fluid.enum' -import { TimeStep } from 'enum/timeStep.enum' -import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner' import ConsumptionView from './ConsumptionView' -import { FluidStatus } from 'models' -import { mockTestProfile1 } from '../../../tests/__mocks__/profileType.mock' -import { - mockCustomPopup, - mockCustomPopupOff, -} from '../../../tests/__mocks__/customPopup.mock' jest.mock('cozy-ui/transpiled/react/I18n', () => { return { diff --git a/src/services/consumptionFormatter.service.ts b/src/services/consumptionFormatter.service.ts index efb73dd9869e60e75a3578bbc3e709cbf18aca5c..885e527285727aec350c7ea9fccfb38655e4fba4 100644 --- a/src/services/consumptionFormatter.service.ts +++ b/src/services/consumptionFormatter.service.ts @@ -5,7 +5,6 @@ import { DateTime, Interval } from 'luxon' import { Dataload, FluidStatus, TimePeriod } from 'models' import DateChartService from 'services/dateChart.service' import { compareDates } from 'utils/date' -import log from 'utils/logger' import ConfigService from './fluidConfig.service' export default class ConsumptionFormatterService { diff --git a/src/services/consumptionValidator.service.ts b/src/services/consumptionValidator.service.ts index 6da879afd3901fe3764f4c0afdfdaa62f30a889b..618e402dfb9298e34a6b677798f01f1a34aca5cc 100644 --- a/src/services/consumptionValidator.service.ts +++ b/src/services/consumptionValidator.service.ts @@ -9,7 +9,7 @@ export default class ConsumptionValidatorService { timeStep: TimeStep, fluidTypes: FluidType[], compareTimePeriod?: TimePeriod, - isExport?: Boolean + isExport?: boolean ): boolean { if (fluidTypes.length === 0) return false if (!this.ValidateTimePeriod(timePeriod)) return false diff --git a/src/targets/services/monthlyReportNotification.ts b/src/targets/services/monthlyReportNotification.ts index 5c7501b5dc7f8c2c8398ea5b28ad889ee0e9fd4b..24e3366f453dea7d901f3e17f7ed81faa96f33a8 100644 --- a/src/targets/services/monthlyReportNotification.ts +++ b/src/targets/services/monthlyReportNotification.ts @@ -42,14 +42,12 @@ const getConsumptionValue = async ( endDate: analysisDate.minus({ month: 2 }).endOf('month'), }, } - const fetchedPerformanceIndicators = - await consumptionService.getPerformanceIndicators( - periods.timePeriod, - TimeStep.MONTH, - fluidType, - periods.comparisonTimePeriod - ) - return fetchedPerformanceIndicators + return consumptionService.getPerformanceIndicators( + periods.timePeriod, + TimeStep.MONTH, + fluidType, + periods.comparisonTimePeriod + ) } /**