fix: added reportgmailerrored icon

2022-10-05 10:38:49 +05:00
79 changed files with 637 additions and 2161 deletions
--- a/.env
+++ b/.env
@@ -20,6 +20,5 @@ SEGMENT_KEY=''
 SITE_NAME=''
 USER_INFO_COOKIE_NAME=''
 SUPPORT_URL=''
-TA_FEEDBACK_FORM= ''
-STAFF_FEEDBACK_FORM= ''
-DISPLAY_FEEDBACK_BANNER='false'
+TA_FEEDBACK_FORM: ''
+STAFF_FEEDBACK_FORM: ''
--- a/.env.development
+++ b/.env.development
@@ -21,6 +21,5 @@ SEGMENT_KEY=''
 SITE_NAME=localhost
 USER_INFO_COOKIE_NAME='edx-user-info'
 SUPPORT_URL='https://support.edx.org'
-TA_FEEDBACK_FORM='https://learner-form.test'
-STAFF_FEEDBACK_FORM='https://staff-form.test'
-DISPLAY_FEEDBACK_BANNER='false'
+TA_FEEDBACK_FORM: 'https://learner-form.test'
+STAFF_FEEDBACK_FORM: 'https://staff-form.test'
--- a/.env.test
+++ b/.env.test
@@ -19,6 +19,5 @@ SEGMENT_KEY=''
 SITE_NAME='localhost'
 USER_INFO_COOKIE_NAME='edx-user-info'
 SUPPORT_URL='https://support.edx.org'
-TA_FEEDBACK_FORM='https://learner-form.test'
-STAFF_FEEDBACK_FORM='https://staff-form.test'
-DISPLAY_FEEDBACK_BANNER='false'
+TA_FEEDBACK_FORM: 'https://learner-form.test'
+STAFF_FEEDBACK_FORM: 'https://staff-form.test'
--- a/2
+++ b/2
@@ -59,7 +59,7 @@ push_translations:

 # Pulls translations from Transifex.
 pull_translations:
-	tx pull -t -f --mode reviewed --languages=$(transifex_langs)
+	tx pull -f --mode reviewed --languages=$(transifex_langs)

 # This target is used by Travis.
 validate-no-uncommitted-package-lock-changes:
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
        "@edx/frontend-component-footer": "11.2.0",
        "@edx/frontend-component-header": "3.2.0",
        "@edx/frontend-platform": "2.6.1",
-        "@edx/paragon": "20.15.0",
+        "@edx/paragon": "19.10.1",
        "@reduxjs/toolkit": "1.8.0",
        "@tinymce/tinymce-react": "3.13.1",
        "babel-polyfill": "6.26.0",
@@ -3514,96 +3514,36 @@
      }
    },
    "node_modules/@edx/paragon": {
-      "version": "20.15.0",
-      "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-20.15.0.tgz",
-      "integrity": "sha512-Sq5/je3Ub3UpXrrneaCShz+kB6wuMNmeF1Y/XfVt6X2i+ZCQGlQrBa3KtcwGwDOHIQ65eC6dqJpL9LISHg+xtg==",
+      "version": "19.10.1",
+      "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-19.10.1.tgz",
+      "integrity": "sha512-kVIx/yJWYeaTIb+j2NmB/iz1XGR4WY8aYEQbt1FtGFWcKzeiThtiqr4TeRxQeA8UrooyQl5HyzYISq7xC5AH2w==",
      "dependencies": {
-        "@fortawesome/fontawesome-svg-core": "^6.1.1",
-        "@fortawesome/react-fontawesome": "^0.1.18",
-        "@popperjs/core": "^2.11.4",
-        "bootstrap": "^4.6.2",
+        "@fortawesome/fontawesome-svg-core": "^1.2.36",
+        "@fortawesome/free-solid-svg-icons": "^5.15.4",
+        "@fortawesome/react-fontawesome": "^0.1.16",
+        "@popperjs/core": "^2.11.2",
+        "airbnb-prop-types": "^2.12.0",
+        "bootstrap": "4.6.0",
        "classnames": "^2.3.1",
        "email-prop-type": "^3.0.0",
-        "file-selector": "^0.6.0",
        "font-awesome": "^4.7.0",
-        "glob": "^8.0.3",
        "lodash.uniqby": "^4.7.0",
-        "mailto-link": "^2.0.0",
+        "mailto-link": "^1.0.0",
        "prop-types": "^15.8.1",
-        "react-bootstrap": "^1.6.5",
-        "react-dropzone": "^14.2.1",
+        "react-bootstrap": "^1.6.4",
        "react-focus-on": "^3.5.4",
-        "react-loading-skeleton": "^3.1.0",
        "react-popper": "^2.2.5",
        "react-proptype-conditional-require": "^1.0.4",
        "react-responsive": "^8.2.0",
        "react-table": "^7.7.0",
        "react-transition-group": "^4.4.2",
-        "tabbable": "^5.3.3",
-        "uncontrollable": "^7.2.1"
+        "tabbable": "^4.0.0",
+        "uncontrollable": "7.2.1"
      },
      "peerDependencies": {
-        "react": "^16.8.6 || ^17.0.0",
-        "react-dom": "^16.8.6 || ^17.0.0",
-        "react-intl": "^5.25.1"
-      }
-    },
-    "node_modules/@edx/paragon/node_modules/@fortawesome/fontawesome-common-types": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz",
-      "integrity": "sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg==",
-      "hasInstallScript": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@edx/paragon/node_modules/@fortawesome/fontawesome-svg-core": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz",
-      "integrity": "sha512-Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "@fortawesome/fontawesome-common-types": "6.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@edx/paragon/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@edx/paragon/node_modules/glob": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
-      "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^5.0.1",
-        "once": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@edx/paragon/node_modules/minimatch": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
+        "prop-types": "^15.7.2",
+        "react": "^16.8.6",
+        "react-dom": "^16.8.6"
      }
    },
    "node_modules/@edx/reactifex": {
@@ -7134,6 +7074,28 @@
        "node": ">=8"
      }
    },
+    "node_modules/airbnb-prop-types": {
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz",
+      "integrity": "sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==",
+      "dependencies": {
+        "array.prototype.find": "^2.1.1",
+        "function.prototype.name": "^1.1.2",
+        "is-regex": "^1.1.0",
+        "object-is": "^1.1.2",
+        "object.assign": "^4.1.0",
+        "object.entries": "^1.1.2",
+        "prop-types": "^15.7.2",
+        "prop-types-exact": "^1.2.0",
+        "react-is": "^16.13.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      },
+      "peerDependencies": {
+        "react": "^0.14 || ^15.0.0 || ^16.0.0-alpha"
+      }
+    },
    "node_modules/ajv": {
      "version": "6.12.6",
      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -7421,6 +7383,20 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/array.prototype.find": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.2.0.tgz",
+      "integrity": "sha512-sn40qmUiLYAcRb/1HsIQjTTZ1kCy8II8VtZJpMn2Aoen9twULhbWXisfh3HimGqMlHGUul0/TfKCnXg42LuPpQ==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.4",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
    "node_modules/array.prototype.flat": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
@@ -7510,14 +7486,6 @@
        "node": ">= 4.5.0"
      }
    },
-    "node_modules/attr-accept": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.2.tgz",
-      "integrity": "sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
    "node_modules/autoprefixer": {
      "version": "10.2.6",
      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.6.tgz",
@@ -8536,19 +8504,13 @@
      "dev": true
    },
    "node_modules/bootstrap": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
-      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/twbs"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/bootstrap"
-        }
-      ],
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz",
+      "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/bootstrap"
+      },
      "peerDependencies": {
        "jquery": "1.9.1 - 3",
        "popper.js": "^1.16.1"
@@ -8816,7 +8778,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
      "dependencies": {
        "function-bind": "^1.1.1",
        "get-intrinsic": "^1.0.2"
@@ -10072,6 +10033,7 @@
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
      "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==",
+      "dev": true,
      "engines": {
        "node": ">=0.10"
      }
@@ -10459,7 +10421,6 @@
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
      "dependencies": {
        "has-property-descriptors": "^1.0.0",
        "object-keys": "^1.1.1"
@@ -11060,7 +11021,6 @@
      "version": "1.20.1",
      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
      "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.2",
        "es-to-primitive": "^1.2.1",
@@ -11120,7 +11080,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
      "dependencies": {
        "has": "^1.0.3"
      }
@@ -11129,7 +11088,6 @@
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
      "dependencies": {
        "is-callable": "^1.1.4",
        "is-date-object": "^1.0.1",
@@ -12507,22 +12465,6 @@
        "webpack": "^4.0.0 || ^5.0.0"
      }
    },
-    "node_modules/file-selector": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.6.0.tgz",
-      "integrity": "sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw==",
-      "dependencies": {
-        "tslib": "^2.4.0"
-      },
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/file-selector/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
    "node_modules/file-type": {
      "version": "12.4.2",
      "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz",
@@ -12578,14 +12520,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/filter-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
-      "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
    "node_modules/finalhandler": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -13119,14 +13053,12 @@
    "node_modules/function-bind": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
    },
    "node_modules/function.prototype.name": {
      "version": "1.1.5",
      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.2",
        "define-properties": "^1.1.3",
@@ -13150,7 +13082,6 @@
      "version": "1.2.3",
      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true,
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
@@ -13177,7 +13108,6 @@
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
-      "dev": true,
      "dependencies": {
        "function-bind": "^1.1.1",
        "has": "^1.0.3",
@@ -13233,7 +13163,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.2",
        "get-intrinsic": "^1.1.1"
@@ -13588,7 +13517,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
      "dependencies": {
        "function-bind": "^1.1.1"
      },
@@ -13600,7 +13528,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
@@ -13618,7 +13545,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
      "dependencies": {
        "get-intrinsic": "^1.1.1"
      },
@@ -13640,7 +13566,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
      "engines": {
        "node": ">= 0.4"
      },
@@ -13665,7 +13590,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
      "dependencies": {
        "has-symbols": "^1.0.2"
      },
@@ -14830,7 +14754,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
      "dependencies": {
        "get-intrinsic": "^1.1.0",
        "has": "^1.0.3",
@@ -14966,7 +14889,6 @@
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
      "dependencies": {
        "has-bigints": "^1.0.1"
      },
@@ -15002,7 +14924,6 @@
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.2",
        "has-tostringtag": "^1.0.0"
@@ -15041,7 +14962,6 @@
      "version": "1.2.4",
      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
      "engines": {
        "node": ">= 0.4"
      },
@@ -15115,7 +15035,6 @@
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
      "dependencies": {
        "has-tostringtag": "^1.0.0"
      },
@@ -15283,7 +15202,6 @@
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
      "engines": {
        "node": ">= 0.4"
      },
@@ -15304,7 +15222,6 @@
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
      "dependencies": {
        "has-tostringtag": "^1.0.0"
      },
@@ -15400,7 +15317,6 @@
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.2",
        "has-tostringtag": "^1.0.0"
@@ -15441,7 +15357,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.2"
      },
@@ -15462,7 +15377,6 @@
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
      "dependencies": {
        "has-tostringtag": "^1.0.0"
      },
@@ -15493,7 +15407,6 @@
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
      "dependencies": {
        "has-symbols": "^1.0.2"
      },
@@ -15526,7 +15439,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.2"
      },
@@ -19630,17 +19542,14 @@
      }
    },
    "node_modules/mailto-link": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mailto-link/-/mailto-link-2.0.0.tgz",
-      "integrity": "sha512-b5FErkZ4t6mpH1IFZSw7Mm2IQHXQ2R0/5Q4xd7Rv8dVkWvE54mFG/UW7HjfFazXFjXTNsM+dSX2tTeIDrV9K9A==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mailto-link/-/mailto-link-1.0.0.tgz",
+      "integrity": "sha512-DVRvtkoeXLHAbH+S+9m3ILIdnvQsSc9IvJwfEclQVD8e8FhzwA5Mtw4Q0XXYr/sAziw/HsMc/gpGAI+5w6ohIw==",
      "dependencies": {
        "assert-ok": "~1.0.0",
-        "cast-array": "~1.0.1",
+        "cast-array": "~1.0.0",
        "object-filter": "~1.0.2",
-        "query-string": "~7.0.0"
-      },
-      "engines": {
-        "node": ">= 12"
+        "query-string": "~2.4.1"
      }
    },
    "node_modules/make-dir": {
@@ -20395,7 +20304,6 @@
      "version": "1.12.2",
      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true,
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
@@ -20404,7 +20312,6 @@
      "version": "1.1.5",
      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.2",
        "define-properties": "^1.1.3"
@@ -20420,7 +20327,6 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
      "engines": {
        "node": ">= 0.4"
      }
@@ -20441,7 +20347,6 @@
      "version": "4.1.2",
      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.0",
        "define-properties": "^1.1.3",
@@ -20459,7 +20364,6 @@
      "version": "1.1.5",
      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.2",
        "define-properties": "^1.1.3",
@@ -22049,6 +21953,16 @@
        "react-is": "^16.13.1"
      }
    },
+    "node_modules/prop-types-exact": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz",
+      "integrity": "sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==",
+      "dependencies": {
+        "has": "^1.0.3",
+        "object.assign": "^4.1.0",
+        "reflect.ownkeys": "^0.2.0"
+      }
+    },
    "node_modules/prop-types-extra": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz",
@@ -22138,28 +22052,14 @@
      }
    },
    "node_modules/query-string": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.0.1.tgz",
-      "integrity": "sha512-uIw3iRvHnk9to1blJCG3BTc+Ro56CBowJXKmNNAm3RulvPBzWLRqKSiiDk+IplJhsydwtuNMHi8UGQFcCLVfkA==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-2.4.2.tgz",
+      "integrity": "sha512-Y+OMYUuY7HxznI6WBN822fi/FMvnCTiuqd6KNcidPColOmMWPoV1RGYyyzObve1T/dD1i0ZgCCbO8ytu0ZUrkA==",
      "dependencies": {
-        "decode-uri-component": "^0.2.0",
-        "filter-obj": "^1.1.0",
-        "split-on-first": "^1.0.0",
-        "strict-uri-encode": "^2.0.0"
+        "strict-uri-encode": "^1.0.0"
      },
      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/query-string/node_modules/strict-uri-encode": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
-      "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==",
-      "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
      }
    },
    "node_modules/queue-microtask": {
@@ -22543,22 +22443,6 @@
        "react": "^16.14.0"
      }
    },
-    "node_modules/react-dropzone": {
-      "version": "14.2.2",
-      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.2.2.tgz",
-      "integrity": "sha512-5oyGN/B5rNhop2ggUnxztXBQ6q6zii+OMEftPzsxAR2hhpVWz0nAV+3Ktxo2h5bZzdcCKrpd8bfWAVsveIBM+w==",
-      "dependencies": {
-        "attr-accept": "^2.2.2",
-        "file-selector": "^0.6.0",
-        "prop-types": "^15.8.1"
-      },
-      "engines": {
-        "node": ">= 10.13"
-      },
-      "peerDependencies": {
-        "react": ">= 16.8 || 18.0.0"
-      }
-    },
    "node_modules/react-error-overlay": {
      "version": "6.0.11",
      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
@@ -22673,14 +22557,6 @@
      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
    },
-    "node_modules/react-loading-skeleton": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/react-loading-skeleton/-/react-loading-skeleton-3.1.0.tgz",
-      "integrity": "sha512-j1U1CWWs68nBPOg7tkQqnlFcAMFF6oEK6MgqAo15f8A5p7mjH6xyKn2gHbkcimpwfO0VQXqxAswnSYVr8lWzjw==",
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
    "node_modules/react-mathjax-preview": {
      "version": "2.2.6",
      "resolved": "https://registry.npmjs.org/react-mathjax-preview/-/react-mathjax-preview-2.2.6.tgz",
@@ -23151,6 +23027,11 @@
        "redux": "^4"
      }
    },
+    "node_modules/reflect.ownkeys": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz",
+      "integrity": "sha512-qOLsBKHCpSOFKK1NUOCGC5VyeufB6lEsFe92AL2bhIJsacZS1qdoOZSbPk3MYKuT2cFlRDnulKXuuElIrMjGUg=="
+    },
    "node_modules/regenerate": {
      "version": "1.4.2",
      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -23206,7 +23087,6 @@
      "version": "1.4.3",
      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.2",
        "define-properties": "^1.1.3",
@@ -24233,7 +24113,6 @@
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.0",
        "get-intrinsic": "^1.0.2",
@@ -24727,14 +24606,6 @@
        "node": ">= 6"
      }
    },
-    "node_modules/split-on-first": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
-      "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
    "node_modules/split-string": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -24919,8 +24790,6 @@
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
      "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==",
-      "dev": true,
-      "optional": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -25014,7 +24883,6 @@
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.2",
        "define-properties": "^1.1.4",
@@ -25028,7 +24896,6 @@
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.2",
        "define-properties": "^1.1.4",
@@ -25328,9 +25195,9 @@
      "dev": true
    },
    "node_modules/tabbable": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz",
-      "integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-4.0.0.tgz",
+      "integrity": "sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ=="
    },
    "node_modules/table": {
      "version": "5.4.6",
@@ -26041,7 +25908,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
      "dependencies": {
        "call-bind": "^1.0.2",
        "has-bigints": "^1.0.2",
@@ -27239,7 +27105,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
      "dependencies": {
        "is-bigint": "^1.0.1",
        "is-boolean-object": "^1.1.0",
@@ -30114,76 +29979,31 @@
      }
    },
    "@edx/paragon": {
-      "version": "20.15.0",
-      "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-20.15.0.tgz",
-      "integrity": "sha512-Sq5/je3Ub3UpXrrneaCShz+kB6wuMNmeF1Y/XfVt6X2i+ZCQGlQrBa3KtcwGwDOHIQ65eC6dqJpL9LISHg+xtg==",
+      "version": "19.10.1",
+      "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-19.10.1.tgz",
+      "integrity": "sha512-kVIx/yJWYeaTIb+j2NmB/iz1XGR4WY8aYEQbt1FtGFWcKzeiThtiqr4TeRxQeA8UrooyQl5HyzYISq7xC5AH2w==",
      "requires": {
-        "@fortawesome/fontawesome-svg-core": "^6.1.1",
-        "@fortawesome/react-fontawesome": "^0.1.18",
-        "@popperjs/core": "^2.11.4",
-        "bootstrap": "^4.6.2",
+        "@fortawesome/fontawesome-svg-core": "^1.2.36",
+        "@fortawesome/free-solid-svg-icons": "^5.15.4",
+        "@fortawesome/react-fontawesome": "^0.1.16",
+        "@popperjs/core": "^2.11.2",
+        "airbnb-prop-types": "^2.12.0",
+        "bootstrap": "4.6.0",
        "classnames": "^2.3.1",
        "email-prop-type": "^3.0.0",
-        "file-selector": "^0.6.0",
        "font-awesome": "^4.7.0",
-        "glob": "^8.0.3",
        "lodash.uniqby": "^4.7.0",
-        "mailto-link": "^2.0.0",
+        "mailto-link": "^1.0.0",
        "prop-types": "^15.8.1",
-        "react-bootstrap": "^1.6.5",
-        "react-dropzone": "^14.2.1",
+        "react-bootstrap": "^1.6.4",
        "react-focus-on": "^3.5.4",
-        "react-loading-skeleton": "^3.1.0",
        "react-popper": "^2.2.5",
        "react-proptype-conditional-require": "^1.0.4",
        "react-responsive": "^8.2.0",
        "react-table": "^7.7.0",
        "react-transition-group": "^4.4.2",
-        "tabbable": "^5.3.3",
-        "uncontrollable": "^7.2.1"
-      },
-      "dependencies": {
-        "@fortawesome/fontawesome-common-types": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz",
-          "integrity": "sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg=="
-        },
-        "@fortawesome/fontawesome-svg-core": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz",
-          "integrity": "sha512-Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw==",
-          "requires": {
-            "@fortawesome/fontawesome-common-types": "6.2.0"
-          }
-        },
-        "brace-expansion": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-          "requires": {
-            "balanced-match": "^1.0.0"
-          }
-        },
-        "glob": {
-          "version": "8.0.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
-          "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^5.0.1",
-            "once": "^1.3.0"
-          }
-        },
-        "minimatch": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
-          "requires": {
-            "brace-expansion": "^2.0.1"
-          }
-        }
+        "tabbable": "^4.0.0",
+        "uncontrollable": "7.2.1"
      }
    },
    "@edx/reactifex": {
@@ -33007,6 +32827,22 @@
        "indent-string": "^4.0.0"
      }
    },
+    "airbnb-prop-types": {
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz",
+      "integrity": "sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==",
+      "requires": {
+        "array.prototype.find": "^2.1.1",
+        "function.prototype.name": "^1.1.2",
+        "is-regex": "^1.1.0",
+        "object-is": "^1.1.2",
+        "object.assign": "^4.1.0",
+        "object.entries": "^1.1.2",
+        "prop-types": "^15.7.2",
+        "prop-types-exact": "^1.2.0",
+        "react-is": "^16.13.1"
+      }
+    },
    "ajv": {
      "version": "6.12.6",
      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -33206,6 +33042,17 @@
      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
      "dev": true
    },
+    "array.prototype.find": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.2.0.tgz",
+      "integrity": "sha512-sn40qmUiLYAcRb/1HsIQjTTZ1kCy8II8VtZJpMn2Aoen9twULhbWXisfh3HimGqMlHGUul0/TfKCnXg42LuPpQ==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.4",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
    "array.prototype.flat": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
@@ -33274,11 +33121,6 @@
      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
      "dev": true
    },
-    "attr-accept": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.2.tgz",
-      "integrity": "sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg=="
-    },
    "autoprefixer": {
      "version": "10.2.6",
      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.6.tgz",
@@ -34100,9 +33942,9 @@
      "dev": true
    },
    "bootstrap": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
-      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz",
+      "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==",
      "requires": {}
    },
    "brace-expansion": {
@@ -34309,7 +34151,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
      "requires": {
        "function-bind": "^1.1.1",
        "get-intrinsic": "^1.0.2"
@@ -35286,7 +35127,8 @@
    "decode-uri-component": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="
+      "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==",
+      "dev": true
    },
    "decompress": {
      "version": "4.2.1",
@@ -35586,7 +35428,6 @@
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
      "requires": {
        "has-property-descriptors": "^1.0.0",
        "object-keys": "^1.1.1"
@@ -36068,7 +35909,6 @@
      "version": "1.20.1",
      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
      "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.2",
        "es-to-primitive": "^1.2.1",
@@ -36116,7 +35956,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
      "requires": {
        "has": "^1.0.3"
      }
@@ -36125,7 +35964,6 @@
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
      "requires": {
        "is-callable": "^1.1.4",
        "is-date-object": "^1.0.1",
@@ -37215,21 +37053,6 @@
        "schema-utils": "^3.0.0"
      }
    },
-    "file-selector": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.6.0.tgz",
-      "integrity": "sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw==",
-      "requires": {
-        "tslib": "^2.4.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-        }
-      }
-    },
    "file-type": {
      "version": "12.4.2",
      "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz",
@@ -37270,11 +37093,6 @@
        "to-regex-range": "^5.0.1"
      }
    },
