From d6421da561d0ef60e3afe69f47d1b2316d106427 Mon Sep 17 00:00:00 2001
From: Kshitij Sobti <kshitij@sobti.in>
Date: Tue, 1 Mar 2022 12:24:33 +0530
Subject: [PATCH] fix: remove new and legacy from discussion app names (#260)

Both providers should have the same name.
---
 .../discussions/DiscussionsSettings.test.jsx                  | 2 +-
 .../discussions/app-config-form/messages.js                   | 4 ++--
 src/pages-and-resources/discussions/app-list/messages.js      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages-and-resources/discussions/DiscussionsSettings.test.jsx b/src/pages-and-resources/discussions/DiscussionsSettings.test.jsx
index ce7b18547..c979e5b4d 100644
--- a/src/pages-and-resources/discussions/DiscussionsSettings.test.jsx
+++ b/src/pages-and-resources/discussions/DiscussionsSettings.test.jsx
@@ -147,7 +147,7 @@ describe('DiscussionsSettings', () => {
       // content has been loaded - prior to proceeding with our expectations.
       await waitForElementToBeRemoved(screen.getByRole('status'));
 
-      userEvent.click(queryByLabelText(container, 'Select edX (Legacy)'));
+      userEvent.click(queryByLabelText(container, 'Select edX'));
       userEvent.click(queryByText(container, messages.nextButton.defaultMessage));
 
       await waitForElementToBeRemoved(screen.getByRole('status'));
diff --git a/src/pages-and-resources/discussions/app-config-form/messages.js b/src/pages-and-resources/discussions/app-config-form/messages.js
index a065a51e7..20f926841 100644
--- a/src/pages-and-resources/discussions/app-config-form/messages.js
+++ b/src/pages-and-resources/discussions/app-config-form/messages.js
@@ -82,12 +82,12 @@ const messages = defineMessages({
   },
   'appName-legacy': {
     id: 'authoring.discussions.appConfigForm.appName-legacy',
-    defaultMessage: 'edX (Legacy)',
+    defaultMessage: 'edX',
     description: 'The name of the Legacy edX Discussions app.',
   },
   'appName-openedx': {
     id: 'authoring.discussions.appConfigForm.appName-openedx',
-    defaultMessage: 'edX (NEW)',
+    defaultMessage: 'edX',
     description: 'The name of the new edX Discussions app.',
   },
   divisionByGroup: {
diff --git a/src/pages-and-resources/discussions/app-list/messages.js b/src/pages-and-resources/discussions/app-list/messages.js
index e45da318a..0b2ce7524 100644
--- a/src/pages-and-resources/discussions/app-list/messages.js
+++ b/src/pages-and-resources/discussions/app-list/messages.js
@@ -48,7 +48,7 @@ const messages = defineMessages({
   // Legacy
   'appName-legacy': {
     id: 'authoring.discussions.appList.appName-legacy',
-    defaultMessage: 'edX (Legacy)',
+    defaultMessage: 'edX',
     description: 'The name of the Legacy edX Discussions app.',
   },
   'appDescription-legacy': {