diff --git a/source/components/QuickLinks.js b/source/components/QuickLinks.js index c255e64df..79613b878 100644 --- a/source/components/QuickLinks.js +++ b/source/components/QuickLinks.js @@ -3,7 +3,7 @@ import { goToQuestion } from 'Actions/actions' import { T } from 'Components' import withLanguage from 'Components/utils/withLanguage' import { compose, contains, filter, reject, toPairs } from 'ramda' -import React, { Fragment } from 'react' +import React from 'react' import { connect } from 'react-redux' import { withRouter } from 'react-router' import { @@ -18,6 +18,7 @@ type OwnProps = { type Props = OwnProps & { goToQuestion: string => void, location: Location, + currentQuestion: string, nextSteps: Array, quickLinksToHide: Array, show: boolean @@ -25,6 +26,7 @@ type Props = OwnProps & { const QuickLinks = ({ goToQuestion, + currentQuestion, nextSteps, quickLinks, quickLinksToHide @@ -41,18 +43,17 @@ const QuickLinks = ({ return ( !!links.length && ( - - Autres questions : - + Questions : {links.map(([label, dottedName]) => ( - - - + ))}{' '} {/* */} @@ -66,12 +67,10 @@ export default (compose( connect( (state, props) => ({ key: props.language, + currentQuestion: currentQuestionSelector(state), nextSteps: nextStepsSelector(state), quickLinks: state.simulation?.config.questions?.["à l'affiche"], - quickLinksToHide: [ - ...state.conversationSteps.foldedSteps, - currentQuestionSelector(state) - ] + quickLinksToHide: state.conversationSteps.foldedSteps }), { goToQuestion diff --git a/source/components/ui/Button/button.css b/source/components/ui/Button/button.css index d32147e47..d4f71b8f9 100644 --- a/source/components/ui/Button/button.css +++ b/source/components/ui/Button/button.css @@ -140,6 +140,9 @@ color: rgb(41, 117, 209); color: var(--colour); } +.ui__.link-button.active { + font-weight: bold; +} .ui__.dashed-button::before { padding: 0.8rem 0; diff --git a/source/locales/en.yaml b/source/locales/en.yaml index 9e798901a..c54b745d3 100644 --- a/source/locales/en.yaml +++ b/source/locales/en.yaml @@ -124,7 +124,6 @@ quicklinks: Temps partiel: Part time Type d'activité: Activity type Charges: Expenses - autres: 'Other questions:' Impôt: Tax Mes réponses: My answers Prochaines questions: Next questions