-    "filter-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
-      "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ=="
-    },
    "finalhandler": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -37661,14 +37479,12 @@
    "function-bind": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
    },
    "function.prototype.name": {
      "version": "1.1.5",
      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.2",
        "define-properties": "^1.1.3",
@@ -37685,8 +37501,7 @@
    "functions-have-names": {
      "version": "1.2.3",
      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
    },
    "gensync": {
      "version": "1.0.0-beta.2",
@@ -37704,7 +37519,6 @@
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
-      "dev": true,
      "requires": {
        "function-bind": "^1.1.1",
        "has": "^1.0.3",
@@ -37745,7 +37559,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.2",
        "get-intrinsic": "^1.1.1"
@@ -38009,7 +37822,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
      "requires": {
        "function-bind": "^1.1.1"
      }
@@ -38017,8 +37829,7 @@
    "has-bigints": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
    },
    "has-flag": {
      "version": "3.0.0",
@@ -38030,7 +37841,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
      "requires": {
        "get-intrinsic": "^1.1.1"
      }
@@ -38045,8 +37855,7 @@
    "has-symbols": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
    },
    "has-to-string-tag-x": {
      "version": "1.4.1",
@@ -38062,7 +37871,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
      "requires": {
        "has-symbols": "^1.0.2"
      }
@@ -38928,7 +38736,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
      "requires": {
        "get-intrinsic": "^1.1.0",
        "has": "^1.0.3",
@@ -39046,7 +38853,6 @@
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
      "requires": {
        "has-bigints": "^1.0.1"
      }
@@ -39070,7 +38876,6 @@
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.2",
        "has-tostringtag": "^1.0.0"
@@ -39085,8 +38890,7 @@
    "is-callable": {
      "version": "1.2.4",
      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
    },
    "is-ci": {
      "version": "2.0.0",
@@ -39146,7 +38950,6 @@
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
      "requires": {
        "has-tostringtag": "^1.0.0"
      }
@@ -39266,8 +39069,7 @@
    "is-negative-zero": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
    },
    "is-number": {
      "version": "7.0.0",
@@ -39279,7 +39081,6 @@
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
      "requires": {
        "has-tostringtag": "^1.0.0"
      }
@@ -39348,7 +39149,6 @@
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.2",
        "has-tostringtag": "^1.0.0"
@@ -39377,7 +39177,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.2"
      }
@@ -39392,7 +39191,6 @@
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
      "requires": {
        "has-tostringtag": "^1.0.0"
      }
@@ -39411,7 +39209,6 @@
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
      "requires": {
        "has-symbols": "^1.0.2"
      }
@@ -39435,7 +39232,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.2"
      }
@@ -42599,14 +42395,14 @@
      "dev": true
    },
    "mailto-link": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mailto-link/-/mailto-link-2.0.0.tgz",
-      "integrity": "sha512-b5FErkZ4t6mpH1IFZSw7Mm2IQHXQ2R0/5Q4xd7Rv8dVkWvE54mFG/UW7HjfFazXFjXTNsM+dSX2tTeIDrV9K9A==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mailto-link/-/mailto-link-1.0.0.tgz",
+      "integrity": "sha512-DVRvtkoeXLHAbH+S+9m3ILIdnvQsSc9IvJwfEclQVD8e8FhzwA5Mtw4Q0XXYr/sAziw/HsMc/gpGAI+5w6ohIw==",
      "requires": {
        "assert-ok": "~1.0.0",
-        "cast-array": "~1.0.1",
+        "cast-array": "~1.0.0",
        "object-filter": "~1.0.2",
-        "query-string": "~7.0.0"
+        "query-string": "~2.4.1"
      }
    },
    "make-dir": {
@@ -43205,14 +43001,12 @@
    "object-inspect": {
      "version": "1.12.2",
      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
    },
    "object-is": {
      "version": "1.1.5",
      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.2",
        "define-properties": "^1.1.3"
@@ -43221,8 +43015,7 @@
    "object-keys": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
    },
    "object-visit": {
      "version": "1.0.1",
@@ -43237,7 +43030,6 @@
      "version": "4.1.2",
      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.0",
        "define-properties": "^1.1.3",
@@ -43249,7 +43041,6 @@
      "version": "1.1.5",
      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.2",
        "define-properties": "^1.1.3",
@@ -44361,6 +44152,16 @@
        "react-is": "^16.13.1"
      }
    },
+    "prop-types-exact": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz",
+      "integrity": "sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==",
+      "requires": {
+        "has": "^1.0.3",
+        "object.assign": "^4.1.0",
+        "reflect.ownkeys": "^0.2.0"
+      }
+    },
    "prop-types-extra": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz",
@@ -44435,21 +44236,11 @@
      }
    },
    "query-string": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.0.1.tgz",
-      "integrity": "sha512-uIw3iRvHnk9to1blJCG3BTc+Ro56CBowJXKmNNAm3RulvPBzWLRqKSiiDk+IplJhsydwtuNMHi8UGQFcCLVfkA==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-2.4.2.tgz",
+      "integrity": "sha512-Y+OMYUuY7HxznI6WBN822fi/FMvnCTiuqd6KNcidPColOmMWPoV1RGYyyzObve1T/dD1i0ZgCCbO8ytu0ZUrkA==",
      "requires": {
-        "decode-uri-component": "^0.2.0",
-        "filter-obj": "^1.1.0",
-        "split-on-first": "^1.0.0",
-        "strict-uri-encode": "^2.0.0"
-      },
-      "dependencies": {
-        "strict-uri-encode": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
-          "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ=="
-        }
+        "strict-uri-encode": "^1.0.0"
      }
    },
    "queue-microtask": {
@@ -44723,16 +44514,6 @@
        "scheduler": "^0.19.1"
      }
    },
-    "react-dropzone": {
-      "version": "14.2.2",
-      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.2.2.tgz",
-      "integrity": "sha512-5oyGN/B5rNhop2ggUnxztXBQ6q6zii+OMEftPzsxAR2hhpVWz0nAV+3Ktxo2h5bZzdcCKrpd8bfWAVsveIBM+w==",
-      "requires": {
-        "attr-accept": "^2.2.2",
-        "file-selector": "^0.6.0",
-        "prop-types": "^15.8.1"
-      }
-    },
    "react-error-overlay": {
      "version": "6.0.11",
      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
@@ -44821,12 +44602,6 @@
      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
    },
-    "react-loading-skeleton": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/react-loading-skeleton/-/react-loading-skeleton-3.1.0.tgz",
-      "integrity": "sha512-j1U1CWWs68nBPOg7tkQqnlFcAMFF6oEK6MgqAo15f8A5p7mjH6xyKn2gHbkcimpwfO0VQXqxAswnSYVr8lWzjw==",
-      "requires": {}
-    },
    "react-mathjax-preview": {
      "version": "2.2.6",
      "resolved": "https://registry.npmjs.org/react-mathjax-preview/-/react-mathjax-preview-2.2.6.tgz",
@@ -45182,6 +44957,11 @@
      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==",
      "requires": {}
    },
+    "reflect.ownkeys": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz",
+      "integrity": "sha512-qOLsBKHCpSOFKK1NUOCGC5VyeufB6lEsFe92AL2bhIJsacZS1qdoOZSbPk3MYKuT2cFlRDnulKXuuElIrMjGUg=="
+    },
    "regenerate": {
      "version": "1.4.2",
      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -45231,7 +45011,6 @@
      "version": "1.4.3",
      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.2",
        "define-properties": "^1.1.3",
@@ -46038,7 +45817,6 @@
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.0",
        "get-intrinsic": "^1.0.2",
@@ -46465,11 +46243,6 @@
        }
      }
    },
-    "split-on-first": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
-      "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="
-    },
    "split-string": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -46622,9 +46395,7 @@
    "strict-uri-encode": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==",
-      "dev": true,
-      "optional": true
+      "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ=="
    },
    "string_decoder": {
      "version": "1.1.1",
@@ -46704,7 +46475,6 @@
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.2",
        "define-properties": "^1.1.4",
@@ -46715,7 +46485,6 @@
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.2",
        "define-properties": "^1.1.4",
@@ -46943,9 +46712,9 @@
      "dev": true
    },
    "tabbable": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz",
-      "integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-4.0.0.tgz",
+      "integrity": "sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ=="
    },
    "table": {
      "version": "5.4.6",
@@ -47508,7 +47277,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
      "requires": {
        "call-bind": "^1.0.2",
        "has-bigints": "^1.0.2",
@@ -48389,7 +48157,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
      "requires": {
        "is-bigint": "^1.0.1",
        "is-boolean-object": "^1.1.0",
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
    "@edx/frontend-component-footer": "11.2.0",
    "@edx/frontend-component-header": "3.2.0",
    "@edx/frontend-platform": "2.6.1",
-    "@edx/paragon": "20.15.0",
+    "@edx/paragon": "19.10.1",
    "@reduxjs/toolkit": "1.8.0",
    "@tinymce/tinymce-react": "3.13.1",
    "babel-polyfill": "6.26.0",
--- a/public/index.html
+++ b/public/index.html
@@ -10,7 +10,7 @@
      type="image/x-icon"
    />
  </head>
-  <body>
-    <div id="root" class="small"></div>
+  <body class="vh-100 vw-100 h-100 m-0">
+    <div id="root" class="vh-100 vw-100 small"></div>
  </body>
 </html>
--- a/src/components/FilterBar.jsx
+++ b/src/components/FilterBar.jsx
@@ -1,201 +0,0 @@
-/* eslint-disable react/forbid-prop-types */
-import React, { useMemo, useState } from 'react';
-import PropTypes from 'prop-types';
-
-import { capitalize, toString } from 'lodash';
-import { useSelector } from 'react-redux';
-
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import {
-  Collapsible, Form, Icon, Spinner,
-} from '@edx/paragon';
-import { Tune } from '@edx/paragon/icons';
-
-import {
-  PostsStatusFilter, RequestStatus,
-  ThreadOrdering, ThreadType,
-} from '../data/constants';
-import { selectCourseCohorts } from '../discussions/cohorts/data/selectors';
-import messages from '../discussions/posts/post-filter-bar/messages';
-import { ActionItem } from '../discussions/posts/post-filter-bar/PostFilterBar';
-
-function FilterBar({
-  intl,
-  filters,
-  selectedFilters,
-  onFilterChange,
-  showCohortsFilter,
-}) {
-  const [isOpen, setOpen] = useState(false);
-  const cohorts = useSelector(selectCourseCohorts);
-  const { status } = useSelector(state => state.cohorts);
-  const selectedCohort = useMemo(() => cohorts.find(cohort => (
-    toString(cohort.id) === selectedFilters.cohort)),
-  [selectedFilters.cohort]);
-
-  const allFilters = [
-    {
-      id: 'type-all',
-      label: intl.formatMessage(messages.allPosts),
-      value: ThreadType.ALL,
-    },
-    {
-      id: 'type-discussions',
-      label: intl.formatMessage(messages.filterDiscussions),
-      value: ThreadType.DISCUSSION,
-    },
-    {
-      id: 'type-questions',
-      label: intl.formatMessage(messages.filterQuestions),
-      value: ThreadType.QUESTION,
-    },
-    {
-      id: 'status-any',
-      label: intl.formatMessage(messages.filterAnyStatus),
-      value: PostsStatusFilter.ALL,
-    },
-    {
-      id: 'status-unread',
-      label: intl.formatMessage(messages.filterUnread),
-      value: PostsStatusFilter.UNREAD,
-    },
-    {
-      id: 'status-reported',
-      label: intl.formatMessage(messages.filterReported),
-      value: PostsStatusFilter.REPORTED,
-    },
-    {
-      id: 'status-unanswered',
-      label: intl.formatMessage(messages.filterUnanswered),
-      value: PostsStatusFilter.UNANSWERED,
-    },
-    {
-      id: 'status-unresponded',
-      label: intl.formatMessage(messages.filterUnresponded),
-      value: PostsStatusFilter.UNRESPONDED,
-    },
-    {
-      id: 'sort-activity',
-      label: intl.formatMessage(messages.lastActivityAt),
-      value: ThreadOrdering.BY_LAST_ACTIVITY,
-    },
-    {
-      id: 'sort-comments',
-      label: intl.formatMessage(messages.commentCount),
-      value: ThreadOrdering.BY_COMMENT_COUNT,
-    },
-    {
-      id: 'sort-votes',
-      label: intl.formatMessage(messages.voteCount),
-      value: ThreadOrdering.BY_VOTE_COUNT,
-    },
-  ];
-
-  return (
-    <Collapsible.Advanced
-      open={isOpen}
-      onToggle={() => setOpen(!isOpen)}
-      className="filter-bar collapsible-card-lg border-0"
-    >
-      <Collapsible.Trigger className="collapsible-trigger border-0">
-        <span className="text-primary-700 pr-4">
-          {intl.formatMessage(messages.sortFilterStatus, {
-            own: false,
-            type: selectedFilters.type,
-            sort: selectedFilters.orderBy,
-            status: selectedFilters.status,
-            cohortType: selectedCohort?.name ? 'group' : 'all',
-            cohort: capitalize(selectedCohort?.name),
-          })}
-        </span>
-        <Collapsible.Visible whenClosed>
-          <Icon src={Tune} />
-        </Collapsible.Visible>
-        <Collapsible.Visible whenOpen>
-          <Icon src={Tune} />
-        </Collapsible.Visible>
-      </Collapsible.Trigger>
-      <Collapsible.Body className="collapsible-body px-4 pb-3 pt-0">
-        <Form>
-          <div className="d-flex flex-row py-2 justify-content-between">
-            {filters.map((value) => (
-              <Form.RadioSet
-                name={value.name}
-                className="d-flex flex-column list-group list-group-flush"
-                value={selectedFilters[value.name]}
-                onChange={onFilterChange}
-              >
-                {
-                  value.filters.map(filterName => {
-                    const element = allFilters.find(obj => obj.id === filterName);
-                    if (element) {
-                      return (
-                        <ActionItem
-                          id={element.id}
-                          label={element.label}
-                          value={element.value}
-                          selected={selectedFilters[value.name]}
-                        />
-                      );
-                    }
-                    return false;
-                  })
-                }
-
-              </Form.RadioSet>
-            ))}
-          </div>
-          {showCohortsFilter && (
-            <>
-              <div className="border-bottom my-2" />
-              {status === RequestStatus.IN_PROGRESS ? (
-                <div className="d-flex justify-content-center p-4">
-                  <Spinner animation="border" variant="primary" size="lg" />
-                </div>
-              ) : (
-                <div className="d-flex flex-row pt-2">
-                  <Form.RadioSet
-                    name="cohort"
-                    className="d-flex flex-column list-group list-group-flush w-100"
-                    value={selectedFilters.cohort}
-                    onChange={onFilterChange}
-                  >
-                    <ActionItem
-                      id="all-groups"
-                      label="All groups"
-                      value=""
-                      selected={selectedFilters.cohort}
-                    />
-                    {cohorts.map(cohort => (
-                      <ActionItem
-                        key={toString(cohort.id)}
-                        id={toString(cohort.id)}
-                        label={capitalize(cohort.name)}
-                        value={toString(cohort.id)}
-                        selected={selectedFilters.cohort}
-                      />
-                    ))}
-                  </Form.RadioSet>
-                </div>
-              )}
-            </>
-          )}
-        </Form>
-      </Collapsible.Body>
-    </Collapsible.Advanced>
-  );
-}
-
-FilterBar.propTypes = {
-  intl: intlShape.isRequired,
-  filters: PropTypes.array.isRequired,
-  selectedFilters: PropTypes.object.isRequired,
-  onFilterChange: PropTypes.func.isRequired,
-  showCohortsFilter: PropTypes.bool,
-};
-
-FilterBar.defaultProps = {
-  showCohortsFilter: false,
-};
-
-export default injectIntl(FilterBar);
--- a/src/components/HTMLLoader.jsx
+++ b/src/components/HTMLLoader.jsx
@@ -11,15 +11,12 @@ const baseConfig = {
      ['\\\\(', '\\\\)'],
      ['\\(', '\\)'],
      ['[mathjaxinline]', '[/mathjaxinline]'],
-      ['\\begin{math}', '\\end{math}'],
    ],
    displayMath: [
      ['[mathjax]', '[/mathjax]'],
      ['$$', '$$'],
      ['\\\\[', '\\\\]'],
      ['\\[', '\\]'],
-      ['\\begin{displaymath}', '\\end{displaymath}'],
-      ['\\begin{equation}', '\\end{equation}'],
    ],
  },

@@ -30,9 +27,6 @@ function HTMLLoader({ htmlNode, componentId, cssClassName }) {
  const isLatex = htmlNode.match(/(\${1,2})((?:\\.|.)*)\1/)
                  || htmlNode.match(/(\[mathjax](.+?)\[\/mathjax])+/)
                  || htmlNode.match(/(\[mathjaxinline](.+?)\[\/mathjaxinline])+/)
-                  || htmlNode.match(/(\\begin\{math}(.+?)\\end\{math})+/)
-                  || htmlNode.match(/(\\begin\{displaymath}(.+?)\\end\{displaymath})+/)
-                  || htmlNode.match(/(\\begin\{equation}(.+?)\\end\{equation})+/)
                  || htmlNode.match(/(\\\[(.+?)\\\])+/)
                  || htmlNode.match(/(\\\((.+?)\\\))+/);

--- a/src/components/PostPreviewPane.jsx
+++ b/src/components/PostPreviewPane.jsx
@@ -17,8 +17,8 @@ function PostPreviewPane({
    <>
      {showPreviewPane && (
        <div
-          className={`w-100 p-2 bg-light-200 rounded box-shadow-down-1 post-preview ${isPost ? 'mt-2 mb-5' : 'my-3'}`}
-          style={{ minHeight: '200px', wordBreak: 'break-word' }}
+          className={`p-2 bg-light-200 rounded box-shadow-down-1 post-preview ${isPost ? 'mt-2 mb-5' : 'my-3'}`}
+          style={{ maxHeight: '200px', overflow: 'scroll' }}
        >
          <IconButton
            onClick={() => setShowPreviewPane(false)}
--- a/src/components/SearchInfo.jsx
+++ b/src/components/SearchInfo.jsx
@@ -14,23 +14,18 @@ function SearchInfo({
  text,
  loadingStatus,
  onClear,
-  textSearchRewrite,
 }) {
  return (
    <div className="d-flex flex-row border-bottom border-light-400">
      <Icon src={Search} className="justify-content-start ml-3.5 mr-2 mb-2 mt-2.5" />
-      <Button variant="" size="inline" className="text-justify p-2">
-        {loadingStatus === RequestStatus.SUCCESSFUL && (
-          textSearchRewrite ? intl.formatMessage(messages.searchRewriteInfo, {
-            searchString: text,
-            count,
-            textSearchRewrite,
-          })
-            : intl.formatMessage(messages.searchInfo, { count, text })
-        )}
-        {loadingStatus !== RequestStatus.SUCCESSFUL && intl.formatMessage(messages.searchInfoSearching)}
+      <Button variant="" size="inline">
+        {
+          loadingStatus === RequestStatus.SUCCESSFUL
+            ? intl.formatMessage(messages.searchInfo, { count, text })
+            : intl.formatMessage(messages.searchInfoSearching)
+        }
      </Button>
-      <Button variant="link" size="inline" className="ml-auto mr-3" onClick={onClear} style={{ minWidth: '26%' }}>
+      <Button variant="link" size="inline" className="ml-auto mr-4" onClick={onClear}>
        {intl.formatMessage(messages.clearSearch)}
      </Button>
    </div>
@@ -42,13 +37,11 @@ SearchInfo.propTypes = {
  count: PropTypes.number.isRequired,
  text: PropTypes.string.isRequired,
  loadingStatus: PropTypes.string.isRequired,
-  textSearchRewrite: PropTypes.string,
  onClear: PropTypes.func,
 };

 SearchInfo.defaultProps = {
  onClear: () => {},
-  textSearchRewrite: null,
 };

 export default injectIntl(SearchInfo);
--- a/src/components/TinyMCEEditor.jsx
+++ b/src/components/TinyMCEEditor.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';

 import { Editor } from '@tinymce/tinymce-react';
 import { useParams } from 'react-router';
@@ -6,11 +6,7 @@ import { useParams } from 'react-router';
 // eslint-disable-next-line no-unused-vars,import/no-extraneous-dependencies
 import tinymce from 'tinymce/tinymce';

-import { useIntl } from '@edx/frontend-platform/i18n';
-import { ActionRow, AlertModal, Button } from '@edx/paragon';
-
 import { MAX_UPLOAD_FILE_SIZE } from '../data/constants';
-import messages from '../discussions/messages';
 import { uploadFile } from '../discussions/posts/data/api';

 import 'tinymce/plugins/code';
@@ -22,7 +18,6 @@ import 'tinymce/icons/default';
 import 'tinymce/skins/ui/oxide/skin.css';
 // importing the plugin js.
 import 'tinymce/plugins/autolink';
-import 'tinymce/plugins/autoresize';
 import 'tinymce/plugins/autosave';
 import 'tinymce/plugins/codesample';
 import 'tinymce/plugins/image';
@@ -62,8 +57,7 @@ export default function TinyMCEEditor(props) {
  // loading process and is instead loaded as a string via content_style

  const { courseId, postId } = useParams();
-  const [showImageWarning, setShowImageWarning] = useState(false);
-  const intl = useIntl();
+
  const uploadHandler = async (blobInfo, success, failure) => {
    try {
      const blob = blobInfo.blob();
@@ -74,11 +68,6 @@ export default function TinyMCEEditor(props) {
      }
      const filename = blobInfo.filename();
      const { location } = await uploadFile(blob, filename, courseId, postId || 'root');
-      const img = new Image();
-      img.onload = function () {
-        if (img.height > 999 || img.width > 999) { setShowImageWarning(true); }
-      };
-      img.src = location;
      success(location);
    } catch (e) {
      failure(e.toString(), { remove: true });
@@ -94,54 +83,34 @@ export default function TinyMCEEditor(props) {
  }

  return (
-    <>
-      <Editor
-        init={{
-          skin: false,
-          menubar: false,
-          branding: false,
-          contextmenu: false,
-          browser_spellcheck: true,
-          a11y_advanced_options: true,
-          autosave_interval: '1s',
-          autosave_restore_when_empty: false,
-          plugins: 'autoresize autosave codesample link lists image imagetools code emoticons charmap',
-          toolbar: 'undo redo'
-                      + ' | formatselect | bold italic underline'
-                      + ' | link blockquote openedx_code image'
-                      + ' | bullist numlist outdent indent'
-                      + ' | removeformat'
-                      + ' | openedx_html'
-                      + ' | emoticons'
-                      + ' | charmap',
-          content_css: false,
-          content_style: contentStyle,
-          body_class: 'm-2 text-editor',
-          default_link_target: '_blank',
-          target_list: false,
-          images_upload_handler: uploadHandler,
-          setup,
-        }}
-        {...props}
-      />
-      <AlertModal
-        title={intl.formatMessage(messages.imageWarningModalTitle)}
-        isOpen={showImageWarning}
-        onClose={() => setShowImageWarning(false)}
-        isBlocking
-        footerNode={(
-          <ActionRow>
-            <Button variant="danger" onClick={() => setShowImageWarning(false)}>
-              {intl.formatMessage(messages.imageWarningDismissButton)}
-            </Button>
-          </ActionRow>
-                )}
-      >
-        <p>
-          {intl.formatMessage(messages.imageWarningMessage)}
-        </p>
-      </AlertModal>
-    </>
-
+    <Editor
+      init={{
+        skin: false,
+        menubar: false,
+        branding: false,
+        contextmenu: false,
+        browser_spellcheck: true,
+        a11y_advanced_options: true,
+        autosave_interval: '1s',
+        autosave_restore_when_empty: false,
+        plugins: 'autosave codesample link lists image imagetools code emoticons charmap',
+        toolbar: 'undo redo'
+          + ' | formatselect | bold italic underline'
+          + ' | link blockquote openedx_code image'
+          + ' | bullist numlist outdent indent'
+          + ' | removeformat'
+          + ' | openedx_html'
+          + ' | emoticons'
+          + ' | charmap',
+        content_css: false,
+        content_style: contentStyle,
+        body_class: 'm-2 text-editor',
+        default_link_target: '_blank',
+        target_list: false,
+        images_upload_handler: uploadHandler,
+        setup,
+      }}
+      {...props}
+    />
  );
 }
--- a/src/components/icons/ReportGmailerrorred.jsx
+++ b/src/components/icons/ReportGmailerrorred.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+
+export default function ReportGmailerrorred() {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="20"
+      height="20"
+      fill="none"
+      viewBox="0 0 20 20"
+    >
+      <g clipPath="url(#clip0_6935_1296)">
+        <path d="M13.1083 2.5H6.89167L2.5 6.89167V13.1083L6.89167 17.5H13.1083L17.5 13.1083V6.89167L13.1083 2.5ZM15.8333 12.4167L12.4167 15.8333H7.58333L4.16667 12.4167V7.58333L7.58333 4.16667H12.4167L15.8333 7.58333V12.4167Z" fill="#00262B" />
+        <path d="M9.99996 14.1667C10.4602 14.1667 10.8333 13.7936 10.8333 13.3333C10.8333 12.8731 10.4602 12.5 9.99996 12.5C9.53972 12.5 9.16663 12.8731 9.16663 13.3333C9.16663 13.7936 9.53972 14.1667 9.99996 14.1667Z" fill="#00262B" />
+        <path d="M9.16663 5.83331H10.8333V11.6666H9.16663V5.83331Z" fill="#00262B" />
+      </g>
+      <defs>
+        <clipPath id="clip0_6935_1296">
+          <rect width="20" height="20" fill="white" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+}
--- a/src/components/icons/index.js
+++ b/src/components/icons/index.js
@@ -5,6 +5,7 @@ export { default as PushPin } from './PushPin';
 export { default as Question } from './Question';
 export { default as QuestionAnswer } from './QuestionAnswer';
 export { default as QuestionAnswerOutline } from './QuestionAnswerOutline';
+export { default as ReportGmailerrorred } from './ReportGmailerrorred';
 export { default as StarFilled } from './StarFilled';
 export { default as StarOutline } from './StarOutline';
 export { default as ThumbUpFilled } from './ThumbUpFilled';
--- a/src/data/constants.js
+++ b/src/data/constants.js
@@ -111,7 +111,6 @@ export const PostsStatusFilter = {
  FOLLOWING: 'statusFollowing',
  REPORTED: 'statusReported',
  UNANSWERED: 'statusUnanswered',
-  UNRESPONDED: 'statusUnresponded',
 };

 /**
@@ -134,7 +133,6 @@ export const TopicOrdering = {
 export const LearnersOrdering = {
  BY_FLAG: 'flagged',
  BY_LAST_ACTIVITY: 'activity',
-  BY_RECENCY: 'recency',
 };

 /**
--- a/src/data/selectors.js
+++ b/src/data/selectors.js
@@ -2,7 +2,7 @@

 import { createSelector } from '@reduxjs/toolkit';

-import { selectDiscussionProvider, selectGroupAtSubsection } from '../discussions/data/selectors';
+import { selectDiscussionProvider } from '../discussions/data/selectors';
 import { DiscussionProvider } from './constants';

 export const selectTopicContext = (topicId) => (state) => state.blocks.topics[topicId];
@@ -14,18 +14,6 @@ export const selectorForUnitSubsection = createSelector(
  blocks => key => blocks[blocks[key]?.parent],
 );

-// If subsection grouping is enabled, and the current selection is a unit, then get the current subsection.
-export const selectCurrentCategoryGrouping = createSelector(
-  selectDiscussionProvider,
-  selectGroupAtSubsection,
-  selectBlocks,
-  (provider, groupAtSubsection, blocks) => blockId => (
-    (provider !== 'openedx' || !groupAtSubsection || blocks[blockId]?.type !== 'vertical')
-      ? blockId
-      : blocks[blockId].parent
-  ),
-);
-
 export const selectChapters = (state) => state.blocks.chapters;
 export const selectTopicsUnderCategory = createSelector(
  selectDiscussionProvider,
--- a/src/discussions/comments/CommentsView.jsx
+++ b/src/discussions/comments/CommentsView.jsx
@@ -69,31 +69,25 @@ function DiscussionCommentsView({
  } = usePostComments(postId, endorsed);
  const sortedComments = useMemo(() => [...filterPosts(comments, 'endorsed'),
    ...filterPosts(comments, 'unendorsed')], [comments]);
-
  return (
    <>
-      {((hasMorePages && isLoading) || !isLoading)
-      && (
      <div className="mx-4 text-primary-700" role="heading" aria-level="2" style={{ lineHeight: '28px' }}>
        {endorsed === EndorsementStatus.ENDORSED
          ? intl.formatMessage(messages.endorsedResponseCount, { num: sortedComments.length })
          : intl.formatMessage(messages.responseCount, { num: sortedComments.length })}
      </div>
-      )}
-
      <div className="mx-4" role="list">
        {sortedComments.map(comment => (
          <Comment comment={comment} key={comment.id} postType={postType} isClosedPost={isClosed} />
        ))}
+        {!!sortedComments.length && !isClosed
+          && <ResponseEditor postId={postId} addWrappingDiv />}
        {hasMorePages && !isLoading && (
          <Button
            onClick={handleLoadMoreResponses}
            variant="link"
            block="true"
-            className="card p-4 mb-4 font-weight-500 font-size-14"
-            style={{
-              lineHeight: '20px',
-            }}
+            className="card p-4"
            data-testid="load-more-comments"
          >
            {intl.formatMessage(messages.loadMoreResponses)}
@@ -105,8 +99,6 @@ function DiscussionCommentsView({
            <Spinner animation="border" variant="primary" />
          </div>
        )}
-        {!!sortedComments.length && !isClosed
-          && <ResponseEditor postId={postId} addWrappingDiv />}
      </div>
    </>

--- a/src/discussions/comments/comment/Comment.jsx
+++ b/src/discussions/comments/comment/Comment.jsx
@@ -80,7 +80,7 @@ function Comment({
          <CommentHeader comment={comment} actionHandlers={actionHandlers} postType={postType} />
          {isEditing
            ? (
-              <CommentEditor comment={comment} onCloseEditor={() => setEditing(false)} formClasses="pt-3" />
+              <CommentEditor comment={comment} onCloseEditor={() => setEditing(false)} />
            )
            : <HTMLLoader cssClassName="comment-body pt-4 text-primary-500" componentId="comment" htmlNode={comment.renderedBody} />}
          <CommentIcons
@@ -112,7 +112,7 @@ function Comment({
              lineHeight: '20px',
            }}
          >
-            {intl.formatMessage(messages.loadMoreComments)}
+            {intl.formatMessage(messages.loadMoreResponses)}
          </Button>
          )}
          {!isNested && showFullThread && (
@@ -130,11 +130,8 @@ function Comment({
                {(!isClosedPost && !inBlackoutDateRange(blackoutDateRange))
                  && (
                    <Button
-                      className="d-flex flex-grow mt-3 py-2 font-size-14"
+                      className="d-flex flex-grow mt-4.5"
                      variant="outline-primary"
-                      style={{
-                        lineHeight: '20px',
-                      }}
                      onClick={() => setReplying(true)}
                    >
                      {intl.formatMessage(messages.addComment)}
--- a/src/discussions/comments/comment/CommentEditor.jsx
+++ b/src/discussions/comments/comment/CommentEditor.jsx
@@ -17,7 +17,6 @@ import {
  selectModerationSettings,
  selectUserHasModerationPrivileges,
  selectUserIsGroupTa,
-  selectUserIsStaff,
 } from '../../data/selectors';
 import { formikCompatibleHandler, isFormikFieldInvalid } from '../../utils';
 import { addComment, editComment } from '../data/thunks';
@@ -28,19 +27,16 @@ function CommentEditor({
  comment,
  onCloseEditor,
  edit,
-  formClasses,
 }) {
  const editorRef = useRef(null);
  const { authenticatedUser } = useContext(AppContext);
  const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
  const userIsGroupTa = useSelector(selectUserIsGroupTa);
-  const userIsStaff = useSelector(selectUserIsStaff);
  const { reasonCodesEnabled, editReasons } = useSelector(selectModerationSettings);
  const [submitting, dispatch] = useDispatchWithState();

-  const canDisplayEditReason = (reasonCodesEnabled && edit
-    && (userHasModerationPrivileges || userIsGroupTa || userIsStaff)
-    && comment?.author !== authenticatedUser.username
+  const canDisplayEditReason = (reasonCodesEnabled && (userHasModerationPrivileges || userIsGroupTa)
+    && edit && comment.author !== authenticatedUser.username
  );

  const editReasonCodeValidation = canDisplayEditReason && {
@@ -55,7 +51,7 @@ function CommentEditor({

  const initialValues = {
    comment: comment.rawBody,
-    editReasonCode: comment?.lastEdit?.reasonCode || (userIsStaff ? 'violates-guidelines' : ''),
+    editReasonCode: comment?.lastEdit?.reasonCode || '',
  };

  const handleCloseEditor = (resetForm) => {
@@ -98,7 +94,7 @@ function CommentEditor({
        handleChange,
        resetForm,
      }) => (
-        <Form onSubmit={handleSubmit} className={formClasses}>
+        <Form onSubmit={handleSubmit}>
          {canDisplayEditReason && (
            <Form.Group
              isInvalid={isFormikFieldInvalid('editReasonCode', {
@@ -108,7 +104,7 @@ function CommentEditor({
            >
              <Form.Control
                name="editReasonCode"
-                className="mt-2 mr-0"
+                className="mt-2"
                as="select"
                value={values.editReasonCode}
                onChange={handleChange}
@@ -185,12 +181,10 @@ CommentEditor.propTypes = {
  onCloseEditor: PropTypes.func.isRequired,
  intl: intlShape.isRequired,
  edit: PropTypes.bool,
-  formClasses: PropTypes.string,
 };

 CommentEditor.defaultProps = {
  edit: true,
-  formClasses: '',
 };

 export default injectIntl(CommentEditor);
--- a/src/discussions/comments/comment/CommentHeader.jsx
+++ b/src/discussions/comments/comment/CommentHeader.jsx
@@ -39,12 +39,7 @@ function CommentHeader({
            height: '32px',
          }}
        />
-        <AuthorLabel
-          author={comment.author}
-          authorLabel={comment.authorLabel}
-          labelColor={colorClass && `text-${colorClass}`}
-          linkToProfile
-        />
+        <AuthorLabel author={comment.author} authorLabel={comment.authorLabel} labelColor={colorClass && `text-${colorClass}`} linkToProfile />
      </div>
      <div className="d-flex align-items-center">
        <span className="btn-icon btn-icon-sm mr-1 align-items-center">
--- a/src/discussions/comments/comment/ResponseEditor.jsx
+++ b/src/discussions/comments/comment/ResponseEditor.jsx
@@ -37,14 +37,7 @@ function ResponseEditor({
    )
    : !inBlackoutDateRange(blackoutDateRange) && (
      <div className={classNames({ 'mb-4': addWrappingDiv }, 'actions d-flex')}>
-        <Button
-          variant="primary"
-          className="px-2.5 py-2 font-size-14"
-          onClick={() => setAddingResponse(true)}
-          style={{
-            lineHeight: '20px',
-          }}
-        >
+        <Button variant="primary" className="px-2.5 py-2" onClick={() => setAddingResponse(true)}>
          {intl.formatMessage(messages.addResponse)}
        </Button>
      </div>
--- a/src/discussions/common/ActionsDropdown.jsx
+++ b/src/discussions/common/ActionsDropdown.jsx
@@ -6,7 +6,7 @@ import { useSelector } from 'react-redux';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { logError } from '@edx/frontend-platform/logging';
 import {
-  Button, Dropdown, Icon, IconButton, ModalPopup, useToggle,
+  Button, Dropdown, Icon, IconButton, ModalPopup,
 } from '@edx/paragon';
 import { MoreHoriz } from '@edx/paragon/icons';

@@ -23,8 +23,8 @@ function ActionsDropdown({
  disabled,
  actionHandlers,
 }) {
-  const [isOpen, open, close] = useToggle(false);
-  const [target, setTarget] = useState(null);
+  const [isOpen, setOpen] = useState(false);
+  const dropdownIconRef = React.useRef(null);
  const actions = useActions(commentOrPost);
  const handleActions = (action) => {
    const actionFunction = actionHandlers[action];
@@ -42,17 +42,17 @@ function ActionsDropdown({
  return (
    <>
      <IconButton
-        onClick={open}
+        onClick={() => setOpen(!isOpen)}
        alt={intl.formatMessage(messages.actionsAlt)}
        src={MoreHoriz}
        iconAs={Icon}
        disabled={disabled}
        size="sm"
-        ref={setTarget}
+        ref={dropdownIconRef}
      />
      <ModalPopup
-        onClose={close}
-        positionRef={target}
+        onClose={() => setOpen(false)}
+        positionRef={dropdownIconRef}
        isOpen={isOpen}
        placement="auto-start"
      >
@@ -70,7 +70,7 @@ function ActionsDropdown({
                variant="tertiary"
                size="inline"
                onClick={() => {
-                  close();
+                  setOpen(false);
                  handleActions(action.action);
                }}
                className="d-flex justify-content-start py-1.5 mr-4"
--- a/src/discussions/common/AlertBanner.jsx
+++ b/src/discussions/common/AlertBanner.jsx
@@ -23,11 +23,12 @@ function AlertBanner({
  const { reasonCodesEnabled } = useSelector(selectModerationSettings);
  const userIsContentAuthor = getAuthenticatedUser().username === content.author;
  const canSeeLastEditOrClosedAlert = (userHasModerationPrivileges || userIsContentAuthor || userIsGroupTa);
-  const canSeeReportedBanner = content?.abuseFlagged;
+  const isReportedByCurrentUser = getAuthenticatedUser().username === content?.abuseFlaggedBy;
+  const canSeeReportedBanner = (userHasModerationPrivileges || userIsGroupTa || isReportedByCurrentUser);

  return (
    <>
-      {canSeeReportedBanner && (
+      {content.abuseFlagged && canSeeReportedBanner && (
        <Alert icon={Error} variant="danger" className="px-3 mb-2 py-10px shadow-none flex-fill">
          {intl.formatMessage(messages.abuseFlaggedMessage)}
        </Alert>
--- a/src/discussions/common/AuthorLabel.jsx
+++ b/src/discussions/common/AuthorLabel.jsx
@@ -40,7 +40,7 @@ function AuthorLabel({
  const className = classNames('d-flex align-items-center', labelColor);

  const showUserNameAsLink = useShowLearnersTab()
-      && linkToProfile && author && author !== intl.formatMessage(messages.anonymous);
+      && linkToProfile && author && author !== messages.anonymous;

  const labelContents = (
    <div className={className}>
--- a/src/discussions/common/AuthorLabel.test.jsx
+++ b/src/discussions/common/AuthorLabel.test.jsx
@@ -1,107 +0,0 @@
-import React from 'react';
-
-import { render, screen } from '@testing-library/react';
-import MockAdapter from 'axios-mock-adapter';
-import { IntlProvider } from 'react-intl';
-
-import { initializeMockApp } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import { AppProvider } from '@edx/frontend-platform/react';
-
-import { initializeStore } from '../../store';
-import { executeThunk } from '../../test-utils';
-import { courseConfigApiUrl } from '../data/api';
-import { fetchCourseConfig } from '../data/thunks';
-import AuthorLabel from './AuthorLabel';
-import { DiscussionContext } from './context';
-
-const courseId = 'course-v1:edX+DemoX+Demo_Course';
-let store;
-let axiosMock;
-let container;
-
-function renderComponent(author, authorLabel, linkToProfile, labelColor) {
-  const wrapper = render(
-    <IntlProvider locale="en">
-      <AppProvider store={store}>
-        <DiscussionContext.Provider value={{ courseId }}>
-          <AuthorLabel
-            author={author}
-            authorLabel={authorLabel}
-            linkToProfile={linkToProfile}
-            labelColor={labelColor}
-          />
-        </DiscussionContext.Provider>
-      </AppProvider>
-    </IntlProvider>,
-  );
-  container = wrapper.container;
-  return container;
-}
-
-describe('Author label', () => {
-  beforeEach(async () => {
-    initializeMockApp({
-      authenticatedUser: {
-        userId: 3,
-        username: 'abc123',
-        administrator: true,
-        roles: [],
-      },
-    });
-    store = initializeStore();
-    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
-    axiosMock.onGet(`${courseConfigApiUrl}${courseId}/`).reply(200, {
-      learners_tab_enabled: true,
-      has_moderation_privileges: true,
-    });
-    axiosMock.onGet(`${courseConfigApiUrl}${courseId}/settings`).reply(200, {});
-    await executeThunk(fetchCourseConfig(courseId), store.dispatch, store.getState);
-  });
-
-  describe.each([
-    ['anonymous', null, false, ''],
-    ['ta_user', 'Community TA', true, 'text-TA-color'],
-    ['retired__user', null, false, ''],
-    ['staff_user', 'Staff', true, 'text-staff-color'],
-    ['learner_user', null, false, ''],
-  ])('for %s', (
-    author, authorLabel, linkToProfile, labelColor,
-  ) => {
-    it('it has author name text',
-      async () => {
-        renderComponent(author, authorLabel, linkToProfile, labelColor);
-        const authorElement = container.querySelector('[role=heading]');
-        const authorName = author.startsWith('retired__user') ? '[Deactivated]' : author;
-
-        expect(authorElement).toHaveTextContent(authorName);
-      });
-
-    it(`it is "${!linkToProfile && 'not'}" clickable when linkToProfile is ${!!linkToProfile}`,
-      async () => {
-        renderComponent(author, authorLabel, linkToProfile, labelColor);
-
-        if (linkToProfile) {
-          expect(screen.queryByTestId('learner-posts-link')).toBeInTheDocument();
-        } else {
-          expect(screen.queryByTestId('learner-posts-link')).not.toBeInTheDocument();
-        }
-      });
-
-    it(`it has "${!linkToProfile && 'not'}" label text and label color when linkToProfile is ${!!linkToProfile}`,
-      async () => {
-        renderComponent(author, authorLabel, linkToProfile, labelColor);
-        const authorElement = container.querySelector('[role=heading]');
-        const labelElement = authorElement.parentNode.lastChild;
-        const label = ['TA', 'Staff'].includes(labelElement.textContent) && labelElement.textContent;
-
-        if (linkToProfile) {
-          expect(authorElement.parentNode).toHaveClass(labelColor);
-          expect(authorElement.parentNode.lastChild).toHaveTextContent(label);
-        } else {
-          expect(authorElement.parentNode.lastChild).not.toHaveTextContent(label, { exact: true });
-          expect(authorElement.parentNode).not.toHaveClass(labelColor, { exact: true });
-        }
-      });
-  });
-});
--- a/src/discussions/common/DeleteConfirmation.jsx
+++ b/src/discussions/common/DeleteConfirmation.jsx
@@ -15,7 +15,7 @@ function DeleteConfirmation({
  onDelete,
 }) {
  return (
-    <ModalDialog title={title} isOpen={isOpen} hasCloseButton={false} onClose={onClose} zIndex={5000}>
+    <ModalDialog title={title} isOpen={isOpen} hasCloseButton={false} onClose={onClose}>
      <ModalDialog.Header>
        <ModalDialog.Title>
          {title}
--- a/src/discussions/data/hooks.js
+++ b/src/discussions/data/hooks.js
@@ -11,9 +11,7 @@ import { AppContext } from '@edx/frontend-platform/react';
 import { breakpoints, useWindowSize } from '@edx/paragon';

 import { Routes } from '../../data/constants';
-import { selectTopicsUnderCategory } from '../../data/selectors';
 import { fetchCourseBlocks } from '../../data/thunks';
-import { DiscussionContext } from '../common/context';
 import { clearRedirect } from '../posts/data';
 import { selectTopics } from '../topics/data/selectors';
 import { fetchCourseTopics } from '../topics/data/thunks';
@@ -23,7 +21,7 @@ import {
  selectModerationSettings,
  selectPostThreadCount,
  selectUserHasModerationPrivileges,
-  selectUserIsGroupTa,
+  selectUserIsGroupTa, selectUserIsStaff, selectUserRoles,
 } from './selectors';
 import { fetchCourseConfig } from './thunks';

@@ -142,7 +140,8 @@ export const useAlertBannerVisible = (content) => {
  const { reasonCodesEnabled } = useSelector(selectModerationSettings);
  const userIsContentAuthor = getAuthenticatedUser().username === content.author;
  const canSeeLastEditOrClosedAlert = (userHasModerationPrivileges || userIsContentAuthor || userIsGroupTa);
-  const canSeeReportedBanner = content.abuseFlagged;
+  const isReportedByCurrentUser = getAuthenticatedUser().username === content?.abuseFlaggedBy;
+  const canSeeReportedBanner = (userHasModerationPrivileges || userIsGroupTa || isReportedByCurrentUser);

  return (
    (reasonCodesEnabled && canSeeLastEditOrClosedAlert && (content.lastEdit?.reason || content.closed))
@@ -150,25 +149,12 @@ export const useAlertBannerVisible = (content) => {
  );
 };

-export const useShowLearnersTab = () => useSelector(selectLearnersTabEnabled);
-
-/**
- * React hook that gets the current topic ID from the current topic or category.
- * The topicId in the DiscussionContext only return the direct topicId from the URL.
- * If the URL has the current block ID it cannot get the topicID from that. This hook
- * gets the topic ID from the URL if available, or from the current category otherwise.
- * It only returns an ID if a single ID is available, if navigating a subsection it
- * returns null.
- * @returns {null|string} A topic ID if a single one available in the current context.
- */
-export const useCurrentDiscussionTopic = () => {
-  const { topicId, category } = useContext(DiscussionContext);
-  const topics = useSelector(selectTopicsUnderCategory)(category);
-  if (topicId) {
-    return topicId;
-  }
-  if (topics?.length === 1) {
-    return topics[0];
-  }
-  return null;
+export const useShowLearnersTab = () => {
+  const learnersTabEnabled = useSelector(selectLearnersTabEnabled);
+  const userRoles = useSelector(selectUserRoles);
+  const isAdmin = useSelector(selectUserIsStaff);
+  const IsGroupTA = useSelector(selectUserIsGroupTa);
+  const privileged = useSelector(selectUserHasModerationPrivileges);
+  const allowedUsers = isAdmin || IsGroupTA || privileged || (userRoles.includes('Student') && userRoles.length > 1);
+  return learnersTabEnabled && allowedUsers;
 };
--- a/src/discussions/data/hooks.test.jsx
+++ b/src/discussions/data/hooks.test.jsx
@@ -1,85 +0,0 @@
-import { render } from '@testing-library/react';
-import { IntlProvider } from 'react-intl';
-
-import { initializeMockApp } from '@edx/frontend-platform';
-import { AppProvider } from '@edx/frontend-platform/react';
-
-import { initializeStore } from '../../store';
-import { DiscussionContext } from '../common/context';
-import { useCurrentDiscussionTopic } from './hooks';
-
-let store;
-initializeMockApp();
-describe('Hooks', () => {
-  describe('useCurrentDiscussionTopic', () => {
-    function ComponentWithHook() {
-      const topic = useCurrentDiscussionTopic();
-      return (
-        <div>
-          {String(topic)}
-        </div>
-      );
-    }
-
-    function renderComponent({ topicId, category }) {
-      return render(
-        <IntlProvider locale="en">
-          <AppProvider store={store}>
-            <DiscussionContext.Provider
-              value={{
-                topicId,
-                category,
-              }}
-            >
-              <ComponentWithHook />
-            </DiscussionContext.Provider>
-          </AppProvider>
-        </IntlProvider>,
-      );
-    }
-
-    beforeEach(() => {
-      store = initializeStore({
-        blocks: {
-          blocks: {
-            'some-unit-key': { topics: ['some-topic-0'], parent: 'some-sequence-key' },
-            'some-sequence-key': { topics: ['some-topic-0'] },
-            'another-sequence-key': { topics: ['some-topic-1', 'some-topic-2'] },
-            'empty-key': { topics: [] },
-          },
-        },
-        config: { provider: 'openedx' },
-      });
-    });
-
-    test('when topicId is in context', () => {
-      const { queryByText } = renderComponent({ topicId: 'some-topic' });
-      expect(queryByText('some-topic')).toBeInTheDocument();
-    });
-
-    test('when the category is a unit', () => {
-      const { queryByText } = renderComponent({ category: 'some-unit-key' });
-      expect(queryByText('some-topic-0')).toBeInTheDocument();
-    });
-
-    test('when the category is a sequence with one unit', () => {
-      const { queryByText } = renderComponent({ category: 'some-sequence-key' });
-      expect(queryByText('some-topic-0')).toBeInTheDocument();
-    });
-
-    test('when the category is a sequence with multiple units', () => {
-      const { queryByText } = renderComponent({ category: 'another-sequence-key' });
-      expect(queryByText('null')).toBeInTheDocument();
-    });
-
-    test('when the category is invalid', () => {
-      const { queryByText } = renderComponent({ category: 'invalid-key' });
-      expect(queryByText('null')).toBeInTheDocument();
-    });
-
-    test('when the category has no topics', () => {
-      const { queryByText } = renderComponent({ category: 'empty-key' });
-      expect(queryByText('null')).toBeInTheDocument();
-    });
-  });
-});
--- a/src/discussions/data/selectors.js
+++ b/src/discussions/data/selectors.js
@@ -22,8 +22,6 @@ export const selectDivisionSettings = state => state.config.settings;

 export const selectBlackoutDate = state => state.config.blackouts;

-export const selectGroupAtSubsection = state => state.config.groupAtSubsection;
-
 export const selectModerationSettings = state => ({
  postCloseReasons: state.config.postCloseReasons,
  editReasons: state.config.editReasons,
--- a/src/discussions/data/slices.js
+++ b/src/discussions/data/slices.js
@@ -11,7 +11,6 @@ const configSlice = createSlice({
    allowAnonymous: false,
    allowAnonymousToPeers: false,
    userRoles: [],
-    groupAtSubsection: false,
    hasModerationPrivileges: false,
    isGroupTa: false,
    isUserAdmin: false,
--- a/src/discussions/discussions-home/BlackoutInformationBanner.jsx
+++ b/src/discussions/discussions-home/BlackoutInformationBanner.jsx
@@ -1,36 +0,0 @@
-import React, { useState } from 'react';
-
-import { useSelector } from 'react-redux';
-
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { PageBanner } from '@edx/paragon';
-
-import { selectBlackoutDate } from '../data/selectors';
-import messages from '../messages';
-import { inBlackoutDateRange } from '../utils';
-
-function BlackoutInformationBanner({
-  intl,
-}) {
-  const isDiscussionsBlackout = inBlackoutDateRange(useSelector(selectBlackoutDate));
-  const [showBanner, setShowBanner] = useState(true);
-
-  return (
-    <PageBanner
-      variant="accentB"
-      show={isDiscussionsBlackout && showBanner}
-      dismissible
-      onDismiss={() => setShowBanner(false)}
-    >
-      <div className="font-weight-500">
-        {intl.formatMessage(messages.blackoutDiscussionInformation)}
-      </div>
-    </PageBanner>
-  );
-}
-
-BlackoutInformationBanner.propTypes = {
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(BlackoutInformationBanner);
--- a/src/discussions/discussions-home/BlackoutInformationBanner.test.jsx
+++ b/src/discussions/discussions-home/BlackoutInformationBanner.test.jsx
@@ -1,76 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { IntlProvider } from 'react-intl';
-
-import { initializeMockApp } from '@edx/frontend-platform';
-import { AppProvider } from '@edx/frontend-platform/react';
-
-import { initializeStore } from '../../store';
-import { DiscussionContext } from '../common/context';
-import { fetchConfigSuccess } from '../data/slices';
-import messages from '../messages';
-import BlackoutInformationBanner from './BlackoutInformationBanner';
-
-let store;
-let container;
-const courseId = 'course-v1:edX+DemoX+Demo_Course';
-let activeStartDate = new Date();
-activeStartDate.setDate(activeStartDate.getDate() - 2);
-let activeEndDate = new Date();
-activeEndDate.setDate(activeEndDate.getDate() + 2);
-activeStartDate = activeStartDate.toISOString();
-activeEndDate = activeEndDate.toISOString();
-
-const getConfigData = (blackouts = []) => ({
-  id: 'course-v1:edX+DemoX+Demo_Course',
-  userRoles: ['Admin', 'Student'],
-  hasModerationPrivileges: false,
-  isGroupTa: false,
-  isUserAdmin: false,
-  blackouts,
-});
-
-function renderComponent() {
-  const wrapper = render(
-    <IntlProvider locale="en">
-      <AppProvider store={store}>
-        <DiscussionContext.Provider value={{ courseId }}>
-          <BlackoutInformationBanner />
-        </DiscussionContext.Provider>
-      </AppProvider>
-    </IntlProvider>,
-  );
-  container = wrapper.container;
-  return container;
-}
-
-describe('Blackout Information Banner', () => {
-  beforeEach(async () => {
-    initializeMockApp({
-      authenticatedUser: {
-        userId: 3,
-        username: 'abc123',
-        administrator: false,
-        roles: ['Student'],
-      },
-    });
-  });
-
-  test.each([
-    { blackouts: [], visibility: false },
-    { blackouts: ['2021-12-31T10:15', '2021-12-31T10:20'], visibility: false },
-    { blackouts: [{ start: activeStartDate, end: activeEndDate }], visibility: true },
-    { blackouts: [{ start: activeEndDate, end: activeEndDate }], visibility: false },
-  ])('Test Blackout Banner is visible on app load if blackout date is active', async ({ blackouts, visibility }) => {
-    store = initializeStore();
-    await store.dispatch(fetchConfigSuccess(getConfigData(blackouts)));
-    renderComponent();
-    if (visibility) {
-      const element = await screen.findByRole('alert');
-      expect(element).toBeInTheDocument();
-      expect(element).toHaveTextContent(messages.blackoutDiscussionInformation.defaultMessage);
-    } else {
-      const element = await screen.queryByRole('alert');
-      expect(element).not.toBeInTheDocument();
-    }
-  });
-});
--- a/src/discussions/discussions-home/DiscussionSidebar.jsx
+++ b/src/discussions/discussions-home/DiscussionSidebar.jsx
@@ -7,8 +7,6 @@ import {
  Redirect, Route, Switch, useLocation,
 } from 'react-router';

-import { useWindowSize } from '@edx/paragon';
-
 import { RequestStatus, Routes } from '../../data/constants';
 import {
  useContainerSize, useIsOnDesktop, useIsOnXLDesktop, useShowLearnersTab,
@@ -26,14 +24,13 @@ export default function DiscussionSidebar({ displaySidebar, postActionBarRef })
  const redirectToLearnersTab = useShowLearnersTab();
  const sidebarRef = useRef(null);
  const postActionBarHeight = useContainerSize(postActionBarRef);
-  const { height: windowHeight } = useWindowSize();

  useEffect(() => {
    if (sidebarRef && postActionBarHeight) {
      if (isOnDesktop) {
-        sidebarRef.current.style.maxHeight = `${windowHeight - postActionBarHeight}px`;
+        sidebarRef.current.style.maxHeight = `${document.body.offsetHeight - postActionBarHeight}px`;
      }
-      sidebarRef.current.style.minHeight = `${windowHeight - postActionBarHeight}px`;
+      sidebarRef.current.style.minHeight = `${document.body.offsetHeight - postActionBarHeight}px`;
      sidebarRef.current.style.top = `${postActionBarHeight}px`;
    }
  }, [sidebarRef, postActionBarHeight]);
--- a/src/discussions/discussions-home/DiscussionsHome.jsx
+++ b/src/discussions/discussions-home/DiscussionsHome.jsx
@@ -7,7 +7,6 @@ import {

 import Footer from '@edx/frontend-component-footer';
 import { LearningHeader as Header } from '@edx/frontend-component-header';
-import { getConfig } from '@edx/frontend-platform';

 import { PostActionsBar } from '../../components';
 import { CourseTabsNavigation } from '../../components/NavigationBar';
@@ -21,7 +20,6 @@ import { EmptyLearners, EmptyPosts, EmptyTopics } from '../empty-posts';
 import messages from '../messages';
 import { BreadcrumbMenu, LegacyBreadcrumbMenu, NavigationBar } from '../navigation';
 import { postMessageToParent } from '../utils';
-import BlackoutInformationBanner from './BlackoutInformationBanner';
 import DiscussionContent from './DiscussionContent';
 import DiscussionSidebar from './DiscussionSidebar';
 import InformationBanner from './InformationsBanner';
@@ -39,7 +37,6 @@ export default function DiscussionsHome() {
  const { params: { path } } = useRouteMatch(`${Routes.DISCUSSIONS.PATH}/:path*`);
  const { params } = useRouteMatch(ALL_ROUTES);
  const isRedirectToLearners = useShowLearnersTab();
-  const isFeedbackBannerVisible = getConfig().DISPLAY_FEEDBACK_BANNER === 'true';

  const {
    courseId,
@@ -49,6 +46,7 @@ export default function DiscussionsHome() {
    learnerUsername,
  } = params;
  const inContext = new URLSearchParams(location.search).get('inContext') !== null;
+  const inIframe = new URLSearchParams(location.search).get('inIframe')?.toLowerCase() === 'true';
  // Display the content area if we are currently viewing/editing a post or creating one.
  const displayContentArea = postId || postEditorVisible || (learnerUsername && postId);
  let displaySidebar = useSidebarVisible();
@@ -84,9 +82,10 @@ export default function DiscussionsHome() {
      learnerUsername,
    }}
    >
-      <Header courseOrg={org} courseNumber={courseNumber} courseTitle={courseTitle} />
+      {!inIframe && <Header courseOrg={org} courseNumber={courseNumber} courseTitle={courseTitle} />}
      <main className="container-fluid d-flex flex-column p-0 w-100" id="main" tabIndex="-1">
-        <CourseTabsNavigation activeTab="discussion" courseId={courseId} />
+        {!inIframe
+          && <CourseTabsNavigation activeTab="discussion" courseId={courseId} />}
        <div className="header-action-bar" ref={postActionBarRef}>
          <div
            className="d-flex flex-row justify-content-between navbar fixed-top"
@@ -96,8 +95,7 @@ export default function DiscussionsHome() {
            )}
            <PostActionsBar inContext={inContext} />
          </div>
-          {isFeedbackBannerVisible && <InformationBanner />}
-          <BlackoutInformationBanner />
+          <InformationBanner />
        </div>
        <Route
          path={[Routes.POSTS.PATH, Routes.TOPICS.CATEGORY]}
@@ -122,7 +120,7 @@ export default function DiscussionsHome() {
          )}
        </div>
      </main>
-      <Footer />
+      {!inIframe && <Footer />}
    </DiscussionContext.Provider>
  );
 }
--- a/src/discussions/discussions-home/DiscussionsHome.test.jsx
+++ b/src/discussions/discussions-home/DiscussionsHome.test.jsx
@@ -88,10 +88,35 @@ describe('DiscussionsHome', () => {
    window.parent = parent;
  });

-  test('header, course navigation bar and footer are visible', async () => {
-    renderComponent();
-    expect(screen.queryByRole('banner')).toBeInTheDocument();
-    expect(document.getElementById('courseTabsNavigation')).toBeInTheDocument();
-    expect(screen.queryByRole('contentinfo')).toBeInTheDocument();
-  });
+  describe.each([
+    {
+      queryParam: 'inIframe=True',
+      iframeView: true,
+    },
+    {
+      queryParam: 'inIframe=False',
+      iframeView: false,
+    },
+    {
+      queryParam: '',
+      iframeView: false,
+    },
+  ])(
+    'Header/Footer visibility',
+    ({
+      queryParam,
+      iframeView,
+    }) => {
+      test(`inIframe query param ${queryParam}`, async () => {
+        renderComponent(`/${courseId}/topics?${queryParam}`);
+        if (iframeView) {
+          expect(screen.queryByRole('banner')).not.toBeInTheDocument();
+          expect(screen.queryByRole('contentinfo')).not.toBeInTheDocument();
+        } else {
+          expect(screen.queryByRole('banner')).toBeInTheDocument();
+          expect(screen.queryByRole('contentinfo')).toBeInTheDocument();
+        }
+      });
+    },
+  );
 });
--- a/src/discussions/discussions-home/InformationsBanner.jsx
+++ b/src/discussions/discussions-home/InformationsBanner.jsx
@@ -27,7 +27,7 @@ function InformationBanner({
      dismissible
      onDismiss={() => setShowBanner(false)}
    >
-      <div className="font-weight-500">
+      <div style={{ fontWeight: '500' }}>
        {intl.formatMessage(messages.bannerMessage)}
        {!hideLearnMoreButton
          && (
--- a/src/discussions/learners/LearnerPostsView.jsx
+++ b/src/discussions/learners/LearnerPostsView.jsx
@@ -2,7 +2,6 @@ import React, {
  useCallback, useContext, useEffect, useMemo,
 } from 'react';

-import snakeCase from 'lodash.snakecase';
 import capitalize from 'lodash/capitalize';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory, useLocation } from 'react-router-dom';
@@ -13,25 +12,17 @@ import {
 } from '@edx/paragon';
 import { ArrowBack } from '@edx/paragon/icons';

-import {
-  PostsStatusFilter,
-  RequestStatus,
-  Routes,
-  ThreadType,
-} from '../../data/constants';
+import { RequestStatus, Routes } from '../../data/constants';
 import { DiscussionContext } from '../common/context';
-import { selectUserHasModerationPrivileges, selectUserIsStaff } from '../data/selectors';
 import {
  selectAllThreads,
  selectThreadNextPage,
  threadsLoadingStatus,
 } from '../posts/data/selectors';
-import { clearPostsPages } from '../posts/data/slices';
 import NoResults from '../posts/NoResults';
 import { PostLink } from '../posts/post';
 import { discussionsPath, filterPosts } from '../utils';
 import { fetchUserPosts } from './data/thunks';
-import LearnerPostFilterBar from './learner-post-filter-bar/LearnerPostFilterBar';
 import messages from './messages';

 function LearnerPostsView({ intl }) {
@@ -41,48 +32,15 @@ function LearnerPostsView({ intl }) {

  const posts = useSelector(selectAllThreads);
  const loadingStatus = useSelector(threadsLoadingStatus());
-  const postFilter = useSelector(state => state.learners.postFilter);
  const { courseId, learnerUsername: username } = useContext(DiscussionContext);
  const nextPage = useSelector(selectThreadNextPage());
-  const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
-  const userIsStaff = useSelector(selectUserIsStaff);
-  const countFlagged = userHasModerationPrivileges || userIsStaff;
-  const params = {
-    orderBy: snakeCase(postFilter.orderBy),
-    username,
-    page: 1,
-  };
-  if (postFilter.type !== ThreadType.ALL) {
-    params.threadType = postFilter.type;
-  }
-  if (postFilter.status !== PostsStatusFilter.ALL) {
-    const statusMapping = {
-      statusUnread: 'unread',
-      statusReported: 'flagged',
-      statusUnanswered: 'unanswered',
-      statusUnresponded: 'unresponded',
-    };
-    params.status = statusMapping[postFilter.status];
-  }
-  if (postFilter.cohort !== '') {
-    params.groupId = postFilter.cohort;
-  }
-  if (countFlagged) {
-    params.countFlagged = countFlagged;
-  }

  useEffect(() => {
-    dispatch(fetchUserPosts(courseId, params));
+    dispatch(fetchUserPosts(courseId, username));
  }, [courseId, username]);

-  useEffect(() => {
-    dispatch(clearPostsPages());
-    dispatch(fetchUserPosts(courseId, params));
-  }, [postFilter]);
-
  const loadMorePosts = () => (
-    dispatch(fetchUserPosts(courseId, {
-      ...params,
+    dispatch(fetchUserPosts(courseId, username, {
      page: nextPage,
    }))
  );
@@ -120,7 +78,6 @@ function LearnerPostsView({ intl }) {
        <div style={{ padding: '18px' }} />
      </div>
      <div className="bg-light-400 border border-light-300" />
-      <LearnerPostFilterBar />
      <div className="list-group list-group-flush">
        {postInstances(pinnedPosts)}
        {postInstances(unpinnedPosts)}
--- a/src/discussions/learners/LearnerPostsView.test.jsx
+++ b/src/discussions/learners/LearnerPostsView.test.jsx
@@ -1,90 +0,0 @@
-import React from 'react';
-
-import { render, screen } from '@testing-library/react';
-import MockAdapter from 'axios-mock-adapter';
-import { act } from 'react-dom/test-utils';
-import { IntlProvider } from 'react-intl';
-import { MemoryRouter, Route } from 'react-router';
-import { Factory } from 'rosie';
-
-import { initializeMockApp } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import { AppProvider } from '@edx/frontend-platform/react';
-
-import { initializeStore } from '../../store';
-import { executeThunk } from '../../test-utils';
-import { DiscussionContext } from '../common/context';
-import { courseConfigApiUrl } from '../data/api';
-import { fetchCourseConfig } from '../data/thunks';
-import { coursesApiUrl } from './data/api';
-import LearnerPostsView from './LearnerPostsView';
-
-import './data/__factories__';
-
-let store;
-let axiosMock;
-const courseId = 'course-v1:edX+TestX+Test_Course';
-const username = 'abc123';
-
-function renderComponent(path = `/${courseId}/learners/${username}/posts`) {
-  return render(
-    <IntlProvider locale="en">
-      <AppProvider store={store}>
-        <DiscussionContext.Provider
-          value={{
-            learnerUsername: username,
-            courseId,
-          }}
-        >
-          <MemoryRouter initialEntries={[path]}>
-            <Route path={path}>
-              <LearnerPostsView />
-            </Route>
-          </MemoryRouter>
-        </DiscussionContext.Provider>
-      </AppProvider>
-    </IntlProvider>,
-  );
-}
-
-describe('LearnerPostsView', () => {
-  beforeEach(async () => {
-    initializeMockApp({
-      authenticatedUser: {
-        userId: 3,
-        username,
-        administrator: true,
-        roles: [],
-      },
-    });
-
-    store = initializeStore();
-    Factory.resetAll();
-    const learnerPosts = Factory.build('learnerPosts', {}, {
-      abuseFlaggedCount: 1,
-    });
-    const apiUrl = `${coursesApiUrl}${courseId}/learner/`;
-    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
-    axiosMock.onGet(apiUrl, { username, count_flagged: true })
-      .reply(() => [200, learnerPosts]);
-  });
-
-  describe('Basic', () => {
-    test('Reported icon is visible to moderator for post with reported comment', async () => {
-      axiosMock.onGet(`${courseConfigApiUrl}${courseId}/`).reply(200, {
-        has_moderation_privileges: true,
-      });
-      axiosMock.onGet(`${courseConfigApiUrl}${courseId}/settings`).reply(200, {});
-      await executeThunk(fetchCourseConfig(courseId), store.dispatch, store.getState);
-      await act(async () => {
-        renderComponent();
-      });
-      expect(screen.queryAllByTestId('reported-post')[0]).toBeInTheDocument();
-    });
-
-    test('Reported icon is not visible to learner for post with reported comment', async () => {
-      await renderComponent();
-      expect(screen.queryByTestId('reported-post')).not.toBeInTheDocument();
-    });
-  });
-});
--- a/src/discussions/learners/data/factories/learners.factory.js
+++ b/src/discussions/learners/data/factories/learners.factory.js
@@ -86,63 +86,3 @@ Factory.define('learnersProfile')
    }));
    return profiles;
  });
-
-Factory.define('learnerPosts')
-  .option('abuseFlaggedCount', null, null)
-  .option('courseId', null, 'course-v1:edX+TestX+Test_Course')
-  .attr(
-    'results',
-    ['abuseFlaggedCount', 'courseId'],
-    (abuseFlaggedCount, courseId) => {
-      const threads = [];
-      for (let i = 0; i < 2; i++) {
-        threads.push({
-          created_at: new Date().toISOString(),
-          updated_at: new Date().toISOString(),
-          editable_fields: [
-            'abuse_flagged',
-            'following',
-            'group_id',
-            'raw_body',
-            'closed',
-            'read',
-            'title',
-            'topic_id',
-            'type',
-            'voted',
-            'pinned',
-          ],
-          id: `post_id${i}`,
-          author: 'test_user',
-          author_label: 'Staff',
-          abuse_flagged: false,
-          can_delete: true,
-          voted: false,
-          vote_count: 1,
-          title: `Title ${i}`,
-          raw_body: `<p>body ${i}</p>`,
-          preview_body: `<p>body ${i}</p>`,
-          course_id: courseId,
-          group_id: null,
-          group_name: null,
-          abuse_flagged_count: abuseFlaggedCount,
-          following: false,
-          comment_count: 8,
-          unread_comment_count: 0,
-          endorsed_comment_list_url: null,
-          non_endorsed_comment_list_url: null,
-          read: false,
-          has_endorsed: false,
-          pinned: false,
-          topic_id: 'topic',
-        });
-      }
-      return threads;
-    },
-  )
-  .attr('pagination', [], () => ({
-    next: null,
-    prev: null,
-    count: 2,
-    num_pages: 1,
-  }));
--- a/src/discussions/learners/data/api.js
+++ b/src/discussions/learners/data/api.js
@@ -1,5 +1,5 @@
 /* eslint-disable import/prefer-default-export */
-import { ensureConfig, getConfig, snakeCaseObject } from '@edx/frontend-platform';
+import { ensureConfig, getConfig } from '@edx/frontend-platform';
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';

 ensureConfig([
@@ -45,10 +45,10 @@ export async function getUserProfiles(usernames) {
 *    pagination: {count, num_pages, next, previous}
 *  }
 */
-export async function getUserPosts(courseId, params) {
+export async function getUserPosts(courseId, username, { page }) {
  const learnerPostsApiUrl = `${coursesApiUrl}${courseId}/learner/`;
-  const snakeCaseParams = snakeCaseObject(params);
+
  const { data } = await getAuthenticatedHttpClient()
-    .get(learnerPostsApiUrl, { params: snakeCaseParams });
+    .get(learnerPostsApiUrl, { params: { username, page } });
  return data;
 }
--- a/src/discussions/learners/data/slices.js
+++ b/src/discussions/learners/data/slices.js
@@ -3,10 +3,7 @@ import { createSlice } from '@reduxjs/toolkit';

 import {
  LearnersOrdering,
-  PostsStatusFilter,
  RequestStatus,
-  ThreadOrdering,
-  ThreadType,
 } from '../../../data/constants';

 const learnersSlice = createSlice({
@@ -19,12 +16,6 @@ const learnersSlice = createSlice({
    totalPages: null,
    totalLearners: null,
    sortedBy: LearnersOrdering.BY_LAST_ACTIVITY,
-    postFilter: {
-      type: ThreadType.ALL,
-      status: PostsStatusFilter.ALL,
-      orderBy: ThreadOrdering.BY_LAST_ACTIVITY,
-      cohort: '',
-    },
    usernameSearch: null,
  },
  reducers: {
@@ -56,10 +47,6 @@ const learnersSlice = createSlice({
      state.usernameSearch = payload;
      state.pages = [];
    },
-    setPostFilter: (state, { payload }) => {
-      state.pages = [];
-      state.postFilter = payload;
-    },
  },
 });

@@ -70,7 +57,6 @@ export const {
  fetchLearnersDenied,
  setSortedBy,
  setUsernameSearch,
-  setPostFilter,
 } = learnersSlice.actions;

 export const learnersReducer = learnersSlice.reducer;
--- a/src/discussions/learners/data/thunks.js
+++ b/src/discussions/learners/data/thunks.js
@@ -67,17 +67,15 @@ export function fetchLearners(courseId, {
 * @param page
 * @returns a promise that will update the state with the learner's posts
 */
-export function fetchUserPosts(courseId, params) {
+export function fetchUserPosts(courseId, username, { page = 1 } = {}) {
  return async (dispatch) => {
    try {
-      dispatch(fetchLearnerThreadsRequest({ courseId, author: params?.username }));
-      const data = await getUserPosts(courseId, params);
+      dispatch(fetchLearnerThreadsRequest({ courseId, author: username }));
+
+      const data = await getUserPosts(courseId, username, { page });
      const normalisedData = normaliseThreads(camelCaseObject(data));
-      dispatch(fetchThreadsSuccess({
-        ...normalisedData,
-        page: params.page,
-        author: params.username,
-      }));
+
+      dispatch(fetchThreadsSuccess({ ...normalisedData, page, author: username }));
    } catch (error) {
      if (getHttpErrorStatus(error) === 403) {
        dispatch(fetchThreadsDenied());
--- a/src/discussions/learners/learner-post-filter-bar/LearnerPostFilterBar.jsx
+++ b/src/discussions/learners/learner-post-filter-bar/LearnerPostFilterBar.jsx
@@ -1,89 +0,0 @@
-import React, { useEffect } from 'react';
-
-import { isEmpty } from 'lodash';
-import { useDispatch, useSelector } from 'react-redux';
-import { useParams } from 'react-router-dom';
-
-import FilterBar from '../../../components/FilterBar';
-import { selectCourseCohorts } from '../../cohorts/data/selectors';
-import { fetchCourseCohorts } from '../../cohorts/data/thunks';
-import { selectUserHasModerationPrivileges, selectUserIsGroupTa } from '../../data/selectors';
-import { setPostFilter } from '../data/slices';
-
-function LearnerPostFilterBar() {
-  const dispatch = useDispatch();
-  const { courseId } = useParams();
-  const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
-  const userIsGroupTa = useSelector(selectUserIsGroupTa);
-  const cohorts = useSelector(selectCourseCohorts);
-  const postFilter = useSelector(state => state.learners.postFilter);
-
-  const filtersToShow = [
-    {
-      name: 'type',
-      filters: ['type-all', 'type-discussions', 'type-questions'],
-    },
-    {
-      name: 'status',
-      filters: ['status-any', 'status-unread', 'status-unanswered', 'status-unresponded'],
-    },
-    {
-      name: 'orderBy',
-      filters: ['sort-activity', 'sort-comments', 'sort-votes'],
-    },
-  ];
-
-  if (userHasModerationPrivileges || userIsGroupTa) {
-    filtersToShow[1].filters.splice(2, 0, 'status-reported');
-  }
-
-  const handleFilterChange = (event) => {
-    const { name, value } = event.currentTarget;
-    if (name === 'type') {
-      if (postFilter.type !== value) {
-        dispatch(setPostFilter({
-          ...postFilter,
-          type: value,
-        }));
-      }
-    } else if (name === 'status') {
-      if (postFilter.status !== value) {
-        dispatch(setPostFilter({
-          ...postFilter,
-          status: value,
-        }));
-      }
-    } else if (name === 'orderBy') {
-      if (postFilter.orderBy !== value) {
-        dispatch(setPostFilter({
-          ...postFilter,
-          orderBy: value,
-        }));
-      }
-    } else if (name === 'cohort') {
-      if (postFilter.cohort !== value) {
-        dispatch(setPostFilter({
-          ...postFilter,
-          cohort: value,
-        }));
-      }
-    }
-  };
-
-  useEffect(() => {
-    if (userHasModerationPrivileges && isEmpty(cohorts)) {
-      dispatch(fetchCourseCohorts(courseId));
-    }
-  }, [courseId, userHasModerationPrivileges]);
-
-  return (
-    <FilterBar
-      filters={filtersToShow}
-      selectedFilters={postFilter}
-      onFilterChange={handleFilterChange}
-      showCohortsFilter={userHasModerationPrivileges || userIsGroupTa}
-    />
-  );
-}
-
-export default LearnerPostFilterBar;
--- a/src/discussions/learners/learner-post-filter-bar/LearnerPostFilterBar.test.jsx
+++ b/src/discussions/learners/learner-post-filter-bar/LearnerPostFilterBar.test.jsx
@@ -1,108 +0,0 @@
-import {
-  act,
-  fireEvent,
-  render,
-  waitFor,
-} from '@testing-library/react';
-import { IntlProvider } from 'react-intl';
-import { generatePath, MemoryRouter, Route } from 'react-router';
-
-import { initializeMockApp } from '@edx/frontend-platform';
-import { AppProvider } from '@edx/frontend-platform/react';
-
-import { Routes } from '../../../data/constants';
-import { initializeStore } from '../../../store';
-import { DiscussionContext } from '../../common/context';
-import LearnerPostFilterBar from './LearnerPostFilterBar';
-
-let store;
-const username = 'abc123';
-const courseId = 'course-v1:edX+DemoX+Demo_Course';
-const path = generatePath(
-  Routes.LEARNERS.POSTS,
-  { courseId, learnerUsername: username },
-);
-
-function renderComponent() {
-  return render(
-    <IntlProvider locale="en">
-      <AppProvider store={store}>
-        <DiscussionContext.Provider
-          value={{
-            learnerUsername: username,
-            courseId,
-          }}
-        >
-          <MemoryRouter initialEntries={[path]}>
-            <Route
-              path={Routes.LEARNERS.POSTS}
-              component={LearnerPostFilterBar}
-            />
-          </MemoryRouter>
-        </DiscussionContext.Provider>
-      </AppProvider>
-    </IntlProvider>,
-  );
-}
-
-describe('LearnerPostFilterBar', () => {
-  beforeEach(async () => {
-    initializeMockApp({
-      authenticatedUser: {
-        userId: 3,
-        username,
-        administrator: true,
-        roles: [],
-      },
-    });
-    const initialData = {
-      config: {
-        hasModerationPrivileges: true,
-        isGroupTa: false,
-      },
-      cohorts: {
-        status: 'successful',
-        cohorts: [
-          {
-            name: 'Default Group',
-            id: 1,
-            userCount: 1,
-            groupId: null,
-          },
-        ],
-      },
-    };
-    store = initializeStore(initialData);
-  });
-
-  test('checks if all filters are visible', async () => {
-    const { queryAllByRole } = await renderComponent();
-    await act(async () => {
-      fireEvent.click(queryAllByRole('button')[0]);
-    });
-    await waitFor(() => {
-      expect(queryAllByRole('radiogroup')).toHaveLength(4);
-    });
-  });
-
-  test('checks if default values are selected', async () => {
-    const { queryAllByRole } = await renderComponent();
-    await act(async () => {
-      fireEvent.click(queryAllByRole('button')[0]);
-    });
-    await waitFor(() => {
-      expect(
-        queryAllByRole('radiogroup')[0].querySelector('input[value="all"]'),
-      ).toBeChecked();
-      expect(
-        queryAllByRole('radiogroup')[1].querySelector('input[value="statusAll"]'),
-      ).toBeChecked();
-      expect(
-        queryAllByRole('radiogroup')[2].querySelector('input[value="lastActivityAt"]'),
-      ).toBeChecked();
-      expect(
-        queryAllByRole('radiogroup')[3].querySelector('input[value=""]'),
-      ).toBeChecked();
-    });
-  });
-});
--- a/src/discussions/learners/learner/LearnerFilterBar.jsx
+++ b/src/discussions/learners/learner/LearnerFilterBar.jsx
@@ -103,12 +103,6 @@ function LearnerFilterBar({
                  selected={currentSorting}
                />
              )}
-              <ActionItem
-                id="sort-recency"
-                label={intl.formatMessage(messages.recentActivity)}
-                value={LearnersOrdering.BY_RECENCY}
-                selected={currentSorting}
-              />
            </Form.RadioSet>
          </div>
        </Form>
--- a/src/discussions/learners/learner/LearnerFooter.jsx
+++ b/src/discussions/learners/learner/LearnerFooter.jsx
@@ -4,9 +4,9 @@ import { useSelector } from 'react-redux';

 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Icon, OverlayTrigger, Tooltip } from '@edx/paragon';
-import { Edit, Report, ReportGmailerrorred } from '@edx/paragon/icons';
+import { Edit, Report } from '@edx/paragon/icons';

-import { QuestionAnswerOutline } from '../../../components/icons';
+import { QuestionAnswerOutline, ReportGmailerrorred } from '../../../components/icons';
 import { selectUserHasModerationPrivileges, selectUserIsGroupTa } from '../../data/selectors';
 import messages from '../messages';
 import { learnerShape } from './proptypes';
--- a/src/discussions/learners/messages.js
+++ b/src/discussions/learners/messages.js
@@ -38,11 +38,6 @@ const messages = defineMessages({
    defaultMessage: 'Reported activity',
    description: 'Text for learners sorting by reported activity',
  },
-  recentActivity: {
-    id: 'discussions.learner.recentActivity',
-    defaultMessage: 'Recent activity',
-    description: 'Text for learners sorting by recent activity',
-  },
  sortFilterStatus: {
    id: 'discussions.learner.sortFilterStatus',
    defaultMessage: `All learners by {sort, select,
--- a/src/discussions/messages.js
+++ b/src/discussions/messages.js
@@ -176,7 +176,7 @@ const messages = defineMessages({
  bannerMessage: {
    id: 'discussion.banner.welcomeMessage',
    defaultMessage: '🎉 Welcome to the new and improved discussions experience!',
-    description: 'Information banner welcome text',
+    description: 'Author name displayed when a post is anonymous',
  },
  learnMoreBannerLink: {
    id: 'discussion.banner.learnMore',
@@ -188,26 +188,6 @@ const messages = defineMessages({
    defaultMessage: 'Share feedback',
    description: 'Share feedback button to open feedback forms',
  },
-  blackoutDiscussionInformation: {
-    id: 'discussion.blackoutBanner.information',
-    defaultMessage: 'Blackout dates are currently active. Posting in discussions is unavailable at this time.',
-    description: 'Informative text when discussions blackout is active',
-  },
-  imageWarningMessage: {
-    id: 'discussions.editor.image.warning.message',
-    defaultMessage: 'Images having width or height greater than 999px will not be visible when the post, response or comment is viewed using in-line course discussions',
-    description: 'Modal message to tell image dimensions compatibility issue with legacy',
-  },
-  imageWarningModalTitle: {
-    id: 'discussions.editor.image.warning.title',
-    defaultMessage: 'Warning!',
-    description: 'Modal message title',
-  },
-  imageWarningDismissButton: {
-    id: 'discussions.editor.image.warning.dismiss',
-    defaultMessage: 'Ok',
-    description: 'Modal dismiss button text',
-  },
 });

 export default messages;
--- a/src/discussions/navigation/breadcrumb-menu/BreadcrumbMenu.jsx
+++ b/src/discussions/navigation/breadcrumb-menu/BreadcrumbMenu.jsx
@@ -44,7 +44,7 @@ function BreadcrumbMenu() {
  });

  return (
-    <div className="breadcrumb-menu d-flex flex-row bg-light-200 box-shadow-down-1 px-2.5 py-1">
+    <div className="breadcrumb-menu d-flex flex-row mt-2 mx-3">
      <BreadcrumbDropdown
        currentItem={currentChapter}
        showAllPath={discussionsPath(Routes.TOPICS.ALL, { courseId })}
--- a/src/discussions/navigation/breadcrumb-menu/LegacyBreadcrumbMenu.jsx
+++ b/src/discussions/navigation/breadcrumb-menu/LegacyBreadcrumbMenu.jsx
@@ -31,7 +31,7 @@ function LegacyBreadcrumbMenu() {
  const isNonCoursewareTopic = currentTopic && !currentCategory;

  return (
-    <div className="breadcrumb-menu d-flex flex-row bg-light-200 box-shadow-down-1 px-2.5 py-1">
+    <div className="breadcrumb-menu d-flex flex-row mt-2 mx-3">
      {isNonCoursewareTopic ? (
        <BreadcrumbDropdown
          currentItem={currentTopic}
--- a/src/discussions/posts/PostsView.jsx
+++ b/src/discussions/posts/PostsView.jsx
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';

 import SearchInfo from '../../components/SearchInfo';
-import { selectCurrentCategoryGrouping, selectTopicsUnderCategory } from '../../data/selectors';
+import { selectTopicsUnderCategory } from '../../data/selectors';
 import { DiscussionContext } from '../common/context';
 import {
  selectAllThreads,
@@ -29,10 +29,7 @@ TopicPostsList.propTypes = {
 };

 function CategoryPostsList({ category }) {
-  const { inContext } = useContext(DiscussionContext);
-  const groupedCategory = useSelector(selectCurrentCategoryGrouping)(category);
-  // If grouping at subsection is enabled, only apply it when browsing discussions in context in the learning MFE.
-  const topicIds = useSelector(selectTopicsUnderCategory)(inContext ? groupedCategory : category);
+  const topicIds = useSelector(selectTopicsUnderCategory)(category);
  const posts = useSelector(selectTopicThreads(topicIds));
  return <PostsList posts={posts} topics={topicIds} />;
 }
@@ -49,7 +46,6 @@ function PostsView() {
  const dispatch = useDispatch();
  const searchString = useSelector(({ threads }) => threads.filters.search);
  const resultsFound = useSelector(({ threads }) => threads.totalThreads);
-  const textSearchRewrite = useSelector(({ threads }) => threads.textSearchRewrite);
  const loadingStatus = useSelector(({ threads }) => threads.status);

  let postsListComponent;
@@ -78,15 +74,9 @@ function PostsView() {

  return (
    <div className="discussion-posts d-flex flex-column h-100">
-      {searchString && (
-        <SearchInfo
-          count={resultsFound}
-          text={searchString}
-          loadingStatus={loadingStatus}
-          onClear={() => dispatch(setSearchQuery(''))}
-          textSearchRewrite={textSearchRewrite}
-        />
-      )}
+      {
+        searchString && <SearchInfo count={resultsFound} text={searchString} loadingStatus={loadingStatus} onClear={() => dispatch(setSearchQuery(''))} />
+      }
      <PostFilterBar />
      <div className="border-bottom border-light-400" />
      <div className="list-group list-group-flush flex-fill" role="list" onKeyDown={e => handleKeyDown(e)}>
--- a/src/discussions/posts/PostsView.test.jsx
+++ b/src/discussions/posts/PostsView.test.jsx
@@ -29,7 +29,7 @@ let store;
 let axiosMock;

 async function renderComponent({
-  postId, topicId, category, myPosts, inContext = false,
+  postId, topicId, category, myPosts,
 } = { myPosts: false }) {
  let path = generatePath(Routes.POSTS.ALL_POSTS, { courseId });
  let page;
@@ -56,7 +56,6 @@ async function renderComponent({
            topicId,
            category,
            page,
-            inContext,
          }}
          >
            <Switch>
@@ -86,6 +85,12 @@ describe('PostsView', () => {
        roles: [],
      },
    });
+
+    store = initializeStore({
+      blocks: { blocks: { 'test-usage-key': { topics: ['some-topic-2', 'some-topic-0'] } } },
+      config: { hasModerationPrivileges: true },
+    });
+    store.dispatch(fetchConfigSuccess({}));
    Factory.resetAll();
    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
    axiosMock.onGet(getCohortsApiUrl(courseId)).reply(200, Factory.buildList('cohort', 1));
@@ -104,20 +109,8 @@ describe('PostsView', () => {
      });
  });

-  function setupStore(data = {}) {
-    const storeData = {
-      blocks: { blocks: { 'test-usage-key': { topics: ['some-topic-2', 'some-topic-0'] } } },
-      config: { hasModerationPrivileges: true },
-      ...data,
-    };
-    // console.log(storeData);
-    store = initializeStore(storeData);
-    store.dispatch(fetchConfigSuccess({}));
-  }
-
  describe('Basic', () => {
    test('displays a list of all posts', async () => {
-      setupStore();
      await act(async () => {
        await renderComponent();
      });
@@ -125,7 +118,6 @@ describe('PostsView', () => {
    });

    test('displays a list of user posts', async () => {
-      setupStore();
      await act(async () => {
        await renderComponent({ myPosts: true });
      });
@@ -133,42 +125,20 @@ describe('PostsView', () => {
    });

    test('displays a list of posts in a topic', async () => {
-      setupStore();
      await act(async () => {
        await renderComponent({ topicId: 'some-topic-1' });
      });
      expect(screen.getAllByText(/this is thread-\d+ in topic some-topic-1/i)).toHaveLength(Math.ceil(threadCount / 3));
    });

-    test.each([true, false])(
-      'displays a list of posts in a category with grouping at subsection = %s',
-      async (grouping) => {
-        setupStore({
-          blocks: {
-            blocks: {
-              'test-usage-key': {
-                type: 'vertical',
-                topics: ['some-topic-2', 'some-topic-0'],
-                parent: 'test-seq-key',
-              },
-              'test-seq-key': { type: 'sequential', topics: ['some-topic-0', 'some-topic-1', 'some-topic-2'] },
-            },
-          },
-          config: { groupAtSubsection: grouping, hasModerationPrivileges: true, provider: 'openedx' },
-        });
-        await act(async () => {
-          await renderComponent({ category: 'test-usage-key', inContext: true, p: true });
-        });
-        const topicThreadCount = Math.ceil(threadCount / 3);
-        expect(screen.queryAllByText(/this is thread-\d+ in topic some-topic-2/i))
-          .toHaveLength(topicThreadCount);
-        expect(screen.queryAllByText(/this is thread-\d+ in topic some-topic-0/i))
-          .toHaveLength(topicThreadCount);
-        // When grouping is enabled, topic 1 will be shown, but not otherwise.
-        expect(screen.queryAllByText(/this is thread-\d+ in topic some-topic-1/i))
-          .toHaveLength(grouping ? topicThreadCount : 0);
-      },
-    );
+    test('displays a list of posts in a category', async () => {
+      await act(async () => {
+        await renderComponent({ category: 'test-usage-key' });
+      });
+      expect(screen.queryAllByText(/this is thread-\d+ in topic some-topic-1}/i)).toHaveLength(0);
+      expect(screen.queryAllByText(/this is thread-\d+ in topic some-topic-2/i)).toHaveLength(Math.ceil(threadCount / 3));
+      expect(screen.queryAllByText(/this is thread-\d+ in topic some-topic-0/i)).toHaveLength(Math.ceil(threadCount / 3));
+    });
  });

  describe('Filtering', () => {
@@ -180,7 +150,6 @@ describe('PostsView', () => {
    }

    beforeEach(async () => {
-      setupStore();
      await act(async () => {
        await renderComponent();
      });
--- a/src/discussions/posts/data/slices.js
+++ b/src/discussions/posts/data/slices.js
@@ -40,7 +40,6 @@ const threadsSlice = createSlice({
    nextPage: null,
    totalPages: null,
    totalThreads: null,
-    textSearchRewrite: null,
    postStatus: RequestStatus.SUCCESSFUL,
    filters: {
      status: PostsStatusFilter.ALL,
@@ -61,9 +60,6 @@ const threadsSlice = createSlice({
      }
      state.status = RequestStatus.IN_PROGRESS;
    },
-    clearPostsPages: (state) => {
-      state.pages = [];
-    },
    fetchThreadsRequest: (state) => {
      state.status = RequestStatus.IN_PROGRESS;
    },
@@ -84,7 +80,6 @@ const threadsSlice = createSlice({
      state.nextPage = (payload.page < payload.pagination.numPages) ? payload.page + 1 : null;
      state.totalPages = payload.pagination.numPages;
      state.totalThreads = payload.pagination.count;
-      state.textSearchRewrite = payload.textSearchRewrite;
    },
    fetchThreadsFailed: (state) => {
      state.status = RequestStatus.FAILED;
@@ -245,7 +240,6 @@ export const {
  showPostEditor,
  hidePostEditor,
  clearRedirect,
-  clearPostsPages,
 } = threadsSlice.actions;

 export const threadsReducer = threadsSlice.reducer;
--- a/src/discussions/posts/data/thunks.js
+++ b/src/discussions/posts/data/thunks.js
@@ -138,7 +138,7 @@ export function fetchThreads(courseId, {
      const data = await getThreads(courseId, options);
      const normalisedData = normaliseThreads(camelCaseObject(data), topicIds);
      dispatch(fetchThreadsSuccess({
-        ...normalisedData, page, author, textSearchRewrite: data.text_search_rewrite,
+        ...normalisedData, page, author,
      }));
    } catch (error) {
      if (getHttpErrorStatus(error) === 403) {
--- a/src/discussions/posts/post-actions-bar/messages.js
+++ b/src/discussions/posts/post-actions-bar/messages.js
@@ -26,11 +26,6 @@ const messages = defineMessages({
    defaultMessage: 'Showing {count} results for "{text}"',
    description: 'Message displayed when user performs a search',
  },
-  searchRewriteInfo: {
-    id: 'discussions.actionBar.searchRewriteInfo',
-    defaultMessage: 'No results found for "{searchString}". Showing {count} results for "{textSearchRewrite}".',
-    description: 'Message displayed when user performs a search and search query is rewritten because matching results are not found',
-  },
  searchInfoSearching: {
    id: 'discussions.actionBar.searchInfoSearching',
    defaultMessage: 'Searching...',
--- a/src/discussions/posts/post-editor/PostEditor.jsx
+++ b/src/discussions/posts/post-editor/PostEditor.jsx
@@ -10,7 +10,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { useHistory, useLocation, useParams } from 'react-router-dom';
 import * as Yup from 'yup';

-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { AppContext } from '@edx/frontend-platform/react';
 import {
  Button, Card, Form, Spinner, StatefulButton,
@@ -23,7 +23,6 @@ import PostPreviewPane from '../../../components/PostPreviewPane';
 import { useDispatchWithState } from '../../../data/hooks';
 import { selectCourseCohorts } from '../../cohorts/data/selectors';
 import { fetchCourseCohorts } from '../../cohorts/data/thunks';
-import { useCurrentDiscussionTopic } from '../../data/hooks';
 import {
  selectAnonymousPostingConfig,
  selectDivisionSettings,
@@ -78,9 +77,9 @@ DiscussionPostType.propTypes = {
 };

 function PostEditor({
+  intl,
  editExisting,
 }) {
-  const intl = useIntl();
  const { authenticatedUser } = useContext(AppContext);
  const dispatch = useDispatch();
  const editorRef = useRef(null);
@@ -90,9 +89,9 @@ function PostEditor({
  const commentsPagePath = useCommentsPagePath();
  const {
    courseId,
+    topicId,
    postId,
  } = useParams();
-  const topicId = useCurrentDiscussionTopic();

  const nonCoursewareTopics = useSelector(selectNonCoursewareTopics);
  const nonCoursewareIds = useSelector(selectNonCoursewareIds);
@@ -107,8 +106,7 @@ function PostEditor({
  const userIsStaff = useSelector(selectUserIsStaff);

  const canDisplayEditReason = (reasonCodesEnabled && editExisting
-    && (userHasModerationPrivileges || userIsGroupTa || userIsStaff)
-    && post?.author !== authenticatedUser.username
+    && (userHasModerationPrivileges || userIsGroupTa || userIsStaff) && post?.author !== authenticatedUser.username
  );

  const editReasonCodeValidation = canDisplayEditReason && {
@@ -136,7 +134,7 @@ function PostEditor({
    follow: isEmpty(post?.following) ? true : post?.following,
    anonymous: allowAnonymous ? false : undefined,
    anonymousToPeers: allowAnonymousToPeers ? false : undefined,
-    editReasonCode: post?.lastEdit?.reasonCode || (userIsStaff ? 'violates-guidelines' : ''),
+    editReasonCode: post?.lastEdit?.reasonCode || '',
    cohort: post?.cohort || 'default',
  };

@@ -352,7 +350,7 @@ function PostEditor({
                  name="editReasonCode"
                  className="m-0"
                  as="select"
-                  value={values.editReasonCode}
+                  value={userIsStaff ? 'violates-guidelines' : values.editReasonCode}
                  onChange={handleChange}
                  onBlur={handleBlur}
                  aria-describedby="editReasonCodeInput"
@@ -441,6 +439,7 @@ function PostEditor({
 }

 PostEditor.propTypes = {
+  intl: intlShape.isRequired,
  editExisting: PropTypes.bool,
 };

@@ -448,4 +447,4 @@ PostEditor.defaultProps = {
  editExisting: false,
 };

-export default PostEditor;
+export default injectIntl(PostEditor);
--- a/src/discussions/posts/post-editor/messages.js
+++ b/src/discussions/posts/post-editor/messages.js
@@ -116,11 +116,6 @@ const messages = defineMessages({
    defaultMessage: 'Show Preview',
    description: 'show preview button text to allow user to see their post content.',
  },
-  actionsAlt: {
-    id: 'discussions.actions.label',
-    defaultMessage: 'Actions menu',
-    description: 'Button to see actions for a post or comment',
-  },
 });

 export default messages;
--- a/src/discussions/posts/post-filter-bar/PostFilterBar.jsx
+++ b/src/discussions/posts/post-filter-bar/PostFilterBar.jsx
@@ -25,7 +25,7 @@ import {
 import { selectThreadFilters, selectThreadSorting } from '../data/selectors';
 import messages from './messages';

-export const ActionItem = ({
+const ActionItem = ({
  id,
  label,
  value,
--- a/src/discussions/posts/post-filter-bar/messages.js
+++ b/src/discussions/posts/post-filter-bar/messages.js
@@ -46,11 +46,6 @@ const messages = defineMessages({
    defaultMessage: 'Unanswered',
    description: 'Option in dropdown to filter to unanswered posts',
  },
-  filterUnresponded: {
-    id: 'discussions.posts.status.filter.unresponded',
-    defaultMessage: 'Unresponded',
-    description: 'Option in dropdown to filter to unresponded posts',
-  },
  myPosts: {
    id: 'discussions.posts.filter.myPosts',
    defaultMessage: 'My posts',
@@ -98,7 +93,6 @@ const messages = defineMessages({
      statusFollowing {followed}
      statusReported {reported}
      statusUnanswered {unanswered}
-      statusUnresponded {unresponded}
      other {{status}}
    } {type, select,
      discussion {discussions}
--- a/src/discussions/posts/post/PostLink.jsx
+++ b/src/discussions/posts/post/PostLink.jsx
@@ -2,15 +2,17 @@ import React, { useContext } from 'react';
 import PropTypes from 'prop-types';

 import classNames from 'classnames';
+import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';

-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Badge, Icon } from '@edx/paragon';

 import { PushPin } from '../../../components/icons';
 import { AvatarOutlineAndLabelColors, Routes, ThreadType } from '../../../data/constants';
 import AuthorLabel from '../../common/AuthorLabel';
 import { DiscussionContext } from '../../common/context';
+import { selectUserHasModerationPrivileges, selectUserIsGroupTa } from '../../data/selectors';
 import { discussionsPath, isPostPreviewAvailable } from '../../utils';
 import messages from './messages';
 import PostFooter from './PostFooter';
@@ -20,10 +22,11 @@ import { postShape } from './proptypes';
 function PostLink({
  post,
  isSelected,
+  intl,
+  learnerTab,
  showDivider,
  idx,
 }) {
-  const intl = useIntl();
  const {
    page,
    postId,
@@ -39,9 +42,12 @@ function PostLink({
    category,
    learnerUsername,
  });
+  const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
+  const userIsGroupTa = useSelector(selectUserIsGroupTa);
  const showAnsweredBadge = post.hasEndorsed && post.type === ThreadType.QUESTION;
  const authorLabelColor = AvatarOutlineAndLabelColors[post.authorLabel];
-  const canSeeReportedBadge = post.abuseFlagged || post.abuseFlaggedCount;
+  const postReported = post.abuseFlagged || post.abuseFlaggedCount;
+  const canSeeReportedBadge = postReported && (userHasModerationPrivileges || userIsGroupTa);
  const read = post.read || (!post.read && post.commentCount !== post.unreadCommentCount);

  return (
@@ -57,7 +63,7 @@ function PostLink({
        style={{ lineHeight: '21px' }}
        aria-current={isSelected(post.id) ? 'page' : undefined}
        role="option"
-        tabIndex={(isSelected(post.id) || idx === 0) ? 0 : -1}
+        tabindex={(isSelected(post.id) || idx === 0) ? 0 : -1}
      >
        <div
          className={
@@ -112,6 +118,7 @@ function PostLink({
              author={post.author || intl.formatMessage(messages.anonymous)}
              authorLabel={post.authorLabel}
              labelColor={authorLabelColor && `text-${authorLabelColor}`}
+              linkToProfile={!learnerTab && post.author}
            />
            <div
              className="text-truncate text-primary-500 font-weight-normal font-size-14 font-style-normal font-family-inter"
@@ -135,13 +142,16 @@ function PostLink({
 PostLink.propTypes = {
  post: postShape.isRequired,
  isSelected: PropTypes.func.isRequired,
+  intl: intlShape.isRequired,
+  learnerTab: PropTypes.bool,
  showDivider: PropTypes.bool,
  idx: PropTypes.number,
 };

 PostLink.defaultProps = {
+  learnerTab: false,
  showDivider: true,
  idx: -1,
 };

-export default PostLink;
+export default injectIntl(PostLink);
--- a/src/discussions/posts/post/PostLink.test.jsx
+++ b/src/discussions/posts/post/PostLink.test.jsx
@@ -19,12 +19,12 @@ const courseId = 'course-v1:edX+DemoX+Demo_Course';
 let store;
 let axiosMock;

-function renderComponent(post) {
+function renderComponent(post, learnerTab = false) {
  return render(
    <IntlProvider locale="en">
      <AppProvider store={store}>
        <DiscussionContext.Provider value={{ courseId }}>
-          <PostLink post={post} key={post.id} isSelected={() => true} />
+          <PostLink post={post} key={post.id} isSelected={() => true} learnerTab={learnerTab} />
        </DiscussionContext.Provider>
      </AppProvider>
    </IntlProvider>,
@@ -103,10 +103,27 @@ describe('Post username', () => {
  });

  it.each([
-    'anonymous',
-    'test-user',
-  ])('is not clickable for %s user', async (user) => {
-    renderComponent({ ...mockPost, author: user });
-    expect(screen.queryByTestId('learner-posts-link')).not.toBeInTheDocument();
+    true,
+    false,
+  ])('is a clickable link %s', async (leanerTab) => {
+    renderComponent(mockPost, leanerTab);
+
+    if (leanerTab) {
+      expect(screen.queryByTestId('learner-posts-link')).not.toBeInTheDocument();
+    } else {
+      expect(screen.queryByTestId('learner-posts-link')).toBeInTheDocument();
+    }
+  });
+
+  it.each([
+    true,
+    false,
+  ])('is only clickable if user is not anonymous', async (isAnonymous) => {
+    renderComponent({ ...mockPost, author: isAnonymous ? null : 'test-user' });
+    if (isAnonymous) {
+      expect(screen.queryByTestId('learner-posts-link')).not.toBeInTheDocument();
+    } else {
+      expect(screen.queryByTestId('learner-posts-link')).toBeInTheDocument();
+    }
  });
 });
--- a/src/discussions/topics/TopicsView.jsx
+++ b/src/discussions/topics/TopicsView.jsx
@@ -22,19 +22,15 @@ function CourseWideTopics() {
  const { category } = useParams();
  const filter = useSelector(selectTopicFilter);
  const nonCoursewareTopics = useSelector(selectNonCoursewareTopics);
-  const filteredNonCoursewareTopics = nonCoursewareTopics.filter(item => (filter
-    ? item.name.toLowerCase().includes(filter)
-    : true
-  ));
-
-  return (nonCoursewareTopics && category === undefined)
-    && filteredNonCoursewareTopics.map((topic, index) => (
-      <Topic
-        topic={topic}
-        key={topic.id}
-        index={index}
-        showDivider={(filteredNonCoursewareTopics.length - 1) !== index}
-      />
+  return (nonCoursewareTopics && category === undefined) && nonCoursewareTopics.filter(
+    item => (filter
+      ? item.name.toLowerCase()
+        .includes(filter)
+      : true
+    ),
+  )
+    .map(topic => (
+      <Topic topic={topic} key={topic.id} />
    ));
 }

@@ -80,20 +76,6 @@ function TopicsView() {
  const { courseId } = useContext(DiscussionContext);
  const dispatch = useDispatch();

-  const handleKeyDown = (event) => {
-    const { key } = event;
-    if (key !== 'ArrowDown' && key !== 'ArrowUp') { return; }
-    const option = event.target;
-
-    let selectedOption;
-    if (key === 'ArrowDown') { selectedOption = option.nextElementSibling; }
-    if (key === 'ArrowUp') { selectedOption = option.previousElementSibling; }
-
-    if (selectedOption) {
-      selectedOption.focus();
-    }
-  };
-
  useEffect(() => {
    // Don't load till the provider information is available
    if (provider) {
@@ -107,19 +89,19 @@ function TopicsView() {
  }, [topicFilter]);

  return (
-    <div className="discussion-topics d-flex flex-column h-100" data-testid="topics-view">
-      {topicFilter && (
-        <SearchInfo
-          text={topicFilter}
-          count={filteredTopicsCount}
-          loadingStatus={loadingStatus}
-          onClear={() => dispatch(setFilter(''))}
-        />
-      )}
-      <div className="list-group list-group-flush flex-fill" role="list" onKeyDown={e => handleKeyDown(e)}>
-        <CourseWideTopics />
-        {provider === DiscussionProvider.OPEN_EDX && <CoursewareTopics />}
-        {provider === DiscussionProvider.LEGACY && <LegacyCoursewareTopics />}
+    <div className="d-flex flex-column flex-fill">
+      <div
+        className="discussion-topics card"
+        data-testid="topics-view"
+      >
+        {
+          topicFilter && <SearchInfo text={topicFilter} count={filteredTopicsCount} loadingStatus={loadingStatus} onClear={() => dispatch(setFilter(''))} />
+        }
+        <div className="list-group list-group-flush">
+          <CourseWideTopics />
+          {provider === DiscussionProvider.OPEN_EDX && <CoursewareTopics />}
+          {provider === DiscussionProvider.LEGACY && <LegacyCoursewareTopics />}
+        </div>
      </div>
      {
        filteredTopicsCount === 0
--- a/src/discussions/topics/TopicsView.test.jsx
+++ b/src/discussions/topics/TopicsView.test.jsx
@@ -159,7 +159,7 @@ describe('TopicsView', () => {
        renderComponent();
        const archivedTopicGroup = screen.queryAllByTestId('topic-group').pop();
        expect(archivedTopicGroup).toHaveTextContent(/archived/i);
-        const archivedTopicLinks = within(archivedTopicGroup).queryAllByRole('option');
+        const archivedTopicLinks = within(archivedTopicGroup).queryAllByRole('link');
        expect(archivedTopicLinks).toHaveLength(2);
      });
    }
--- a/src/discussions/topics/data/selectors.js
+++ b/src/discussions/topics/data/selectors.js
@@ -34,7 +34,7 @@ export const selectCoursewareTopics = createSelector(
      : sequences.map(sequence => ({
        id: sequence.id,
        name: sequence.displayName,
-        topics: sequence.topics.map(topicId => ({ id: topicId, name: topics[topicId]?.name || 'unnamed' })),
+        topics: sequence.topics.map(topicId => ({ id: topicId, name: topics[topicId].name })),
      }))
  ),
 );
--- a/src/discussions/topics/messages.js
+++ b/src/discussions/topics/messages.js
@@ -1,34 +1,6 @@
 import { defineMessages } from '@edx/frontend-platform/i18n';

 const messages = defineMessages({
-  discussions: {
-    id: 'discussions.topics.discussions',
-    defaultMessage: `{count, plural,
-      =0 {Discussion}
-      one {# Discussion}
-      other {# Discussions}
-    }`,
-    description: 'Display tooltip text used to indicate how many posts type are discussion',
-  },
-  questions: {
-    id: 'discussions.topics.questions',
-    defaultMessage: `{count, plural,
-      =0 {Question}
-      one {# Question}
-      other {# Questions}
-    }`,
-    description: 'Display tooltip text used to indicate how many posts type are questions',
-  },
-  reported: {
-    id: 'discussions.topics.reported',
-    defaultMessage: '{reported} reported',
-    description: 'Display tooltip text used to indicate how many posts are reported',
-  },
-  previouslyReported: {
-    id: 'discussions.topics.previouslyReported',
-    defaultMessage: '{previouslyReported} previously reported',
-    description: 'Display tooltip text used to indicate how many posts are previously reported',
-  },
  sortedBy: {
    id: 'discussions.topics.sort.message',
    defaultMessage: 'Sorted by {sortBy}',
@@ -59,11 +31,6 @@ const messages = defineMessages({
    defaultMessage: 'Archived',
    description: 'Heading for displaying topics that are archived.',
  },
-  unnamedTopicCategories: {
-    id: 'discussions.topics.unnamed.label',
-    defaultMessage: 'Unnamed Topic',
-    description: 'Text to display in place of topic name if topic name is empty',
-  },
 });

 export default messages;
--- a/src/discussions/topics/topic-group/TopicGroupBase.jsx
+++ b/src/discussions/topics/topic-group/TopicGroupBase.jsx
@@ -4,13 +4,10 @@ import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';

-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-
 import { Routes } from '../../../data/constants';
 import { DiscussionContext } from '../../common/context';
 import { discussionsPath } from '../../utils';
 import { selectTopicFilter } from '../data/selectors';
-import messages from '../messages';
 import Topic, { topicShape } from './topic/Topic';

 function TopicGroupBase({
@@ -18,56 +15,50 @@ function TopicGroupBase({
  groupTitle,
  linkToGroup,
  topics,
-  intl,
 }) {
  const { courseId } = useContext(DiscussionContext);
  const filter = useSelector(selectTopicFilter);
  const hasTopics = topics.length > 0;
  const matchesFilter = filter
-    ? groupTitle?.toLowerCase().includes(filter)
+    ? groupTitle?.toLowerCase()
+      .includes(filter)
    : true;
-
-  const filteredTopicElements = topics.filter(
-    topic => (filter
-      ? (topic.name.toLowerCase().includes(filter) || matchesFilter)
-      : true
+  const topicElements = topics.filter(
+    topic => (
+      filter
+        ? (topic.name.toLowerCase()
+          .includes(filter) || matchesFilter)
+        : true
    ),
-  );
-
-  const hasFilteredSubtopics = (filteredTopicElements.length > 0);
+  )
+    .map(topic => (<Topic topic={topic} key={topic.id} />));
+  const hasFilteredSubtopics = (topicElements.length > 0);
  if (!hasTopics || (!matchesFilter && !hasFilteredSubtopics)) {
    return null;
  }
  return (
    <div
-      className="discussion-topic-group d-flex flex-column text-primary-500"
+      className="discussion-topic-group d-flex flex-column"
      data-category-id={groupId}
      data-testid="topic-group"
    >
-      <div className="pt-2.5 px-4 font-weight-bold">
-        {linkToGroup && groupId
-          ? (
-            <Link
-              className="text-decoration-none text-primary-500"
-              to={discussionsPath(Routes.TOPICS.CATEGORY, {
-                courseId,
-                category: groupId,
-              })}
-            >
-              {groupTitle}
-            </Link>
-          ) : (
-            groupTitle || intl.formatMessage(messages.unnamedTopicCategories)
-          )}
-      </div>
-      {filteredTopicElements.map((topic, index) => (
-        <Topic
-          topic={topic}
-          key={topic.id}
-          index={index}
-          showDivider={(filteredTopicElements.length - 1) !== index}
-        />
-      ))}
+      {linkToGroup
+        ? (
+          <Link
+            className="list-group-item p-4 text-primary-500"
+            to={discussionsPath(Routes.TOPICS.CATEGORY, {
+              courseId,
+              category: groupId,
+            })}
+          >
+            {groupTitle}
+          </Link>
+        ) : (
+          <span className="list-group-item p-4 text-primary-500">
+            {groupTitle}
+          </span>
+        )}
+      {topicElements}
    </div>
  );
 }
@@ -77,11 +68,10 @@ TopicGroupBase.propTypes = {
  groupTitle: PropTypes.string.isRequired,
  topics: PropTypes.arrayOf(topicShape).isRequired,
  linkToGroup: PropTypes.bool,
-  intl: intlShape.isRequired,
 };

 TopicGroupBase.defaultProps = {
  linkToGroup: true,
 };

-export default injectIntl(TopicGroupBase);
+export default TopicGroupBase;
--- a/src/discussions/topics/topic-group/topic/Topic.jsx
+++ b/src/discussions/topics/topic-group/topic/Topic.jsx
@@ -2,120 +2,65 @@
 import React from 'react';
 import PropTypes from 'prop-types';

-import classNames from 'classnames';
-import { useSelector } from 'react-redux';
 import { useParams } from 'react-router';
 import { Link } from 'react-router-dom';

-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Icon, OverlayTrigger, Tooltip } from '@edx/paragon';
-import { HelpOutline, PostOutline, Report } from '@edx/paragon/icons';
+import { Icon } from '@edx/paragon';
+import { Error as ErrorIcon, Help, PostOutline } from '@edx/paragon/icons';

 import { Routes } from '../../../../data/constants';
-import { selectUserHasModerationPrivileges, selectUserIsGroupTa } from '../../../data/selectors';
 import { discussionsPath } from '../../../utils';
-import messages from '../../messages';

-function Topic({
-  topic,
-  showDivider,
-  index,
-  intl,
-}) {
+function Topic({ topic }) {
  const { courseId } = useParams();
  const topicUrl = discussionsPath(Routes.TOPICS.TOPIC, {
    courseId,
    topicId: topic.id,
  });
-  const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
-  const userIsGroupTa = useSelector(selectUserIsGroupTa);
-  const { inactiveFlags, activeFlags } = topic;
-  const canSeeReportedStats = (activeFlags || inactiveFlags) && (userHasModerationPrivileges || userIsGroupTa);
-  const isSelected = (id) => window.location.pathname.includes(id);
-
+  const icons = [
+    {
+      key: 'discussions',
+      icon: PostOutline,
+      count: topic.threadCounts?.discussion || 0,
+    },
+    {
+      key: 'questions',
+      icon: Help,
+      count: topic.threadCounts?.question || 0,
+    },
+  ];
  return (
    <Link
-      className={
-        classNames('discussion-topic p-0 text-decoration-none text-primary-500', {
-          'border-bottom border-light-400': showDivider,
-        })
-      }
+      className="discussion-topic d-flex flex-column list-group-item px-4 py-3 text-primary-500"
      data-topic-id={topic.id}
      to={topicUrl}
-      onClick={() => isSelected(topic.id)}
-      aria-current={isSelected(topic.id) ? 'page' : undefined}
-      role="option"
-      tabIndex={(isSelected(topic.id) || index === 0) ? 0 : -1}
    >
-      <div className="d-flex flex-row pt-2.5 pb-2 px-4">
-        <div className="d-flex flex-column flex-fill" style={{ minWidth: 0 }}>
-          <div className="d-flex flex-column justify-content-start mw-100 flex-fill">
-            <div className="topic-name text-truncate">
-              {topic.name}
-            </div>
-          </div>
-          <div className="d-flex align-items-center mt-2.5" style={{ marginBottom: '2px' }}>
-            <OverlayTrigger
-              overlay={(
-                <Tooltip>
-                  <div className="d-flex flex-column align-items-start">
-                    {intl.formatMessage(messages.discussions, {
-                      count: topic.threadCounts?.discussion || 0,
-                    })}
-                  </div>
-                </Tooltip>
-                )}
-            >
-              <div className="d-flex align-items-center mr-3.5">
-                <Icon src={PostOutline} className="icon-size mr-2" />
-                {topic.threadCounts?.discussion || 0}
-              </div>
-            </OverlayTrigger>
-            <OverlayTrigger
-              overlay={(
-                <Tooltip>
-                  <div className="d-flex flex-column align-items-start">
-                    {intl.formatMessage(messages.questions, {
-                      count: topic.threadCounts?.question || 0,
-                    })}
-                  </div>
-                </Tooltip>
-              )}
-            >
-              <div className="d-flex align-items-center mr-3.5">
-                <Icon src={HelpOutline} className="icon-size mr-2" />
-                {topic.threadCounts?.question || 0}
-              </div>
-            </OverlayTrigger>
-            {Boolean(canSeeReportedStats) && (
-              <OverlayTrigger
-                overlay={(
-                  <Tooltip>
-                    <div className="d-flex flex-column align-items-start">
-                      {Boolean(activeFlags) && (
-                        <span>
-                          {intl.formatMessage(messages.reported, { reported: activeFlags })}
-                        </span>
-                      )}
-                      {Boolean(inactiveFlags) && (
-                        <span>
-                          {intl.formatMessage(messages.previouslyReported, { previouslyReported: inactiveFlags })}
-                        </span>
-                      )}
-                    </div>
-                  </Tooltip>
-                )}
-              >
-                <div className="d-flex align-items-center">
-                  <Icon src={Report} className="icon-size mr-2 text-danger" />
-                  {activeFlags}{Boolean(inactiveFlags) && `/${inactiveFlags}`}
-                </div>
-              </OverlayTrigger>
-            )}
-          </div>
-        </div>
+      <div className="topic-name">
+        {topic.name}
+      </div>
+      <div className="d-flex mt-3">
+        {
+          icons.map(({
+            key,
+            icon,
+            count,
+          }) => (
+            <div className="mr-4 d-flex align-items-center" key={key}>
+              <Icon className="mr-2" src={icon} />
+              {/* Reserve some space for larger counts */}
+              <span>
+                {count}
+              </span>
+            </div>
+          ))
+        }
+        {topic?.flags && (
+          <div className="d-flex align-items-center">
+            <Icon className="mr-2" src={ErrorIcon} />
+            {topic.flags}
+          </div>
+        )}
      </div>
-      {!showDivider && <div className="divider pt-1 bg-light-500 border-top border-light-700" />}
    </Link>
  );
 }
@@ -128,15 +73,7 @@ export const topicShape = PropTypes.shape({
  flags: PropTypes.number,
 });
 Topic.propTypes = {
-  intl: intlShape.isRequired,
  topic: topicShape.isRequired,
-  showDivider: PropTypes.bool,
-  index: PropTypes.number,
 };

-Topic.defaultProps = {
-  showDivider: true,
-  index: -1,
-};
-
-export default injectIntl(Topic);
+export default Topic;
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -43,8 +43,6 @@
  "discussions.learner.mostActivity": "Most activity",
  "discussions.learner.reportedActivity": "Reported activity",
  "discussions.learner.sortFilterStatus": "All learners by {sort, select,\n      flagged {reported activity}\n      activity {most activity}\n      other {{sort}}\n    }",
-  "discussion.learner.allActivity": "All activity",
-  "discussion.learner.posts": "Posts",
  "discussions.actions.button.alt": "Actions menu",
  "discussions.actions.back.alt": "Back",
  "discussions.actions.copylink": "Copy link",
@@ -79,7 +77,6 @@
  "discussion.banner.welcomeMessage": "🎉 Welcome to the new and improved discussions experience!",
  "discussion.banner.learnMore": "Learn more",
  "discussion.banner.shareFeedback": "Share feedback",
-  "discussion.blackoutBanner.information": "Blackout dates are currently active. Posting in discussions is unavailable at this time.",
  "discussions.navigation.breadcrumbMenu.allTopics": "Topics",
  "discussions.navigation.breadcrumbMenu.showAll": "Show all",
  "discussions.navigation.navigationBar.allPosts": "All posts",
@@ -88,9 +85,8 @@
  "discussions.navigation.navigationBar.learners": "Learners",
  "discussions.app.title": "Discussions",
  "discussions.posts.actionBar.searchAllPosts": "Search all posts",
-  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
+  "discussions.posts.actionBar.search": "{page, select,\n      topics {Find a topic}\n      posts {Search all posts}\n      learners {Search learner}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
  "discussions.actionBar.searchInfo": "Showing {count} results for \"{text}\"",
-  "discussions.actionBar.searchRewriteInfo": "No results found for \"{searchString}\". Showing {count} results for \"{textSearchRewrite}\".",
  "discussions.actionBar.searchInfoSearching": "Searching...",
  "discussions.actionBar.clearSearch": "Clear results",
  "discussion.posts.actionBar.add": "Add a post",
@@ -128,7 +124,6 @@
  "discussions.posts.status.filter.following": "Following",
  "discussions.posts.status.filter.reported": "Reported",
  "discussions.posts.status.filter.unanswered": "Unanswered",
-  "discussions.posts.status.filter.unresponded": "Unresponded",
  "discussions.posts.filter.myPosts": "My posts",
  "discussions.posts.filter.myDiscussions": "My discussions",
  "discussions.posts.filter.myQuestions": "My questions",
@@ -136,7 +131,7 @@
  "discussions.posts.sort.lastActivity": "Recent activity",
  "discussions.posts.sort.commentCount": "Most activity",
  "discussions.posts.sort.voteCount": "Most likes",
-  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      statusUnresponded {unresponded}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
+  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
  "discussions.post.author.anonymous": "anonymous",
  "discussions.post.lastResponse": "Last response {time}",
  "discussions.post.postedOn": "Posted {time} by {author} {authorLabel}",
@@ -161,15 +156,10 @@
  "discussions.post.editedBy": "Edited by",
  "discussions.post.editReason": "Reason",
  "discussions.post.postWithoutPreview": "No preview available",
-  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
-  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
-  "discussions.topics.reported": "{reported} reported",
-  "discussions.topics.previouslyReported": "{previouslyReported} previously reported",
  "discussions.topics.sort.message": "Sorted by {sortBy}",
  "discussions.topics.sort.lastActivity": "Recent activity",
  "discussions.topics.sort.commentCount": "Most activity",
  "discussions.topics.sort.courseStructure": "Course Structure",
-  "discussions.topics.find.label": "Search topics",
-  "discussions.topics.archived.label": "Archived",
-  "discussions.topics.unnamed.label": "Unnamed Topic"
+  "discussions.topics.find.label": "Find a topic",
+  "discussions.topics.archived.label": "Archived"
 }
--- a/src/i18n/messages/de_DE.json
+++ b/src/i18n/messages/de_DE.json
@@ -43,8 +43,6 @@
  "discussions.learner.mostActivity": "Most activity",
  "discussions.learner.reportedActivity": "Reported activity",
  "discussions.learner.sortFilterStatus": "All learners by {sort, select,\n      flagged {reported activity}\n      activity {most activity}\n      other {{sort}}\n    }",
-  "discussion.learner.allActivity": "All activity",
-  "discussion.learner.posts": "Posts",
  "discussions.actions.button.alt": "Actions menu",
  "discussions.actions.back.alt": "Back",
  "discussions.actions.copylink": "Copy link",
@@ -79,7 +77,6 @@
  "discussion.banner.welcomeMessage": "🎉 Welcome to the new and improved discussions experience!",
  "discussion.banner.learnMore": "Learn more",
  "discussion.banner.shareFeedback": "Share feedback",
-  "discussion.blackoutBanner.information": "Blackout dates are currently active. Posting in discussions is unavailable at this time.",
  "discussions.navigation.breadcrumbMenu.allTopics": "Topics",
  "discussions.navigation.breadcrumbMenu.showAll": "Show all",
  "discussions.navigation.navigationBar.allPosts": "All posts",
@@ -88,9 +85,8 @@
  "discussions.navigation.navigationBar.learners": "Learners",
  "discussions.app.title": "Discussions",
  "discussions.posts.actionBar.searchAllPosts": "Search all posts",
-  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
+  "discussions.posts.actionBar.search": "{page, select,\n      topics {Find a topic}\n      posts {Search all posts}\n      learners {Search learner}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
  "discussions.actionBar.searchInfo": "Showing {count} results for \"{text}\"",
-  "discussions.actionBar.searchRewriteInfo": "No results found for \"{searchString}\". Showing {count} results for \"{textSearchRewrite}\".",
  "discussions.actionBar.searchInfoSearching": "Searching...",
  "discussions.actionBar.clearSearch": "Clear results",
  "discussion.posts.actionBar.add": "Add a post",
@@ -128,7 +124,6 @@
  "discussions.posts.status.filter.following": "Following",
  "discussions.posts.status.filter.reported": "Reported",
  "discussions.posts.status.filter.unanswered": "Unanswered",
-  "discussions.posts.status.filter.unresponded": "Unresponded",
  "discussions.posts.filter.myPosts": "My posts",
  "discussions.posts.filter.myDiscussions": "My discussions",
  "discussions.posts.filter.myQuestions": "My questions",
@@ -136,7 +131,7 @@
  "discussions.posts.sort.lastActivity": "Recent activity",
  "discussions.posts.sort.commentCount": "Most activity",
  "discussions.posts.sort.voteCount": "Most likes",
-  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      statusUnresponded {unresponded}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
+  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
  "discussions.post.author.anonymous": "anonymous",
  "discussions.post.lastResponse": "Last response {time}",
  "discussions.post.postedOn": "Posted {time} by {author} {authorLabel}",
@@ -161,15 +156,10 @@
  "discussions.post.editedBy": "Edited by",
  "discussions.post.editReason": "Reason",
  "discussions.post.postWithoutPreview": "No preview available",
-  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
-  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
-  "discussions.topics.reported": "{reported} reported",
-  "discussions.topics.previouslyReported": "{previouslyReported} previously reported",
  "discussions.topics.sort.message": "Sorted by {sortBy}",
  "discussions.topics.sort.lastActivity": "Recent activity",
  "discussions.topics.sort.commentCount": "Most activity",
  "discussions.topics.sort.courseStructure": "Course Structure",
-  "discussions.topics.find.label": "Search topics",
-  "discussions.topics.archived.label": "Archived",
-  "discussions.topics.unnamed.label": "Unnamed Topic"
+  "discussions.topics.find.label": "Find a topic",
+  "discussions.topics.archived.label": "Archived"
 }
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -43,8 +43,6 @@
  "discussions.learner.mostActivity": "La mayoría de la actividad",
  "discussions.learner.reportedActivity": "Actividad reportada",
  "discussions.learner.sortFilterStatus": "Todos los alumnos por {sort, select,\n      flagged {reported activity}\n      activity {most activity}\n      other {{sort}}\n    }",
-  "discussion.learner.allActivity": "Toda la actividad",
-  "discussion.learner.posts": "Publicaciones",
  "discussions.actions.button.alt": "Menú de acciones",
  "discussions.actions.back.alt": "Volver atrás",
  "discussions.actions.copylink": "Copiar link",
@@ -79,7 +77,6 @@
  "discussion.banner.welcomeMessage": "🎉 ¡Bienvenido a la nueva y mejorada experiencia de debates!",
  "discussion.banner.learnMore": "Aprender más",
  "discussion.banner.shareFeedback": "Compartir comentarios",
-  "discussion.blackoutBanner.information": "Blackout dates are currently active. Posting in discussions is unavailable at this time.",
  "discussions.navigation.breadcrumbMenu.allTopics": "Temas",
  "discussions.navigation.breadcrumbMenu.showAll": "Mostrar todo",
  "discussions.navigation.navigationBar.allPosts": "Todos los mensajes",
@@ -88,9 +85,8 @@
  "discussions.navigation.navigationBar.learners": "Estudiantes",
  "discussions.app.title": "Debates",
  "discussions.posts.actionBar.searchAllPosts": "Buscar en todas las publicaciones",
-  "discussions.posts.actionBar.search": "{page, select, topics {Search topics} posts {Search all posts} learners {Search learners} myPosts {Search all posts} other {{page}} }",
+  "discussions.posts.actionBar.search": "{page, select,\n      topics {Find a topic}\n      posts {Search all posts}\n      learners {Search learner}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
  "discussions.actionBar.searchInfo": "Mostrando resultados de {count} para &quot;{text}&quot;",
-  "discussions.actionBar.searchRewriteInfo": "No results found for \"{searchString}\". Showing {count} results for \"{textSearchRewrite}\".",
  "discussions.actionBar.searchInfoSearching": "Buscando..",
  "discussions.actionBar.clearSearch": "Borrar resultados",
  "discussion.posts.actionBar.add": "Agregar una publicación",
@@ -128,7 +124,6 @@
  "discussions.posts.status.filter.following": "Siguiendo",
  "discussions.posts.status.filter.reported": "Informado",
  "discussions.posts.status.filter.unanswered": "Sin responder",
-  "discussions.posts.status.filter.unresponded": "Unresponded",
  "discussions.posts.filter.myPosts": "Mis publicaciones",
  "discussions.posts.filter.myDiscussions": "Mis debates",
  "discussions.posts.filter.myQuestions": "Mis preguntas",
@@ -136,7 +131,7 @@
  "discussions.posts.sort.lastActivity": "Actividad reciente",
  "discussions.posts.sort.commentCount": "La mayoría de la actividad",
  "discussions.posts.sort.voteCount": "La mayoría me gusta",
-  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      statusUnresponded {unresponded}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
+  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
  "discussions.post.author.anonymous": "anónimo",
  "discussions.post.lastResponse": "Última respuesta {time}",
  "discussions.post.postedOn": "Publicado {time} por {author} {authorLabel}",
@@ -161,15 +156,10 @@
  "discussions.post.editedBy": "Editado por",
  "discussions.post.editReason": "Motivo",
  "discussions.post.postWithoutPreview": "No hay vista previa disponible",
-  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
-  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
-  "discussions.topics.reported": "{reported} informado",
-  "discussions.topics.previouslyReported": "{previouslyReported} informado anteriormente",
  "discussions.topics.sort.message": "Ordenado por {sortBy}",
  "discussions.topics.sort.lastActivity": "Actividad reciente",
  "discussions.topics.sort.commentCount": "La mayoría de la actividad",
  "discussions.topics.sort.courseStructure": "Estructura del curso",
-  "discussions.topics.find.label": "Buscar temas",
-  "discussions.topics.archived.label": "Archivado",
-  "discussions.topics.unnamed.label": "Tema sin nombre"
+  "discussions.topics.find.label": "Encuentra un tema",
+  "discussions.topics.archived.label": "Archivado"
 }
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -1,50 +1,48 @@
 {
  "navigation.course.tabs.label": "Course Material",
-  "learn.course.tabs.navigation.overflow.menu": "Plus...",
-  "discussions.comments.comment.addResponse": "Ajouter une réponse",
-  "discussions.comments.comment.addComment": "Ajouter un commentaire",
-  "discussions.comments.comment.abuseFlaggedMessage": "Contenu signalé au personnel pour examen",
+  "learn.course.tabs.navigation.overflow.menu": "More...",
+  "discussions.comments.comment.addResponse": "Add a response",
+  "discussions.comments.comment.addComment": "Add a comment",
+  "discussions.comments.comment.abuseFlaggedMessage": "Content reported for staff to review",
  "discussions.comments.comment.responseCount": "{num, plural,\n      =0 {No responses}\n      one {Showing # response}\n      other {Showing # responses}\n    }",
  "discussions.comments.comment.endorsedResponseCount": "{num, plural,\n      =0 {No endorsed responses}\n      one {Showing # endorsed response}\n      other {Showing # endorsed responses}\n    }",
-  "discussions.comments.comment.loadMoreComments": "Charger plus de commentaires",
-  "discussions.comments.comment.loadMoreResponses": "Charger plus de réponses",
+  "discussions.comments.comment.loadMoreComments": "Load more comments",
+  "discussions.comments.comment.loadMoreResponses": "Load more responses",
  "discussions.comments.comment.visibility": "This post is visible to {group, select,\n         null {Everyone}\n         other {{group}}\n    }.",
  "discussions.comments.comment.postedTime": "{postType, select,\n      discussion {Discussion}\n      question {Question}\n      other {{postType}}\n    } posted {relativeTime} by",
  "discussions.comments.comment.commentTime": "Posted {relativeTime}",
-  "discussions.comments.comment.answer": "Réponse",
-  "discussions.comments.comment.answeredlabel": "Marqué comme répondu par",
-  "discussions.comments.comment.endorsed": "Approuvé",
-  "discussions.comments.comment.endorsedlabel": "Approuvé par",
-  "discussions.actions.label": "Menu Actions",
-  "discussions.actions.edit": "Modifier",
-  "discussions.actions.pin": "Épingler",
+  "discussions.comments.comment.answer": "Answer",
+  "discussions.comments.comment.answeredlabel": "Marked as answered by",
+  "discussions.comments.comment.endorsed": "Endorsed",
+  "discussions.comments.comment.endorsedlabel": "Endorsed by",
+  "discussions.actions.label": "Actions menu",
+  "discussions.actions.edit": "Edit",
+  "discussions.actions.pin": "Pin",
  "discussions.actions.delete": "Delete",
  "discussions.editor.submit": "Submit",
  "discussions.editor.submitting": "Submitting",
-  "discussions.editor.cancel": "Annuler",
-  "discussions.editor.error.empty": "Le contenu de la publication ne peut pas être vide.",
+  "discussions.editor.cancel": "Cancel",
+  "discussions.editor.error.empty": "Post content cannot be empty.",
  "discussions.editor.delete.response.title": "Delete response",
  "discussions.editor.delete.response.description": "Are you sure you want to permanently delete this response?",
  "discussions.editor.delete.comment.title": "Delete comment",
  "discussions.editor.delete.comment.description": "Are you sure you want to permanently delete this comment?",
  "discussions.editor.comments.editReasonCode": "Reason for editing",
  "discussions.editor.posts.editReasonCode.error": "Select reason for editing",
-  "discussions.comment.comments.editedBy": "Édité par",
-  "discussions.comment.comments.reason": "Motif",
-  "discussions.post.closedBy": "Message fermé par",
-  "discussion.comment.repliesHeading": "{count} réponses pour la réponse ajoutée",
-  "discussion.comment.time": "il y a {time}",
-  "discussions.learner.reported": "{reported} signalé",
+  "discussions.comment.comments.editedBy": "Edited by",
+  "discussions.comment.comments.reason": "Reason",
+  "discussions.post.closedBy": "Post closed by",
+  "discussion.comment.repliesHeading": "{count} replies for the response added",
+  "discussion.comment.time": "{time} ago",
+  "discussions.learner.reported": "{reported} reported",
  "discussions.learner.previouslyReported": "{previouslyReported} previously reported",
  "discussions.learner.lastLogin": "Last active {lastActiveTime}",
-  "discussions.learner.loadMostLearners": "Charger plus",
-  "discussions.learner.back": "Retour",
-  "discussions.learner.activityForLearner": "Activité pour {username}",
+  "discussions.learner.loadMostLearners": "Load more",
+  "discussions.learner.back": "Back",
+  "discussions.learner.activityForLearner": "Activity for {username}",
  "discussions.learner.mostActivity": "Most activity",
  "discussions.learner.reportedActivity": "Reported activity",
  "discussions.learner.sortFilterStatus": "All learners by {sort, select,\n      flagged {reported activity}\n      activity {most activity}\n      other {{sort}}\n    }",
-  "discussion.learner.allActivity": "All activity",
-  "discussion.learner.posts": "Posts",
  "discussions.actions.button.alt": "Actions menu",
  "discussions.actions.back.alt": "Back",
  "discussions.actions.copylink": "Copy link",
@@ -79,7 +77,6 @@
  "discussion.banner.welcomeMessage": "🎉 Welcome to the new and improved discussions experience!",
  "discussion.banner.learnMore": "Learn more",
  "discussion.banner.shareFeedback": "Share feedback",
-  "discussion.blackoutBanner.information": "Blackout dates are currently active. Posting in discussions is unavailable at this time.",
  "discussions.navigation.breadcrumbMenu.allTopics": "Topics",
  "discussions.navigation.breadcrumbMenu.showAll": "Show all",
  "discussions.navigation.navigationBar.allPosts": "All posts",
@@ -88,9 +85,8 @@
  "discussions.navigation.navigationBar.learners": "Learners",
  "discussions.app.title": "Discussions",
  "discussions.posts.actionBar.searchAllPosts": "Search all posts",
-  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
+  "discussions.posts.actionBar.search": "{page, select,\n      topics {Find a topic}\n      posts {Search all posts}\n      learners {Search learner}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
  "discussions.actionBar.searchInfo": "Showing {count} results for \"{text}\"",
-  "discussions.actionBar.searchRewriteInfo": "No results found for \"{searchString}\". Showing {count} results for \"{textSearchRewrite}\".",
  "discussions.actionBar.searchInfoSearching": "Searching...",
  "discussions.actionBar.clearSearch": "Clear results",
  "discussion.posts.actionBar.add": "Add a post",
@@ -128,7 +124,6 @@
  "discussions.posts.status.filter.following": "Following",
  "discussions.posts.status.filter.reported": "Reported",
  "discussions.posts.status.filter.unanswered": "Unanswered",
-  "discussions.posts.status.filter.unresponded": "Unresponded",
  "discussions.posts.filter.myPosts": "My posts",
  "discussions.posts.filter.myDiscussions": "My discussions",
  "discussions.posts.filter.myQuestions": "My questions",
@@ -136,7 +131,7 @@
  "discussions.posts.sort.lastActivity": "Recent activity",
  "discussions.posts.sort.commentCount": "Most activity",
  "discussions.posts.sort.voteCount": "Most likes",
-  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      statusUnresponded {unresponded}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
+  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
  "discussions.post.author.anonymous": "anonymous",
  "discussions.post.lastResponse": "Last response {time}",
  "discussions.post.postedOn": "Posted {time} by {author} {authorLabel}",
@@ -161,15 +156,10 @@
  "discussions.post.editedBy": "Edited by",
  "discussions.post.editReason": "Reason",
  "discussions.post.postWithoutPreview": "No preview available",
-  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
-  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
-  "discussions.topics.reported": "{reported} reported",
-  "discussions.topics.previouslyReported": "{previouslyReported} previously reported",
  "discussions.topics.sort.message": "Sorted by {sortBy}",
  "discussions.topics.sort.lastActivity": "Recent activity",
  "discussions.topics.sort.commentCount": "Most activity",
  "discussions.topics.sort.courseStructure": "Course Structure",
-  "discussions.topics.find.label": "Search topics",
-  "discussions.topics.archived.label": "Archived",
-  "discussions.topics.unnamed.label": "Unnamed Topic"
+  "discussions.topics.find.label": "Find a topic",
+  "discussions.topics.archived.label": "Archived"
 }
--- a/src/i18n/messages/fr_CA.json
+++ b/src/i18n/messages/fr_CA.json
@@ -43,8 +43,6 @@
  "discussions.learner.mostActivity": "La plupart des activités",
  "discussions.learner.reportedActivity": "Activité signalée",
  "discussions.learner.sortFilterStatus": "Tous les apprenants par {sort, select,\n      flagged {reported activity}\n      activity {most activity}\n      other {{sort}}\n    }",
-  "discussion.learner.allActivity": "Toutes les activités",
-  "discussion.learner.posts": "Posts",
  "discussions.actions.button.alt": "Menu Actions",
  "discussions.actions.back.alt": "Retour",
  "discussions.actions.copylink": "Copier le lien",
@@ -79,7 +77,6 @@
  "discussion.banner.welcomeMessage": "🎉 Bienvenue dans la nouvelle expérience améliorée de discussions !",
  "discussion.banner.learnMore": "En savoir plus",
  "discussion.banner.shareFeedback": "Partager vos commentaires",
-  "discussion.blackoutBanner.information": "Les dates d'interdiction sont actuellement actives. La publication dans les discussions n'est pas disponible pour le moment.",
  "discussions.navigation.breadcrumbMenu.allTopics": "Sujets",
  "discussions.navigation.breadcrumbMenu.showAll": "Tout afficher",
  "discussions.navigation.navigationBar.allPosts": "Tous les messages",
@@ -88,9 +85,8 @@
  "discussions.navigation.navigationBar.learners": "Apprenants",
  "discussions.app.title": "Discussions",
  "discussions.posts.actionBar.searchAllPosts": "Recherche dans les messages",
-  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
+  "discussions.posts.actionBar.search": "{page, select,\n      topics {Find a topic}\n      posts {Search all posts}\n      learners {Search learner}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
  "discussions.actionBar.searchInfo": "Affichage des résultats {count} pour \"{text}\"",
-  "discussions.actionBar.searchRewriteInfo": "Aucun résultat trouvé pour \"searchString}\". Affichage des résultats {count} pour \"{textSearchRewrite}\".",
  "discussions.actionBar.searchInfoSearching": "Recherche...",
  "discussions.actionBar.clearSearch": "Effacer les résultats",
  "discussion.posts.actionBar.add": "Ajouter un message",
@@ -128,7 +124,6 @@
  "discussions.posts.status.filter.following": "Suivi",
  "discussions.posts.status.filter.reported": "Reporté",
  "discussions.posts.status.filter.unanswered": "Non répondu",
-  "discussions.posts.status.filter.unresponded": "Unresponded",
  "discussions.posts.filter.myPosts": "Mes messages",
  "discussions.posts.filter.myDiscussions": "Mes discussions",
  "discussions.posts.filter.myQuestions": "Mes questions",
@@ -136,7 +131,7 @@
  "discussions.posts.sort.lastActivity": "Activité récente",
  "discussions.posts.sort.commentCount": "La plupart des activités",
  "discussions.posts.sort.voteCount": "La plupart des aimés",
-  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      statusUnresponded {unresponded}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
+  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
  "discussions.post.author.anonymous": "anonyme",
  "discussions.post.lastResponse": "Dernière réponse {time}",
  "discussions.post.postedOn": "Publié {time} par {author} {authorLabel}",
@@ -161,15 +156,10 @@
  "discussions.post.editedBy": "Édité par",
  "discussions.post.editReason": "Raison",
  "discussions.post.postWithoutPreview": "Aucun aperçu disponible",
-  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
-  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
-  "discussions.topics.reported": "{reported} signalé",
-  "discussions.topics.previouslyReported": "{previouslyReported} signalé précédemment",
  "discussions.topics.sort.message": "Trié par {sortBy}",
  "discussions.topics.sort.lastActivity": "Activité récente",
  "discussions.topics.sort.commentCount": "La plupart des activités",
  "discussions.topics.sort.courseStructure": "Structure du cours",
-  "discussions.topics.find.label": "Rechercher des sujets",
-  "discussions.topics.archived.label": "Archivé",
-  "discussions.topics.unnamed.label": "Sujet sans nom"
+  "discussions.topics.find.label": "Trouver un sujet",
+  "discussions.topics.archived.label": "Archivé"
 }
--- a/src/i18n/messages/fr_FR.json
+++ b/src/i18n/messages/fr_FR.json
@@ -43,8 +43,6 @@
  "discussions.learner.mostActivity": "Most activity",
  "discussions.learner.reportedActivity": "Reported activity",
  "discussions.learner.sortFilterStatus": "All learners by {sort, select,\n      flagged {reported activity}\n      activity {most activity}\n      other {{sort}}\n    }",
-  "discussion.learner.allActivity": "All activity",
-  "discussion.learner.posts": "Posts",
  "discussions.actions.button.alt": "Actions menu",
  "discussions.actions.back.alt": "Back",
  "discussions.actions.copylink": "Copy link",
@@ -79,7 +77,6 @@
  "discussion.banner.welcomeMessage": "🎉 Welcome to the new and improved discussions experience!",
  "discussion.banner.learnMore": "Learn more",
  "discussion.banner.shareFeedback": "Share feedback",
-  "discussion.blackoutBanner.information": "Blackout dates are currently active. Posting in discussions is unavailable at this time.",
  "discussions.navigation.breadcrumbMenu.allTopics": "Topics",
  "discussions.navigation.breadcrumbMenu.showAll": "Show all",
  "discussions.navigation.navigationBar.allPosts": "All posts",
@@ -88,9 +85,8 @@
  "discussions.navigation.navigationBar.learners": "Learners",
  "discussions.app.title": "Discussions",
  "discussions.posts.actionBar.searchAllPosts": "Search all posts",
-  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
+  "discussions.posts.actionBar.search": "{page, select,\n      topics {Find a topic}\n      posts {Search all posts}\n      learners {Search learner}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
  "discussions.actionBar.searchInfo": "Showing {count} results for \"{text}\"",
-  "discussions.actionBar.searchRewriteInfo": "No results found for \"{searchString}\". Showing {count} results for \"{textSearchRewrite}\".",
  "discussions.actionBar.searchInfoSearching": "Searching...",
  "discussions.actionBar.clearSearch": "Clear results",
  "discussion.posts.actionBar.add": "Add a post",
@@ -128,7 +124,6 @@
  "discussions.posts.status.filter.following": "Following",
  "discussions.posts.status.filter.reported": "Reported",
  "discussions.posts.status.filter.unanswered": "Unanswered",
-  "discussions.posts.status.filter.unresponded": "Unresponded",
  "discussions.posts.filter.myPosts": "My posts",
  "discussions.posts.filter.myDiscussions": "My discussions",
  "discussions.posts.filter.myQuestions": "My questions",
@@ -136,7 +131,7 @@
  "discussions.posts.sort.lastActivity": "Recent activity",
  "discussions.posts.sort.commentCount": "Most activity",
  "discussions.posts.sort.voteCount": "Most likes",
-  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      statusUnresponded {unresponded}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
+  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
  "discussions.post.author.anonymous": "anonymous",
  "discussions.post.lastResponse": "Last response {time}",
  "discussions.post.postedOn": "Posted {time} by {author} {authorLabel}",
@@ -161,15 +156,10 @@
  "discussions.post.editedBy": "Edited by",
  "discussions.post.editReason": "Reason",
  "discussions.post.postWithoutPreview": "No preview available",
-  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
-  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
-  "discussions.topics.reported": "{reported} reported",
-  "discussions.topics.previouslyReported": "{previouslyReported} previously reported",
  "discussions.topics.sort.message": "Sorted by {sortBy}",
  "discussions.topics.sort.lastActivity": "Recent activity",
  "discussions.topics.sort.commentCount": "Most activity",
  "discussions.topics.sort.courseStructure": "Course Structure",
-  "discussions.topics.find.label": "Search topics",
-  "discussions.topics.archived.label": "Archived",
-  "discussions.topics.unnamed.label": "Unnamed Topic"
+  "discussions.topics.find.label": "Find a topic",
+  "discussions.topics.archived.label": "Archived"
 }
--- a/src/i18n/messages/it_IT.json
+++ b/src/i18n/messages/it_IT.json
@@ -43,8 +43,6 @@
  "discussions.learner.mostActivity": "La maggior parte delle attività",
  "discussions.learner.reportedActivity": "Attività segnalata",
  "discussions.learner.sortFilterStatus": "Tutti gli studenti di {sort, select, flagged {attività segnalata} activity {più attività} other {{sort}} }",
-  "discussion.learner.allActivity": "All activity",
-  "discussion.learner.posts": "Posts",
  "discussions.actions.button.alt": "Menù Azioni",
  "discussions.actions.back.alt": "Indietro",
  "discussions.actions.copylink": "Copia link",
@@ -79,7 +77,6 @@
  "discussion.banner.welcomeMessage": "🎉 Benvenuto nella nuova e avanzata esperienza di discussione!",
  "discussion.banner.learnMore": "Per saperne di più",
  "discussion.banner.shareFeedback": "Condividi feedback",
-  "discussion.blackoutBanner.information": "Blackout dates are currently active. Posting in discussions is unavailable at this time.",
  "discussions.navigation.breadcrumbMenu.allTopics": "Argomenti",
  "discussions.navigation.breadcrumbMenu.showAll": "Mostra tutto",
  "discussions.navigation.navigationBar.allPosts": "Tutti i post",
@@ -88,9 +85,8 @@
  "discussions.navigation.navigationBar.learners": "Utenti",
  "discussions.app.title": "Discussioni",
  "discussions.posts.actionBar.searchAllPosts": "Cerca tutti i messaggi",
-  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
+  "discussions.posts.actionBar.search": "{page, select, topics {Find a topic} posts {Search all posts} learners {Search learner} myPosts {Search all posts} other {{page}} }",
  "discussions.actionBar.searchInfo": "Visualizzazione di {count} risultati per &quot;{text}&quot;",
-  "discussions.actionBar.searchRewriteInfo": "No results found for \"{searchString}\". Showing {count} results for \"{textSearchRewrite}\".",
  "discussions.actionBar.searchInfoSearching": "Ricerca in corso...",
  "discussions.actionBar.clearSearch": "Risultati chiari",
  "discussion.posts.actionBar.add": "Aggiungi un post",
@@ -128,7 +124,6 @@
  "discussions.posts.status.filter.following": "Seguente",
  "discussions.posts.status.filter.reported": "Segnalato ",
  "discussions.posts.status.filter.unanswered": "Senza Risposta",
-  "discussions.posts.status.filter.unresponded": "Unresponded",
  "discussions.posts.filter.myPosts": "I miei post",
  "discussions.posts.filter.myDiscussions": "Le mie discussioni",
  "discussions.posts.filter.myQuestions": "Le mie domande",
@@ -136,7 +131,7 @@
  "discussions.posts.sort.lastActivity": "Attività Recente",
  "discussions.posts.sort.commentCount": "La maggior parte delle attività",
  "discussions.posts.sort.voteCount": "La maggior parte dei Mi piace",
-  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      statusUnresponded {unresponded}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
+  "discussions.posts.sort-filter.sortFilterStatus": "{own, select, false {All} true {Own} other {{own}} } {status, select, statusAll {} statusUnread {unread} statusFollowing {followed} statusReported {reported} statusUnanswered {unanswered} other {{status}} } {type, select, discussion {discussions} question {questions} all {posts} other {{type}} } {cohortType, select, all {} group {in {cohort}} other {{cohortType}} } by {sort , select, lastActivityAt {attività recente} commentCount {più attività} voteCount {maggior parte dei voti} other {{sort}} }",
  "discussions.post.author.anonymous": "anonimo",
  "discussions.post.lastResponse": "Ultima risposta {time}",
  "discussions.post.postedOn": "Inserito {time} da {author} {authorLabel}",
@@ -161,15 +156,10 @@
  "discussions.post.editedBy": "A cura di",
  "discussions.post.editReason": "Motivo ",
  "discussions.post.postWithoutPreview": "nessuna anteprima disponibile",
-  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
-  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
-  "discussions.topics.reported": "{reported} reported",
-  "discussions.topics.previouslyReported": "{previouslyReported} previously reported",
  "discussions.topics.sort.message": "Ordinato per {sortBy}",
  "discussions.topics.sort.lastActivity": "Attività Recente",
  "discussions.topics.sort.commentCount": "La maggior parte delle attività",
  "discussions.topics.sort.courseStructure": "Struttura Corso",
-  "discussions.topics.find.label": "Search topics",
-  "discussions.topics.archived.label": "Archiviati",
-  "discussions.topics.unnamed.label": "Unnamed Topic"
+  "discussions.topics.find.label": "Trova un argomento",
+  "discussions.topics.archived.label": "Archiviati"
 }
--- a/src/i18n/messages/pl.json
+++ b/src/i18n/messages/pl.json
@@ -43,8 +43,6 @@
  "discussions.learner.mostActivity": "Największa aktywność",
  "discussions.learner.reportedActivity": "Zgłoszona aktywność",
  "discussions.learner.sortFilterStatus": "All learners by {sort, select,\n      flagged {reported activity}\n      activity {most activity}\n      other {{sort}}\n    }",
-  "discussion.learner.allActivity": "All activity",
-  "discussion.learner.posts": "Posts",
  "discussions.actions.button.alt": "Menu czynności",
  "discussions.actions.back.alt": "Back",
  "discussions.actions.copylink": "Copy link",
@@ -79,7 +77,6 @@
  "discussion.banner.welcomeMessage": "🎉 Welcome to the new and improved discussions experience!",
  "discussion.banner.learnMore": "Learn more",
  "discussion.banner.shareFeedback": "Share feedback",
-  "discussion.blackoutBanner.information": "Blackout dates are currently active. Posting in discussions is unavailable at this time.",
  "discussions.navigation.breadcrumbMenu.allTopics": "Topics",
  "discussions.navigation.breadcrumbMenu.showAll": "Show all",
  "discussions.navigation.navigationBar.allPosts": "Wszystkie posty",
@@ -88,9 +85,8 @@
  "discussions.navigation.navigationBar.learners": "Learners",
  "discussions.app.title": "Discussions",
  "discussions.posts.actionBar.searchAllPosts": "Search all posts",
-  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
+  "discussions.posts.actionBar.search": "{page, select,\n      topics {Find a topic}\n      posts {Search all posts}\n      learners {Search learner}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
  "discussions.actionBar.searchInfo": "Wyświetlanie {count} wyników dla „{text}”",
-  "discussions.actionBar.searchRewriteInfo": "No results found for \"{searchString}\". Showing {count} results for \"{textSearchRewrite}\".",
  "discussions.actionBar.searchInfoSearching": "Searching...",
  "discussions.actionBar.clearSearch": "Clear results",
  "discussion.posts.actionBar.add": "Dodaj post",
@@ -128,7 +124,6 @@
  "discussions.posts.status.filter.following": "Following",
  "discussions.posts.status.filter.reported": "Reported",
  "discussions.posts.status.filter.unanswered": "Unanswered",
-  "discussions.posts.status.filter.unresponded": "Unresponded",
  "discussions.posts.filter.myPosts": "Moje posty",
  "discussions.posts.filter.myDiscussions": "Moje dyskusje",
  "discussions.posts.filter.myQuestions": "Moje pytania",
@@ -136,7 +131,7 @@
  "discussions.posts.sort.lastActivity": "Ostatnia aktywność",
  "discussions.posts.sort.commentCount": "Most activity",
  "discussions.posts.sort.voteCount": "Most likes",
-  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      statusUnresponded {unresponded}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
+  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
  "discussions.post.author.anonymous": "anonymous",
  "discussions.post.lastResponse": "Ostatnia odpowiedź {time}",
  "discussions.post.postedOn": "Posted {time} by {author} {authorLabel}",
@@ -161,15 +156,10 @@
  "discussions.post.editedBy": "Edytowany przez",
  "discussions.post.editReason": "Reason",
  "discussions.post.postWithoutPreview": "Podgląd niedostępny",
-  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
-  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
-  "discussions.topics.reported": "{reported} reported",
-  "discussions.topics.previouslyReported": "{previouslyReported} previously reported",
  "discussions.topics.sort.message": "Posortowane według {sortBy}",
  "discussions.topics.sort.lastActivity": "Ostatnia aktywność",
  "discussions.topics.sort.commentCount": "Most activity",
  "discussions.topics.sort.courseStructure": "Course Structure",
-  "discussions.topics.find.label": "Search topics",
-  "discussions.topics.archived.label": "Archived",
-  "discussions.topics.unnamed.label": "Unnamed Topic"
+  "discussions.topics.find.label": "Znajdź temat",
+  "discussions.topics.archived.label": "Archived"
 }
--- a/src/i18n/messages/tr_TR.json
+++ b/src/i18n/messages/tr_TR.json
@@ -17,7 +17,7 @@
  "discussions.comments.comment.endorsedlabel": "Endorsed by",
  "discussions.actions.label": "Eylemler menüsü",
  "discussions.actions.edit": "Düzenle",
-  "discussions.actions.pin": "İşaretle",
+  "discussions.actions.pin": "Pin",
  "discussions.actions.delete": "Sil",
  "discussions.editor.submit": "Gönder",
  "discussions.editor.submitting": "Gönderiliyor",
@@ -34,79 +34,75 @@
  "discussions.post.closedBy": "Post closed by",
  "discussion.comment.repliesHeading": "{count} replies for the response added",
  "discussion.comment.time": "{time} ago",
-  "discussions.learner.reported": "{reported} rapor edildi",
-  "discussions.learner.previouslyReported": "{previouslyReported} daha önce rapor edildi",
-  "discussions.learner.lastLogin": "Son etkinlik {lastActiveTime}",
+  "discussions.learner.reported": "{reported} reported",
+  "discussions.learner.previouslyReported": "{previouslyReported} previously reported",
+  "discussions.learner.lastLogin": "Last active {lastActiveTime}",
  "discussions.learner.loadMostLearners": "Daha fazla yükle",
  "discussions.learner.back": "Geri",
-  "discussions.learner.activityForLearner": "{username} için etkinlik",
-  "discussions.learner.mostActivity": "En çok etkinlik",
-  "discussions.learner.reportedActivity": "Rapor edilen etkinlik",
+  "discussions.learner.activityForLearner": "Activity for {username}",
+  "discussions.learner.mostActivity": "Most activity",
+  "discussions.learner.reportedActivity": "Reported activity",
  "discussions.learner.sortFilterStatus": "All learners by {sort, select,\n      flagged {reported activity}\n      activity {most activity}\n      other {{sort}}\n    }",
-  "discussion.learner.allActivity": "All activity",
-  "discussion.learner.posts": "Gönderiler",
-  "discussions.actions.button.alt": "Eylemler menüsü",
-  "discussions.actions.back.alt": "Geri",
+  "discussions.actions.button.alt": "Actions menu",
+  "discussions.actions.back.alt": "Back",
  "discussions.actions.copylink": "Copy link",
-  "discussions.actions.unpin": "İşareti kaldır",
+  "discussions.actions.unpin": "Unpin",
  "discussions.actions.close": "Kapat",
-  "discussions.actions.reopen": "Yeniden aç",
+  "discussions.actions.reopen": "Reopen",
  "discussions.actions.report": "Raporla",
  "discussions.actions.unreport": "Bildirme",
  "discussions.actions.endorse": "Destekle",
  "discussions.actions.unendorse": "Destekleme",
-  "discussions.actions.markAnswered": "Cevaplandı olarak işaretle",
-  "discussions.actions.unMarkAnswered": "Cevaplandı olarak işaretini kaldır",
+  "discussions.actions.markAnswered": "Mark as Answered",
+  "discussions.actions.unMarkAnswered": "Unmark as answered",
  "discussions.delete.confirmation.button.cancel": "İptal",
  "discussions.delete.confirmation.button.delete": "Sil",
-  "discussions.empty.allTopics": "Bu konularla ilgili tüm tartışma etkinlikleri burada gösterilecektir.",
-  "discussions.empty.allPosts": "Dersiniz için tüm tartışma etkinlikleri burada gösterilecektir.",
-  "discussions.empty.myPosts": "Etkileşimde bulunduğunuz gönderiler burada gösterilecektir.",
-  "discussions.empty.topic": "Bu konuyla ilgili tüm tartışma etkinlikleri burada gösterilecektir.",
-  "discussions.empty.title": "Burada henüz bir şey yok",
-  "discussions.empty.noPostSelected": "Gönderi seçilmedi",
-  "discussions.empty.noTopicSelected": "Konu seçilmedi",
+  "discussions.empty.allTopics": "All discussion activity for these topics will show up here.",
+  "discussions.empty.allPosts": "All discussion activity for your course will show up here.",
+  "discussions.empty.myPosts": "Posts you've interacted with will show up here.",
+  "discussions.empty.topic": "All discussion activity for this topic will show up here.",
+  "discussions.empty.title": "Nothing here yet",
+  "discussions.empty.noPostSelected": "No post selected",
+  "discussions.empty.noTopicSelected": "No topic selected",
  "discussions.sidebar.noResultsFound": "Sonuç bulunamadı",
  "discussions.sidebar.differentKeywords": "Try searching different keywords",
-  "discussions.sidebar.removeKeywords": "Farklı anahtar kelimeler aramayı veya bazı filtreleri kaldırmayı deneyin",
+  "discussions.sidebar.removeKeywords": "Try searching different keywords or removing some filters",
  "discussions.sidebar.removeKeywordsOnly": "Try searching different keywords",
-  "discussions.sidebar.removeFilters": "Bazı filtreleri kaldırmayı deneyin",
+  "discussions.sidebar.removeFilters": "Try removing some filters",
  "discussions.empty.iconAlt": "Boş",
  "discussions.authors.label.staff": "Personel",
  "discussions.authors.label.ta": "TA",
-  "discussions.learner.loadMostPosts": "Daha fazla ileti yükle",
-  "discussions.post.anonymous.author": "anonim",
+  "discussions.learner.loadMostPosts": "Load more posts",
+  "discussions.post.anonymous.author": "anonymous",
  "discussion.banner.welcomeMessage": "🎉 Welcome to the new and improved discussions experience!",
-  "discussion.banner.learnMore": "Daha fazlasını öğren",
+  "discussion.banner.learnMore": "Learn more",
  "discussion.banner.shareFeedback": "Share feedback",
-  "discussion.blackoutBanner.information": "Blackout dates are currently active. Posting in discussions is unavailable at this time.",
  "discussions.navigation.breadcrumbMenu.allTopics": "Konular",
  "discussions.navigation.breadcrumbMenu.showAll": "Tümünü göster",
-  "discussions.navigation.navigationBar.allPosts": "Tüm iletiler",
+  "discussions.navigation.navigationBar.allPosts": "All posts",
  "discussions.navigation.navigationBar.allTopics": "Konular",
-  "discussions.navigation.navigationBar.myPosts": "İletilerim",
+  "discussions.navigation.navigationBar.myPosts": "My posts",
  "discussions.navigation.navigationBar.learners": "Öğrenciler",
  "discussions.app.title": "Forumlar",
  "discussions.posts.actionBar.searchAllPosts": "Tüm gönderilerde ara",
-  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
-  "discussions.actionBar.searchInfo": "\"{text}\" için {count} sonuç gösteriliyor",
-  "discussions.actionBar.searchRewriteInfo": "No results found for \"{searchString}\". Showing {count} results for \"{textSearchRewrite}\".",
-  "discussions.actionBar.searchInfoSearching": "Aranıyor...",
+  "discussions.posts.actionBar.search": "{page, select,\n      topics {Find a topic}\n      posts {Search all posts}\n      learners {Search learner}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
+  "discussions.actionBar.searchInfo": "Showing {count} results for \"{text}\"",
+  "discussions.actionBar.searchInfoSearching": "Searching...",
  "discussions.actionBar.clearSearch": "Clear results",
-  "discussion.posts.actionBar.add": "Bir ileti ekle",
+  "discussion.posts.actionBar.add": "Add a post",
  "discussion.posts.actionBar.close": "Kapat",
  "discussions.post.editor.type": "Gönderi türü",
-  "discussions.post.editor.addPostHeading": "Bir ileti ekle",
-  "discussions.post.editor.editPostHeading": "İletiyi düzenle",
+  "discussions.post.editor.addPostHeading": "Add a post",
+  "discussions.post.editor.editPostHeading": "Edit post",
  "discussions.post.editor.typeDescription": "Sorular cevap gerektiren konuları ileri sürer. Tartışmalar fikirleri paylaşır ve sohbeti başlatır.",
  "discussions.post.editor.required": "Gerekli",
  "discussions.post.editor.questionType": "Soru",
-  "discussions.post.editor.questionDescription": "Cevaplanması gereken sorunları dile getirin",
+  "discussions.post.editor.questionDescription": "Raise issues that need answers",
  "discussions.post.editor.discussionType": "Forum",
-  "discussions.post.editor.discussionDescription": "Fikirleri paylaşın ve sohbetler başlatın",
+  "discussions.post.editor.discussionDescription": "Share ideas and start conversations",
  "discussions.post.editor.topicArea": "Başlık alanı",
  "discussions.post.editor.topicAreaDescription": "Add your post to a relevant topic to help others find it.",
-  "discussions.post.editor.cohortVisibility": "Kohort görünürlüğü",
+  "discussions.post.editor.cohortVisibility": "Cohort visibility",
  "discussions.post.editor.cohortVisibilityAllLearners": "Tüm öğrenciler",
  "discussions.post.editor.title": "Post title",
  "discussions.post.editor.titleDescription": "Katılıma teşvik etmek için, açık ve tanıtıcı bir başlık ekleyin.",
@@ -115,61 +111,55 @@
  "discussions.post.editor.questionText": "Sorunuz veya fikriniz (gerekli)",
  "discussions.post.editor.preview": "Önizleme",
  "discussions.post.editor.followPost": "Bu iletiyi takip edin",
-  "discussions.post.editor.anonymousPost": "Anonim olarak gönder",
-  "discussions.post.editor.anonymousToPeersPost": "Akranlarına anonim olarak gönder",
-  "discussions.editor.posts.editReasonCode": "Düzenleme nedeni",
-  "discussions.editor.posts.showPreview.button": "Önizlemeyi Göster",
+  "discussions.post.editor.anonymousPost": "Post anonymously",
+  "discussions.post.editor.anonymousToPeersPost": "Post anonymously to peers",
+  "discussions.editor.posts.editReasonCode": "Reason for editing",
+  "discussions.editor.posts.showPreview.button": "Show Preview",
  "discussions.posts.filter.showALl": "Tümünü göster",
  "discussions.posts.filter.discussions": "Forumlar",
  "discussions.posts.filter.questions": "Sorular",
-  "discussions.posts.filter.message": "Durum: {filterBy}",
-  "discussions.posts.status.filter.anyStatus": "Herhangi bir durum",
+  "discussions.posts.filter.message": "Status: {filterBy}",
+  "discussions.posts.status.filter.anyStatus": "Any status",
  "discussions.posts.status.filter.unread": "Okunmamış",
  "discussions.posts.status.filter.following": "Takip ediliyor",
  "discussions.posts.status.filter.reported": "Rapor edildi",
  "discussions.posts.status.filter.unanswered": "Cevaplanmamış",
-  "discussions.posts.status.filter.unresponded": "Unresponded",
-  "discussions.posts.filter.myPosts": "Gönderilerim",
-  "discussions.posts.filter.myDiscussions": "Tartışmalarım",
-  "discussions.posts.filter.myQuestions": "Sorularım",
-  "discussions.posts.sort.message": "{sortBy} ölçütüne göre sıralandı",
-  "discussions.posts.sort.lastActivity": "Son etkinlik",
-  "discussions.posts.sort.commentCount": "En çok etkinlik",
-  "discussions.posts.sort.voteCount": "En çok beğenilenler",
-  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      statusUnresponded {unresponded}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
+  "discussions.posts.filter.myPosts": "My posts",
+  "discussions.posts.filter.myDiscussions": "My discussions",
+  "discussions.posts.filter.myQuestions": "My questions",
+  "discussions.posts.sort.message": "Sorted by {sortBy}",
+  "discussions.posts.sort.lastActivity": "Recent activity",
+  "discussions.posts.sort.commentCount": "Most activity",
+  "discussions.posts.sort.voteCount": "Most likes",
+  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
  "discussions.post.author.anonymous": "anonim",
-  "discussions.post.lastResponse": "Son yanıt {time}",
+  "discussions.post.lastResponse": "Last response {time}",
  "discussions.post.postedOn": "Posted {time} by {author} {authorLabel}",
  "discussions.post.contentReported": "Rapor edildi",
  "discussions.post.following": "Takip ediliyor",
  "discussions.post.follow": "Takip et",
  "discussions.post.answered": "Yanıtlandı",
  "discussions.post.unFollow": "Takibi bırak",
-  "discussions.post.like": "Beğen",
+  "discussions.post.like": "Like",
  "discussions.post.removeLike": "Unlike",
-  "discussions.post.viewActivity": "Etkinliği görüntüle",
-  "discussions.post.closed": "Yanıtlar ve yorumlar için gönderi kapatıldı",
+  "discussions.post.viewActivity": "View activity",
+  "discussions.post.closed": "Post closed for responses and comments",
  "discussions.post.relatedTo": "Related to",
-  "discussions.editor.delete.post.title": "Gönderiyi sil",
-  "discussions.editor.delete.post.description": "Bu gönderiyi kalıcı olarak silmek istediğinizden emin misiniz?",
-  "discussions.post.closePostModal.title": "Gönderiyi kapat",
-  "discussions.post.closePostModal.text": "Bu gönderiyi kapatmak için bir neden girin. Bu sadece diğer moderatörlere gösterilecektir.",
+  "discussions.editor.delete.post.title": "Delete post",
+  "discussions.editor.delete.post.description": "Are you sure you want to permanently delete this post?",
+  "discussions.post.closePostModal.title": "Close post",
+  "discussions.post.closePostModal.text": "Enter a reason for closing this post. This will only be displayed to other moderators.",
  "discussions.post.closePostModal.reasonCodeInput": "Gerekçe",
  "discussions.post.closePostModal.cancel": "İptal",
-  "discussions.post.closePostModal.confirm": "Gönderiyi kapat",
-  "discussions.post.label.new": "{count} Yeni",
-  "discussions.post.editedBy": "Düzenleyen",
+  "discussions.post.closePostModal.confirm": "Close post",
+  "discussions.post.label.new": "{count} New",
+  "discussions.post.editedBy": "Edited by",
  "discussions.post.editReason": "Gerekçe",
-  "discussions.post.postWithoutPreview": "Önizleme yok",
-  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
-  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
-  "discussions.topics.reported": "{reported} reported",
-  "discussions.topics.previouslyReported": "{previouslyReported} previously reported",
-  "discussions.topics.sort.message": "{sortBy} ölçütüne göre sıralandı",
-  "discussions.topics.sort.lastActivity": "Son etkinlik",
-  "discussions.topics.sort.commentCount": "En çok etkinlik",
+  "discussions.post.postWithoutPreview": "No preview available",
+  "discussions.topics.sort.message": "Sorted by {sortBy}",
+  "discussions.topics.sort.lastActivity": "Recent activity",
+  "discussions.topics.sort.commentCount": "Most activity",
  "discussions.topics.sort.courseStructure": "Ders Yapısı",
-  "discussions.topics.find.label": "Search topics",
-  "discussions.topics.archived.label": "Arşivlenmiş",
-  "discussions.topics.unnamed.label": "Unnamed Topic"
+  "discussions.topics.find.label": "Find a topic",
+  "discussions.topics.archived.label": "Arşivlenmiş"
 }
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -43,8 +43,6 @@
  "discussions.learner.mostActivity": "Most activity",
  "discussions.learner.reportedActivity": "Reported activity",
  "discussions.learner.sortFilterStatus": "All learners by {sort, select,\n      flagged {reported activity}\n      activity {most activity}\n      other {{sort}}\n    }",
-  "discussion.learner.allActivity": "All activity",
-  "discussion.learner.posts": "Posts",
  "discussions.actions.button.alt": "Actions menu",
  "discussions.actions.back.alt": "Back",
  "discussions.actions.copylink": "Copy link",
@@ -79,7 +77,6 @@
  "discussion.banner.welcomeMessage": "🎉 Welcome to the new and improved discussions experience!",
  "discussion.banner.learnMore": "Learn more",
  "discussion.banner.shareFeedback": "Share feedback",
-  "discussion.blackoutBanner.information": "Blackout dates are currently active. Posting in discussions is unavailable at this time.",
  "discussions.navigation.breadcrumbMenu.allTopics": "Topics",
  "discussions.navigation.breadcrumbMenu.showAll": "Show all",
  "discussions.navigation.navigationBar.allPosts": "All posts",
@@ -88,9 +85,8 @@
  "discussions.navigation.navigationBar.learners": "Learners",
  "discussions.app.title": "Discussions",
  "discussions.posts.actionBar.searchAllPosts": "Search all posts",
-  "discussions.posts.actionBar.search": "{page, select,\n      topics {Search topics}\n      posts {Search all posts}\n      learners {Search learners}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
+  "discussions.posts.actionBar.search": "{page, select,\n      topics {Find a topic}\n      posts {Search all posts}\n      learners {Search learner}\n      myPosts {Search all posts}\n      other {{page}}\n    }",
  "discussions.actionBar.searchInfo": "Showing {count} results for \"{text}\"",
-  "discussions.actionBar.searchRewriteInfo": "No results found for \"{searchString}\". Showing {count} results for \"{textSearchRewrite}\".",
  "discussions.actionBar.searchInfoSearching": "Searching...",
  "discussions.actionBar.clearSearch": "Clear results",
  "discussion.posts.actionBar.add": "Add a post",
@@ -128,7 +124,6 @@
  "discussions.posts.status.filter.following": "Following",
  "discussions.posts.status.filter.reported": "Reported",
  "discussions.posts.status.filter.unanswered": "Unanswered",
-  "discussions.posts.status.filter.unresponded": "Unresponded",
  "discussions.posts.filter.myPosts": "My posts",
  "discussions.posts.filter.myDiscussions": "My discussions",
  "discussions.posts.filter.myQuestions": "My questions",
@@ -136,7 +131,7 @@
  "discussions.posts.sort.lastActivity": "Recent activity",
  "discussions.posts.sort.commentCount": "Most activity",
  "discussions.posts.sort.voteCount": "Most likes",
-  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      statusUnresponded {unresponded}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
+  "discussions.posts.sort-filter.sortFilterStatus": "{own, select,\n      false {All}\n      true {Own}\n      other {{own}}\n    } {status, select,\n      statusAll {}\n      statusUnread {unread}\n      statusFollowing {followed}\n      statusReported {reported}\n      statusUnanswered {unanswered}\n      other {{status}}\n    } {type, select,\n      discussion {discussions}\n      question {questions}\n      all {posts}\n      other {{type}}\n    } {cohortType, select,\n        all {}\n        group {in {cohort}}\n        other {{cohortType}}\n    } by {sort, select,\n      lastActivityAt {recent activity}\n      commentCount {most activity}\n      voteCount {most votes}\n      other {{sort}}\n    }",
  "discussions.post.author.anonymous": "anonymous",
  "discussions.post.lastResponse": "Last response {time}",
  "discussions.post.postedOn": "Posted {time} by {author} {authorLabel}",
@@ -161,15 +156,10 @@
  "discussions.post.editedBy": "Edited by",
  "discussions.post.editReason": "Reason",
  "discussions.post.postWithoutPreview": "No preview available",
-  "discussions.topics.discussions": "{count, plural,\n      =0 {Discussion}\n      one {# Discussion}\n      other {# Discussions}\n    }",
-  "discussions.topics.questions": "{count, plural,\n      =0 {Question}\n      one {# Question}\n      other {# Questions}\n    }",
-  "discussions.topics.reported": "{reported} reported",
-  "discussions.topics.previouslyReported": "{previouslyReported} previously reported",
  "discussions.topics.sort.message": "Sorted by {sortBy}",
  "discussions.topics.sort.lastActivity": "Recent activity",
  "discussions.topics.sort.commentCount": "Most activity",
  "discussions.topics.sort.courseStructure": "Course Structure",
-  "discussions.topics.find.label": "Search topics",
-  "discussions.topics.archived.label": "Archived",
-  "discussions.topics.unnamed.label": "Unnamed Topic"
+  "discussions.topics.find.label": "Find a topic",
+  "discussions.topics.archived.label": "Archived"
 }
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -7,11 +7,9 @@ import ReactDOM from 'react-dom';
 import { messages as footerMessages } from '@edx/frontend-component-footer';
 import { messages as headerMessages } from '@edx/frontend-component-header';
 import {
-  APP_INIT_ERROR, APP_READY, initialize, mergeConfig,
-  subscribe,
+  APP_INIT_ERROR, APP_READY, initialize, subscribe,
 } from '@edx/frontend-platform';
 import { AppProvider, ErrorPage } from '@edx/frontend-platform/react';
-import { messages as paragonMessages } from '@edx/paragon';

 import { DiscussionsHome } from './discussions';
 import appMessages from './i18n';
@@ -39,14 +37,5 @@ initialize({
    headerMessages,
    footerMessages,
    appMessages,
-    paragonMessages,
  ],
-  handlers: {
-    config: () => {
-      mergeConfig({
-        LEARNING_BASE_URL: process.env.LEARNING_BASE_URL,
-        DISPLAY_FEEDBACK_BANNER: process.env.DISPLAY_FEEDBACK_BANNER || 'false',
-      }, 'DiscussionsConfig');
-    },
-  },
 });
--- a/src/index.scss
+++ b/src/index.scss
@@ -118,7 +118,7 @@ $fa-font-path: "~font-awesome/fonts";

 header {
  .user-dropdown {
-    z-index: 2005;
+    z-index: 10000;
  }
  .logo {
    margin-right: 1rem;
@@ -227,24 +227,8 @@ header {

 .header-action-bar {
  background-color: #fff;
-  z-index: 2002;
+  z-index: 2;
  box-shadow: 0px 2px 4px rgb(0 0 0 / 15%), 0px 2px 8px rgb(0 0 0 / 15%);
  position: sticky;
  top: 0;
 }
-
-.breadcrumb-menu {
-  z-index: 1;
-}
-
-.discussion-topic-group:last-of-type .divider{
-  display: none;
-}
-
-.zindex-5000 {
- z-index: 5000;
-}
-
-#paragon-portal-root .pgn__modal-layer {
-  z-index: 1500 !important;
-}