From 5ae671464ca7feea12b7f0ce5e1ac599ce444c66 Mon Sep 17 00:00:00 2001
From: Johan Girod <johan.girod@beta.gouv.fr>
Date: Tue, 11 Jun 2019 15:28:46 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20de=20la=20page=20de=20compa?=
 =?UTF-8?q?raison=20des=20r=C3=A9gimes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/components/SchemeComparaison.js        |   2 +-
 .../components/conversation/Conversation.js   | 105 ++++++++----------
 2 files changed, 48 insertions(+), 59 deletions(-)

diff --git a/source/components/SchemeComparaison.js b/source/components/SchemeComparaison.js
index 15886f568..ba9596450 100644
--- a/source/components/SchemeComparaison.js
+++ b/source/components/SchemeComparaison.js
@@ -217,7 +217,7 @@ const SchemeComparaison = ({
 							<h3 className="legend">Paiement des cotisations</h3>
 							<div className="AS">Mensuel</div>
 							<div className="indep">
-								Provision mensuelle
+								Provision mensuelle ou trimestrielle
 								<small>
 									(avec régularisation après coup en fonction du revenu réel)
 								</small>
diff --git a/source/components/conversation/Conversation.js b/source/components/conversation/Conversation.js
index abe42ec7e..70847684e 100644
--- a/source/components/conversation/Conversation.js
+++ b/source/components/conversation/Conversation.js
@@ -1,7 +1,6 @@
 import { goToQuestion, resetSimulation, skipQuestion } from 'Actions/actions'
 import { T } from 'Components'
 import QuickLinks from 'Components/QuickLinks'
-import Scroll from 'Components/utils/Scroll'
 import { getInputComponent } from 'Engine/generateQuestions'
 import { compose } from 'ramda'
 import React from 'react'
@@ -48,64 +47,54 @@ export default compose(
 			goToNext()
 		}
 	}
-	return (
-		<Scroll.toElement onlyIfNotVisible>
-			{nextSteps.length ? (
-				<>
-					<Aide />
-					<div
-						tabIndex="0"
-						style={{ outline: 'none' }}
-						onKeyDown={handleKeyDown}>
-						{currentQuestion && (
-							<React.Fragment key={currentQuestion}>
-								<Animate.fadeIn>
-									{getInputComponent(flatRules)(currentQuestion)}
-								</Animate.fadeIn>
-								<div className="ui__ answer-group">
-									{previousAnswers.length > 0 && (
-										<>
-											<button
-												onClick={goToPrevious}
-												className="ui__ simple small skip button left">
-												← Précédent
-											</button>
-										</>
-									)}
+	return nextSteps.length ? (
+		<>
+			<Aide />
+			<div tabIndex="0" style={{ outline: 'none' }} onKeyDown={handleKeyDown}>
+				{currentQuestion && (
+					<React.Fragment key={currentQuestion}>
+						<Animate.fadeIn>
+							{getInputComponent(flatRules)(currentQuestion)}
+						</Animate.fadeIn>
+						<div className="ui__ answer-group">
+							{previousAnswers.length > 0 && (
+								<>
 									<button
-										onClick={goToNext}
-										className="ui__ simple small skip button right">
-										Passer →
+										onClick={goToPrevious}
+										className="ui__ simple small skip button left">
+										← Précédent
 									</button>
-								</div>
-							</React.Fragment>
-						)}
-						<QuickLinks />
-					</div>
-				</>
-			) : (
-				<div style={{ textAlign: 'center' }}>
-					<h3>
-						{emoji('🌟')}{' '}
-						<T k="simulation-end.title">Vous avez complété cette simulation</T>{' '}
-					</h3>
-					<p>
-						{customEndMessages ? (
-							customEndMessages
-						) : (
-							<T k="simulation-end.text">
-								Vous avez maintenant accès à l'estimation la plus précise
-								possible.
-							</T>
-						)}
-					</p>
-					<button
-						className="ui__ small simple  button "
-						onClick={resetSimulation}>
-						<T>Recommencer</T>
-					</button>
-				</div>
-			)}
-		</Scroll.toElement>
+								</>
+							)}
+							<button
+								onClick={goToNext}
+								className="ui__ simple small skip button right">
+								Passer →
+							</button>
+						</div>
+					</React.Fragment>
+				)}
+				<QuickLinks />
+			</div>
+		</>
+	) : (
+		<div style={{ textAlign: 'center' }}>
+			<h3>
+				{emoji('🌟')}{' '}
+				<T k="simulation-end.title">Vous avez complété cette simulation</T>{' '}
+			</h3>
+			<p>
+				{customEndMessages ? (
+					customEndMessages
+				) : (
+					<T k="simulation-end.text">
+						Vous avez maintenant accès à l'estimation la plus précise possible.
+					</T>
+				)}
+			</p>
+			<button className="ui__ small simple  button " onClick={resetSimulation}>
+				<T>Recommencer</T>
+			</button>
+		</div>
 	)
 })