diff --git a/source/components/Controls.js b/source/components/Controls.js index 81f05c315..76663b522 100644 --- a/source/components/Controls.js +++ b/source/components/Controls.js @@ -9,7 +9,6 @@ import { analysisWithDefaultsSelector } from 'Selectors/analyseSelectors' import animate from 'Ui/animate' import './Controls.css' import { Markdown } from './utils/markdown' -import withColours from './utils/withColours' function Controls({ controls, @@ -94,6 +93,5 @@ export default compose( goToQuestion, hideControl } - ), - withColours + ) )(Controls) diff --git a/source/components/SalaryExplanation.js b/source/components/SalaryExplanation.js index fcaa5262c..c6b955ea0 100644 --- a/source/components/SalaryExplanation.js +++ b/source/components/SalaryExplanation.js @@ -1,7 +1,6 @@ import { T } from 'Components' import Distribution from 'Components/Distribution' import PaySlip from 'Components/PaySlip' -import withTracker from 'Components/utils/withTracker' import { compose } from 'ramda' import React, { useRef } from 'react' import emoji from 'react-easy-emoji' @@ -26,7 +25,6 @@ class ErrorBoundary extends React.Component { } export default compose( - withTracker, connect(state => ({ showDistributionFirst: !state.conversationSteps.foldedSteps.length })) diff --git a/source/components/conversation/InputSuggestions.js b/source/components/conversation/InputSuggestions.js index e48213944..3e547ec12 100644 --- a/source/components/conversation/InputSuggestions.js +++ b/source/components/conversation/InputSuggestions.js @@ -1,4 +1,3 @@ -import withColours from 'Components/utils/withColours' import { compose, toPairs } from 'ramda' import React, { useState } from 'react' import { useTranslation } from 'react-i18next' @@ -6,7 +5,6 @@ import { connect } from 'react-redux' import { formValueSelector } from 'redux-form' export default compose( - withColours, connect(state => ({ period: formValueSelector('conversation')(state, 'période') })) diff --git a/source/sites/mon-entreprise.fr/pages/Landing/Landing.js b/source/sites/mon-entreprise.fr/pages/Landing/Landing.js index 0fc3bb68b..d39b80f03 100644 --- a/source/sites/mon-entreprise.fr/pages/Landing/Landing.js +++ b/source/sites/mon-entreprise.fr/pages/Landing/Landing.js @@ -6,7 +6,6 @@ import logoEnSvg from 'Images/logo-mycompany.svg' import logoSvg from 'Images/logo.svg' import marianneSvg from 'Images/marianne.svg' import urssafSvg from 'Images/urssaf.svg' -import { compose } from 'ramda' import React from 'react' import emoji from 'react-easy-emoji' import { useTranslation } from 'react-i18next' @@ -19,7 +18,7 @@ import type { SitePaths } from 'Components/utils/withSitePaths' type Props = { sitePaths: SitePaths } -export default compose(withSitePaths)(({ sitePaths }: Props) => { +export default withSitePaths(({ sitePaths }: Props) => { const { i18n: { language } } = useTranslation() diff --git a/source/sites/mon-entreprise.fr/pages/ÉconomieCollaborative/ActivitésSelection.js b/source/sites/mon-entreprise.fr/pages/ÉconomieCollaborative/ActivitésSelection.js index 0d9f58759..e2369465c 100644 --- a/source/sites/mon-entreprise.fr/pages/ÉconomieCollaborative/ActivitésSelection.js +++ b/source/sites/mon-entreprise.fr/pages/ÉconomieCollaborative/ActivitésSelection.js @@ -53,36 +53,34 @@ export default (function ActivitésSelection() { ) }) -export const ActivitéSelection = withSitePaths( - ({ activités, currentActivité }) => { - const { state } = useContext(StoreContext) - const activitéRépondue = activitésRéponduesSelector(state) - const nextButtonDisabled = !intersection( - activitésEffectuéesSelector(state), - activités - ).length +export const ActivitéSelection = ({ activités, currentActivité }) => { + const { state } = useContext(StoreContext) + const activitéRépondue = activitésRéponduesSelector(state) + const nextButtonDisabled = !intersection( + activitésEffectuéesSelector(state), + activités + ).length - return ( - <> -
- {activités.map(title => { - const selected = state[title].effectuée - const answered = activitéRépondue.includes(title) - return ( - - ) - })} -
- - - ) - } -) + return ( + <> +
+ {activités.map(title => { + const selected = state[title].effectuée + const answered = activitéRépondue.includes(title) + return ( + + ) + })} +
+ + + ) +} const activitéCardCss = ` width: 14rem;