Skip to content
Snippets Groups Projects
Commit 94ceb276 authored by Yoan VALLET's avatar Yoan VALLET
Browse files

Merge branch 'fix/review_consumption_design' into 'dev'

fix(consumption): display € and color correctly in consumption visualizer

See merge request web-et-numerique/llle_project/ecolyo!578
parents 72e8d41b 12789b6c
Branches
Tags
2 merge requests!584chore(release): 1.8.1,!578fix(consumption): display € and color correctly in consumption visualizer
import React, { useCallback } from 'react' import React, { useCallback } from 'react'
import classNames from 'classnames'
import { NavLink } from 'react-router-dom' import { NavLink } from 'react-router-dom'
import { useClient } from 'cozy-client' import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n' import { useI18n } from 'cozy-ui/transpiled/react/I18n'
...@@ -11,7 +12,6 @@ import { UsageEventType } from 'enum/usageEvent.enum' ...@@ -11,7 +12,6 @@ import { UsageEventType } from 'enum/usageEvent.enum'
import ConverterService from 'services/converter.service' import ConverterService from 'services/converter.service'
import { formatNumberValues } from 'utils/utils' import { formatNumberValues } from 'utils/utils'
import UsageEventService from 'services/usageEvent.service' import UsageEventService from 'services/usageEvent.service'
import classNames from 'classnames'
interface DataloadSectionDetailProps { interface DataloadSectionDetailProps {
dataload: Dataload dataload: Dataload
...@@ -41,9 +41,12 @@ const DataloadSectionDetail = ({ ...@@ -41,9 +41,12 @@ const DataloadSectionDetail = ({
if (fluidType !== FluidType.MULTIFLUID) { if (fluidType !== FluidType.MULTIFLUID) {
return ( return (
<div <div
className={`dataloadvisualizer-euro ${FluidType[ className={classNames('dataloadvisualizer-euro text-16-normal', {
fluidType [`${FluidType[fluidType].toLowerCase()}`]:
].toLowerCase()}-compare text-16-normal`} dataloadSectionType !== DataloadSectionType.LEFT,
[`${FluidType[fluidType].toLowerCase()}-compare`]:
dataloadSectionType === DataloadSectionType.LEFT,
})}
> >
{`${formatNumberValues( {`${formatNumberValues(
converterService.LoadToEuro( converterService.LoadToEuro(
......
...@@ -112,7 +112,7 @@ describe('DataloadSectionValue component', () => { ...@@ -112,7 +112,7 @@ describe('DataloadSectionValue component', () => {
.first() .first()
.contains('12,00') .contains('12,00')
).toBeTruthy() ).toBeTruthy()
expect(wrapper.find('.euroUnit').exists()).toBeFalsy() expect(wrapper.find('.euroUnit').exists()).toBeTruthy()
expect(wrapper.find('.estimated').exists()).toBeTruthy() expect(wrapper.find('.estimated').exists()).toBeTruthy()
expect(wrapper.find('.estimated').text()).toBe( expect(wrapper.find('.estimated').text()).toBe(
'consumption_visualizer.estimated' 'consumption_visualizer.estimated'
......
import React from 'react' import React from 'react'
import classNames from 'classnames'
import { useI18n } from 'cozy-ui/transpiled/react/I18n' import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { Dataload } from 'models' import { Dataload } from 'models'
import { FluidType } from 'enum/fluid.enum' import { FluidType } from 'enum/fluid.enum'
...@@ -25,12 +24,7 @@ const DataloadSectionValue = ({ ...@@ -25,12 +24,7 @@ const DataloadSectionValue = ({
return ( return (
<> <>
{formatNumberValues(dataload.value)} {formatNumberValues(dataload.value)}
<span <span className={'text-18-normal euroUnit'}>
className={classNames('text-18-normal', {
['euroUnit']:
dataloadSectionType !== DataloadSectionType.NO_COMPARE,
})}
>
{`${t('FLUID.' + FluidType[fluidType] + '.UNIT')}`} {`${t('FLUID.' + FluidType[fluidType] + '.UNIT')}`}
</span> </span>
{dataloadSectionType === DataloadSectionType.NO_COMPARE && ( {dataloadSectionType === DataloadSectionType.NO_COMPARE && (
......
...@@ -180,7 +180,7 @@ exports[`DataloadSectionDetail component should render correctly 1`] = ` ...@@ -180,7 +180,7 @@ exports[`DataloadSectionDetail component should render correctly 1`] = `
fluidType={0} fluidType={0}
> >
<div <div
className="dataloadvisualizer-euro electricity-compare text-16-normal" className="dataloadvisualizer-euro text-16-normal electricity"
> >
2,09 € 2,09 €
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment