From da9cb6054cdac05cb10857468298f4d0f7e3ac57 Mon Sep 17 00:00:00 2001
From: Raymond Zhou <56318341+rayzhou-bit@users.noreply.github.com>
Date: Thu, 16 Mar 2023 10:44:41 -0700
Subject: [PATCH] Revert "feat: update switch to Advanced Editor warning
 (#259)" (#282)

This reverts commit 4a24d25f223c4a360e0aebb4f2db58ca799d7b0c.
---
 .../SettingsWidget/messages.js                | 13 ++++--------
 .../SwitchToAdvancedEditorCard.jsx            |  3 +--
 .../SwitchToAdvancedEditorCard.test.jsx.snap  | 20 +++++--------------
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/messages.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/messages.js
index f141385fb..09f3599ab 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/messages.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/messages.js
@@ -179,15 +179,10 @@ export const messages = {
     defaultMessage: 'Switch to advanced editor',
     description: 'button to switch to the advanced mode of the editor.',
   },
-  ConfirmSwitchMessageOne: {
-    id: 'authoring.problemeditor.settings.switchtoadvancededitor.message.one',
-    defaultMessage: 'If you use the advanced editor, \r this problem will be converted to OLX and you will not be able to return to the simple editor.',
-    description: 'message to confirm that a user wants to use the advanced editor part 1',
-  },
-  ConfirmSwitchMessageTwo: {
-    id: 'authoring.problemeditor.settings.switchtoadvancededitor.message.two',
-    defaultMessage: 'Any changes made after the last Save action will be lost when converting to OLX.',
-    description: 'message to confirm that a user wants to use the advanced editor part 2',
+  ConfirmSwitchMessage: {
+    id: 'authoring.problemeditor.settings.switchtoadvancededitor.message',
+    defaultMessage: 'If you use the advanced editor, this problem will be converted to OLX and you will not be able to return to the simple editor.',
+    description: 'message to confirm that a user wants to use the advanced editor',
   },
   ConfirmSwitchMessageTitle: {
     id: 'authoring.problemeditor.settings.switchtoadvancededitor.message',
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/SwitchToAdvancedEditorCard.jsx b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/SwitchToAdvancedEditorCard.jsx
index 32c291182..3b00cdab7 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/SwitchToAdvancedEditorCard.jsx
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/SwitchToAdvancedEditorCard.jsx
@@ -34,8 +34,7 @@ export const SwitchToAdvancedEditorCard = ({
         )}
         size="md"
       >
-        <p><FormattedMessage {...messages.ConfirmSwitchMessageOne} /></p>
-        <p><FormattedMessage {...messages.ConfirmSwitchMessageTwo} /></p>
+        <FormattedMessage {...messages.ConfirmSwitchMessage} />
       </BaseModal>
       <Button
         className="my-3 ml-2 py-0"
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/__snapshots__/SwitchToAdvancedEditorCard.test.jsx.snap b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/__snapshots__/SwitchToAdvancedEditorCard.test.jsx.snap
index 6e42777de..2ecc2a26c 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/__snapshots__/SwitchToAdvancedEditorCard.test.jsx.snap
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/__snapshots__/SwitchToAdvancedEditorCard.test.jsx.snap
@@ -31,21 +31,11 @@ exports[`SwitchToAdvancedEditorCard snapshot snapshot: SwitchToAdvancedEditorCar
       />
     }
   >
-    <p>
-      <FormattedMessage
-        defaultMessage="If you use the advanced editor, 
- this problem will be converted to OLX and you will not be able to return to the simple editor."
-        description="message to confirm that a user wants to use the advanced editor part 1"
-        id="authoring.problemeditor.settings.switchtoadvancededitor.message.one"
-      />
-    </p>
-    <p>
-      <FormattedMessage
-        defaultMessage="Any changes made after the last Save action will be lost when converting to OLX."
-        description="message to confirm that a user wants to use the advanced editor part 2"
-        id="authoring.problemeditor.settings.switchtoadvancededitor.message.two"
-      />
-    </p>
+    <FormattedMessage
+      defaultMessage="If you use the advanced editor, this problem will be converted to OLX and you will not be able to return to the simple editor."
+      description="message to confirm that a user wants to use the advanced editor"
+      id="authoring.problemeditor.settings.switchtoadvancededitor.message"
+    />
   </BaseModal>
   <Button
     className="my-3 ml-2 py-0"