diff --git a/src/components/Analysis/AnalysisConsumption.tsx b/src/components/Analysis/AnalysisConsumption.tsx index 921e3808bcd2ceeb971048babd644ff86d38fc58..bd827c7676c46be211302729da10319d2c12532d 100644 --- a/src/components/Analysis/AnalysisConsumption.tsx +++ b/src/components/Analysis/AnalysisConsumption.tsx @@ -11,12 +11,10 @@ import MuiButton from '@material-ui/core/Button' import StyledIcon from 'components/CommonKit/Icon/StyledIcon' import StyledCard from 'components/CommonKit/Card/StyledCard' import EuroIcon from 'assets/icons/ico/euro-icon.svg' -import ElecIcon from 'assets/icons/visu/elec-small.svg' -import WaterIcon from 'assets/icons/visu/water-small.svg' -import GasIcon from 'assets/icons/visu/gas-small.svg' import ProfileTypeService from 'services/profileType.service' import ConverterService from 'services/converter.service' import { formatNumberValues } from 'utils/utils' +import { getPicto } from 'utils/picto' interface AnalysisConsumptionProps { aggregatedPerformanceIndicator: PerformanceIndicator @@ -82,9 +80,7 @@ const AnalysisConsumption: React.FC<AnalysisConsumptionProps> = ({ <div className="analysis-graph"> <div className="consumption-title text-20-bold"> <div className="user-title">{t('analysis.user_consumption')}</div> - <div className={`${toggleHome}-title`}> - {t(`analysis.${toggleHome}_home`)} - </div> + <div className={`${toggleHome}-title`}>{t(`analysis.comparison`)}</div> </div> {userPriceConsumption && ( <div className="consumption-price"> @@ -120,14 +116,8 @@ const AnalysisConsumption: React.FC<AnalysisConsumptionProps> = ({ const fluidForecast: FluidForecast = forecast.fluidForecast[fluid] const performanceValue: number | null = peformanceIndicator[fluid].value - let fluidIcon: string = GasIcon let fluidLoad: number = fluidForecast.load let fluidValue: number = fluidForecast.value - if (fluid === FluidType.ELECTRICITY) { - fluidIcon = ElecIcon - } else if (fluid === FluidType.WATER) { - fluidIcon = WaterIcon - } if (toggleHome === 'ideal') { fluidLoad = fluidForecast.load - fluidForecast.load * idealCoefficient @@ -164,7 +154,7 @@ const AnalysisConsumption: React.FC<AnalysisConsumptionProps> = ({ </div> )} <div className="icon-container"> - <StyledIcon icon={fluidIcon} size={22} /> + <StyledIcon icon={getPicto(fluid, true)} size={22} /> </div> <div className={`${toggleHome}-graph`}> <div diff --git a/src/components/Analysis/AnalysisView.spec.tsx b/src/components/Analysis/AnalysisView.spec.tsx index 8abf578c8b6bf4d4c8cf9890157d8a3740a9e2a0..3dd91d3bba6f9d34d06154dae4d19d723bd09679 100644 --- a/src/components/Analysis/AnalysisView.spec.tsx +++ b/src/components/Analysis/AnalysisView.spec.tsx @@ -84,25 +84,4 @@ describe('ReportOptions component', () => { expect(toogleReportNotificationSpy).toBeCalledTimes(1) expect(toogleReportNotificationSpy).toHaveBeenCalledWith(false) }) - - it('should toogle report notification to false if user have seen last report', () => { - useSelectorSpy.mockReturnValue({ - global: { - ...globalStateData, - reportNotification: false, - }, - profile: { - ...profileData, - haveSeenLastReport: true, - }, - }) - useDispatchSpy.mockReturnValue(jest.fn()) - mount( - <Provider store={store}> - <AnalysisView /> - </Provider> - ) - expect(toogleReportNotificationSpy).toBeCalledTimes(1) - expect(toogleReportNotificationSpy).toHaveBeenCalledWith(false) - }) }) diff --git a/src/components/Analysis/AnalysisView.tsx b/src/components/Analysis/AnalysisView.tsx index b6a7fd5b1df41d5582e6f9e304eccd93b4d929d5..5ef3805c63f74a0c129a11edf04033b7fcc4137e 100644 --- a/src/components/Analysis/AnalysisView.tsx +++ b/src/components/Analysis/AnalysisView.tsx @@ -15,7 +15,7 @@ const AnalysisView: React.FC = () => { const [headerHeight, setHeaderHeight] = useState<number>(0) const { global: { reportNotification }, - profile: { haveSeenLastReport, monthlyReportDate }, + profile: { monthlyReportDate }, } = useSelector((state: AppStore) => state.ecolyo) const dispatch = useDispatch() @@ -24,20 +24,15 @@ const AnalysisView: React.FC = () => { }, []) useEffect(() => { - const updateProfileReport = () => { + const updateReportNotification = () => { if (reportNotification) { dispatch(updateProfile({ haveSeenLastReport: true })) dispatch(toogleReportNotification(false)) } } - const updateReportNotification = () => { - if (haveSeenLastReport) { - dispatch(toogleReportNotification(false)) - } - } - updateProfileReport() + updateReportNotification() - }, [dispatch, reportNotification, haveSeenLastReport]) + }, [dispatch, reportNotification]) return ( <> diff --git a/src/components/Analysis/MonthlyAnalysis.tsx b/src/components/Analysis/MonthlyAnalysis.tsx index d713efb240f301ff75d7f302eb8b5dddd2378ad7..08807431acdfbd30e3d59386478bd926851e63b0 100644 --- a/src/components/Analysis/MonthlyAnalysis.tsx +++ b/src/components/Analysis/MonthlyAnalysis.tsx @@ -3,7 +3,6 @@ import { useI18n } from 'cozy-ui/transpiled/react/I18n' import { useClient } from 'cozy-client' import { useSelector } from 'react-redux' import { AppStore } from 'store' -import { DateTime } from 'luxon' import './monthlyanalysis.scss' import { FluidType } from 'enum/fluid.enum' @@ -30,9 +29,7 @@ const MonthlyAnalysis: React.FC = () => { const history = useHistory() const { fluidTypes } = useSelector((state: AppStore) => state.ecolyo.global) const profile = useSelector((state: AppStore) => state.ecolyo.profile) - const [reportDate, setReportDate] = useState<DateTime>( - profile.monthlyReportDate - ) + const reportDate = profile.monthlyReportDate const [performanceIndicators, setPerformanceIndicators] = useState< PerformanceIndicator[] >([]) diff --git a/src/locales/fr.json b/src/locales/fr.json index 8bf53bdb77bde1e32c083e32591d5e2f4cf2ae53..809b46c094869c39b4491cf8196885009a0d833b 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -302,18 +302,19 @@ "analysis": { "viewTitle": "Analyse", "status": "Votre situation", + "comparison": "Comparatif", "analysis_date": "Conso du mois", "detail": "Détail du mois", "challenge": "Défis terminés en", "user_consumption": "Votre conso", - "average_home": "Foyer type", - "ideal_home": "Foyer idéal", + "average_home": "Conso moyenne d'un profil similaire", + "ideal_home": "Conso idéale pour votre profil", "approximate_title": "Cette comparaison est très approximative.", "approximative_description": "Pour une comparaison plus précise, vous pouvez ajuster votre profil de consommation :", "adjust_profile": "Ajuster mon profil", - "error_title": "Aucune analyse possible", - "error_message": "Aucune analyse n’est possible tant que vous n’avez pas connecter de compteur connecté à Ecolyo.", - "go_to_options": "Connecter mes connecteurs", + "error_title": "Aucune analyse", + "error_message": "Pour profiter d’une analyse de vos consommations, connectez au moins un de vos compteurs.", + "go_to_options": "Je connecte mes connecteurs", "go_back": "Retour" }, "challenge": {