From 76698d08bf82d1c241c2d6c3dbef53cd131bbc6a Mon Sep 17 00:00:00 2001
From: advu <anh-duc.vu@f-secure.com>
Date: Wed, 16 Oct 2024 15:32:57 +0300
Subject: [PATCH] fix ddlang

---
 client/components/HomeView/index.js            | 18 ++++++++++--------
 .../ReadingTestElicitationDialog.js            |  1 +
 .../Tests/ReadingTest/ReadingTestFeedbacks.js  |  1 +
 .../ReadingTest/ReadingTestNextSetDialog.js    |  1 +
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/client/components/HomeView/index.js b/client/components/HomeView/index.js
index 08d6d1e1..98925e71 100644
--- a/client/components/HomeView/index.js
+++ b/client/components/HomeView/index.js
@@ -368,7 +368,7 @@ const HomeView = () => {
   return (
     <div className="cont-tall cont flex-col auto gap-row-sm pt-lg blue-bg">
       {showDDLangIntroductory && <DDLangIntroductory setShowDDLangIntroductory={setShowDDLangIntroductory}/>}
-      {showDDLangBackGroundQuestions && <DDLangTermsAndConditions openModal={showDDLangBackGroundQuestions} setOpenModal={setShowDDLangBackGroundQuestions}/>}
+      {/* {showDDLangBackGroundQuestions && <DDLangTermsAndConditions openModal={showDDLangBackGroundQuestions} setOpenModal={setShowDDLangBackGroundQuestions}/>} */}
       <AddStoryModal open={addStoryModalOpen} setOpen={setAddStoryModalOpen} />
       <PracticeModal open={practiceModalOpen} setOpen={setPracticeModalOpen} />
       <BetaLanguageModal
@@ -380,13 +380,15 @@ const HomeView = () => {
       {(!user?.user.is_teacher || (user?.user.is_teacher && !user?.teacherView)) && (
         <Recommender />
       )}
-
-      {!userData.is_teacher && !userData.grade && !userIsAnonymous && userData.is_new_user && (
-        <SetCEFRReminder
-          open={openReminder}
-          setOpen={setOpenReminder}
-          newUser={userData.is_new_user}
-        />
+      {(!userData.is_teacher || !userData.is_teacher[learningLanguage]) &&
+        !userData.grade &&
+        !userIsAnonymous &&
+        userData.is_new_user && (
+          <SetCEFRReminder
+            open={openReminder}
+            setOpen={setOpenReminder}
+            newUser={userData.is_new_user}
+          />
       )}
       <div className="grow flex-col">
         {bigScreen ? (
diff --git a/client/components/Tests/ReadingTest/ReadingTestElicitationDialog.js b/client/components/Tests/ReadingTest/ReadingTestElicitationDialog.js
index d5ed891e..f183a7fc 100644
--- a/client/components/Tests/ReadingTest/ReadingTestElicitationDialog.js
+++ b/client/components/Tests/ReadingTest/ReadingTestElicitationDialog.js
@@ -54,6 +54,7 @@ const ReadingTestElicationDialog = ({ question, showElication, submitElication }
                                     values={{
                                         b: (chunks) => <b>{chunks}</b>,
                                         i: (chunks) => <i>{chunks}</i>,
+                                        br: () => <br />,
                                     }}
                                 />
                             </h3>
diff --git a/client/components/Tests/ReadingTest/ReadingTestFeedbacks.js b/client/components/Tests/ReadingTest/ReadingTestFeedbacks.js
index 5d6f9e8d..c5d8e383 100644
--- a/client/components/Tests/ReadingTest/ReadingTestFeedbacks.js
+++ b/client/components/Tests/ReadingTest/ReadingTestFeedbacks.js
@@ -101,6 +101,7 @@ const ReadingTestFeedbacks = ({ showFeedbacks, closeFeedbacks }) => {
                                             values={{
                                                 b: (chunks) => <b>{chunks}</b>,
                                                 i: (chunks) => <i>{chunks}</i>,
+                                                br: () => <br />,
                                             }}
                                         />
                                     </div>
diff --git a/client/components/Tests/ReadingTest/ReadingTestNextSetDialog.js b/client/components/Tests/ReadingTest/ReadingTestNextSetDialog.js
index 4cc83ac4..57f9198a 100644
--- a/client/components/Tests/ReadingTest/ReadingTestNextSetDialog.js
+++ b/client/components/Tests/ReadingTest/ReadingTestNextSetDialog.js
@@ -47,6 +47,7 @@ const ReadingTestNextSetDialog = ({ showNextSetDialog, confirmNextSet }) => {
                                 values={{
                                     b: (chunks) => <b>{chunks}</b>,
                                     i: (chunks) => <i>{chunks}</i>,
+                                    br: () => <br />,
                                 }} />
                         </h4>
                         <button