From 9f1a970214d88a85e17193952873aa0fcad56c56 Mon Sep 17 00:00:00 2001 From: Mael Date: Mon, 11 Feb 2019 11:28:43 +0100 Subject: [PATCH 1/2] :bug: Page blanche sur /doc/allocations-familiales --- source/engine/mecanismViews/Variations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/engine/mecanismViews/Variations.js b/source/engine/mecanismViews/Variations.js index dbf07449c..e1da11cef 100644 --- a/source/engine/mecanismViews/Variations.js +++ b/source/engine/mecanismViews/Variations.js @@ -42,7 +42,7 @@ let Comp = withLanguage(function Variations({ : - {makeJsx(consequence)} + {consequence && makeJsx(consequence)} From d1599387dfb15eeefdaf4da1683d7a724e017a24 Mon Sep 17 00:00:00 2001 From: Mael Date: Mon, 11 Feb 2019 11:34:00 +0100 Subject: [PATCH 2/2] =?UTF-8?q?:art:=20Ic=C3=B4ne=20d'aide=20aux=20questio?= =?UTF-8?q?ns=20plus=20sobre=20mais=20plus=20courante?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suite à des retours utilisateur qui ne comprenaient pas les questions mais ne voyaient pas le bouton d'aide sous forme de livre --- source/components/conversation/Explicable.js | 32 ++++++++------------ 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/source/components/conversation/Explicable.js b/source/components/conversation/Explicable.js index ba77457df..6b809a40a 100644 --- a/source/components/conversation/Explicable.js +++ b/source/components/conversation/Explicable.js @@ -1,13 +1,13 @@ -import { EXPLAIN_VARIABLE } from 'Actions/actions'; -import classNames from 'classnames'; -import { findRuleByDottedName } from 'Engine/rules'; -import { compose } from 'ramda'; -import React from 'react'; -import emoji from 'react-easy-emoji'; -import { connect } from 'react-redux'; -import { flatRulesSelector } from 'Selectors/analyseSelectors'; -import withTracker from '../utils/withTracker'; -import './Explicable.css'; +import { EXPLAIN_VARIABLE } from 'Actions/actions' +import classNames from 'classnames' +import { findRuleByDottedName } from 'Engine/rules' +import { compose } from 'ramda' +import React from 'react' +import emoji from 'react-easy-emoji' +import { connect } from 'react-redux' +import { flatRulesSelector } from 'Selectors/analyseSelectors' +import withTracker from '../utils/withTracker' +import './Explicable.css' export default compose( connect( @@ -24,13 +24,7 @@ export default compose( )( class Explicable extends React.Component { render() { - let { - flatRules, - dottedName, - explain, - explained, - tracker, - } = this.props + let { flatRules, dottedName, explain, explained, tracker } = this.props // Rien à expliquer ici, ce n'est pas une règle if (dottedName == null) return null @@ -41,7 +35,7 @@ export default compose( //TODO montrer les variables de type 'une possibilité' - return ( + return dottedName === explained ? null : ( - {emoji(dottedName === explained ? '📖' : '📘')} + {emoji('ℹ️')} )