fix: add support for legacy theme static for the LmsHtmlFragment

fix: RTL bug on progress tab (#804 )
feat: add rtl support for chart on progress tab
2022-01-18 18:19:33 +00:00 · 2022-01-18 18:19:06 +00:00 · 2022-01-18 18:19:06 +00:00 · 2022-01-14 09:34:09 +00:00 · 2021-12-20 17:55:30 +01:00 · 2021-12-20 17:55:30 +01:00
230 changed files with 7798 additions and 45042 deletions
--- a/.env
+++ b/.env
@@ -2,20 +2,14 @@
 # If you add a new learning MFE-specific variable, please note it there!

 NODE_ENV='production'
-
 ACCESS_TOKEN_COOKIE_NAME=''
 BASE_URL=''
 CONTACT_URL=''
 CREDENTIALS_BASE_URL=''
-CREDIT_HELP_LINK_URL=''
 CSRF_TOKEN_API_PATH=''
 DISCOVERY_API_BASE_URL=''
-DISCUSSIONS_MFE_BASE_URL=''
 ECOMMERCE_BASE_URL=''
-ENABLE_JUMPNAV='true'
-ENABLE_NOTICES=''
 ENTERPRISE_LEARNER_PORTAL_HOSTNAME=''
-FAVICON_URL=''
 IGNORED_ERROR_REGEX=''
 INSIGHTS_BASE_URL=''
 LANGUAGE_PREFERENCE_COOKIE_NAME=''
@@ -25,13 +19,13 @@ LOGOUT_URL=''
 LOGO_URL=''
 LOGO_TRADEMARK_URL=''
 LOGO_WHITE_URL=''
+FAVICON_URL=''
 LEGACY_THEME_NAME=''
 MARKETING_SITE_BASE_URL=''
 ORDER_HISTORY_URL=''
 REFRESH_ACCESS_TOKEN_ENDPOINT=''
 SEARCH_CATALOG_URL=''
 SEGMENT_KEY=''
-SESSION_COOKIE_DOMAIN=''
 SITE_NAME=''
 SOCIAL_UTM_MILESTONE_CAMPAIGN=''
 STUDIO_BASE_URL=''
@@ -43,3 +37,6 @@ TERMS_OF_SERVICE_URL=''
 TWITTER_HASHTAG=''
 TWITTER_URL=''
 USER_INFO_COOKIE_NAME=''
+SESSION_COOKIE_DOMAIN=''
+ENABLE_JUMPNAV='true'
+ENABLE_NOTICES=''
--- a/.env.development
+++ b/.env.development
@@ -2,20 +2,14 @@
 # If you add a new learning MFE-specific variable, please note it there!

 NODE_ENV='development'
-
 ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
 BASE_URL='http://localhost:2000'
 CONTACT_URL='http://localhost:18000/contact'
 CREDENTIALS_BASE_URL='http://localhost:18150'
-CREDIT_HELP_LINK_URL='https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_credit_courses.html#keep-track-of-credit-requirements'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
 DISCOVERY_API_BASE_URL='http://localhost:18381'
-DISCUSSIONS_MFE_BASE_URL='http://localhost:2002'
 ECOMMERCE_BASE_URL='http://localhost:18130'
-ENABLE_JUMPNAV='true'
-ENABLE_NOTICES=''
 ENTERPRISE_LEARNER_PORTAL_HOSTNAME='localhost:8734'
-FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 IGNORED_ERROR_REGEX=''
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'
@@ -24,6 +18,7 @@ LOGOUT_URL='http://localhost:18000/logout'
 LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
 LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
 LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
+FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 LEGACY_THEME_NAME=''
 MARKETING_SITE_BASE_URL='http://localhost:18000'
 ORDER_HISTORY_URL='http://localhost:1996/orders'
@@ -43,3 +38,5 @@ TWITTER_HASHTAG='myedxjourney'
 TWITTER_URL='https://twitter.com/edXOnline'
 USER_INFO_COOKIE_NAME='edx-user-info'
 SESSION_COOKIE_DOMAIN='localhost'
+ENABLE_JUMPNAV='true'
+ENABLE_NOTICES=''
--- a/.env.test
+++ b/.env.test
@@ -2,20 +2,14 @@
 # If you add a new learning MFE-specific variable, please note it there!

 NODE_ENV='test'
-
 ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
 BASE_URL='http://localhost:2000'
 CONTACT_URL='http://localhost:18000/contact'
 CREDENTIALS_BASE_URL='http://localhost:18150'
-CREDIT_HELP_LINK_URL='https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_credit_courses.html#keep-track-of-credit-requirements'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
 DISCOVERY_API_BASE_URL='http://localhost:18381'
-DISCUSSIONS_MFE_BASE_URL='http://localhost:2002'
 ECOMMERCE_BASE_URL='http://localhost:18130'
-ENABLE_JUMPNAV='true'
-ENABLE_NOTICES=''
 ENTERPRISE_LEARNER_PORTAL_HOSTNAME='localhost:8734'
-FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 IGNORED_ERROR_REGEX=''
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'
@@ -24,6 +18,7 @@ LOGOUT_URL='http://localhost:18000/logout'
 LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
 LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
 LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
+FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 LEGACY_THEME_NAME=''
 MARKETING_SITE_BASE_URL='http://localhost:18000'
 ORDER_HISTORY_URL='http://localhost:1996/orders'
@@ -42,3 +37,5 @@ TERMS_OF_SERVICE_URL='https://www.edx.org/edx-terms-service'
 TWITTER_HASHTAG='myedxjourney'
 TWITTER_URL='https://twitter.com/edXOnline'
 USER_INFO_COOKIE_NAME='edx-user-info'
+ENABLE_JUMPNAV='true'
+ENABLE_NOTICES=''
--- a/.github/workflows/add-depr-ticket-to-depr-board.yml
+++ b/.github/workflows/add-depr-ticket-to-depr-board.yml
@@ -1,19 +0,0 @@
-# Run the workflow that adds new tickets that are either:
-# - labelled "DEPR"
-# - title starts with "[DEPR]"
-# - body starts with "Proposal Date" (this is the first template field)
-# to the org-wide DEPR project board
-
-name: Add newly created DEPR issues to the DEPR project board
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  routeissue:
-    uses: openedx/.github/.github/workflows/add-depr-ticket-to-depr-board.yml@master
-    secrets:
-      GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
-      GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
-      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -1,22 +1,19 @@
 name: validate
 on:
-  push:
-    branches:
-    - 'master'
-  pull_request:
-    branches:
-    - '**'
+- push
+- pull_request
 jobs:
-  tests:
+  build:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        node: [12, 14, 16]
+        node-version:
+        - 12
    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
      with:
-        node-version: ${{ matrix.node }}
+        node-version: ${{ matrix.node-version }}
    - run: make validate.ci
    - name: Upload coverage
      uses: codecov/codecov-action@v2
--- a/.tx/config
+++ b/.tx/config
@@ -1,9 +1,8 @@
 [main]
 host = https://www.transifex.com

-[o:open-edx:p:edx-platform:r:frontend-app-learning]
+[edx-platform.frontend-app-learning]
 file_filter = src/i18n/messages/<lang>.json
 source_file = src/i18n/transifex_input.json
 source_lang = en
-type        = KEYVALUEJSON
-
+type = KEYVALUEJSON
--- a/12
+++ b/12
@@ -1,9 +1,11 @@
-export TRANSIFEX_RESOURCE=frontend-app-learning
+transifex_resource = frontend-app-learning
 transifex_langs = "ar,fr,es_419,zh_CN"

 transifex_utils = ./node_modules/.bin/transifex-utils.js
 i18n = ./src/i18n
 transifex_input = $(i18n)/transifex_input.json
+tx_url1 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/translation/en/strings/
+tx_url2 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/source/

 # This directory must match .babelrc .
 transifex_temp = ./temp/babel-plugin-react-intl
@@ -36,15 +38,15 @@ push_translations:
 	# Pushing strings to Transifex...
 	tx push -s
 	# Fetching hashes from Transifex...
-	./node_modules/@edx/reactifex/bash_scripts/get_hashed_strings_v3.sh
+	./node_modules/reactifex/bash_scripts/get_hashed_strings.sh $(tx_url1)
 	# Writing out comments to file...
-	$(transifex_utils) $(transifex_temp) --comments --v3-scripts-path
+	$(transifex_utils) $(transifex_temp) --comments
 	# Pushing comments to Transifex...
-	./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
+	./node_modules/reactifex/bash_scripts/put_comments.sh $(tx_url2)

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

 # This target is used by Travis.
 validate-no-uncommitted-package-lock-changes:
--- a/README.rst
+++ b/README.rst
@@ -71,15 +71,6 @@ as documented in the Open edX Developer Guide under

 The learning micro-frontend also supports the following additional variables:

-CREDIT_HELP_LINK_URL
-  A link to resources to help explain what course credit is and how to earn it.
-
-ENABLE_JUMPNAV
-  Enables the new Jump Navigation feature in the course breadcrumbs, defaulted to  the string 'true'.
-  Disable to have simple hyperlinks for breadcrumbs. Setting it to any other value but 'true' ('false','I love flags', 'etc' would disable the Jumpnav).
-  This feature flag is slated to be removed as jumpnav becomes default. Follow the progress of this ticket here:
-  https://openedx.atlassian.net/browse/TNL-8678
-
 SOCIAL_UTM_MILESTONE_CAMPAIGN
  This value is passed as the ``utm_campaign`` parameter for social-share
  links when celebrating learning milestones in the course. Optional.
@@ -119,3 +110,8 @@ TWITTER_URL

  Example: https://twitter.com/edXOnline

+ENABLE_JUMPNAV
+  Enables the new Jump Navigation feature in the course breadcrumbs, defaulted to  the string 'true'.
+  Disable to have simple hyperlinks for breadcrumbs. Setting it to any other value but 'true' ('false','I love flags', 'etc' would disable the Jumpnav).
+  This feature flag is slated to be removed as jumpnav becomes default. Follow the progress of this ticket here:
+  https://openedx.atlassian.net/browse/TNL-8678
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -32,48 +32,52 @@
  },
  "dependencies": {
    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
-    "@edx/frontend-component-footer": "10.2.2",
-    "@edx/frontend-component-header": "2.4.6",
-    "@edx/frontend-lib-special-exams": "1.16.0",
-    "@edx/frontend-platform": "1.15.6",
-    "@edx/paragon": "19.13.6",
-    "@fortawesome/fontawesome-svg-core": "1.3.0",
+    "@edx/frontend-component-footer": "10.1.6",
+    "@edx/frontend-enterprise-utils": "1.1.1",
+    "@edx/frontend-lib-special-exams": "1.14.1",
+    "@edx/frontend-platform": "1.14.3",
+    "@edx/paragon": "16.19.0",
+    "@edx/frontend-component-header": "^2.4.3",
+    "@fortawesome/fontawesome-svg-core": "1.2.36",
    "@fortawesome/free-brands-svg-icons": "5.15.4",
    "@fortawesome/free-regular-svg-icons": "5.15.4",
    "@fortawesome/free-solid-svg-icons": "5.15.4",
-    "@fortawesome/react-fontawesome": "0.1.18",
-    "@popperjs/core": "2.11.5",
-    "@reduxjs/toolkit": "1.8.1",
+    "@fortawesome/react-fontawesome": "0.1.15",
+    "@pact-foundation/pact": "9.16.4",
+    "@reduxjs/toolkit": "1.6.2",
    "classnames": "2.3.1",
-    "core-js": "3.21.1",
+    "core-js": "3.18.3",
    "js-cookie": "3.0.1",
    "lodash.camelcase": "4.3.0",
-    "prop-types": "15.8.1",
+    "prop-types": "15.7.2",
    "react": "17.0.2",
+    "react-break": "1.3.2",
    "react-dom": "17.0.2",
    "react-helmet": "6.1.0",
-    "react-redux": "7.2.8",
+    "react-redux": "7.2.5",
    "react-router": "5.2.1",
    "react-router-dom": "5.3.0",
    "react-share": "4.4.0",
-    "redux": "4.1.2",
+    "redux": "4.1.1",
    "regenerator-runtime": "0.13.9",
-    "reselect": "4.1.5",
+    "reselect": "4.0.0",
    "truncate-html": "1.0.4",
    "util": "0.12.4"
  },
  "devDependencies": {
-    "@edx/frontend-build": "9.1.4",
-    "@edx/reactifex": "1.1.0",
-    "@pact-foundation/pact": "9.17.3",
-    "@testing-library/jest-dom": "5.16.4",
-    "@testing-library/react": "12.1.4",
-    "@testing-library/user-event": "13.5.0",
+    "@edx/frontend-build": "9.0.5",
+    "@testing-library/dom": "7.16.3",
+    "@testing-library/jest-dom": "5.14.1",
+    "@testing-library/react": "10.3.0",
+    "@testing-library/user-event": "13.4.1",
    "axios-mock-adapter": "1.20.0",
    "codecov": "3.8.3",
-    "es-check": "6.2.1",
-    "husky": "7.0.4",
-    "jest": "27.5.1",
+    "es-check": "6.0.0",
+    "glob": "7.2.0",
+    "husky": "7.0.2",
+    "jest": "27.2.5",
+    "jest-chain": "1.1.5",
+    "reactifex": "1.1.1",
    "rosie": "2.1.0"
  }
 }
--- a/public/index.html
+++ b/public/index.html
--- a/src/alerts/access-expiration-alert/AccessExpirationAlert.jsx
+++ b/src/alerts/access-expiration-alert/AccessExpirationAlert.jsx
@@ -65,7 +65,6 @@ function AccessExpirationAlert({ intl, payload }) {
        <FormattedMessage
          id="learning.accessExpiration.deadline"
          defaultMessage="Upgrade by {date} to get unlimited access to the course as long as it exists on the site."
-          description="Warning shown to learner to upgrade while they are enrolled on the audit version and it's possible to upgrade"
          values={{
            date: (
              <FormattedDate
@@ -98,7 +97,6 @@ function AccessExpirationAlert({ intl, payload }) {
        <FormattedMessage
          id="learning.accessExpiration.header"
          defaultMessage="Audit Access Expires {date}"
-          description="Headline for auditing deadline"
          values={{
            date: (
              <FormattedDate
@@ -117,7 +115,6 @@ function AccessExpirationAlert({ intl, payload }) {
      <FormattedMessage
        id="learning.accessExpiration.body"
        defaultMessage="You lose all access to this course, including your progress, on {date}."
-        description="Message body to tell learner the consequences of course expiration."
        values={{
          date: (
            <FormattedDate
--- a/src/alerts/access-expiration-alert/AccessExpirationMasqueradeBanner.jsx
+++ b/src/alerts/access-expiration-alert/AccessExpirationMasqueradeBanner.jsx
@@ -16,7 +16,6 @@ function AccessExpirationMasqueradeBanner({ payload }) {
      <FormattedMessage
        id="instructorToolbar.pageBanner.courseHasExpired"
        defaultMessage="This learner no longer has access to this course. Their access expired on {date}."
-        description="It's a warning that is shown to course author when being masqueraded as learner, while the course has expired for the real learner."
        values={{
          date: <FormattedDate
            key="instructorToolbar.pageBanner.accessExpirationDate"
--- a/src/alerts/access-expiration-alert/messages.js
+++ b/src/alerts/access-expiration-alert/messages.js
@@ -4,7 +4,6 @@ const messages = defineMessages({
  upgradeNow: {
    id: 'learning.accessExpiration.upgradeNow',
    defaultMessage: 'Upgrade now',
-    description: 'The anchor text for the upgrading link',
  },
 });

--- a/src/alerts/course-start-alert/CourseStartAlert.jsx
+++ b/src/alerts/course-start-alert/CourseStartAlert.jsx
@@ -86,7 +86,6 @@ function CourseStartAlert({ payload }) {
      <FormattedMessage
        id="learning.outline.alert.end.calendar"
        defaultMessage="Don’t forget to add a calendar reminder!"
-        description="It's just a recommendation for learners to set a reminder for the course starting date and is shown when the course starting date is more than a day. "
      />
    </Alert>
  );
--- a/src/alerts/course-start-alert/CourseStartMasqueradeBanner.jsx
+++ b/src/alerts/course-start-alert/CourseStartMasqueradeBanner.jsx
@@ -22,7 +22,6 @@ function CourseStartMasqueradeBanner({ payload }) {
      <FormattedMessage
        id="instructorToolbar.pageBanner.courseHasNotStarted"
        defaultMessage="This learner does not yet have access to this course. The course starts on {date}."
-        description="It's a warning that is shown to course author when being masqueraded as learner, while the course hasn't started for the real learner yet."
        values={{
          date: <FormattedDate
            key="instructorToolbar.pageBanner.courseStartDate"
--- a/src/alerts/logistration-alert/AccountActivationAlert.jsx
+++ b/src/alerts/logistration-alert/AccountActivationAlert.jsx
@@ -9,13 +9,10 @@ import {
  Icon,
 } from '@edx/paragon';
 import { Check, ArrowForward } from '@edx/paragon/icons';
-import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, injectIntl } from '@edx/frontend-platform/i18n';
 import { sendActivationEmail } from '../../courseware/data';
-import messages from './messages';

-function AccountActivationAlert({
-  intl,
-}) {
+function AccountActivationAlert() {
  const [showModal, setShowModal] = useState(false);
  const [showSpinner, setShowSpinner] = useState(false);
  const [showCheck, setShowCheck] = useState(false);
@@ -32,12 +29,22 @@ function AccountActivationAlert({
  if (showAccountActivationAlert !== undefined) {
    Cookies.remove('show-account-activation-popup', { path: '/', domain: process.env.SESSION_COOKIE_DOMAIN });
    // extra check to make sure cookie was removed before updating the state. Updating the state without removal
-    // of cookie would make it infinite rendering
+    // of cookie would make it infinit rendering
    if (Cookies.get('show-account-activation-popup') === undefined) {
      setShowModal(true);
    }
  }

+  const title = (
+    <h3>
+      <FormattedMessage
+        id="account-activation.alert.title"
+        defaultMessage="Activate your account so you can log back in"
+        description="Title for account activation alert which is shown after the registration"
+      />
+    </h3>
+  );
+
  const button = (
    <Button
      variant="primary"
@@ -57,7 +64,7 @@ function AccountActivationAlert({
  );

  const children = () => {
-    let bodyContent;
+    let bodyContent = null;
    const message = (
      <FormattedMessage
        id="account-activation.alert.message"
@@ -116,7 +123,7 @@ function AccountActivationAlert({
  return (
    <AlertModal
      isOpen={showModal}
-      title={intl.formatMessage(messages.accountActivationAlertTitle)}
+      title={title}
      footerNode={button}
      onClose={() => ({})}
    >
@@ -125,8 +132,4 @@ function AccountActivationAlert({
  );
 }

-AccountActivationAlert.propTypes = {
-  intl: intlShape.isRequired,
-};
-
 export default injectIntl(AccountActivationAlert);
--- a/src/alerts/logistration-alert/messages.js
+++ b/src/alerts/logistration-alert/messages.js
@@ -1,11 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  accountActivationAlertTitle: {
-    id: 'account-activation.alert.title',
-    defaultMessage: 'Activate your account so you can log back in',
-    description: 'Title for account activation alert which is shown after the registration',
-  },
-});
-
-export default messages;
--- a/src/alerts/sequence-alerts/hooks.js
+++ b/src/alerts/sequence-alerts/hooks.js
@@ -1,56 +0,0 @@
-import { useSelector } from 'react-redux';
-
-import { useModel } from '../../generic/model-store';
-import { ALERT_TYPES, useAlert } from '../../generic/user-messages';
-
-import messages from './messages';
-
-function useSequenceBannerTextAlert(sequenceId) {
-  const sequence = useModel('sequences', sequenceId);
-  const sequenceStatus = useSelector(state => state.courseware.sequenceStatus);
-
-  // Show Alert that comes along with the sequence
-  useAlert(sequenceStatus === 'loaded' && sequence.bannerText, {
-    code: null,
-    dismissible: false,
-    text: sequence.bannerText,
-    type: ALERT_TYPES.INFO,
-    topic: 'sequence',
-  });
-}
-
-function useSequenceEntranceExamAlert(courseId, sequenceId, intl) {
-  const course = useModel('coursewareMeta', courseId);
-  const sequence = useModel('sequences', sequenceId);
-  const sequenceStatus = useSelector(state => state.courseware.sequenceStatus);
-  const {
-    entranceExamCurrentScore,
-    entranceExamEnabled,
-    entranceExamId,
-    entranceExamMinimumScorePct,
-    entranceExamPassed,
-  } = course.entranceExamData || {};
-  const entranceExamAlertVisible = sequenceStatus === 'loaded' && entranceExamEnabled && entranceExamId === sequence.sectionId;
-  let entranceExamText;
-
-  if (entranceExamPassed) {
-    entranceExamText = intl.formatMessage(
-      messages.entranceExamTextPassed, { entranceExamCurrentScore: entranceExamCurrentScore * 100 },
-    );
-  } else {
-    entranceExamText = intl.formatMessage(messages.entranceExamTextNotPassing, {
-      entranceExamCurrentScore: entranceExamCurrentScore * 100,
-      entranceExamMinimumScorePct: entranceExamMinimumScorePct * 100,
-    });
-  }
-
-  useAlert(entranceExamAlertVisible, {
-    code: null,
-    dismissible: false,
-    text: entranceExamText,
-    type: ALERT_TYPES.INFO,
-    topic: 'sequence',
-  });
-}
-
-export { useSequenceBannerTextAlert, useSequenceEntranceExamAlert };
--- a/src/alerts/sequence-alerts/messages.js
+++ b/src/alerts/sequence-alerts/messages.js
@@ -1,14 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  entranceExamTextNotPassing: {
-    id: 'learn.sequence.entranceExamTextNotPassing',
-    defaultMessage: 'To access course materials, you must score {entranceExamMinimumScorePct}% or higher on this exam. Your current score is {entranceExamCurrentScore}%.',
-  },
-  entranceExamTextPassed: {
-    id: 'learn.sequence.entranceExamTextPassed',
-    defaultMessage: 'Your score is {entranceExamCurrentScore}%. You have passed the entrance exam.',
-  },
-});
-
-export default messages;
--- a/src/course-home/data/factories/courseHomeMetadata.factory.js
+++ b/src/course-home/data/factories/courseHomeMetadata.factory.js
@@ -1,4 +1,5 @@
 import { Factory } from 'rosie'; // eslint-disable-line import/no-extraneous-dependencies
+
 import courseMetadataBase from '../../../shared/data/__factories__/courseMetadataBase.factory';

 Factory.define('courseHomeMetadata')
@@ -8,10 +9,7 @@ Factory.define('courseHomeMetadata')
    title: 'Demonstration Course',
    is_self_paced: false,
    is_enrolled: false,
-    is_staff: false,
-    can_load_courseware: true,
-    can_view_certificate: true,
-    celebrations: null,
+    can_load_courseware: false,
    course_access: {
      additional_context_user_message: null,
      developer_message: null,
@@ -20,106 +18,6 @@ Factory.define('courseHomeMetadata')
      user_fragment: null,
      user_message: null,
    },
-    number: 'DemoX',
-    original_user_is_staff: false,
-    org: 'edX',
    start: '2013-02-05T05:00:00Z',
    user_timezone: 'UTC',
-    username: 'MockUser',
-    verified_mode: {
-      access_expiration_date: null,
-      currency: 'USD',
-      upgrade_url: 'http://localhost:18130/basket/add/?sku=8CF08E5',
-      sku: '8CF08E5',
-      price: 149,
-      currency_symbol: '$',
-    },
-  })
-  .attr(
-    'tabs', ['id', 'host'], (id, host) => [
-      Factory.build(
-        'tab',
-        {
-          title: 'Course',
-          priority: 0,
-          slug: 'courseware',
-          type: 'courseware',
-        },
-        {
-          courseId: id,
-          host,
-          path: 'course/',
-        },
-      ),
-      Factory.build(
-        'tab',
-        {
-          title: 'Discussion',
-          priority: 1,
-          slug: 'discussion',
-          type: 'discussion',
-        },
-        {
-          courseId: id,
-          host,
-          path: 'discussion/forum/',
-        },
-      ),
-      Factory.build(
-        'tab',
-        {
-          title: 'Wiki',
-          priority: 2,
-          slug: 'wiki',
-          type: 'wiki',
-        },
-        {
-          courseId: id,
-          host,
-          path: 'course_wiki',
-        },
-      ),
-      Factory.build(
-        'tab',
-        {
-          title: 'Progress',
-          priority: 3,
-          slug: 'progress',
-          type: 'progress',
-        },
-        {
-          courseId: id,
-          host,
-          path: 'progress',
-        },
-      ),
-      Factory.build(
-        'tab',
-        {
-          title: 'Instructor',
-          priority: 4,
-          slug: 'instructor',
-          type: 'instructor',
-        },
-        {
-          courseId: id,
-          host,
-          path: 'instructor',
-        },
-      ),
-      Factory.build(
-        'tab',
-        {
-          title: 'Dates',
-          priority: 5,
-          slug: 'dates',
-          type: 'dates',
-        },
-        {
-          courseId: id,
-          host,
-          path: 'dates',
-        },
-      ),
-    ],
-  );
+  });
--- a/src/course-home/data/factories/outlineTabData.factory.js
+++ b/src/course-home/data/factories/outlineTabData.factory.js
@@ -40,9 +40,6 @@ Factory.define('outlineTabData')
    course_goals: {
      goal_options: [],
      selected_goal: null,
-      weekly_learning_goal_enabled: false,
-      days_per_week: null,
-      subscribed_to_reminders: null,
    },
    course_tools: [
      {
--- a/src/course-home/data/factories/progressTabData.factory.js
+++ b/src/course-home/data/factories/progressTabData.factory.js
@@ -17,7 +17,6 @@ Factory.define('progressTabData')
      percent: 1,
      is_passing: true,
    },
-    credit_course_requirements: null,
    section_scores: [
      {
        display_name: 'First section',
--- a/src/course-home/data/factories/upgradeNotificationData.factory.js
+++ b/src/course-home/data/factories/upgradeNotificationData.factory.js
@@ -5,6 +5,7 @@ Factory.define('upgradeNotificationData')
  .option('dateBlocks', [])
  .option('offer', null)
  .option('userTimezone', null)
+  .option('accessExpiration', null)
  .option('contentTypeGatingEnabled', false)
  .attr('courseId', 'course-v1:edX+DemoX+Demo_Course')
  .attr('upsellPageName', 'test')
@@ -17,9 +18,4 @@ Factory.define('upgradeNotificationData')
    upgradeUrl: `${host}/dashboard`,
  }))
  .attr('org', 'edX')
-  .attrs({
-    accessExpiration: {
-      expiration_date: '1950-07-13T02:04:49.040006Z',
-    },
-  })
  .attr('timeOffsetMillis', 0);
--- a/src/course-home/data/snapshots/redux.test.js.snap
+++ b/src/course-home/data/snapshots/redux.test.js.snap
@@ -3,9 +3,8 @@
 exports[`Data layer integration tests Test fetchDatesTab Should fetch, normalize, and save metadata 1`] = `
 Object {
  "courseHome": Object {
-    "courseId": "course-v1:edX+DemoX+Demo_Course",
+    "courseId": "course-v1:edX+DemoX+Demo_Course_1",
    "courseStatus": "loaded",
-    "proctoringPanelStatus": "loading",
    "targetUserId": undefined,
    "toastBodyLink": null,
    "toastBodyText": null,
@@ -15,15 +14,12 @@ Object {
    "courseId": null,
    "courseStatus": "loading",
    "sequenceId": null,
-    "sequenceMightBeUnit": false,
    "sequenceStatus": "loading",
  },
  "models": Object {
    "courseHomeMeta": Object {
-      "course-v1:edX+DemoX+Demo_Course": Object {
-        "canLoadCourseware": true,
-        "canViewCertificate": true,
-        "celebrations": null,
+      "course-v1:edX+DemoX+Demo_Course_1": Object {
+        "canLoadCourseware": false,
        "courseAccess": Object {
          "additionalContextUserMessage": null,
          "developerMessage": null,
@@ -32,7 +28,7 @@ Object {
          "userFragment": null,
          "userMessage": null,
        },
-        "id": "course-v1:edX+DemoX+Demo_Course",
+        "id": "course-v1:edX+DemoX+Demo_Course_1",
        "isEnrolled": false,
        "isMasquerading": false,
        "isSelfPaced": false,
@@ -45,49 +41,45 @@ Object {
          Object {
            "slug": "outline",
            "title": "Course",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/course/",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/course/",
          },
          Object {
            "slug": "discussion",
            "title": "Discussion",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/discussion/forum/",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/discussion/forum/",
          },
          Object {
            "slug": "wiki",
            "title": "Wiki",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/course_wiki",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/course_wiki",
          },
          Object {
            "slug": "progress",
            "title": "Progress",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/progress",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/progress",
          },
          Object {
            "slug": "instructor",
            "title": "Instructor",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/instructor",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/instructor",
          },
          Object {
            "slug": "dates",
            "title": "Dates",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/dates",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/dates",
          },
        ],
        "title": "Demonstration Course",
        "userTimezone": "UTC",
-        "username": "MockUser",
        "verifiedMode": Object {
-          "accessExpirationDate": null,
-          "currency": "USD",
          "currencySymbol": "$",
-          "price": 149,
-          "sku": "8CF08E5",
-          "upgradeUrl": "http://localhost:18130/basket/add/?sku=8CF08E5",
+          "price": 10,
+          "upgradeUrl": "test",
        },
      },
    },
    "dates": Object {
-      "course-v1:edX+DemoX+Demo_Course": Object {
+      "course-v1:edX+DemoX+Demo_Course_1": Object {
        "courseDateBlocks": Array [
          Object {
            "date": "2020-05-01T17:59:41Z",
@@ -301,7 +293,7 @@ Object {
          "verifiedUpgradeLink": "http://localhost:18130/basket/add/?sku=8CF08E5",
        },
        "hasEnded": false,
-        "id": "course-v1:edX+DemoX+Demo_Course",
+        "id": "course-v1:edX+DemoX+Demo_Course_1",
        "learnerIsFullAccess": true,
      },
    },
@@ -309,22 +301,14 @@ Object {
  "recommendations": Object {
    "recommendationsStatus": "loading",
  },
-  "tours": Object {
-    "showCoursewareTour": false,
-    "showExistingUserCourseHomeTour": false,
-    "showNewUserCourseHomeModal": false,
-    "showNewUserCourseHomeTour": false,
-    "toursEnabled": false,
-  },
 }
 `;

 exports[`Data layer integration tests Test fetchOutlineTab Should fetch, normalize, and save metadata 1`] = `
 Object {
  "courseHome": Object {
-    "courseId": "course-v1:edX+DemoX+Demo_Course",
+    "courseId": "course-v1:edX+DemoX+Demo_Course_1",
    "courseStatus": "loaded",
-    "proctoringPanelStatus": "loading",
    "targetUserId": undefined,
    "toastBodyLink": null,
    "toastBodyText": null,
@@ -334,15 +318,12 @@ Object {
    "courseId": null,
    "courseStatus": "loading",
    "sequenceId": null,
-    "sequenceMightBeUnit": false,
    "sequenceStatus": "loading",
  },
  "models": Object {
    "courseHomeMeta": Object {
-      "course-v1:edX+DemoX+Demo_Course": Object {
-        "canLoadCourseware": true,
-        "canViewCertificate": true,
-        "celebrations": null,
+      "course-v1:edX+DemoX+Demo_Course_1": Object {
+        "canLoadCourseware": false,
        "courseAccess": Object {
          "additionalContextUserMessage": null,
          "developerMessage": null,
@@ -351,7 +332,7 @@ Object {
          "userFragment": null,
          "userMessage": null,
        },
-        "id": "course-v1:edX+DemoX+Demo_Course",
+        "id": "course-v1:edX+DemoX+Demo_Course_1",
        "isEnrolled": false,
        "isMasquerading": false,
        "isSelfPaced": false,
@@ -364,49 +345,45 @@ Object {
          Object {
            "slug": "outline",
            "title": "Course",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/course/",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/course/",
          },
          Object {
            "slug": "discussion",
            "title": "Discussion",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/discussion/forum/",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/discussion/forum/",
          },
          Object {
            "slug": "wiki",
            "title": "Wiki",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/course_wiki",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/course_wiki",
          },
          Object {
            "slug": "progress",
            "title": "Progress",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/progress",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/progress",
          },
          Object {
            "slug": "instructor",
            "title": "Instructor",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/instructor",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/instructor",
          },
          Object {
            "slug": "dates",
            "title": "Dates",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/dates",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/dates",
          },
        ],
        "title": "Demonstration Course",
        "userTimezone": "UTC",
-        "username": "MockUser",
        "verifiedMode": Object {
-          "accessExpirationDate": null,
-          "currency": "USD",
          "currencySymbol": "$",
-          "price": 149,
-          "sku": "8CF08E5",
-          "upgradeUrl": "http://localhost:18130/basket/add/?sku=8CF08E5",
+          "price": 10,
+          "upgradeUrl": "test",
        },
      },
    },
    "outline": Object {
-      "course-v1:edX+DemoX+Demo_Course": Object {
+      "course-v1:edX+DemoX+Demo_Course_1": Object {
        "accessExpiration": null,
        "canShowUpgradeSock": false,
        "certData": Object {
@@ -419,7 +396,7 @@ Object {
          "courses": Object {
            "block-v1:edX+DemoX+Demo_Course+type@course+block@bcdabcdabcdabcdabcdabcdabcdabcd3": Object {
              "hasScheduledContent": false,
-              "id": "course-v1:edX+DemoX+Demo_Course",
+              "id": "course-v1:edX+DemoX+Demo_Course_1",
              "sectionIds": Array [
                "block-v1:edX+DemoX+Demo_Course+type@chapter+block@bcdabcdabcdabcdabcdabcdabcdabcd2",
              ],
@@ -429,7 +406,7 @@ Object {
          "sections": Object {
            "block-v1:edX+DemoX+Demo_Course+type@chapter+block@bcdabcdabcdabcdabcdabcdabcdabcd2": Object {
              "complete": false,
-              "courseId": "course-v1:edX+DemoX+Demo_Course",
+              "courseId": "course-v1:edX+DemoX+Demo_Course_1",
              "id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@bcdabcdabcdabcdabcdabcdabcdabcd2",
              "resumeBlock": false,
              "sequenceIds": Array [
@@ -455,11 +432,8 @@ Object {
          },
        },
        "courseGoals": Object {
-          "daysPerWeek": null,
          "goalOptions": Array [],
          "selectedGoal": null,
-          "subscribedToReminders": null,
-          "weeklyLearningGoalEnabled": false,
        },
        "courseTools": Array [
          Object {
@@ -476,7 +450,6 @@ Object {
        "datesWidget": Object {
          "courseDateBlocks": Array [],
        },
-        "enableProctoredExams": undefined,
        "enrollAlert": Object {
          "canEnroll": true,
          "extraText": "Contact the administrator.",
@@ -485,7 +458,7 @@ Object {
        "handoutsHtml": "<ul><li>Handout 1</li></ul>",
        "hasEnded": undefined,
        "hasScheduledContent": null,
-        "id": "course-v1:edX+DemoX+Demo_Course",
+        "id": "course-v1:edX+DemoX+Demo_Course_1",
        "offer": null,
        "resumeCourse": Object {
          "hasVisitedCourse": false,
@@ -508,22 +481,14 @@ Object {
  "recommendations": Object {
    "recommendationsStatus": "loading",
  },
-  "tours": Object {
-    "showCoursewareTour": false,
-    "showExistingUserCourseHomeTour": false,
-    "showNewUserCourseHomeModal": false,
-    "showNewUserCourseHomeTour": false,
-    "toursEnabled": false,
-  },
 }
 `;

 exports[`Data layer integration tests Test fetchProgressTab Should fetch, normalize, and save metadata 1`] = `
 Object {
  "courseHome": Object {
-    "courseId": "course-v1:edX+DemoX+Demo_Course",
+    "courseId": "course-v1:edX+DemoX+Demo_Course_1",
    "courseStatus": "loaded",
-    "proctoringPanelStatus": "loading",
    "targetUserId": undefined,
    "toastBodyLink": null,
    "toastBodyText": null,
@@ -533,15 +498,12 @@ Object {
    "courseId": null,
    "courseStatus": "loading",
    "sequenceId": null,
-    "sequenceMightBeUnit": false,
    "sequenceStatus": "loading",
  },
  "models": Object {
    "courseHomeMeta": Object {
-      "course-v1:edX+DemoX+Demo_Course": Object {
-        "canLoadCourseware": true,
-        "canViewCertificate": true,
-        "celebrations": null,
+      "course-v1:edX+DemoX+Demo_Course_1": Object {
+        "canLoadCourseware": false,
        "courseAccess": Object {
          "additionalContextUserMessage": null,
          "developerMessage": null,
@@ -550,7 +512,7 @@ Object {
          "userFragment": null,
          "userMessage": null,
        },
-        "id": "course-v1:edX+DemoX+Demo_Course",
+        "id": "course-v1:edX+DemoX+Demo_Course_1",
        "isEnrolled": false,
        "isMasquerading": false,
        "isSelfPaced": false,
@@ -563,49 +525,45 @@ Object {
          Object {
            "slug": "outline",
            "title": "Course",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/course/",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/course/",
          },
          Object {
            "slug": "discussion",
            "title": "Discussion",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/discussion/forum/",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/discussion/forum/",
          },
          Object {
            "slug": "wiki",
            "title": "Wiki",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/course_wiki",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/course_wiki",
          },
          Object {
            "slug": "progress",
            "title": "Progress",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/progress",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/progress",
          },
          Object {
            "slug": "instructor",
            "title": "Instructor",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/instructor",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/instructor",
          },
          Object {
            "slug": "dates",
            "title": "Dates",
-            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/dates",
+            "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course_1/dates",
          },
        ],
        "title": "Demonstration Course",
        "userTimezone": "UTC",
-        "username": "MockUser",
        "verifiedMode": Object {
-          "accessExpirationDate": null,
-          "currency": "USD",
          "currencySymbol": "$",
-          "price": 149,
-          "sku": "8CF08E5",
-          "upgradeUrl": "http://localhost:18130/basket/add/?sku=8CF08E5",
+          "price": 10,
+          "upgradeUrl": "test",
        },
      },
    },
    "progress": Object {
-      "course-v1:edX+DemoX+Demo_Course": Object {
+      "course-v1:edX+DemoX+Demo_Course_1": Object {
        "accessExpiration": null,
        "certificateData": Object {},
        "completionSummary": Object {
@@ -617,9 +575,9 @@ Object {
          "isPassing": true,
          "letterGrade": "pass",
          "percent": 1,
+          "visiblePercent": 1,
        },
-        "courseId": "course-v1:edX+DemoX+Demo_Course",
-        "creditCourseRequirements": null,
+        "courseId": "course-v1:edX+DemoX+Demo_Course_1",
        "end": "3027-03-31T00:00:00Z",
        "enrollmentMode": "audit",
        "gradesFeatureIsFullyLocked": false,
@@ -627,7 +585,7 @@ Object {
        "gradingPolicy": Object {
          "assignmentPolicies": Array [
            Object {
-              "averageGrade": "1.00",
+              "averageGrade": 1,
              "numDroppable": 1,
              "shortLabel": "HW",
              "type": "Homework",
@@ -640,7 +598,7 @@ Object {
          },
        },
        "hasScheduledContent": false,
-        "id": "course-v1:edX+DemoX+Demo_Course",
+        "id": "course-v1:edX+DemoX+Demo_Course_1",
        "sectionScores": Array [
          Object {
            "displayName": "First section",
@@ -711,12 +669,5 @@ Object {
  "recommendations": Object {
    "recommendationsStatus": "loading",
  },
-  "tours": Object {
-    "showCoursewareTour": false,
-    "showExistingUserCourseHomeTour": false,
-    "showNewUserCourseHomeModal": false,
-    "showNewUserCourseHomeTour": false,
-    "toursEnabled": false,
-  },
 }
 `;
--- a/src/course-home/data/api.js
+++ b/src/course-home/data/api.js
@@ -15,10 +15,7 @@ const calculateAssignmentTypeGrades = (points, assignmentWeight, numDroppable) =
  let averageGrade = 0;
  let weightedGrade = 0;
  if (points.length) {
-    // Calculate the average grade for the assignment and round it. This rounding is not ideal and does not accurately
-    // reflect what a learner's grade would be, however, we must have parity with the current grading behavior that
-    // exists in edx-platform.
-    averageGrade = (points.reduce((a, b) => a + b, 0) / points.length).toFixed(2);
+    averageGrade = points.reduce((a, b) => a + b, 0) / points.length;
    weightedGrade = averageGrade * assignmentWeight;
  }
  return { averageGrade, weightedGrade };
@@ -90,21 +87,14 @@ function normalizeAssignmentPolicies(assignmentPolicies, sectionScores) {
  });
 }

-/**
- * Tweak the metadata for consistency
- * @param metadata the data to normalize
- * @param rootSlug either 'courseware' or 'outline' depending on the context
- * @returns {Object} The normalized metadata
- */
-function normalizeCourseHomeCourseMetadata(metadata, rootSlug) {
+function normalizeCourseHomeCourseMetadata(metadata) {
  const data = camelCaseObject(metadata);
  return {
    ...data,
    tabs: data.tabs.map(tab => ({
-      // The API uses "courseware" as a slug for both courseware and the outline tab.
-      // If needed, we switch it to "outline" here for
+      // The API uses "courseware" as a slug for both courseware and the outline tab. We switch it to "outline" here for
      // use within the MFE to differentiate between course home and courseware.
-      slug: tab.tabId === 'courseware' ? rootSlug : tab.tabId,
+      slug: tab.tabId === 'courseware' ? 'outline' : tab.tabId,
      title: tab.title,
      url: tab.url,
    })),
@@ -189,11 +179,11 @@ export function normalizeOutlineBlocks(courseId, blocks) {
  return models;
 }

-export async function getCourseHomeCourseMetadata(courseId, rootSlug) {
+export async function getCourseHomeCourseMetadata(courseId) {
  let url = `${getConfig().LMS_BASE_URL}/api/course_home/course_metadata/${courseId}`;
  url = appendBrowserTimezoneToUrl(url);
  const { data } = await getAuthenticatedHttpClient().get(url);
-  return normalizeCourseHomeCourseMetadata(data, rootSlug);
+  return normalizeCourseHomeCourseMetadata(data);
 }

 // For debugging purposes, you might like to see a fully loaded dates tab.
@@ -239,6 +229,16 @@ export async function getProgressTabData(courseId, targetUserId) {
      camelCasedData.sectionScores,
    );

+    // Accumulate the weighted grades by assignment type to calculate the learner facing grade. The grades within
+    // assignmentPolicies have been filtered by what's visible to the learner.
+    camelCasedData.courseGrade.visiblePercent = camelCasedData.gradingPolicy.assignmentPolicies
+      ? camelCasedData.gradingPolicy.assignmentPolicies.reduce(
+        (accumulator, assignment) => accumulator + assignment.weightedGrade, 0,
+      ) : camelCasedData.courseGrade.percent;
+
+    camelCasedData.courseGrade.isPassing = camelCasedData.courseGrade.visiblePercent
+      >= Math.min(...Object.values(data.grading_policy.grade_range));
+
    // We replace gradingPolicy.gradeRange with the original data to preserve the intended casing for the grade.
    // For example, if a grade range key is "A", we do not want it to be camel cased (i.e. "A" would become "a")
    // in order to preserve a course team's desired grade formatting.
@@ -343,7 +343,6 @@ export async function getOutlineTabData(courseId) {
  const courseTools = camelCaseObject(data.course_tools);
  const datesBannerInfo = camelCaseObject(data.dates_banner_info);
  const datesWidget = camelCaseObject(data.dates_widget);
-  const enableProctoredExams = data.enable_proctored_exams;
  const enrollAlert = camelCaseObject(data.enroll_alert);
  const enrollmentMode = data.enrollment_mode;
  const handoutsHtml = data.handouts_html;
@@ -367,7 +366,6 @@ export async function getOutlineTabData(courseId) {
    datesWidget,
    enrollAlert,
    enrollmentMode,
-    enableProctoredExams,
    handoutsHtml,
    hasScheduledContent,
    hasEnded,
@@ -388,20 +386,11 @@ export async function postCourseDeadlines(courseId, model) {
  });
 }

-export async function deprecatedPostCourseGoals(courseId, goalKey) {
+export async function postCourseGoals(courseId, goalKey) {
  const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_home/save_course_goal`);
  return getAuthenticatedHttpClient().post(url.href, { course_id: courseId, goal_key: goalKey });
 }

-export async function postWeeklyLearningGoal(courseId, daysPerWeek, subscribedToReminders) {
-  const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_home/save_course_goal`);
-  return getAuthenticatedHttpClient().post(url.href, {
-    course_id: courseId,
-    days_per_week: daysPerWeek,
-    subscribed_to_reminders: subscribedToReminders,
-  });
-}
-
 export async function postDismissWelcomeMessage(courseId) {
  const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_home/dismiss_welcome_message`);
  await getAuthenticatedHttpClient().post(url.href, { course_id: courseId });
--- a/src/course-home/data/index.js
+++ b/src/course-home/data/index.js
@@ -3,8 +3,7 @@ export {
  fetchOutlineTab,
  fetchProgressTab,
  resetDeadlines,
-  deprecatedSaveCourseGoal,
-  saveWeeklyLearningGoal,
+  saveCourseGoal,
 } from './thunks';

 export { reducer } from './slice';
--- a/src/course-home/data/pact-tests/lmsPact.test.jsx
+++ b/src/course-home/data/pact-tests/lmsPact.test.jsx
@@ -139,7 +139,7 @@ describe('Course Home Service', () => {
        title: 'Demonstration Course',
        username: 'edx',
      };
-      const response = await getCourseHomeCourseMetadata(courseId, 'outline');
+      const response = await getCourseHomeCourseMetadata(courseId);
      expect(response).toBeTruthy();
      expect(response).toEqual(normalizedTabData);
    });
--- a/src/course-home/data/redux.test.js
+++ b/src/course-home/data/redux.test.js
@@ -136,7 +136,7 @@ describe('Data layer integration tests', () => {
      const goalUrl = `${getConfig().LMS_BASE_URL}/api/course_home/save_course_goal`;
      axiosMock.onPost(goalUrl).reply(200, {});

-      await thunks.deprecatedSaveCourseGoal(courseId, 'unsure');
+      await thunks.saveCourseGoal(courseId, 'unsure');

      expect(axiosMock.history.post[0].url).toEqual(goalUrl);
      expect(axiosMock.history.post[0].data).toEqual(`{"course_id":"${courseId}","goal_key":"unsure"}`);
--- a/src/course-home/data/slice.js
+++ b/src/course-home/data/slice.js
@@ -11,15 +11,11 @@ const slice = createSlice({
  initialState: {
    courseStatus: 'loading',
    courseId: null,
-    proctoringPanelStatus: 'loading',
    toastBodyText: null,
    toastBodyLink: null,
    toastHeader: '',
  },
  reducers: {
-    fetchProctoringInfoResolved: (state) => {
-      state.proctoringPanelStatus = LOADED;
-    },
    fetchTabDenied: (state, { payload }) => {
      state.courseId = payload.courseId;
      state.courseStatus = DENIED;
@@ -51,7 +47,6 @@ const slice = createSlice({
 });

 export const {
-  fetchProctoringInfoResolved,
  fetchTabDenied,
  fetchTabFailure,
  fetchTabRequest,
--- a/src/course-home/data/thunks.js
+++ b/src/course-home/data/thunks.js
@@ -7,8 +7,7 @@ import {
  getOutlineTabData,
  getProgressTabData,
  postCourseDeadlines,
-  deprecatedPostCourseGoals,
-  postWeeklyLearningGoal,
+  postCourseGoals,
  postDismissWelcomeMessage,
  postRequestCert,
 } from './api';
@@ -33,7 +32,7 @@ export function fetchTab(courseId, tab, getTabData, targetUserId) {
  return async (dispatch) => {
    dispatch(fetchTabRequest({ courseId }));
    Promise.allSettled([
-      getCourseHomeCourseMetadata(courseId, 'outline'),
+      getCourseHomeCourseMetadata(courseId),
      getTabData(courseId, targetUserId),
    ]).then(([courseHomeCourseMetadataResult, tabDataResult]) => {
      const fetchedCourseHomeCourseMetadata = courseHomeCourseMetadataResult.status === 'fulfilled';
@@ -110,12 +109,8 @@ export function resetDeadlines(courseId, model, getTabData) {
  };
 }

-export async function deprecatedSaveCourseGoal(courseId, goalKey) {
-  return deprecatedPostCourseGoals(courseId, goalKey);
-}
-
-export async function saveWeeklyLearningGoal(courseId, daysPerWeek, subscribedToReminders) {
-  return postWeeklyLearningGoal(courseId, daysPerWeek, subscribedToReminders);
+export async function saveCourseGoal(courseId, goalKey) {
+  return postCourseGoals(courseId, goalKey);
 }

 export function processEvent(eventData, getTabData) {
--- a/src/course-home/dates-tab/DatesTab.test.jsx
+++ b/src/course-home/dates-tab/DatesTab.test.jsx
@@ -51,7 +51,7 @@ describe('DatesTab', () => {
  courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);

  function setMetadata(attributes, options) {
-    courseMetadata = Factory.build('courseHomeMetadata', attributes, options);
+    courseMetadata = Factory.build('courseHomeMetadata', { id: courseId, ...attributes }, options);
    axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);
  }

@@ -140,7 +140,7 @@ describe('DatesTab', () => {
      userEvent.hover(tipIcon);
      const tooltip = screen.getByText(tipText); // now it's there
      userEvent.unhover(tipIcon);
-      await waitForElementToBeRemoved(tooltip); // and it's gone again
+      waitForElementToBeRemoved(tooltip); // and it's gone again
    });
  });

--- a/src/course-home/dates-tab/messages.js
+++ b/src/course-home/dates-tab/messages.js
@@ -4,37 +4,30 @@ const messages = defineMessages({
  completed: {
    id: 'learning.dates.badge.completed',
    defaultMessage: 'Completed',
-    description: 'shown as label for the assignments which learner has completed.',
  },
  dueNext: {
    id: 'learning.dates.badge.dueNext',
    defaultMessage: 'Due next',
-    description: 'Shown as label for the assignment which date is in the future',
  },
  pastDue: {
    id: 'learning.dates.badge.pastDue',
    defaultMessage: 'Past due',
-    description: 'Shown as label for the assignments which deadline has passed',
  },
  title: {
    id: 'learning.dates.title',
    defaultMessage: 'Important dates',
-    description: 'The title of dates tab (course timeline).',
  },
  today: {
    id: 'learning.dates.badge.today',
    defaultMessage: 'Today',
-    description: 'Label used when the scheduled date for the assignment matches the current day',
  },
  unreleased: {
    id: 'learning.dates.badge.unreleased',
    defaultMessage: 'Not yet released',
-    description: 'Shown as label for assignments which date is unknown yet',
  },
  verifiedOnly: {
    id: 'learning.dates.badge.verifiedOnly',
    defaultMessage: 'Verified only',
-    description: 'Shown as label for assignments which learner has no access to.',
  },
 });

--- a/src/course-home/goal-unsubscribe/GoalUnsubscribe.jsx
+++ b/src/course-home/goal-unsubscribe/GoalUnsubscribe.jsx
@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

 import { LearningHeader as Header } from '@edx/frontend-component-header';
@@ -29,10 +28,6 @@ function GoalUnsubscribe({ intl }) {
          setError(true);
        },
      );
-    // We unfortunately have no information about the user, course, org, or really anything
-    // as visiting this page is allowed to be done anonymously and without the context of the course.
-    // The token can be used to connect a user and course, it will just require some post-processing
-    sendTrackEvent('edx.ui.lms.goal.unsubscribe', { token });
  }, []); // deps=[] to only run once

  return (
--- a/src/course-home/goal-unsubscribe/ResultPage.jsx
+++ b/src/course-home/goal-unsubscribe/ResultPage.jsx
@@ -36,9 +36,7 @@ function ResultPage({ courseTitle, error, intl }) {
    <>
      <UnsubscribeIcon className="text-primary" alt="" />
      <div role="heading" aria-level="1" className="h2">{header}</div>
-      <div className="row justify-content-center">
-        <div className="col-xl-7 col-12 p-0">{description}</div>
-      </div>
+      <div>{description}</div>
      <Button variant="brand" href={`${getConfig().LMS_BASE_URL}/dashboard`} className="mt-4">
        {intl.formatMessage(messages.goToDashboard)}
      </Button>
--- a/src/course-home/goal-unsubscribe/messages.js
+++ b/src/course-home/goal-unsubscribe/messages.js
@@ -4,32 +4,26 @@ const messages = defineMessages({
  contactSupport: {
    id: 'learning.goals.unsubscribe.contact',
    defaultMessage: 'contact support',
-    description: 'Its shown as a suggestion or recommendation for learner when their unsubscribing request has failed',
  },
  description: {
    id: 'learning.goals.unsubscribe.description',
    defaultMessage: 'You will no longer receive email reminders about your goal for {courseTitle}.',
-    description: 'It describes the consequences to learner when they unsubscribe of goal reminder service',
  },
  errorHeader: {
    id: 'learning.goals.unsubscribe.errorHeader',
    defaultMessage: 'Something went wrong',
-    description: 'It indicate that the unsubscribing request has failed',
  },
  goToDashboard: {
    id: 'learning.goals.unsubscribe.goToDashboard',
    defaultMessage: 'Go to dashboard',
-    description: 'Anchor text for button that redirects to dashboard page',
  },
  header: {
    id: 'learning.goals.unsubscribe.header',
    defaultMessage: 'You’ve unsubscribed from goal reminders',
-    description: 'It indicate that the unsubscribing request was successful',
  },
  loading: {
    id: 'learning.goals.unsubscribe.loading',
    defaultMessage: 'Unsubscribing…',
-    description: 'Message shown when the unsubscribing request is processing',
  },
 });

--- a/src/course-home/outline-tab/DateSummary.jsx
+++ b/src/course-home/outline-tab/DateSummary.jsx
@@ -40,7 +40,7 @@ export default function DateSummary({
  };

  return (
-    <li className="p-0 mb-3 small text-dark-500">
+    <li className="container p-0 mb-3 small text-dark-500">
      <div className="row">
        <FontAwesomeIcon icon={faCalendarAlt} className="ml-3 mt-1 mr-1" fixedWidth />
        <div className="ml-1 font-weight-bold">
--- a/src/course-home/outline-tab/LmsHtmlFragment.jsx
+++ b/src/course-home/outline-tab/LmsHtmlFragment.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from 'react';
+import React, { useRef } from 'react';
 import PropTypes from 'prop-types';

 import { getConfig } from '@edx/frontend-platform';
@@ -17,36 +17,18 @@ export default function LmsHtmlFragment({
        <link rel="stylesheet" type="text/css" href="${getConfig().BASE_URL}/src/course-home/outline-tab/LmsHtmlFragment.css">
      </head>
      <body class="${className}">${html}</body>
-      <script>
-        const resizer = new ResizeObserver(() => {
-          window.parent.postMessage({type: 'lmshtmlfragment.resize'}, '*');
-        });
-        resizer.observe(document.body);
-      </script>
    </html>
  `;

  const iframe = useRef(null);
-  function resetIframeHeight() {
-    if (iframe?.current?.contentWindow?.document?.body) {
-      iframe.current.height = iframe.current.contentWindow.document.body.scrollHeight;
-    }
+  function handleLoad() {
+    iframe.current.height = iframe.current.contentWindow.document.body.scrollHeight;
  }

-  useEffect(() => {
-    function receiveMessage(event) {
-      const { type } = event.data;
-      if (type === 'lmshtmlfragment.resize') {
-        resetIframeHeight();
-      }
-    }
-    global.addEventListener('message', receiveMessage);
-  }, []);
-
  return (
    <iframe
      className="w-100 border-0"
-      onLoad={resetIframeHeight}
+      onLoad={handleLoad}
      ref={iframe}
      referrerPolicy="origin"
      scrolling="no"
--- a/src/course-home/outline-tab/OutlineTab.jsx
+++ b/src/course-home/outline-tab/OutlineTab.jsx
@@ -1,21 +1,22 @@
 import React, { useState } from 'react';
 import { useSelector } from 'react-redux';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
+import { sendTrackEvent, sendTrackingLogEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

-import { Button } from '@edx/paragon';
+import { Button, Toast } from '@edx/paragon';
 import { AlertList } from '../../generic/user-messages';

 import CourseDates from './widgets/CourseDates';
+import CourseGoalCard from './widgets/CourseGoalCard';
 import CourseHandouts from './widgets/CourseHandouts';
-import StartOrResumeCourseCard from './widgets/StartOrResumeCourseCard';
-import WeeklyLearningGoalCard from './widgets/WeeklyLearningGoalCard';
 import CourseTools from './widgets/CourseTools';
 import { fetchOutlineTab } from '../data';
+import genericMessages from '../../generic/messages';
 import messages from './messages';
 import Section from './Section';
 import ShiftDatesAlert from '../suggested-schedule-messaging/ShiftDatesAlert';
+import UpdateGoalSelector from './widgets/UpdateGoalSelector';
 import UpgradeNotification from '../../generic/upgrade-notification/UpgradeNotification';
 import UpgradeToShiftDatesAlert from '../suggested-schedule-messaging/UpgradeToShiftDatesAlert';
 import useCertificateAvailableAlert from './alerts/certificate-status-alert';
@@ -34,13 +35,13 @@ import { initHomeMMP2P, MMP2PFlyover } from '../../experiments/mm-p2p';
 function OutlineTab({ intl }) {
  const {
    courseId,
-    proctoringPanelStatus,
  } = useSelector(state => state.courseHome);

  const {
    isSelfPaced,
    org,
    title,
+    username,
    userTimezone,
  } = useModel('courseHomeMeta', courseId);

@@ -51,23 +52,24 @@ function OutlineTab({ intl }) {
      sections,
    },
    courseGoals: {
+      goalOptions,
      selectedGoal,
-      weeklyLearningGoalEnabled,
    } = {},
    datesBannerInfo,
    datesWidget: {
      courseDateBlocks,
    },
-    enableProctoredExams,
+    resumeCourse: {
+      hasVisitedCourse,
+      url: resumeCourseUrl,
+    },
    offer,
    timeOffsetMillis,
    verifiedMode,
  } = useModel('outline', courseId);

-  const {
-    marketingUrl,
-  } = useModel('coursewareMeta', courseId);
-
+  const [courseGoalToDisplay, setCourseGoalToDisplay] = useState(selectedGoal);
+  const [goalToastHeader, setGoalToastHeader] = useState('');
  const [expandAll, setExpandAll] = useState(false);

  const eventProperties = {
@@ -75,6 +77,14 @@ function OutlineTab({ intl }) {
    courserun_key: courseId,
  };

+  const logResumeCourseClick = () => {
+    sendTrackingLogEvent('edx.course.home.resume_course.clicked', {
+      ...eventProperties,
+      event_type: hasVisitedCourse ? 'resume' : 'start',
+      url: resumeCourseUrl,
+    });
+  };
+
  // Below the course title alerts (appearing in the order listed here)
  const courseStartAlert = useCourseStartAlert(courseId);
  const courseEndAlert = useCourseEndAlert(courseId);
@@ -111,10 +121,24 @@ function OutlineTab({ intl }) {

  return (
    <>
+      <Toast
+        closeLabel={intl.formatMessage(genericMessages.close)}
+        onClose={() => setGoalToastHeader('')}
+        show={!!(goalToastHeader)}
+      >
+        {goalToastHeader}
+      </Toast>
      <div data-learner-type={learnerType} className="row w-100 mx-0 my-3 justify-content-between">
        <div className="col-12 col-sm-auto p-0">
          <div role="heading" aria-level="1" className="h2">{title}</div>
        </div>
+        {resumeCourseUrl && (
+          <div className="col-12 col-sm-auto p-0">
+            <Button variant="brand" block href={resumeCourseUrl} onClick={() => logResumeCourseClick()}>
+              {hasVisitedCourse ? intl.formatMessage(messages.resume) : intl.formatMessage(messages.start)}
+            </Button>
+          </div>
+        )}
      </div>
      {/** [MM-P2P] Experiment (className for optimizely trigger) */}
      <div className="row course-outline-tab">
@@ -148,18 +172,26 @@ function OutlineTab({ intl }) {
              <UpgradeToShiftDatesAlert model="outline" logUpgradeLinkClick={logUpgradeToShiftDatesLinkClick} />
            </>
          )}
-          <StartOrResumeCourseCard />
+          {!courseGoalToDisplay && goalOptions && goalOptions.length > 0 && (
+            <CourseGoalCard
+              courseId={courseId}
+              goalOptions={goalOptions}
+              title={title}
+              setGoalToDisplay={(newGoal) => { setCourseGoalToDisplay(newGoal); }}
+              setGoalToastHeader={(newHeader) => { setGoalToastHeader(newHeader); }}
+            />
+          )}
          <WelcomeMessage courseId={courseId} />
          {rootCourseId && (
            <>
              <div className="row w-100 m-0 mb-3 justify-content-end">
-                <div className="col-12 col-md-auto p-0">
+                <div className="col-12 col-sm-auto p-0">
                  <Button variant="outline-primary" block onClick={() => { setExpandAll(!expandAll); }}>
                    {expandAll ? intl.formatMessage(messages.collapseAll) : intl.formatMessage(messages.expandAll)}
                  </Button>
                </div>
              </div>
-              <ol id="courseHome-outline" className="list-unstyled">
+              <ol className="list-unstyled">
                {courses[rootCourseId].sectionIds.map((sectionId) => (
                  <Section
                    key={sectionId}
@@ -175,16 +207,22 @@ function OutlineTab({ intl }) {
        </div>
        {rootCourseId && (
          <div className="col col-12 col-md-4">
-            <ProctoringInfoPanel />
-            { /** Defer showing the goal widget until the ProctoringInfoPanel has resolved or has been determined as
-             disabled to avoid components bouncing around too much as screen is rendered */ }
-            {(!enableProctoredExams || proctoringPanelStatus === 'loaded') && weeklyLearningGoalEnabled && (
-              <WeeklyLearningGoalCard
-                daysPerWeek={selectedGoal && 'daysPerWeek' in selectedGoal ? selectedGoal.daysPerWeek : null}
-                subscribedToReminders={selectedGoal && 'subscribedToReminders' in selectedGoal ? selectedGoal.subscribedToReminders : false}
+            <ProctoringInfoPanel
+              courseId={courseId}
+              username={username}
+            />
+            {courseGoalToDisplay && goalOptions && goalOptions.length > 0 && (
+              <UpdateGoalSelector
+                courseId={courseId}
+                goalOptions={goalOptions}
+                selectedGoal={courseGoalToDisplay}
+                setGoalToDisplay={(newGoal) => { setCourseGoalToDisplay(newGoal); }}
+                setGoalToastHeader={(newHeader) => { setGoalToastHeader(newHeader); }}
              />
            )}
-            <CourseTools />
+            <CourseTools
+              courseId={courseId}
+            />
            { /** [MM-P2P] Experiment (conditional) */ }
            { MMP2P.state.isEnabled
              ? <MMP2PFlyover isStatic options={MMP2P} />
@@ -194,7 +232,6 @@ function OutlineTab({ intl }) {
                  verifiedMode={verifiedMode}
                  accessExpiration={accessExpiration}
                  contentTypeGatingEnabled={datesBannerInfo.contentTypeGatingEnabled}
-                  marketingUrl={marketingUrl}
                  upsellPageName="course_home"
                  userTimezone={userTimezone}
                  shouldDisplayBorder
@@ -204,10 +241,13 @@ function OutlineTab({ intl }) {
                />
              )}
            <CourseDates
+              courseId={courseId}
              /** [MM-P2P] Experiment */
              mmp2p={MMP2P}
            />
-            <CourseHandouts />
+            <CourseHandouts
+              courseId={courseId}
+            />
          </div>
        )}
      </div>
--- a/src/course-home/outline-tab/OutlineTab.test.jsx
+++ b/src/course-home/outline-tab/OutlineTab.test.jsx
@@ -1,6 +1,3 @@
-/**
- * @jest-environment jsdom
- */
 import React from 'react';
 import { Factory } from 'rosie';
 import { getConfig } from '@edx/frontend-platform';
@@ -9,7 +6,6 @@ import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import MockAdapter from 'axios-mock-adapter';
 import Cookies from 'js-cookie';
 import userEvent from '@testing-library/user-event';
-import messages from './messages';

 import { buildMinimalCourseBlocks } from '../../shared/data/__factories__/courseBlocks.factory';
 import {
@@ -28,21 +24,21 @@ jest.mock('@edx/frontend-platform/analytics');
 describe('Outline Tab', () => {
  let axiosMock;

-  const courseId = 'course-v1:edX+DemoX+Demo_Course';
+  const courseId = 'course-v1:edX+Test+run';
  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/course_metadata/${courseId}`;
  courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);
  const enrollmentUrl = `${getConfig().LMS_BASE_URL}/api/enrollment/v1/enrollment`;
  const goalUrl = `${getConfig().LMS_BASE_URL}/api/course_home/save_course_goal`;
  const masqueradeUrl = `${getConfig().LMS_BASE_URL}/courses/${courseId}/masquerade`;
  const outlineUrl = `${getConfig().LMS_BASE_URL}/api/course_home/outline/${courseId}`;
-  const proctoringInfoUrl = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/user_onboarding/status?is_learning_mfe=true&course_id=${encodeURIComponent(courseId)}&username=MockUser`;
+  const proctoringInfoUrl = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/user_onboarding/status?is_learning_mfe=true&course_id=${encodeURIComponent(courseId)}`;

  const store = initializeStore();
-  const defaultMetadata = Factory.build('courseHomeMetadata');
+  const defaultMetadata = Factory.build('courseHomeMetadata', { id: courseId });
  const defaultTabData = Factory.build('outlineTabData');

  function setMetadata(attributes, options) {
-    const courseMetadata = Factory.build('courseHomeMetadata', attributes, options);
+    const courseMetadata = Factory.build('courseHomeMetadata', { id: courseId, ...attributes }, options);
    axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);
  }

@@ -77,7 +73,7 @@ describe('Outline Tab', () => {
  describe('Course Outline', () => {
    it('displays link to start course', async () => {
      await fetchAndRender();
-      expect(screen.getByRole('link', { name: messages.start.defaultMessage })).toBeInTheDocument();
+      expect(screen.getByRole('link', { name: 'Start Course' })).toBeInTheDocument();
    });

    it('displays link to resume course', async () => {
@@ -332,145 +328,89 @@ describe('Outline Tab', () => {
    });
  });

-  describe('Start or Resume Course Card', () => {
-    it('renders startOrResumeCourseCard', async () => {
-      await fetchAndRender();
-      expect(screen.queryByTestId('start-resume-card')).toBeInTheDocument();
-    });
-  });
-
-  describe('Weekly Learning Goal', () => {
-    it('does not post goals while masquerading', async () => {
-      setMetadata({ is_enrolled: true, original_user_is_staff: true });
-      setTabData({
-        course_goals: {
-          weekly_learning_goal_enabled: true,
-        },
-      });
-      const spy = jest.spyOn(thunks, 'saveWeeklyLearningGoal');
+  describe('Course Goals', () => {
+    const goalOptions = [
+      ['certify', 'Earn a certificate'],
+      ['complete', 'Complete the course'],
+      ['explore', 'Explore the course'],
+      ['unsure', 'Not sure yet'],
+    ];

+    it('does not render goal widgets if no goals available', async () => {
      await fetchAndRender();
-      const button = await screen.getByTestId('weekly-learning-goal-input-Regular');
-      fireEvent.click(button);
-      expect(spy).toHaveBeenCalledTimes(0);
+      expect(screen.queryByTestId('course-goal-card')).not.toBeInTheDocument();
+      expect(screen.queryByLabelText('Goal')).not.toBeInTheDocument();
+      expect(screen.queryByTestId('edit-goal-selector')).not.toBeInTheDocument();
    });

-    describe('weekly learning goal is not set', () => {
+    describe('goal is not set', () => {
      beforeEach(async () => {
        setTabData({
          course_goals: {
-            weekly_learning_goal_enabled: true,
+            goal_options: goalOptions,
+            selected_goal: null,
          },
        });
-
        await fetchAndRender();
      });

-      it('renders weekly learning goal card', async () => {
-        expect(screen.queryByTestId('weekly-learning-goal-card')).toBeInTheDocument();
+      it('renders goal card', () => {
+        expect(screen.queryByLabelText('Goal')).not.toBeInTheDocument();
+        expect(screen.getByTestId('course-goal-card')).toBeInTheDocument();
+        expect(screen.getByRole('button', { name: 'Earn a certificate' })).toBeInTheDocument();
+        expect(screen.getByRole('button', { name: 'Complete the course' })).toBeInTheDocument();
+        expect(screen.getByRole('button', { name: 'Explore the course' })).toBeInTheDocument();
+        expect(screen.getByRole('button', { name: 'Not sure yet' })).toBeInTheDocument();
      });

-      it('disables the subscribe button if no goal is set', async () => {
-        expect(screen.getByLabelText(messages.setGoalReminder.defaultMessage)).toBeDisabled();
+      it('renders goal selector on goal selection', async () => {
+        const certifyGoalButton = screen.getByRole('button', { name: 'Earn a certificate' });
+        fireEvent.click(certifyGoalButton);
+
+        const goalSelector = await screen.findByTestId('edit-goal-selector');
+        expect(goalSelector).toBeInTheDocument();
+      });
+    });
+
+    describe('goal is set', () => {
+      beforeEach(async () => {
+        setTabData({
+          course_goals: {
+            goal_options: goalOptions,
+            selected_goal: { text: 'Earn a certificate', key: 'certify' },
+          },
+        });
+        await fetchAndRender();
      });

-      it.each`
-      level     | days 
-      ${'Casual'}  | ${1}
-      ${'Regular'} | ${3}
-      ${'Intense'} | ${5}
-        `('calls the API with a goal of $days when $level goal is clicked', async ({ level, days }) => {
-  // click on Casual goal
-  const button = await screen.queryByTestId(`weekly-learning-goal-input-${level}`);
-  fireEvent.click(button);
-  // Verify the request was made
-  await waitFor(() => {
-    expect(axiosMock.history.post[0].url).toMatch(goalUrl);
-    // subscribe is turned on automatically
-    expect(axiosMock.history.post[0].data).toMatch(`{"course_id":"${courseId}","days_per_week":${days},"subscribed_to_reminders":true}`);
-    // verify that the additional info about subscriptions shows up
-    expect(screen.queryByText(messages.goalReminderDetail.defaultMessage)).toBeInTheDocument();
-  });
-  expect(screen.getByLabelText(messages.setGoalReminder.defaultMessage)).toBeEnabled();
-});
-      it('shows and hides subscribe to reminders additional text', async () => {
-        const button = await screen.getByTestId('weekly-learning-goal-input-Regular');
-        fireEvent.click(button);
+      it('renders edit goal selector', () => {
+        expect(screen.getByLabelText('Goal')).toBeInTheDocument();
+        expect(screen.getByTestId('edit-goal-selector')).toBeInTheDocument();
+        expect(screen.getByRole('button', { name: 'Earn a certificate' })).toBeInTheDocument();
+      });
+
+      it('updates goal on click', async () => {
+        // Open dropdown
+        const dropdownButtonNode = screen.getByRole('button', { name: 'Earn a certificate' });
+        await waitFor(() => {
+          expect(dropdownButtonNode).toBeInTheDocument();
+        });
+        fireEvent.click(dropdownButtonNode);
+
+        // Select a new goal
+        const unsureButtonNode = screen.getByRole('button', { name: 'Not sure yet' });
+        await waitFor(() => {
+          expect(unsureButtonNode).toBeInTheDocument();
+        });
+        fireEvent.click(unsureButtonNode);
+
        // Verify the request was made
        await waitFor(() => {
          expect(axiosMock.history.post[0].url).toMatch(goalUrl);
-          // subscribe is turned on automatically
-          expect(axiosMock.history.post[0].data).toMatch(`{"course_id":"${courseId}","days_per_week":3,"subscribed_to_reminders":true}`);
-          // verify that the additional info about subscriptions shows up
-          expect(screen.queryByText(messages.goalReminderDetail.defaultMessage)).toBeInTheDocument();
+          expect(axiosMock.history.post[0].data).toMatch(`{"course_id":"${courseId}","goal_key":"unsure"}`);
        });
-        expect(screen.getByLabelText(messages.setGoalReminder.defaultMessage)).toBeEnabled();
-
-        // Click on subscribe to reminders toggle
-        const subscriptionSwitch = await screen.getByRole('switch', { name: messages.setGoalReminder.defaultMessage });
-        expect(subscriptionSwitch).toBeInTheDocument();
-
-        fireEvent.click(subscriptionSwitch);
-        await waitFor(() => {
-          expect(axiosMock.history.post[1].url).toMatch(goalUrl);
-          expect(axiosMock.history.post[1].data)
-            .toMatch(`{"course_id":"${courseId}","days_per_week":3,"subscribed_to_reminders":false}`);
-        });
-
-        // verify that the additional info about subscriptions gets hidden
-        expect(screen.queryByText(messages.goalReminderDetail.defaultMessage)).not.toBeInTheDocument();
      });
    });
-
-    it('has button for weekly learning goal selected', async () => {
-      setTabData({
-        course_goals: {
-          weekly_learning_goal_enabled: true,
-          selected_goal: {
-            subscribed_to_reminders: true,
-            days_per_week: 3,
-          },
-        },
-      });
-      await fetchAndRender();
-
-      const button = await screen.queryByTestId('weekly-learning-goal-input-Regular');
-      expect(button).toBeInTheDocument();
-      expect(button).toHaveClass('flag-button-selected');
-    });
-
-    it('renders weekly learning goal card if ProctoringInfoPanel is not shown', async () => {
-      setTabData({
-        course_goals: {
-          weekly_learning_goal_enabled: true,
-        },
-      });
-      axiosMock.onGet(proctoringInfoUrl).reply(404);
-      await fetchAndRender();
-      expect(screen.queryByTestId('weekly-learning-goal-card')).toBeInTheDocument();
-    });
-
-    it('renders weekly learning goal card if ProctoringInfoPanel is not enabled', async () => {
-      setTabData({
-        course_goals: {
-          weekly_learning_goal_enabled: true,
-          enableProctoredExams: false,
-        },
-      });
-      await fetchAndRender();
-      expect(screen.queryByTestId('weekly-learning-goal-card')).toBeInTheDocument();
-    });
-
-    it('renders weekly learning goal card if ProctoringInfoPanel is enabled', async () => {
-      setTabData({
-        course_goals: {
-          weekly_learning_goal_enabled: true,
-          enableProctoredExams: true,
-        },
-      });
-      await fetchAndRender();
-      expect(screen.queryByTestId('weekly-learning-goal-card')).toBeInTheDocument();
-    });
  });

  describe('Course Handouts', () => {
@@ -676,7 +616,7 @@ describe('Outline Tab', () => {
          ],
        });
        await fetchAndRender();
-        expect(screen.queryByText('Your grade and certificate status will be available soon.')).toBeInTheDocument();
+        expect(screen.queryByText('Your grade and certificate will be ready soon!')).toBeInTheDocument();
      });
      it('renders verification alert', async () => {
        const now = new Date();
@@ -710,7 +650,7 @@ describe('Outline Tab', () => {
          ],
        });
        await fetchAndRender();
-        expect(screen.queryByText('Verify your identity to qualify for a certificate.')).toBeInTheDocument();
+        expect(screen.queryByText('Verify your identity to earn a certificate!')).toBeInTheDocument();
      });
      it('renders non passing grade', async () => {
        const now = new Date();
@@ -743,8 +683,8 @@ describe('Outline Tab', () => {
          ],
        });
        await fetchAndRender();
-        screen.getAllByText('You are not yet eligible for a certificate');
-        expect(screen.queryByText('You are not yet eligible for a certificate')).toBeInTheDocument();
+        screen.getAllByText('You are not eligible for a certificate');
+        expect(screen.queryByText('You are not eligible for a certificate')).toBeInTheDocument();
      });
      it('tracks request cert button', async () => {
        sendTrackEvent.mockClear();
@@ -785,7 +725,7 @@ describe('Outline Tab', () => {
        expect(sendTrackEvent).toHaveBeenCalledTimes(1);
        expect(sendTrackEvent).toHaveBeenCalledWith('edx.ui.lms.course_outline.certificate_alert_request_cert_button.clicked',
          {
-            courserun_key: courseId,
+            courserun_key: 'course-v1:edX+Test+run',
            is_staff: false,
            org_key: 'edX',
          });
@@ -829,7 +769,7 @@ describe('Outline Tab', () => {
        expect(sendTrackEvent).toHaveBeenCalledTimes(1);
        expect(sendTrackEvent).toHaveBeenCalledWith('edx.ui.lms.course_outline.certificate_alert_downloadable_button.clicked',
          {
-            courserun_key: courseId,
+            courserun_key: 'course-v1:edX+Test+run',
            is_staff: false,
            org_key: 'edX',
          });
@@ -873,7 +813,7 @@ describe('Outline Tab', () => {
        expect(sendTrackEvent).toHaveBeenCalledTimes(1);
        expect(sendTrackEvent).toHaveBeenCalledWith('edx.ui.lms.course_outline.certificate_alert_unverified_button.clicked',
          {
-            courserun_key: courseId,
+            courserun_key: 'course-v1:edX+Test+run',
            is_staff: false,
            org_key: 'edX',
          });
@@ -916,7 +856,7 @@ describe('Outline Tab', () => {
          ],
        });
        await fetchAndRender();
-        expect(screen.getByRole('link', { name: messages.start.defaultMessage })).toBeInTheDocument();
+        expect(screen.getByRole('link', { name: 'Start Course' })).toBeInTheDocument();
        expect(screen.queryByText('More content is coming soon!')).not.toBeInTheDocument();
      });
    });
@@ -1116,7 +1056,6 @@ describe('Outline Tab', () => {

    it('does not appear for 404', async () => {
      axiosMock.onGet(proctoringInfoUrl).reply(404);
-      await fetchAndRender();
      expect(screen.queryByRole('link', { name: 'Review instructions and system requirements' })).not.toBeInTheDocument();
    });

@@ -1230,7 +1169,7 @@ describe('Outline Tab', () => {
    });
  });

-  describe('Account Activation Alert', () => {
+  describe('Accont Activation Alert', () => {
    beforeEach(() => {
      const intersectionObserverMock = () => ({
        observe: () => null,
@@ -1258,7 +1197,7 @@ describe('Outline Tab', () => {
      expect(screen.queryByRole('button', { name: 'resend the email' })).not.toBeInTheDocument();
    });

-    it('sends account activation email on clicking the re-send email in account activation alert', async () => {
+    it('sends account activation email on clicking the resened email in account activation alert', async () => {
      Cookies.set = jest.fn();
      Cookies.get = jest.fn().mockImplementation(() => 'true');
      Cookies.remove = jest.fn().mockImplementation(() => { Cookies.get = jest.fn(); });
--- a/src/course-home/outline-tab/alerts/certificate-status-alert/CertificateStatusAlert.jsx
+++ b/src/course-home/outline-tab/alerts/certificate-status-alert/CertificateStatusAlert.jsx
@@ -66,8 +66,8 @@ function CertificateStatusAlert({ intl, payload }) {
      alertProps.body = (
        <p>
          <FormattedMessage
-            id="learning.outline.alert.cert.earnedNotAvailable"
-            defaultMessage="This course ends on {courseEndDateFormatted}. Final grades and any earned certificates are
+            id="learning.outline.alert.cert.when"
+            defaultMessage="This course ends on {courseEndDateFormatted}. Final grades and certificates are
            scheduled to be available after {certificateAvailableDate}."
            values={{
              courseEndDateFormatted,
--- a/src/course-home/outline-tab/alerts/certificate-status-alert/messages.js
+++ b/src/course-home/outline-tab/alerts/certificate-status-alert/messages.js
@@ -2,8 +2,8 @@ import { defineMessages } from '@edx/frontend-platform/i18n';

 const messages = defineMessages({
  certStatusEarnedNotAvailableHeader: {
-    id: 'cert.alert.earned.unavailable.header.v2',
-    defaultMessage: 'Your grade and certificate status will be available soon.',
+    id: 'cert.alert.earned.unavailable.header',
+    defaultMessage: 'Your grade and certificate will be ready soon!',
    description: 'Header alerting the user that their certificate will be available soon.',
  },
  certStatusDownloadableHeader: {
@@ -13,7 +13,7 @@ const messages = defineMessages({
  },
  certStatusNotPassingHeader: {
    id: 'cert.alert.notPassing.header',
-    defaultMessage: 'You are not yet eligible for a certificate',
+    defaultMessage: 'You are not eligible for a certificate',
  },
  certStatusNotPassingButton: {
    id: 'cert.alert.notPassing.button',
--- a/src/course-home/outline-tab/messages.js
+++ b/src/course-home/outline-tab/messages.js
@@ -4,22 +4,6 @@ const messages = defineMessages({
  allDates: {
    id: 'learning.outline.dates.all',
    defaultMessage: 'View all course dates',
-    description: 'Text anchor for link that redirects to dates or course timeline tab',
-  },
-  casualGoalButtonText: {
-    id: 'learning.outline.goalButton.casual.text',
-    defaultMessage: '1 day a week',
-    description: 'Text shown for casual goal button',
-  },
-  casualGoalButtonTitle: {
-    id: 'learning.outline.goalButton.screenReader.text',
-    defaultMessage: 'Casual',
-    description: 'A very short description of the least intense of three learning goals',
-  },
-  certAlt: {
-    id: 'learning.outline.certificateAlt',
-    defaultMessage: 'Example Certificate',
-    description: 'Alternate text displayed when the example certificate image cannot be displayed.',
  },
  collapseAll: {
    id: 'learning.outline.collapseAll',
@@ -39,7 +23,6 @@ const messages = defineMessages({
  dates: {
    id: 'learning.outline.dates',
    defaultMessage: 'Important dates',
-    description: 'Headline for the (summary of dates) section of the outline page',
  },
  editGoal: {
    id: 'learning.outline.editGoal',
@@ -56,11 +39,6 @@ const messages = defineMessages({
    defaultMessage: 'Goal',
    description: 'Label for the selected course goal',
  },
-  goalReminderDetail: {
-    id: 'learning.outline.goalReminderDetail',
-    defaultMessage: 'If we notice you’re not quite at your goal, we’ll send you an email reminder.',
-    description: 'It describe to learner what is goal reminder service',
-  },
  goalUnsure: {
    id: 'learning.outline.goalUnsure',
    defaultMessage: 'Not sure yet',
@@ -68,7 +46,6 @@ const messages = defineMessages({
  handouts: {
    id: 'learning.outline.handouts',
    defaultMessage: 'Course Handouts',
-    description: 'Header for (Course Handouts) section in course outline',
  },
  incompleteAssignment: {
    id: 'learning.outline.incompleteAssignment',
@@ -80,16 +57,6 @@ const messages = defineMessages({
    defaultMessage: 'Incomplete section',
    description: 'Text used to describe the gray checkmark icon in front of a section title',
  },
-  intenseGoalButtonText: {
-    id: 'learning.outline.goalButton.intense.text',
-    defaultMessage: '5 days a week',
-    description: 'Text shown for intense goal button',
-  },
-  intenseGoalButtonTitle: {
-    id: 'learning.outline.goalButton.intense.title',
-    defaultMessage: 'Intense',
-    description: 'A very short description of the most intensive option of three learning goals, Casual, Regular and Intense',
-  },
  learnMore: {
    id: 'learning.outline.learnMore',
    defaultMessage: 'Learn More',
@@ -99,80 +66,34 @@ const messages = defineMessages({
    defaultMessage: 'Open',
    description: 'A button to open the given section of the course outline',
  },
-  proctoringInfoPanel: {
-    id: 'learning.proctoringPanel.header',
-    defaultMessage: 'This course contains proctored exams',
-    description: 'Used as a label to indicate that course has proctored exams',
-  },
-  regularGoalButtonText: {
-    id: 'learning.outline.goalButton.regular.text',
-    defaultMessage: '3 days a week',
-    description: 'Text shown for regular goal button',
-
-  },
-  regularGoalButtonTitle: {
-    id: 'learning.outline.goalButton.regular.title',
-    defaultMessage: 'Regular',
-    description: 'A very short description of the middle option of three learning goals, Casual, Regular and Intense',
-  },
-  resumeBlurb: {
-    id: 'learning.outline.resumeBlurb',
-    defaultMessage: 'Pick up where you left off',
-    description: 'Text describing to the learner that they can return to the last section they visited within the course.',
-  },
  resume: {
    id: 'learning.outline.resume',
    defaultMessage: 'Resume course',
-    description: 'Anchor text for button that would resume course',
  },
  setGoal: {
    id: 'learning.outline.setGoal',
    defaultMessage: 'To start, set a course goal by selecting the option below that best describes your learning plan.',
-    description: 'In indicate to learner how to set or use the goal reminder service',
-  },
-  setGoalReminder: {
-    id: 'learning.outline.setGoalReminder',
-    defaultMessage: 'Set a goal reminder',
-    description: 'The text for the radio button which activate or deactivate the goal reminder service',
-  },
-  setLearningGoalButtonScreenReaderText: {
-    id: 'learning.outline.goalButton.casual.title',
-    defaultMessage: 'Set a learning goal style.',
-    description: 'screen reader text informing learner they can select an intensity of learning goal',
-  },
-  setWeeklyGoal: {
-    id: 'learning.outline.setWeeklyGoal',
-    defaultMessage: 'Set a weekly learning goal',
-    description: 'The headline for (goal reminder service) section in course outline',
-  },
-  setWeeklyGoalDetail: {
-    id: 'learning.outline.setWeeklyGoalDetail',
-    defaultMessage: 'Setting a goal motivates you to finish the course. You can always change it later.',
-    description: 'It indiacate the gaol or the purpose of the goal reminder service to learners',
  },
  start: {
    id: 'learning.outline.start',
-    defaultMessage: 'Start course',
-    description: 'The text for button which starts the course',
-  },
-  startBlurb: {
-    id: 'learning.outline.startBlurb',
-    defaultMessage: 'Begin your course today',
+    defaultMessage: 'Start Course',
  },
  tools: {
    id: 'learning.outline.tools',
    defaultMessage: 'Course Tools',
-    description: 'Headline for the (course tools) section in course outline. course tool might include links to course bookmarks, financial assistance...etc',
  },
  upgradeButton: {
    id: 'learning.outline.upgradeButton',
    defaultMessage: 'Upgrade ({symbol}{price})',
-    description: 'Text for the button which redirects to the upgrading page',
  },
  upgradeTitle: {
    id: 'learning.outline.upgradeTitle',
    defaultMessage: 'Pursue a verified certificate',
-    description: 'Upgrade title',
+  },
+  certAlt: {
+    id: 'learning.outline.certificateAlt',
+    defaultMessage: 'Example Certificate',
+    description: 'Alternate text displayed when the example certificate image cannot be displayed.',
  },
  welcomeMessage: {
    id: 'learning.outline.welcomeMessage',
@@ -191,135 +112,113 @@ const messages = defineMessages({
    defaultMessage: 'Welcome to',
    description: 'This precedes the title of the course',
  },
+  proctoringInfoPanel: {
+    id: 'learning.proctoringPanel.header',
+    defaultMessage: 'This course contains proctored exams',
+  },
  notStartedProctoringStatus: {
    id: 'learning.proctoringPanel.status.notStarted',
    defaultMessage: 'Not Started',
-    description: 'It indcate that proctortrack onboarding exam hasn’t started yet',
  },
  startedProctoringStatus: {
    id: 'learning.proctoringPanel.status.started',
    defaultMessage: 'Started',
-    description: 'Label to indicate the starting status of the proctortrack onboarding exam',
  },
  submittedProctoringStatus: {
    id: 'learning.proctoringPanel.status.submitted',
    defaultMessage: 'Submitted',
-    description: 'Label to indicate the submitted status of proctortrack onboarding exam',
  },
  verifiedProctoringStatus: {
    id: 'learning.proctoringPanel.status.verified',
    defaultMessage: 'Verified',
-    description: 'Label to indicate the verified status of the proctortrack onboarding exam',
  },
  rejectedProctoringStatus: {
    id: 'learning.proctoringPanel.status.rejected',
    defaultMessage: 'Rejected',
-    description: 'Label to indicate the rejection status of the proctortrack onboarding exam',
  },
  errorProctoringStatus: {
    id: 'learning.proctoringPanel.status.error',
    defaultMessage: 'Error',
-    description: 'Label to indicate that there is error in proctortrack onboarding exam',
  },
  otherCourseApprovedProctoringStatus: {
    id: 'learning.proctoringPanel.status.otherCourseApproved',
    defaultMessage: 'Approved in Another Course',
-    description: 'Label to indicate that the proctortrack onboarding exam is verified based on taking onboarding exam on another course',
  },
  expiringSoonProctoringStatus: {
    id: 'learning.proctoringPanel.status.expiringSoon',
    defaultMessage: 'Expiring Soon',
-    description: 'A label to indicate that proctortrack onboarding exam will expire soon',
  },
  proctoringCurrentStatus: {
    id: 'learning.proctoringPanel.status',
    defaultMessage: 'Current Onboarding Status:',
-    description: 'The text that precede the status label of proctortrack onboarding exam',
  },
  notStartedProctoringMessage: {
    id: 'learning.proctoringPanel.message.notStarted',
    defaultMessage: 'You have not started your onboarding exam.',
-    description: 'The text that explain the meaning of (not started) label of the proctortrack onboarding exam',
  },
  startedProctoringMessage: {
    id: 'learning.proctoringPanel.message.started',
    defaultMessage: 'You have started your onboarding exam.',
-    description: 'The text that explain the meaning of (started) label of the proctortrack onboarding exam',
  },
  submittedProctoringMessage: {
    id: 'learning.proctoringPanel.message.submitted',
    defaultMessage: 'You have submitted your onboarding exam.',
-    description: 'The text that explain the meaning of (submitted) label of the proctortrack onboarding exam',
  },
  verifiedProctoringMessage: {
    id: 'learning.proctoringPanel.message.verified',
    defaultMessage: 'Your onboarding exam has been approved in this course.',
-    description: 'The text that explain the meaning of (verified) label of the proctortrack onboarding exam',
  },
  rejectedProctoringMessage: {
    id: 'learning.proctoringPanel.message.rejected',
    defaultMessage: 'Your onboarding exam has been rejected. Please retry onboarding.',
-    description: 'The text that explain the meaning of (rejected) label of the proctortrack onboarding exam',
  },
  errorProctoringMessage: {
    id: 'learning.proctoringPanel.message.error',
    defaultMessage: 'An error has occurred during your onboarding exam. Please retry onboarding.',
-    description: 'The text that explain the meaning of (error) label of the proctortrack onboarding exam',
  },
  otherCourseApprovedProctoringMessage: {
    id: 'learning.proctoringPanel.message.otherCourseApproved',
    defaultMessage: 'Your onboarding exam has been approved in another course.',
-    description: 'The text that explain the meaning of (approved in another course) label of the proctortrack onboarding exam',
  },
  otherCourseApprovedProctoringDetail: {
    id: 'learning.proctoringPanel.detail.otherCourseApproved',
    defaultMessage: 'If your device has changed, we recommend that you complete this course\'s onboarding exam in order to ensure that your setup still meets the requirements for proctoring.',
-    description: 'The text that recommend an action when the status of the proctortrack onboarding exam is (approved in another course)',
  },
  expiringSoonProctoringMessage: {
    id: 'learning.proctoringPanel.message.expiringSoon',
    defaultMessage: 'Your onboarding profile has been approved in another course. However, your onboarding status is expiring soon. Please complete onboarding again to ensure that you will be able to continue taking proctored exams.',
-    description: 'The text that recommend an action when the status of the proctortrack onboarding exam is (expiring soon)',
  },
  proctoringPanelGeneralInfo: {
    id: 'learning.proctoringPanel.generalInfo',
    defaultMessage: 'You must complete the onboarding process prior to taking any proctored exam. ',
-    description: 'It indicate key and important fact to learner about the importance of taking proctortrack onboarding exam',
  },
  proctoringPanelGeneralInfoSubmitted: {
    id: 'learning.proctoringPanel.generalInfoSubmitted',
    defaultMessage: 'Your submitted profile is in review.',
-    description: 'The text that explain the meaning of (in review) label of the proctortrack onboarding exam',
  },
  proctoringPanelGeneralTime: {
    id: 'learning.proctoringPanel.generalTime',
    defaultMessage: 'Onboarding profile review can take 2+ business days.',
-    description: 'This text explain for how long the (in review) status of the proctortrack onboarding exam might remain',
  },
  proctoringOnboardingButton: {
    id: 'learning.proctoringPanel.onboardingButton',
    defaultMessage: 'Complete Onboarding',
-    description: 'Text shown on the button that starts the actual proctortrack onboarding exam when it is released',
  },
  proctoringOnboardingPracticeButton: {
    id: 'learning.proctoringPanel.onboardingPracticeButton',
    defaultMessage: 'View Onboarding Exam',
-    description: 'The text that appears on onboarding exam while its not released, so learners can take or view it as a practice',
  },
  proctoringOnboardingButtonNotOpen: {
    id: 'learning.proctoringPanel.onboardingButtonNotOpen',
    defaultMessage: 'Onboarding Opens: {releaseDate}',
-    description: 'It indicate when or from when the learner can take the proctortrack onboarding exam',
  },
  proctoringReviewRequirementsButton: {
    id: 'learning.proctoringPanel.reviewRequirementsButton',
    defaultMessage: 'Review instructions and system requirements',
-    description: 'Anchor text for button which redirect leaner to doc or a detailed page about proctortrack onboarding exam',
  },
  proctoringOnboardingButtonPastDue: {
    id: 'learning.proctoringPanel.onboardingButtonPastDue',
    defaultMessage: 'Onboarding Past Due',
-    description: 'Text that show when the deadline of proctortrack onboarding exam has passed, it appears on button that start the onboarding exam however for this case the button is disabled for obvious reason',
  },
 });

--- a/src/course-home/outline-tab/widgets/CourseDates.jsx
+++ b/src/course-home/outline-tab/widgets/CourseDates.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';

 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
@@ -9,13 +8,11 @@ import messages from '../messages';
 import { useModel } from '../../../generic/model-store';

 function CourseDates({
+  courseId,
  intl,
  /** [MM-P2P] Experiment */
  mmp2p,
 }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
  const {
    userTimezone,
  } = useModel('courseHomeMeta', courseId);
@@ -32,34 +29,34 @@ function CourseDates({

  return (
    <section className="mb-4">
-      <div id="courseHome-dates">
-        <h2 className="h4">{intl.formatMessage(messages.dates)}</h2>
-        <ol className="list-unstyled">
-          {courseDateBlocks.map((courseDateBlock) => (
-            <DateSummary
-              key={courseDateBlock.title + courseDateBlock.date}
-              dateBlock={courseDateBlock}
-              userTimezone={userTimezone}
-              /** [MM-P2P] Experiment */
-              mmp2p={mmp2p}
-            />
-          ))}
-        </ol>
-        <a className="font-weight-bold ml-4 pl-1 small" href={datesTabLink}>
-          {intl.formatMessage(messages.allDates)}
-        </a>
-      </div>
+      <h2 className="h4">{intl.formatMessage(messages.dates)}</h2>
+      <ol className="list-unstyled">
+        {courseDateBlocks.map((courseDateBlock) => (
+          <DateSummary
+            key={courseDateBlock.title + courseDateBlock.date}
+            dateBlock={courseDateBlock}
+            userTimezone={userTimezone}
+            /** [MM-P2P] Experiment */
+            mmp2p={mmp2p}
+          />
+        ))}
+      </ol>
+      <a className="font-weight-bold ml-4 pl-1 small" href={datesTabLink}>
+        {intl.formatMessage(messages.allDates)}
+      </a>
    </section>
  );
 }

 CourseDates.propTypes = {
+  courseId: PropTypes.string,
  intl: intlShape.isRequired,
  /** [MM-P2P] Experiment */
  mmp2p: PropTypes.shape({}),
 };

 CourseDates.defaultProps = {
+  courseId: null,
  /** [MM-P2P] Experiment */
  mmp2p: {},
 };
--- a/src/course-home/outline-tab/widgets/CourseGoalCard.jsx
+++ b/src/course-home/outline-tab/widgets/CourseGoalCard.jsx
@@ -0,0 +1,94 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { Button, Card } from '@edx/paragon';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+
+import messages from '../messages';
+
+import { saveCourseGoal } from '../../data';
+
+function CourseGoalCard({
+  courseId,
+  goalOptions,
+  intl,
+  title,
+  setGoalToDisplay,
+  setGoalToastHeader,
+}) {
+  function selectGoalHandler(event) {
+    const selectedGoal = {
+      key: event.currentTarget.getAttribute('data-goal-key'),
+      text: event.currentTarget.getAttribute('data-goal-text'),
+    };
+
+    saveCourseGoal(courseId, selectedGoal.key).then((response) => {
+      const { data } = response;
+      const {
+        header,
+      } = data;
+
+      setGoalToDisplay(selectedGoal);
+      setGoalToastHeader(header);
+    });
+  }
+
+  return (
+    <Card className="mb-3" data-testid="course-goal-card">
+      <Card.Body>
+        <div className="row w-100 m-0 justify-content-between align-items-center">
+          <div className="col col-8 p-0">
+            <h2 className="h4 m-0">{intl.formatMessage(messages.welcomeTo)} {title}</h2>
+          </div>
+          <div className="col col-auto p-0">
+            <Button
+              variant="link"
+              className="p-0"
+              size="sm"
+              block
+              data-goal-key="unsure"
+              data-goal-text={`${intl.formatMessage(messages.goalUnsure)}`}
+              onClick={(event) => { selectGoalHandler(event); }}
+            >
+              {intl.formatMessage(messages.goalUnsure)}
+            </Button>
+          </div>
+        </div>
+        <Card.Text className="my-2 mx-1 text-dark-500">{intl.formatMessage(messages.setGoal)}</Card.Text>
+        <div className="row w-100 m-0">
+          {goalOptions.map((goal) => {
+            const [goalKey, goalText] = goal;
+            return (
+              (goalKey !== 'unsure') && (
+                <div key={`goal-${goalKey}`} className="col-auto flex-grow-1 mx-1 my-2 p-0">
+                  <Button
+                    variant="outline-primary"
+                    block
+                    data-goal-key={goalKey}
+                    data-goal-text={goalText}
+                    onClick={(event) => { selectGoalHandler(event); }}
+                  >
+                    {goalText}
+                  </Button>
+                </div>
+              )
+            );
+          })}
+        </div>
+      </Card.Body>
+    </Card>
+  );
+}
+
+CourseGoalCard.propTypes = {
+  courseId: PropTypes.string.isRequired,
+  goalOptions: PropTypes.arrayOf(
+    PropTypes.arrayOf(PropTypes.string),
+  ).isRequired,
+  intl: intlShape.isRequired,
+  title: PropTypes.string.isRequired,
+  setGoalToDisplay: PropTypes.func.isRequired,
+  setGoalToastHeader: PropTypes.func.isRequired,
+};
+
+export default injectIntl(CourseGoalCard);
--- a/src/course-home/outline-tab/widgets/CourseHandouts.jsx
+++ b/src/course-home/outline-tab/widgets/CourseHandouts.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
+import PropTypes from 'prop-types';

 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

@@ -7,10 +7,7 @@ import LmsHtmlFragment from '../LmsHtmlFragment';
 import messages from '../messages';
 import { useModel } from '../../../generic/model-store';

-function CourseHandouts({ intl }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
+function CourseHandouts({ courseId, intl }) {
  const {
    handoutsHtml,
  } = useModel('outline', courseId);
@@ -32,6 +29,7 @@ function CourseHandouts({ intl }) {
 }

 CourseHandouts.propTypes = {
+  courseId: PropTypes.string.isRequired,
  intl: intlShape.isRequired,
 };

--- a/src/course-home/outline-tab/widgets/CourseTools.jsx
+++ b/src/course-home/outline-tab/widgets/CourseTools.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { useSelector } from 'react-redux';
+import PropTypes from 'prop-types';

 import { sendTrackingLogEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
@@ -12,12 +12,8 @@ import { faNewspaper } from '@fortawesome/free-regular-svg-icons';

 import messages from '../messages';
 import { useModel } from '../../../generic/model-store';
-import LaunchCourseHomeTourButton from '../../../product-tours/newUserCourseHomeTour/LaunchCourseHomeTourButton';

-function CourseTools({ intl }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
+function CourseTools({ courseId, intl }) {
  const { org } = useModel('courseHomeMeta', courseId);
  const {
    courseTools,
@@ -73,16 +69,18 @@ function CourseTools({ intl }) {
            </a>
          </li>
        ))}
-        <li className="small" id="courseHome-launchTourLink">
-          <LaunchCourseHomeTourButton />
-        </li>
      </ul>
    </section>
  );
 }

 CourseTools.propTypes = {
+  courseId: PropTypes.string,
  intl: intlShape.isRequired,
 };

+CourseTools.defaultProps = {
+  courseId: null,
+};
+
 export default injectIntl(CourseTools);
--- a/src/course-home/outline-tab/widgets/FlagButton.jsx
+++ b/src/course-home/outline-tab/widgets/FlagButton.jsx
@@ -1,43 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'classnames';
-
-function FlagButton({
-  buttonIcon,
-  title,
-  text,
-  handleSelect,
-  isSelected,
-}) {
-  return (
-    <button
-      type="button"
-      className={classnames('flag-button row w-100 align-content-between m-1.5 py-3.5',
-        isSelected ? 'flag-button-selected' : '')}
-      aria-checked={isSelected}
-      role="radio"
-      onClick={() => handleSelect()}
-      data-testid={`weekly-learning-goal-input-${title}`}
-    >
-      <div className="row w-100 m-0 justify-content-center pb-1">
-        {buttonIcon}
-      </div>
-      <div className={classnames('row w-100 m-0 justify-content-center small text-gray-700 pb-1', isSelected ? 'font-weight-bold' : '')}>
-        {title}
-      </div>
-      <div className={classnames('row w-100 m-0 justify-content-center micro text-gray-500', isSelected ? 'font-weight-bold' : '')}>
-        {text}
-      </div>
-    </button>
-  );
-}
-
-FlagButton.propTypes = {
-  buttonIcon: PropTypes.element.isRequired,
-  title: PropTypes.string.isRequired,
-  text: PropTypes.string.isRequired,
-  handleSelect: PropTypes.func.isRequired,
-  isSelected: PropTypes.bool.isRequired,
-};
-
-export default FlagButton;
--- a/src/course-home/outline-tab/widgets/FlagButton.scss
+++ b/src/course-home/outline-tab/widgets/FlagButton.scss
@@ -1,37 +0,0 @@
-@import "~@edx/brand/paragon/variables";
-@import "~@edx/paragon/scss/core/core";
-@import "~@edx/brand/paragon/overrides";
-
-.flag-button {
-  background-color: $white;
-  border: 1px solid $light-400;
-  border-radius: .2rem;
-  box-shadow: 0 0 0 2px $light-400;
-
-  &:hover {
-    border: 1px solid $primary-300;
-    box-shadow: 0 0 0 2px $white;
-  }
-}
-
-.flag-button-selected {
-  border: 1px solid $primary-300;
-  box-shadow: 0 0 0 2px $primary-300;
-  pointer-events: none;
-}
-
-// @see https://heydonworks.com/article/the-flexbox-holy-albatross-reincarnated/
-// use the container size for layout instead of device media query
-.flag-button-container {
-  display: flex;
-  flex-wrap: wrap;
-  --margin: 1rem;
-  --modifier: calc(20rem - 100%);
-  margin: calc(var(--margin) * -1);
-}
-
-.flag-button-container > *  {
-  flex-grow: 1;
-  flex-basis: calc(var(--modifier) * 999);
-  margin: var(--margin);
-}
--- a/src/course-home/outline-tab/widgets/LearningGoalButton.jsx
+++ b/src/course-home/outline-tab/widgets/LearningGoalButton.jsx
@@ -1,59 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-// These flag svgs are derivatives of the Flag icon from paragon
-import { ReactComponent as FlagIntenseIcon } from './flag_black.svg';
-import { ReactComponent as FlagCasualIcon } from './flag_outline.svg';
-import { ReactComponent as FlagRegularIcon } from './flag_gray.svg';
-import FlagButton from './FlagButton';
-import messages from '../messages';
-
-function LearningGoalButton({
-  level,
-  isSelected,
-  handleSelect,
-  intl,
-}) {
-  const buttonDetails = {
-    casual: {
-      daysPerWeek: 1,
-      title: messages.casualGoalButtonTitle,
-      text: messages.casualGoalButtonText,
-      icon: <FlagCasualIcon />,
-    },
-    regular: {
-      daysPerWeek: 3,
-      title: messages.regularGoalButtonTitle,
-      text: messages.regularGoalButtonText,
-      icon: <FlagRegularIcon />,
-    },
-    intense: {
-      daysPerWeek: 5,
-      title: messages.intenseGoalButtonTitle,
-      text: messages.intenseGoalButtonText,
-      icon: <FlagIntenseIcon />,
-    },
-  };
-
-  const values = buttonDetails[level];
-
-  return (
-    <FlagButton
-      buttonIcon={values.icon}
-      title={intl.formatMessage(values.title)}
-      text={intl.formatMessage(values.text)}
-      handleSelect={() => handleSelect(values.daysPerWeek)}
-      isSelected={isSelected}
-    />
-  );
-}
-
-LearningGoalButton.propTypes = {
-  level: PropTypes.string.isRequired,
-  isSelected: PropTypes.bool.isRequired,
-  handleSelect: PropTypes.func.isRequired,
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(LearningGoalButton);
--- a/src/course-home/outline-tab/widgets/ProctoringInfoPanel.jsx
+++ b/src/course-home/outline-tab/widgets/ProctoringInfoPanel.jsx
@@ -1,24 +1,14 @@
 import React, { useState, useEffect } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
 import camelCase from 'lodash.camelcase';
+import PropTypes from 'prop-types';

 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Button } from '@edx/paragon';

 import messages from '../messages';
 import { getProctoringInfoData } from '../../data/api';
-import { fetchProctoringInfoResolved } from '../../data/slice';
-import { useModel } from '../../../generic/model-store';
-
-function ProctoringInfoPanel({ intl }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-  const {
-    username,
-  } = useModel('courseHomeMeta', courseId);
-  const dispatch = useDispatch();

+function ProctoringInfoPanel({ courseId, username, intl }) {
  const [link, setLink] = useState('');
  const [onboardingPastDue, setOnboardingPastDue] = useState(false);
  const [showInfoPanel, setShowInfoPanel] = useState(false);
@@ -105,13 +95,7 @@ function ProctoringInfoPanel({ intl }) {
            setOnboardingPastDue(response.onboarding_past_due);
          }
        },
-      )
-      .catch(() => {
-        /* Do nothing. API throws 404 when class does not have proctoring */
-      })
-      .finally(() => {
-        dispatch(fetchProctoringInfoResolved());
-      });
+      );
  }, []);

  let onboardingExamButton = null;
@@ -199,7 +183,13 @@ function ProctoringInfoPanel({ intl }) {
 }

 ProctoringInfoPanel.propTypes = {
+  courseId: PropTypes.string.isRequired,
+  username: PropTypes.string,
  intl: intlShape.isRequired,
 };

+ProctoringInfoPanel.defaultProps = {
+  username: null,
+};
+
 export default injectIntl(ProctoringInfoPanel);
--- a/src/course-home/outline-tab/widgets/StartOrResumeCourseCard.jsx
+++ b/src/course-home/outline-tab/widgets/StartOrResumeCourseCard.jsx
@@ -1,68 +0,0 @@
-import React from 'react';
-import { Button, Card } from '@edx/paragon';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-
-import { useSelector } from 'react-redux';
-import { sendTrackingLogEvent } from '@edx/frontend-platform/analytics';
-import messages from '../messages';
-import { useModel } from '../../../generic/model-store';
-
-function StartOrResumeCourseCard({ intl }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-
-  const {
-    org,
-  } = useModel('courseHomeMeta', courseId);
-
-  const eventProperties = {
-    org_key: org,
-    courserun_key: courseId,
-  };
-
-  const {
-    resumeCourse: {
-      hasVisitedCourse,
-      url: resumeCourseUrl,
-    },
-  } = useModel('outline', courseId);
-
-  if (!resumeCourseUrl) {
-    return null;
-  }
-
-  const logResumeCourseClick = () => {
-    sendTrackingLogEvent('edx.course.home.resume_course.clicked', {
-      ...eventProperties,
-      event_type: hasVisitedCourse ? 'resume' : 'start',
-      url: resumeCourseUrl,
-    });
-  };
-
-  return (
-    <Card className="mb-3 raised-card" data-testid="start-resume-card">
-      <Card.Header
-        title={hasVisitedCourse ? intl.formatMessage(messages.resumeBlurb) : intl.formatMessage(messages.startBlurb)}
-        actions={(
-          <Button
-            variant="brand"
-            block
-            href={resumeCourseUrl}
-            onClick={() => logResumeCourseClick()}
-          >
-            {hasVisitedCourse ? intl.formatMessage(messages.resume) : intl.formatMessage(messages.start)}
-          </Button>
-        )}
-      />
-      {/* Footer is needed for internal vertical spacing to work out. If you can remove, be my guest */}
-      <Card.Footer><></></Card.Footer>
-    </Card>
-  );
-}
-
-StartOrResumeCourseCard.propTypes = {
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(StartOrResumeCourseCard);
--- a/src/course-home/outline-tab/widgets/UpdateGoalSelector.jsx
+++ b/src/course-home/outline-tab/widgets/UpdateGoalSelector.jsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { Dropdown } from '@edx/paragon';
+
+import messages from '../messages';
+import { saveCourseGoal } from '../../data';
+
+function UpdateGoalSelector({
+  courseId,
+  goalOptions,
+  intl,
+  selectedGoal,
+  setGoalToDisplay,
+  setGoalToastHeader,
+}) {
+  function selectGoalHandler(event) {
+    const key = event.currentTarget.id;
+    const text = event.currentTarget.innerText;
+    const newGoal = {
+      key,
+      text,
+    };
+
+    setGoalToDisplay(newGoal);
+    saveCourseGoal(courseId, key).then((response) => {
+      const { data } = response;
+      const {
+        header,
+      } = data;
+
+      setGoalToastHeader(header);
+    });
+  }
+
+  return (
+    <>
+      <section className="mb-4">
+        <div className="row w-100 m-0">
+          <div className="col-12 p-0">
+            <label className="h4 m-0" htmlFor="edit-goal-selector">
+              {intl.formatMessage(messages.goal)}
+            </label>
+          </div>
+          <div className="col-12 p-0">
+            <Dropdown className="py-2">
+              <Dropdown.Toggle variant="outline-primary" block id="edit-goal-selector" data-testid="edit-goal-selector">
+                {selectedGoal.text}
+              </Dropdown.Toggle>
+              <Dropdown.Menu>
+                {goalOptions.map(([goalKey, goalText]) => (
+                  <Dropdown.Item
+                    id={goalKey}
+                    key={goalKey}
+                    onClick={(event) => { selectGoalHandler(event); }}
+                    role="button"
+                  >
+                    {goalText}
+                  </Dropdown.Item>
+                ))}
+              </Dropdown.Menu>
+            </Dropdown>
+          </div>
+        </div>
+      </section>
+    </>
+  );
+}
+
+UpdateGoalSelector.propTypes = {
+  courseId: PropTypes.string.isRequired,
+  goalOptions: PropTypes.arrayOf(
+    PropTypes.arrayOf(PropTypes.string),
+  ).isRequired,
+  intl: intlShape.isRequired,
+  selectedGoal: PropTypes.shape({
+    key: PropTypes.string,
+    text: PropTypes.string,
+  }).isRequired,
+  setGoalToDisplay: PropTypes.func.isRequired,
+  setGoalToastHeader: PropTypes.func.isRequired,
+};
+
+export default injectIntl(UpdateGoalSelector);
--- a/src/course-home/outline-tab/widgets/WeeklyLearningGoalCard.jsx
+++ b/src/course-home/outline-tab/widgets/WeeklyLearningGoalCard.jsx
@@ -1,140 +0,0 @@
-import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-
-import { Form, Card, Icon } from '@edx/paragon';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
-import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Email } from '@edx/paragon/icons';
-import { useSelector } from 'react-redux';
-import messages from '../messages';
-import LearningGoalButton from './LearningGoalButton';
-import { saveWeeklyLearningGoal } from '../../data';
-import { useModel } from '../../../generic/model-store';
-import './FlagButton.scss';
-
-function WeeklyLearningGoalCard({
-  daysPerWeek,
-  subscribedToReminders,
-  intl,
-}) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-
-  const {
-    isMasquerading,
-    org,
-  } = useModel('courseHomeMeta', courseId);
-
-  const { administrator } = getAuthenticatedUser();
-
-  const [daysPerWeekGoal, setDaysPerWeekGoal] = useState(daysPerWeek);
-  // eslint-disable-next-line react/prop-types
-  const [isGetReminderSelected, setGetReminderSelected] = useState(subscribedToReminders);
-
-  function handleSelect(days) {
-    // Set the subscription button if this is the first time selecting a goal
-    const selectReminders = daysPerWeekGoal === null ? true : isGetReminderSelected;
-    setGetReminderSelected(selectReminders);
-    setDaysPerWeekGoal(days);
-    if (!isMasquerading) { // don't save goal updates while masquerading
-      saveWeeklyLearningGoal(courseId, days, selectReminders);
-      sendTrackEvent('edx.ui.lms.goal.days-per-week.changed', {
-        org_key: org,
-        courserun_key: courseId,
-        is_staff: administrator,
-        num_days: days,
-        reminder_selected: selectReminders,
-      });
-    }
-  }
-
-  function handleSubscribeToReminders(event) {
-    const isGetReminderChecked = event.target.checked;
-    setGetReminderSelected(isGetReminderChecked);
-    if (!isMasquerading) { // don't save goal updates while masquerading
-      saveWeeklyLearningGoal(courseId, daysPerWeekGoal, isGetReminderChecked);
-      sendTrackEvent('edx.ui.lms.goal.reminder-selected.changed', {
-        org_key: org,
-        courserun_key: courseId,
-        is_staff: administrator,
-        num_days: daysPerWeekGoal,
-        reminder_selected: isGetReminderChecked,
-      });
-    }
-  }
-
-  return (
-    <Card
-      id="courseHome-weeklyLearningGoal"
-      className="row w-100 m-0 mb-3 raised-card"
-      data-testid="weekly-learning-goal-card"
-    >
-      <Card.Header
-        size="sm"
-        title={(<div id="set-weekly-goal-header">{intl.formatMessage(messages.setWeeklyGoal)}</div>)}
-        subtitle={intl.formatMessage(messages.setWeeklyGoalDetail)}
-      />
-      <Card.Section className="text-gray-700 small">
-        <div
-          role="radiogroup"
-          aria-labelledby="set-weekly-goal-header"
-          className="flag-button-container m-0 p-0"
-        >
-          <LearningGoalButton
-            level="casual"
-            isSelected={daysPerWeekGoal === 1}
-            handleSelect={handleSelect}
-          />
-          <LearningGoalButton
-            level="regular"
-            isSelected={daysPerWeekGoal === 3}
-            handleSelect={handleSelect}
-          />
-          <LearningGoalButton
-            level="intense"
-            isSelected={daysPerWeekGoal === 5}
-            handleSelect={handleSelect}
-          />
-        </div>
-        <div className="d-flex pt-3">
-          <Form.Switch
-            checked={isGetReminderSelected}
-            onChange={(event) => handleSubscribeToReminders(event)}
-            disabled={!daysPerWeekGoal}
-          >
-            <small>{intl.formatMessage(messages.setGoalReminder)}</small>
-          </Form.Switch>
-        </div>
-      </Card.Section>
-      {isGetReminderSelected && (
-        <Card.Section muted>
-          <div className="row w-100 m-0 small align-center">
-            <div className="d-flex align-items-center pr-1">
-              <Icon
-                className="text-primary-500"
-                src={Email}
-              />
-            </div>
-            <div className="col">
-              {intl.formatMessage(messages.goalReminderDetail)}
-            </div>
-          </div>
-        </Card.Section>
-      )}
-    </Card>
-  );
-}
-
-WeeklyLearningGoalCard.propTypes = {
-  daysPerWeek: PropTypes.number,
-  subscribedToReminders: PropTypes.bool,
-  intl: intlShape.isRequired,
-};
-
-WeeklyLearningGoalCard.defaultProps = {
-  daysPerWeek: null,
-  subscribedToReminders: false,
-};
-export default injectIntl(WeeklyLearningGoalCard);
--- a/src/course-home/outline-tab/widgets/WelcomeMessage.jsx
+++ b/src/course-home/outline-tab/widgets/WelcomeMessage.jsx
@@ -37,7 +37,6 @@ function WelcomeMessage({ courseId, intl }) {
        setDisplay(false);
        dispatch(dismissWelcomeMessage(courseId));
      }}
-      className="raised-card"
      actions={messageCanBeShortened ? [
        <Button
          onClick={() => setShowShortMessage(!showShortMessage)}
--- a/src/course-home/outline-tab/widgets/flag_black.svg
+++ b/src/course-home/outline-tab/widgets/flag_black.svg
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.4 6L14 4H5V21H7V14H12.6L13 16H20V6H14.4Z" fill="black"/>
-</svg>
--- a/src/course-home/outline-tab/widgets/flag_gray.svg
+++ b/src/course-home/outline-tab/widgets/flag_gray.svg
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="15"
-   height="17"
-   viewBox="0 0 15 17"
-   fill="none"
-   version="1.1"
-   id="svg11"
-   xmlns="http://www.w3.org/2000/svg">
-  <path
-     d="M9.4 2L9 0H0V17H2V10H7.6L8 12H15V2H9.4ZM13 10H9.64L9.24 8H2V2H7.36L7.76 4H13V10Z"
-     fill="#002B2B"
-     id="path9" />
-  <path
-     style="fill:#808080;fill-rule:evenodd;stroke-width:0.0150977"
-     d="M 9.6594698,9.9871226 C 9.6577909,9.9829707 9.5654776,9.5311723 9.4543296,8.9831261 L 9.2522415,7.9866785 5.6376662,7.9790074 2.0230906,7.9713362 V 4.9970494 2.0227625 l 2.6636151,0.00771 2.6636151,0.00771 0.1968204,0.9888987 0.1968205,0.9888988 h 2.6200263 2.620026 v 2.9893428 2.9893428 h -1.660746 c -0.91341,0 -1.6621194,-0.0034 -1.6637982,-0.00755 z"
-     id="path302" />
-</svg>
--- a/src/course-home/outline-tab/widgets/flag_outline.svg
+++ b/src/course-home/outline-tab/widgets/flag_outline.svg
@@ -1,3 +0,0 @@
-<svg width="15" height="17" viewBox="0 0 15 17" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.4 2L9 0H0V17H2V10H7.6L8 12H15V2H9.4ZM13 10H9.64L9.24 8H2V2H7.36L7.76 4H13V10Z" fill="#002B2B"/>
-</svg>
--- a/src/course-home/progress-tab/ProgressTab.jsx
+++ b/src/course-home/progress-tab/ProgressTab.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
+import { layoutGenerator } from 'react-break';
 import { useSelector } from 'react-redux';
-import { breakpoints, useWindowSize } from '@edx/paragon';

 import CertificateStatus from './certificate-status/CertificateStatus';
 import CourseCompletion from './course-completion/CourseCompletion';
@@ -23,15 +23,13 @@ function ProgressTab() {

  const applyLockedOverlay = gradesFeatureIsFullyLocked ? 'locked-overlay' : '';

-  const windowWidth = useWindowSize().width;
-  if (windowWidth === undefined) {
-    // Bail because we don't want to load <CertificateStatus/> twice, emitting 'visited' events both times.
-    // This is a hacky solution, since the user can resize the screen and still get two visited events.
-    // But I'm leaving a larger refactor as an exercise to a future reader.
-    return null;
-  }
+  const layout = layoutGenerator({
+    mobile: 0,
+    desktop: 992,
+  });

-  const wideScreen = windowWidth >= breakpoints.large.minWidth;
+  const OnMobile = layout.is('mobile');
+  const OnDesktop = layout.isAtLeast('desktop');
  return (
    <>
      <ProgressHeader />
@@ -39,9 +37,11 @@ function ProgressTab() {
        {/* Main body */}
        <div className="col-12 col-md-8 p-0">
          <CourseCompletion />
-          {!wideScreen && <CertificateStatus />}
+          <OnMobile>
+            <CertificateStatus />
+          </OnMobile>
          <CourseGrade />
-          <div className={`grades my-4 p-4 rounded raised-card ${applyLockedOverlay}`} aria-hidden={gradesFeatureIsFullyLocked}>
+          <div className={`grades my-4 p-4 rounded shadow-sm ${applyLockedOverlay}`} aria-hidden={gradesFeatureIsFullyLocked}>
            <GradeSummary />
            <DetailedGrades />
          </div>
@@ -49,7 +49,9 @@ function ProgressTab() {

        {/* Side panel */}
        <div className="col-12 col-md-4 p-0 px-md-4">
-          {wideScreen && <CertificateStatus />}
+          <OnDesktop>
+            <CertificateStatus />
+          </OnDesktop>
          <RelatedLinks />
        </div>
      </div>
--- a/src/course-home/progress-tab/ProgressTab.test.jsx
+++ b/src/course-home/progress-tab/ProgressTab.test.jsx
@@ -3,7 +3,6 @@ import { Factory } from 'rosie';
 import { getConfig } from '@edx/frontend-platform';
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import { breakpoints } from '@edx/paragon';
 import MockAdapter from 'axios-mock-adapter';

 import {
@@ -14,7 +13,6 @@ import * as thunks from '../data/thunks';
 import initializeStore from '../../store';
 import ProgressTab from './ProgressTab';
 import LoadedTabPage from '../../tab-page/LoadedTabPage';
-import messages from './grades/messages';

 initializeMockApp();
 jest.mock('@edx/frontend-platform/analytics');
@@ -22,20 +20,18 @@ jest.mock('@edx/frontend-platform/analytics');
 describe('Progress Tab', () => {
  let axiosMock;

-  const store = initializeStore();
-  const defaultMetadata = Factory.build('courseHomeMetadata');
-  const defaultTabData = Factory.build('progressTabData');
-
-  const courseId = defaultMetadata.id;
+  const courseId = 'course-v1:edX+Test+run';
  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/course_metadata/${courseId}`;
  courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);
  const progressUrl = new RegExp(`${getConfig().LMS_BASE_URL}/api/course_home/progress/*`);
  const masqueradeUrl = `${getConfig().LMS_BASE_URL}/courses/${courseId}/masquerade`;
-  const now = new Date();
-  const tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
-  const overmorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 2);
+
+  const store = initializeStore();
+  const defaultMetadata = Factory.build('courseHomeMetadata', { id: courseId });
+  const defaultTabData = Factory.build('progressTabData');
+
  function setMetadata(attributes, options) {
-    const courseMetadata = Factory.build('courseHomeMetadata', attributes, options);
+    const courseMetadata = Factory.build('courseHomeMetadata', { id: courseId, ...attributes }, options);
    axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);
  }

@@ -67,7 +63,6 @@ describe('Progress Tab', () => {

    it('sends event on click of dates tab link', async () => {
      await fetchAndRender();
-      sendTrackEvent.mockClear();

      const datesTabLink = screen.getByRole('link', { name: 'Dates' });
      fireEvent.click(datesTabLink);
@@ -83,7 +78,6 @@ describe('Progress Tab', () => {

    it('sends event on click of outline tab link', async () => {
      await fetchAndRender();
-      sendTrackEvent.mockClear();

      const outlineTabLink = screen.getAllByRole('link', { name: 'Course Outline' });
      fireEvent.click(outlineTabLink[1]); // outlineTabLink[0] corresponds to the link in the DetailedGrades component
@@ -135,8 +129,6 @@ describe('Progress Tab', () => {
      });
      await fetchAndRender();
      expect(screen.queryByRole('button', { name: 'Grade range tooltip' })).not.toBeInTheDocument();
-      expect(screen.getByTestId('currentGradeTooltipContent').innerHTML).toEqual('50%');
-      expect(screen.getByTestId('gradeSummaryFooterTotalWeightedGrade').innerHTML).toEqual('50%');
      expect(screen.getByText('A weighted grade of 75% is required to pass in this course')).toBeInTheDocument();
    });

@@ -170,8 +162,6 @@ describe('Progress Tab', () => {
      });
      await fetchAndRender();
      expect(screen.getByRole('button', { name: 'Grade range tooltip' }));
-      expect(screen.getByTestId('currentGradeTooltipContent').innerHTML).toEqual('0%');
-      expect(screen.getByTestId('gradeSummaryFooterTotalWeightedGrade').innerHTML).toEqual('0%');
      expect(screen.getByText('A weighted grade of 80% is required to pass in this course')).toBeInTheDocument();
    });

@@ -219,8 +209,6 @@ describe('Progress Tab', () => {
      });
      await fetchAndRender();
      expect(screen.getByRole('button', { name: 'Grade range tooltip' }));
-      expect(screen.getByTestId('currentGradeTooltipContent').innerHTML).toEqual('80%');
-      expect(screen.getByTestId('gradeSummaryFooterTotalWeightedGrade').innerHTML).toEqual('80%');
      expect(await screen.findByText('You’re currently passing this course with a grade of B (80-90%)')).toBeInTheDocument();
    });

@@ -297,6 +285,7 @@ describe('Progress Tab', () => {
    });

    it('sends events on click of upgrade button in locked content header (CourseGradeHeader)', async () => {
+      sendTrackEvent.mockClear();
      setTabData({
        completion_summary: {
          complete_count: 1,
@@ -333,7 +322,6 @@ describe('Progress Tab', () => {
        ],
      });
      await fetchAndRender();
-      sendTrackEvent.mockClear();
      expect(screen.getByText('locked feature')).toBeInTheDocument();
      expect(screen.getByText('Unlock to view grades and work towards a certificate.')).toBeInTheDocument();

@@ -450,8 +438,9 @@ describe('Progress Tab', () => {
      expect(screen.queryAllByTestId('blocked-icon')).toHaveLength(4);
    });

-    it('does not render subsections for which showGrades is false', async () => {
-      // The second assignment has showGrades set to false, so it should not be shown.
+    it('renders correct current grade tooltip when showGrades is false', async () => {
+      // The learner has a 50% on the first assignment and a 100% on the second, making their grade a 75%
+      // The second assignment has showGrades set to false, so the grade reflected to the learner should be 50%.
      setTabData({
        section_scores: [
          {
@@ -493,31 +482,10 @@ describe('Progress Tab', () => {
      });

      await fetchAndRender();
-      expect(screen.getByText('First subsection')).toBeInTheDocument();
-      expect(screen.queryByText('Second subsection')).not.toBeInTheDocument();
-    });
-
-    it('renders correct title when credit information is available', async () => {
-      setTabData({
-        credit_course_requirements: {
-          eligibility_status: 'eligible',
-          requirements: [
-            {
-              namespace: 'proctored_exam',
-              name: 'i4x://edX/DemoX/proctoring-block/final_uuid',
-              display_name: 'Proctored Mid Term Exam',
-              criteria: {},
-              reason: {},
-              status: 'satisfied',
-              status_date: '2015-06-26 11:07:42',
-              order: 1,
-            },
-          ],
-        },
-      });
-
-      await fetchAndRender();
-      expect(screen.getByText('Grades & Credit')).toBeInTheDocument();
+      expect(screen.getByTestId('currentGradeTooltipContent').innerHTML).toEqual('50%');
+      // Although the learner's true grade is passing, we should expect this to reflect the grade that's
+      // visible to them, which is non-passing
+      expect(screen.getByText('A weighted grade of 75% is required to pass in this course')).toBeInTheDocument();
    });
  });

@@ -666,7 +634,9 @@ describe('Progress Tab', () => {
      expect(screen.getByRole('row', { name: 'Exam 50% 0% 0%' })).toBeInTheDocument();
    });

-    it('renders override notice', async () => {
+    it('renders correct total weighted grade when showGrades is false', async () => {
+      // The learner has a 50% on the first assignment and a 100% on the second, making their grade a 75%
+      // The second assignment has showGrades set to false, so the grade reflected to the learner should be 50%.
      setTabData({
        section_scores: [
          {
@@ -677,16 +647,12 @@ describe('Progress Tab', () => {
                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
                display_name: 'First subsection',
                has_graded_assignment: true,
-                learner_has_access: true,
                num_points_earned: 1,
                num_points_possible: 2,
                percent_graded: 1.0,
-                problem_scores: [{
-                  earned: 1,
-                  possible: 2,
-                }],
                show_correctness: 'always',
                show_grades: true,
+                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection',
              },
            ],
          },
@@ -694,24 +660,15 @@ describe('Progress Tab', () => {
            display_name: 'Second section',
            subsections: [
              {
-                assignment_type: 'Exam',
-                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@98765',
+                assignment_type: 'Homework',
                display_name: 'Second subsection',
                learner_has_access: true,
                has_graded_assignment: true,
-                num_points_earned: 0,
+                num_points_earned: 1,
                num_points_possible: 1,
-                override: {
-                  system: 'PROCTORING',
-                  reason: 'Suspicious activity',
-                },
                percent_graded: 1.0,
-                problem_scores: [{
-                  earned: 0,
-                  possible: 1,
-                }],
                show_correctness: 'always',
-                show_grades: true,
+                show_grades: false,
                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/second_subsection',
              },
            ],
@@ -720,14 +677,7 @@ describe('Progress Tab', () => {
      });

      await fetchAndRender();
-
-      const problemScoreDrawerToggle = screen.getByRole('button', { name: 'Toggle individual problem scores for Second subsection' });
-      expect(problemScoreDrawerToggle).toBeInTheDocument();
-
-      // Open the problem score drawer
-      fireEvent.click(problemScoreDrawerToggle);
-
-      expect(screen.getByText(messages.sectionGradeOverridden.defaultMessage)).toBeInTheDocument();
+      expect(screen.getByTestId('gradeSummaryFooterTotalWeightedGrade').innerHTML).toEqual('50%');
    });
  });

@@ -741,8 +691,8 @@ describe('Progress Tab', () => {
    });

    it('sends event on click of subsection link', async () => {
-      await fetchAndRender();
      sendTrackEvent.mockClear();
+      await fetchAndRender();
      expect(screen.getByText('Detailed grades')).toBeInTheDocument();

      const subsectionLink = screen.getByRole('link', { name: 'First subsection' });
@@ -758,8 +708,8 @@ describe('Progress Tab', () => {
    });

    it('sends event on click of course outline link', async () => {
-      await fetchAndRender();
      sendTrackEvent.mockClear();
+      await fetchAndRender();
      expect(screen.getByText('Detailed grades')).toBeInTheDocument();

      const outlineLink = screen.getAllByRole('link', { name: 'Course Outline' })[0];
@@ -799,7 +749,22 @@ describe('Progress Tab', () => {

  describe('Certificate Status', () => {
    beforeAll(() => {
-      global.innerWidth = breakpoints.large.minWidth;
+      Object.defineProperty(window, 'matchMedia', {
+        writable: true,
+        value: jest.fn().mockImplementation(query => {
+          const matches = !!(query === 'screen and (min-width: 992px)');
+          return {
+            matches,
+            media: query,
+            onchange: null,
+            addListener: jest.fn(), // deprecated
+            removeListener: jest.fn(), // deprecated
+            addEventListener: jest.fn(),
+            removeEventListener: jest.fn(),
+            dispatchEvent: jest.fn(),
+          };
+        }),
+      });
    });

    describe('enrolled user', () => {
@@ -808,54 +773,11 @@ describe('Progress Tab', () => {
        sendTrackEvent.mockClear();
      });

-      it('Displays text for nonPassing case when learner does not have a passing grade and certificates are viewable', async () => {
+      it('Displays text for nonPassing case when learner does not have a passing grade', async () => {
        await fetchAndRender();
        expect(screen.getByText('In order to qualify for a certificate, you must have a passing grade.')).toBeInTheDocument();
      });

-      it('Displays text for notAvailableNonPassing case when a learner does not have a passing grade and certificates are not viewable', async () => {
-        setMetadata({
-          can_view_certificate: false,
-          is_enrolled: true,
-        });
-        setTabData({
-          end: tomorrow.toISOString(),
-        });
-        await fetchAndRender();
-        expect(screen.getByText(`This course ends on ${tomorrow.toLocaleDateString('en-us', {
-          year: 'numeric',
-          month: 'long',
-          day: 'numeric',
-        })}, final grades and any earned certificates are scheduled to be available after ${tomorrow.toLocaleDateString('en-us', {
-          year: 'numeric',
-          month: 'long',
-          day: 'numeric',
-        })}.`)).toBeInTheDocument();
-      });
-
-      it('Handles certificate available dates for notAvailableNotPassing', async () => {
-        setMetadata({
-          can_view_certificate: false,
-          is_enrolled: true,
-        });
-        setTabData({
-          end: tomorrow.toISOString(),
-          certificate_data: {
-            certificate_available_date: overmorrow.toISOString(),
-          },
-        });
-        await fetchAndRender();
-        expect(screen.getByText(`This course ends on ${tomorrow.toLocaleDateString('en-us', {
-          year: 'numeric',
-          month: 'long',
-          day: 'numeric',
-        })}, final grades and any earned certificates are scheduled to be available after ${overmorrow.toLocaleDateString('en-us', {
-          year: 'numeric',
-          month: 'long',
-          day: 'numeric',
-        })}.`)).toBeInTheDocument();
-      });
-
      it('sends event when visiting progress tab when learner is not passing', async () => {
        await fetchAndRender();

@@ -1267,54 +1189,6 @@ describe('Progress Tab', () => {
    });
  });

-  describe('Credit Information', () => {
-    it('renders credit information when provided', async () => {
-      setTabData({
-        credit_course_requirements: {
-          eligibility_status: 'eligible',
-          requirements: [
-            {
-              namespace: 'proctored_exam',
-              name: 'i4x://edX/DemoX/proctoring-block/final_uuid',
-              display_name: 'Proctored Mid Term Exam',
-              criteria: {},
-              reason: {},
-              status: null,
-              status_date: '2015-06-26 11:07:42',
-              order: 1,
-            },
-            {
-              namespace: 'grade',
-              name: 'i4x://edX/DemoX/proctoring-block/final_uuid',
-              display_name: 'Minimum Passing Grade',
-              criteria: { min_grade: 0.8 },
-              reason: { final_grade: 0.95 },
-              status: 'satisfied',
-              status_date: '2015-06-26 11:07:44',
-              order: 2,
-            },
-          ],
-        },
-      });
-
-      await fetchAndRender();
-      expect(screen.getByText('Grades & Credit')).toBeInTheDocument();
-      expect(screen.getByText('Requirements for course credit')).toBeInTheDocument();
-      expect(screen.getByText('You have met the requirements for credit in this course.', { exact: false })).toBeInTheDocument();
-      expect(screen.getByText('Proctored Mid Term Exam:')).toBeInTheDocument();
-      // 80% comes from the criteria.minGrade being 0.8
-      expect(screen.getByText('Minimum grade for credit (80%):')).toBeInTheDocument();
-      // Completed because the grade requirement has been satisfied
-      expect(screen.getByText('Completed')).toBeInTheDocument();
-    });
-
-    it('does not render credit information when it is not provided', async () => {
-      await fetchAndRender();
-      expect(screen.queryByText('Grades & Credit')).not.toBeInTheDocument();
-      expect(screen.queryByText('Requirements for course credit.')).not.toBeInTheDocument();
-    });
-  });
-
  describe('Access expiration masquerade banner', () => {
    it('renders banner when masquerading as a user', async () => {
      setMetadata({ is_enrolled: true, original_user_is_staff: true });
--- a/src/course-home/progress-tab/certificate-status/CertificateStatus.jsx
+++ b/src/course-home/progress-tab/certificate-status/CertificateStatus.jsx
@@ -22,8 +22,6 @@ function CertificateStatus({ intl }) {
  const {
    isEnrolled,
    org,
-    isSelfPaced,
-    canViewCertificate,
  } = useModel('courseHomeMeta', courseId);

  const {
@@ -92,25 +90,9 @@ function CertificateStatus({ intl }) {
  if (mode === COURSE_EXIT_MODES.disabled) {
    certEventName = 'certificate_status_disabled';
  } else if (mode === COURSE_EXIT_MODES.nonPassing && !certIsDownloadable) {
+    certCase = 'notPassing';
    certEventName = 'not_passing';
-    //  If the learner is not supposed to be able to view a certificate because
-    //  of the certificate display behavior, we also don't want to show them a
-    //  "not passing" message early.
-    certCase = canViewCertificate && !isSelfPaced ? 'notPassing' : 'notAvailableNotPassing';
-    if (!canViewCertificate) {
-      endDate = intl.formatDate(end, {
-        year: 'numeric',
-        month: 'long',
-        day: 'numeric',
-      });
-      certAvailabilityDate = intl.formatDate(certificateAvailableDate || end, {
-        year: 'numeric',
-        month: 'long',
-        day: 'numeric',
-      });
-    }
-    //  These values just pass through if they are not needed by the message
-    body = intl.formatMessage(messages[`${certCase}Body`], { endDate, certAvailabilityDate });
+    body = intl.formatMessage(messages[`${certCase}Body`]);
  } else if (mode === COURSE_EXIT_MODES.inProgress && !certIsDownloadable) {
    certCase = 'inProgress';
    certEventName = 'has_scheduled_content';
@@ -133,7 +115,6 @@ function CertificateStatus({ intl }) {
            <FormattedMessage
              id="progress.certificateStatus.unverifiedBody"
              defaultMessage="In order to generate a certificate, you must complete ID verification. {idVerificationSupportLink}."
-              description="Its shown when learner are not verified thus it recommends going over the verification process"
              values={{ idVerificationSupportLink }}
            />
          );
@@ -152,7 +133,6 @@ function CertificateStatus({ intl }) {
              Showcase your accomplishment on LinkedIn or your resumé today.
              You can download your certificate now and access it any time from your
              {dashboardLink} and {profileLink}."
-            description="Recommending an action for learner when course certificate is available"
            values={{ dashboardLink, profileLink }}
          />
        );
@@ -175,9 +155,8 @@ function CertificateStatus({ intl }) {
        body = (
          <FormattedMessage
            id="courseCelebration.certificateBody.notAvailable.endDate"
-            defaultMessage="This course ends on {endDate}. Final grades and any earned certificates are
+            defaultMessage="This course ends on {endDate}. Final grades and certificates are
            scheduled to be available after {certAvailabilityDate}."
-            description="This shown for leaner when they are eligible for certifcate but it't not available yet, it could because leaners just finished the course quickly!"
            values={{ endDate, certAvailabilityDate }}
          />
        );
@@ -242,12 +221,14 @@ function CertificateStatus({ intl }) {

  return (
    <section data-testid="certificate-status-component" className="text-dark-700 mb-4">
-      <Card className="bg-light-200 raised-card">
-        <Card.Header title={header} />
-        <Card.Section className="small text-gray-700">
-          {body}
-        </Card.Section>
-        <Card.Footer>
+      <Card className="bg-light-200 shadow-sm border-0">
+        <Card.Body>
+          <Card.Title>
+            <h3>{header}</h3>
+          </Card.Title>
+          <Card.Text className="small text-gray-700">
+            {body}
+          </Card.Text>
          {buttonText && (buttonLocation || buttonAction) && (
            <Button
              variant="outline-brand"
@@ -261,7 +242,7 @@ function CertificateStatus({ intl }) {
              {buttonText}
            </Button>
          )}
-        </Card.Footer>
+        </Card.Body>
      </Card>
    </section>
  );
--- a/src/course-home/progress-tab/certificate-status/messages.js
+++ b/src/course-home/progress-tab/certificate-status/messages.js
@@ -4,117 +4,86 @@ const messages = defineMessages({
  notPassingHeader: {
    id: 'progress.certificateStatus.notPassingHeader',
    defaultMessage: 'Certificate status',
-    description: 'Header text when learner certifcate status is not passing',
  },
  notPassingBody: {
    id: 'progress.certificateStatus.notPassingBody',
    defaultMessage: 'In order to qualify for a certificate, you must have a passing grade.',
-    description: 'Body text when learner certifcate status is not passing',
  },
  inProgressHeader: {
    id: 'progress.certificateStatus.inProgressHeader',
    defaultMessage: 'More content is coming soon!',
-    description: 'Header text when learner certifcate is in progress',
  },
  inProgressBody: {
    id: 'progress.certificateStatus.inProgressBody',
    defaultMessage: 'It looks like there is more content in this course that will be released in the future. Look out for email updates or check back on your course for when this content will be available.',
-    description: 'Body text when learner certifcate is in progress',
  },
  requestableHeader: {
    id: 'progress.certificateStatus.requestableHeader',
    defaultMessage: 'Certificate status',
-    description: 'Header text when learner certifcate status is requestable',
  },
  requestableBody: {
    id: 'progress.certificateStatus.requestableBody',
    defaultMessage: 'Congratulations, you qualified for a certificate! In order to access your certificate, request it below.',
-    description: 'Body text when learner certifcate status is requestable',
  },
  requestableButton: {
    id: 'progress.certificateStatus.requestableButton',
    defaultMessage: 'Request certificate',
-    description: 'Button text when learner certifcate status is requestable',
  },
  unverifiedHeader: {
    id: 'progress.certificateStatus.unverifiedHeader',
    defaultMessage: 'Certificate status',
-    description: 'Header text when learner certifcate status is unverified',
  },
  unverifiedButton: {
    id: 'progress.certificateStatus.unverifiedButton',
    defaultMessage: 'Verify ID',
-    description: 'Button text when learner certifcate status is unverified',
  },
  unverifiedPendingBody: {
    id: 'progress.certificateStatus.courseCelebration.verificationPending',
    defaultMessage: 'Your ID verification is pending and your certificate will be available once approved.',
-    description: 'Body text when learner certifcate status is unverified pending',
  },
  downloadableHeader: {
    id: 'progress.certificateStatus.downloadableHeader',
    defaultMessage: 'Your certificate is available!',
-    description: 'Header text when the certifcate is available',
  },
  downloadableBody: {
    id: 'progress.certificateStatus.downloadableBody',
    defaultMessage: 'Showcase your accomplishment on LinkedIn or your resumé today. You can download your certificate now and access it any time from your Dashboard and Profile.',
-    description: 'Recommending an action for learner when course certificate is available',
  },
  downloadableButton: {
    id: 'progress.certificateStatus.downloadableButton',
    defaultMessage: 'Download my certificate',
-    description: 'Button text when learner certifcate status is downloadable',
  },
  viewableButton: {
    id: 'progress.certificateStatus.viewableButton',
    defaultMessage: 'View my certificate',
-    description: 'Button text which view or links to the certifcate',
  },
  notAvailableHeader: {
    id: 'progress.certificateStatus.notAvailableHeader',
    defaultMessage: 'Certificate status',
-    description: 'Header text when the certifcate is not available',
  },
  upgradeHeader: {
    id: 'progress.certificateStatus.upgradeHeader',
    defaultMessage: 'Earn a certificate',
-    description: 'Header text when the learner needs to upgrade to earn a certifcate ',
  },
  upgradeBody: {
    id: 'progress.certificateStatus.upgradeBody',
    defaultMessage: 'You are in an audit track and do not qualify for a certificate. In order to work towards a certificate, upgrade your course today.',
-    description: 'Body text when the learner needs to upgrade to earn a certifcate ',
  },
  upgradeButton: {
    id: 'progress.certificateStatus.upgradeButton',
    defaultMessage: 'Upgrade now',
-    description: 'Button text which leaner needs to upgrade to get the certifcate',
  },
  unverifiedHomeHeader: {
-    id: 'progress.certificateStatus.unverifiedHomeHeader.v2',
-    defaultMessage: 'Verify your identity to qualify for a certificate.',
-    description: 'Header text when the learner needs to do verification to earn a certifcate ',
+    id: 'progress.certificateStatus.unverifiedHomeHeader',
+    defaultMessage: 'Verify your identity to earn a certificate!',
  },
  unverifiedHomeButton: {
    id: 'progress.certificateStatus.unverifiedHomeButton',
    defaultMessage: 'Verify my ID',
-    description: 'Button text which leaner needs to do verification to earn a certifcate',
  },
  unverifiedHomeBody: {
    id: 'progress.certificateStatus.unverifiedHomeBody',
    defaultMessage: 'In order to generate a certificate for this course, you must complete the ID verification process.',
-    description: 'Body text when the learner needs to do verification to earn a certifcate',
-  },
-  notAvailableNotPassingHeader: {
-    id: 'progress.certificateStatus.notAvailableNotPassingHeader',
-    defaultMessage: 'Certificate status',
-    description: 'Header text when the certifcate is not available',
-  },
-  notAvailableNotPassingBody: {
-    id: 'progress.certificateStatus.notAvailableNotPassingBody',
-    defaultMessage: 'This course ends on {endDate}, final grades and any earned certificates are scheduled to be available after {certAvailabilityDate}.',
-    description: 'message that appears at the end of a course for a user who has finished a course early and has not passed or grades are not final',
  },
 });

--- a/src/course-home/progress-tab/course-completion/CourseCompletion.jsx
+++ b/src/course-home/progress-tab/course-completion/CourseCompletion.jsx
@@ -6,7 +6,7 @@ import messages from './messages';

 function CourseCompletion({ intl }) {
  return (
-    <section className="text-dark-700 mb-4 rounded raised-card p-4">
+    <section className="text-dark-700 mb-4 rounded shadow-sm p-4">
      <div className="row w-100 m-0">
        <div className="col-12 col-sm-6 col-md-7 p-0">
          <h2>{intl.formatMessage(messages.courseCompletion)}</h2>
--- a/src/course-home/progress-tab/course-completion/messages.js
+++ b/src/course-home/progress-tab/course-completion/messages.js
@@ -4,47 +4,38 @@ const messages = defineMessages({
  donutLabel: {
    id: 'progress.completion.donut.label',
    defaultMessage: 'completed',
-    description: 'Label text for progress donut chart',
  },
  completionBody: {
    id: 'progress.completion.body',
    defaultMessage: 'This represents how much of the course content you have completed. Note that some content may not yet be released.',
-    description: 'It explains the meaning of progress donut chart',
  },
  completeContentTooltip: {
    id: 'progress.completion.tooltip.locked',
    defaultMessage: 'Content that you have completed.',
-    description: 'It expalains the meaning of content that is completed',
  },
  courseCompletion: {
    id: 'progress.completion.header',
    defaultMessage: 'Course completion',
-    description: 'Header text for (completion donut chart) section of the progress tab',
  },
  incompleteContentTooltip: {
    id: 'progress.completion.tooltip',
    defaultMessage: 'Content that you have access to and have not completed.',
-    description: 'It explain the meaning for content is completed',
  },
  lockedContentTooltip: {
    id: 'progress.completion.tooltip.complete',
    defaultMessage: 'Content that is locked and available only to those who upgrade.',
-    description: 'It expalains the meaning of content that is locked',
  },
  percentComplete: {
    id: 'progress.completion.donut.percentComplete',
    defaultMessage: 'You have completed {percent}% of content in this course.',
-    description: 'It summarize the progress in the course (100% - %incomplete)',
  },
  percentIncomplete: {
    id: 'progress.completion.donut.percentIncomplete',
    defaultMessage: 'You have not completed {percent}% of content in this course that you have access to.',
-    description: 'It summarize the progress in the course (100% - %complete)',
  },
  percentLocked: {
    id: 'progress.completion.donut.percentLocked',
    defaultMessage: '{percent}% of content in this course is locked and available only for those who upgrade.',
-    description: 'It indicate the relative size of content that is locked in the course (100% - %open_content)',
  },
 });

--- a/src/course-home/progress-tab/credit-information/CreditInformation.jsx
+++ b/src/course-home/progress-tab/credit-information/CreditInformation.jsx
@@ -1,115 +0,0 @@
-import React from 'react';
-import { useSelector } from 'react-redux';
-import { getConfig } from '@edx/frontend-platform';
-import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { CheckCircle, WarningFilled, WatchFilled } from '@edx/paragon/icons';
-import { Hyperlink, Icon } from '@edx/paragon';
-
-import { useModel } from '../../../generic/model-store';
-import { DashboardLink } from '../../../shared/links';
-
-import messages from './messages';
-
-function CreditInformation({ intl }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-
-  const {
-    creditCourseRequirements,
-  } = useModel('progress', courseId);
-
-  if (!creditCourseRequirements) { return null; }
-
-  let eligibilityStatus;
-  let requirementStatus;
-  const requirements = [];
-  const dashboardLink = <DashboardLink />;
-  const creditLink = (
-    <Hyperlink
-      variant="muted"
-      isInline
-      destination={getConfig().CREDIT_HELP_LINK_URL}
-    >{intl.formatMessage(messages.courseCredit)}
-    </Hyperlink>
-  );
-
-  switch (creditCourseRequirements.eligibilityStatus) {
-    case 'not_eligible':
-      eligibilityStatus = (
-        <FormattedMessage
-          id="progress.creditInformation.creditNotEligible"
-          defaultMessage="You are no longer eligible for credit in this course. Learn more about {creditLink}."
-          description="Message to learner who are not eligible for course credit, it can because the a requirement deadline have passed"
-          values={{ creditLink }}
-        />
-      );
-      break;
-    case 'eligible':
-      eligibilityStatus = (
-        <FormattedMessage
-          id="progress.creditInformation.creditEligible"
-          defaultMessage="
-          You have met the requirements for credit in this course. Go to your
-          {dashboardLink} to purchase course credit. Or learn more about {creditLink}."
-          description="After the credit requirements are met, leaners can then do the last step which purchasing the credit. Note that is only doable for leaners after they met all the requirements"
-          values={{ dashboardLink, creditLink }}
-        />
-      );
-      break;
-    case 'partial_eligible':
-      eligibilityStatus = (
-        <FormattedMessage
-          id="progress.creditInformation.creditPartialEligible"
-          defaultMessage="You have not yet met the requirements for credit. Learn more about {creditLink}."
-          description="This means that one or more requirements is not satisfied yet"
-          values={{ creditLink }}
-        />
-      );
-      break;
-    default:
-      break;
-  }
-  creditCourseRequirements.requirements.forEach(requirement => {
-    switch (requirement.status) {
-      case 'submitted':
-        requirementStatus = (<>{intl.formatMessage(messages.verificationSubmitted)} <Icon src={CheckCircle} className="text-success-500 d-inline-flex align-bottom" /></>);
-        break;
-      case 'failed':
-      case 'declined':
-        requirementStatus = (<>{intl.formatMessage(messages.verificationFailed)} <Icon src={WarningFilled} className="d-inline-flex align-bottom" /></>);
-        break;
-      case 'satisfied':
-        requirementStatus = (<>{intl.formatMessage(messages.completed)} <Icon src={CheckCircle} className="text-success-500 d-inline-flex align-bottom" /></>);
-        break;
-      default:
-        requirementStatus = (<>{intl.formatMessage(messages.upcoming)} <Icon src={WatchFilled} className="text-gray-500 d-inline-flex align-bottom" /></>);
-    }
-    requirements.push((
-      <div className="row w-100 m-0 small" key={`requirement-${requirement.order}`}>
-        <p className="font-weight-bold">
-          {requirement.namespace === 'grade'
-            ? `${intl.formatMessage(messages.minimumGrade, { minGrade: Number(requirement.criteria.minGrade) * 100 })}:`
-            : `${requirement.displayName}:`}
-        </p>
-        <div className="ml-1">
-          {requirementStatus}
-        </div>
-      </div>
-    ));
-  });
-
-  return (
-    <>
-      <h3 className="h4 col-12 p-0">{intl.formatMessage(messages.requirementsHeader)}</h3>
-      <p className="small">{eligibilityStatus}</p>
-      {requirements}
-    </>
-  );
-}
-
-CreditInformation.propTypes = {
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(CreditInformation);
--- a/src/course-home/progress-tab/credit-information/messages.js
+++ b/src/course-home/progress-tab/credit-information/messages.js
@@ -1,40 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  completed: {
-    id: 'progress.creditInformation.completed',
-    defaultMessage: 'Completed',
-    description: 'Label text if a requirement for (course credit) is satisfied',
-  },
-  courseCredit: {
-    id: 'progress.creditInformation.courseCredit',
-    defaultMessage: 'course credit',
-    description: 'Anchor text for link that redirects (course credit) help page',
-  },
-  minimumGrade: {
-    id: 'progress.creditInformation.minimumGrade',
-    defaultMessage: 'Minimum grade for credit ({minGrade}%)',
-  },
-  requirementsHeader: {
-    id: 'progress.creditInformation.requirementsHeader',
-    defaultMessage: 'Requirements for course credit',
-    description: 'Header for the requirements section in course credit',
-  },
-  upcoming: {
-    id: 'progress.creditInformation.upcoming',
-    defaultMessage: 'Upcoming',
-    description: 'It indicate that the a (credit requirement) status is not known yet',
-  },
-  verificationFailed: {
-    id: 'progress.creditInformation.verificationFailed',
-    defaultMessage: 'Verification failed',
-    description: 'It indicate that the learner submitted a requirement but is either failed or declined',
-  },
-  verificationSubmitted: {
-    id: 'progress.creditInformation.verificationSubmitted',
-    defaultMessage: 'Verification submitted',
-    description: 'It indicate that the learner submitted a requirement but is not graded or reviewed yet',
-  },
-});
-
-export default messages;
--- a/src/course-home/progress-tab/grades/course-grade/CourseGrade.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/CourseGrade.jsx
@@ -7,7 +7,6 @@ import { useModel } from '../../../../generic/model-store';
 import CourseGradeFooter from './CourseGradeFooter';
 import CourseGradeHeader from './CourseGradeHeader';
 import GradeBar from './GradeBar';
-import CreditInformation from '../../credit-information/CreditInformation';

 import messages from '../messages';

@@ -17,7 +16,6 @@ function CourseGrade({ intl }) {
  } = useSelector(state => state.courseHome);

  const {
-    creditCourseRequirements,
    gradesFeatureIsFullyLocked,
    gradesFeatureIsPartiallyLocked,
    gradingPolicy: {
@@ -30,24 +28,18 @@ function CourseGrade({ intl }) {
  const applyLockedOverlay = gradesFeatureIsFullyLocked ? 'locked-overlay' : '';

  return (
-    <section className="text-dark-700 my-4 rounded raised-card">
+    <section className="text-dark-700 my-4 rounded shadow-sm">
      {(gradesFeatureIsFullyLocked || gradesFeatureIsPartiallyLocked) && <CourseGradeHeader />}
      <div className={applyLockedOverlay} aria-hidden={gradesFeatureIsFullyLocked}>
        <div className="row w-100 m-0 p-4">
-          <div className="col-12 col-sm-6 p-0 pr-sm-5.5">
-            <h2>{creditCourseRequirements
-              ? intl.formatMessage(messages.gradesAndCredit)
-              : intl.formatMessage(messages.grades)}
-            </h2>
+          <div className="col-12 col-sm-6 p-0 pr-sm-2">
+            <h2>{intl.formatMessage(messages.grades)}</h2>
            <p className="small">
              {intl.formatMessage(messages.courseGradeBody)}
            </p>
          </div>
          <GradeBar passingGrade={passingGrade} />
        </div>
-        <div className="row w-100 m-0 px-4">
-          <CreditInformation />
-        </div>
        <CourseGradeFooter passingGrade={passingGrade} />
      </div>
    </section>
--- a/src/course-home/progress-tab/grades/course-grade/CourseGradeFooter.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/CourseGradeFooter.jsx
@@ -2,9 +2,11 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';

+import { layoutGenerator } from 'react-break';
+
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { CheckCircle, WarningFilled } from '@edx/paragon/icons';
-import { breakpoints, Icon, useWindowSize } from '@edx/paragon';
+import { Icon } from '@edx/paragon';
 import { useModel } from '../../../../generic/model-store';

 import GradeRangeTooltip from './GradeRangeTooltip';
@@ -25,7 +27,13 @@ function CourseGradeFooter({ intl, passingGrade }) {
    },
  } = useModel('progress', courseId);

-  const wideScreen = useWindowSize().width >= breakpoints.medium.minWidth;
+  const layout = layoutGenerator({
+    mobile: 0,
+    tablet: 768,
+  });
+
+  const OnMobile = layout.is('mobile');
+  const OnAtLeastTablet = layout.isAtLeast('tablet');

  const hasLetterGrades = Object.keys(gradeRange).length > 1; // A pass/fail course will only have one key
  let footerText = intl.formatMessage(messages.courseGradeFooterNonPassing, { passingGrade });
@@ -58,7 +66,7 @@ function CourseGradeFooter({ intl, passingGrade }) {
        {icon}
      </div>
      <div className="col-11 pl-2 px-0">
-        {!wideScreen && (
+        <OnMobile>
          <span className="h5 align-bottom">
            {footerText}
            {hasLetterGrades && (
@@ -68,8 +76,8 @@ function CourseGradeFooter({ intl, passingGrade }) {
              </span>
            )}
          </span>
-        )}
-        {wideScreen && (
+        </OnMobile>
+        <OnAtLeastTablet>
          <span className="h4 m-0 align-bottom">
            {footerText}
            {hasLetterGrades && (
@@ -79,7 +87,7 @@ function CourseGradeFooter({ intl, passingGrade }) {
              </span>
            )}
          </span>
-        )}
+        </OnAtLeastTablet>
      </div>
    </div>
  );
--- a/src/course-home/progress-tab/grades/course-grade/CurrentGradeTooltip.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/CurrentGradeTooltip.jsx
@@ -19,11 +19,11 @@ function CurrentGradeTooltip({ intl, tooltipClassName }) {
  const {
    courseGrade: {
      isPassing,
-      percent,
+      visiblePercent,
    },
  } = useModel('progress', courseId);

-  const currentGrade = Number((percent * 100).toFixed(0));
+  const currentGrade = Number((visiblePercent * 100).toFixed(0));

  let currentGradeDirection = currentGrade < 50 ? '' : '-';

--- a/src/course-home/progress-tab/grades/course-grade/GradeBar.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/GradeBar.jsx
@@ -17,17 +17,17 @@ function GradeBar({ intl, passingGrade }) {
  const {
    courseGrade: {
      isPassing,
-      percent,
+      visiblePercent,
    },
    gradesFeatureIsFullyLocked,
  } = useModel('progress', courseId);

-  const currentGrade = Number((percent * 100).toFixed(0));
+  const currentGrade = Number((visiblePercent * 100).toFixed(0));

  const lockedTooltipClassName = gradesFeatureIsFullyLocked ? 'locked-overlay' : '';

  return (
-    <div className="col-12 col-sm-6 align-self-center p-0">
+    <div className="col-12 col-sm-6 align-self-center">
      <div className="sr-only">{intl.formatMessage(messages.courseGradeBarAltText, { currentGrade, passingGrade })}</div>
      <svg width="100%" height="100px" className="grade-bar" aria-hidden="true">
        <g style={{ transform: 'translateY(2.61em)' }}>
--- a/src/course-home/progress-tab/grades/detailed-grades/DetailedGrades.jsx
+++ b/src/course-home/progress-tab/grades/detailed-grades/DetailedGrades.jsx
@@ -39,8 +39,7 @@ function DetailedGrades({ intl }) {

  const outlineLink = (
    <Hyperlink
-      variant="muted"
-      isInline
+      className="muted-link inline-link"
      destination={`${getConfig().LMS_BASE_URL}/courses/${courseId}/course`}
      onClick={logOutlineLinkClick}
      tabIndex={gradesFeatureIsFullyLocked ? '-1' : '0'}
@@ -68,7 +67,6 @@ function DetailedGrades({ intl }) {
        <FormattedMessage
          id="progress.ungradedAlert"
          defaultMessage="For progress on ungraded aspects of the course, view your {outlineLink}."
-          description="Text that precede link that redirect to course outline page"
          values={{ outlineLink }}
        />
      </p>
--- a/src/course-home/progress-tab/grades/detailed-grades/SubsectionTitleCell.jsx
+++ b/src/course-home/progress-tab/grades/detailed-grades/SubsectionTitleCell.jsx
@@ -6,9 +6,7 @@ import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Collapsible, Icon, Row } from '@edx/paragon';
-import {
-  ArrowDropDown, ArrowDropUp, Blocked, Info,
-} from '@edx/paragon/icons';
+import { ArrowDropDown, ArrowDropUp, Blocked } from '@edx/paragon/icons';

 import messages from '../messages';
 import { useModel } from '../../../../generic/model-store';
@@ -81,21 +79,7 @@ function SubsectionTitleCell({ intl, subsection }) {
        </span>
      </Row>
      <Collapsible.Body className="d-flex w-100">
-        <div className="col">
-          { subsection.override && (
-            <div className="row w-100 m-0 x-small ml-4 pt-2 pl-1 text-gray-700 flex-nowrap">
-              <div>
-                <Icon
-                  src={Info}
-                  className="x-small mr-1 text-primary-500"
-                  style={{ height: '1.3em', width: '1.3em' }}
-                />
-              </div>
-              <div>{intl.formatMessage(messages.sectionGradeOverridden)}</div>
-            </div>
-          )}
-          <ProblemScoreDrawer problemScores={problemScores} subsection={subsection} />
-        </div>
+        <ProblemScoreDrawer problemScores={problemScores} subsection={subsection} />
      </Collapsible.Body>
    </Collapsible.Advanced>
  );
@@ -103,20 +87,7 @@ function SubsectionTitleCell({ intl, subsection }) {

 SubsectionTitleCell.propTypes = {
  intl: intlShape.isRequired,
-  subsection: PropTypes.shape({
-    blockKey: PropTypes.string.isRequired,
-    displayName: PropTypes.string.isRequired,
-    learnerHasAccess: PropTypes.bool.isRequired,
-    override: PropTypes.shape({
-      system: PropTypes.string,
-      reason: PropTypes.string,
-    }),
-    problemScores: PropTypes.arrayOf(PropTypes.shape({
-      earned: PropTypes.number.isRequired,
-      possible: PropTypes.number.isRequired,
-    })).isRequired,
-    url: PropTypes.string,
-  }).isRequired,
+  subsection: PropTypes.shape.isRequired,
 };

 export default injectIntl(SubsectionTitleCell);
--- a/src/course-home/progress-tab/grades/grade-summary/GradeSummaryTable.jsx
+++ b/src/course-home/progress-tab/grades/grade-summary/GradeSummaryTable.jsx
@@ -64,7 +64,7 @@ function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {
      footnoteMarker = footnotes.length;
    }

-    const locked = !gradesFeatureIsFullyLocked && hasNoAccessToAssignmentsOfType(assignment.type);
+    const locked = !gradesFeatureIsFullyLocked && hasNoAccessToAssignmentsOfType(assignment.type) ? 'greyed-out' : '';

    return {
      type: {
--- a/src/course-home/progress-tab/grades/grade-summary/GradeSummaryTableFooter.jsx
+++ b/src/course-home/progress-tab/grades/grade-summary/GradeSummaryTableFooter.jsx
@@ -15,12 +15,12 @@ function GradeSummaryTableFooter({ intl }) {
  const {
    courseGrade: {
      isPassing,
-      percent,
+      visiblePercent,
    },
  } = useModel('progress', courseId);

  const bgColor = isPassing ? 'bg-success-100' : 'bg-warning-100';
-  const totalGrade = (percent * 100).toFixed(0);
+  const totalGrade = (visiblePercent * 100).toFixed(0);

  return (
    <DataTable.TableFooter className={`border-top border-primary ${bgColor}`}>
--- a/src/course-home/progress-tab/grades/messages.js
+++ b/src/course-home/progress-tab/grades/messages.js
@@ -4,196 +4,149 @@ const messages = defineMessages({
  assignmentType: {
    id: 'progress.assignmentType',
    defaultMessage: 'Assignment type',
-    description: 'Header for column that indicate type of the assignment in grade summary table',
  },
  backToContent: {
    id: 'progress.footnotes.backToContent',
    defaultMessage: 'Back to content',
-    description: 'Text for button that redirects to contnet',
  },
  courseGradeBody: {
    id: 'progress.courseGrade.body',
    defaultMessage: 'This represents your weighted grade against the grade needed to pass this course.',
-    description: 'This text is shown to explain the meaning of the (grade bar) chart',
  },
  courseGradeBarAltText: {
    id: 'progress.courseGrade.gradeBar.altText',
    defaultMessage: 'Your current grade is {currentGrade}%. A weighted grade of {passingGrade}% is required to pass in this course.',
-    description: 'Alt text for the grade chart bar',
  },
  courseGradeFooterGenericPassing: {
    id: 'progress.courseGrade.footer.generic.passing',
    defaultMessage: 'You’re currently passing this course',
-    description: 'This shown when learner weighted grade is greater or equal course passing grade',
  },
  courseGradeFooterNonPassing: {
    id: 'progress.courseGrade.footer.nonPassing',
    defaultMessage: 'A weighted grade of {passingGrade}% is required to pass in this course',
-    description: 'This shown when learner weighted grade is less than course passing grade',
  },
  courseGradeFooterPassingWithGrade: {
    id: 'progress.courseGrade.footer.passing',
    defaultMessage: 'You’re currently passing this course with a grade of {letterGrade} ({minGrade}-{maxGrade}%)',
-    description: 'This shown when learner weighted grade is greater or equal course passing grade amd course is using letter grade',
  },
  courseGradePreviewHeaderLocked: {
    id: 'progress.courseGrade.preview.headerLocked',
    defaultMessage: 'locked feature',
-    description: 'This when (progress page) feature is locked, sometimes learner needs to upgrade to get insight about their progress',
  },
  courseGradePreviewHeaderLimited: {
    id: 'progress.courseGrade.preview.headerLimited',
    defaultMessage: 'limited feature',
-    description: 'This when (progress page) feature is partially locked, it means leaners can see their progress but not get to a certificate',
  },
  courseGradePreviewHeaderAriaHidden: {
    id: 'progress.courseGrade.preview.header.ariaHidden',
    defaultMessage: 'Preview of a ',
-    description: 'This text precedes either (locked feature) or (limited feature)',
  },
  courseGradePreviewUnlockCertificateBody: {
    id: 'progress.courseGrade.preview.body.unlockCertificate',
    defaultMessage: 'Unlock to view grades and work towards a certificate.',
-    description: 'Recommending an action for learner when they need to upgrade to view progress and get a certificate',
  },
  courseGradePartialPreviewUnlockCertificateBody: {
    id: 'progress.courseGrade.partialpreview.body.unlockCertificate',
    defaultMessage: 'Unlock to work towards a certificate.',
-    description: 'Recommending an action for learner when they need to upgrade to get a certificate',
  },
  courseGradePreviewUpgradeDeadlinePassedBody: {
    id: 'progress.courseGrade.preview.body.upgradeDeadlinePassed',
    defaultMessage: 'The deadline to upgrade in this course has passed.',
-    description: 'Shown when learner no longer can upgrade',
  },
  courseGradePreviewUpgradeButton: {
    id: 'progress.courseGrade.preview.button.upgrade',
    defaultMessage: 'Upgrade now',
-    description: 'Text for button that redirects to the upgrade page',
  },
  courseGradeRangeTooltip: {
    id: 'progress.courseGrade.gradeRange.tooltip',
    defaultMessage: 'Grade ranges for this course:',
-    description: 'This shown when course is using (letter grade) to explain e.g. range for A, B, and C...etc',
  },
  courseOutline: {
    id: 'progress.courseOutline',
    defaultMessage: 'Course Outline',
-    description: 'Anchor text for link that redirects to (course outline) tab',
  },
  currentGradeLabel: {
    id: 'progress.courseGrade.label.currentGrade',
    defaultMessage: 'Your current grade',
-    description: 'Text label current leaner grade on (grade bar) chart',
  },
  detailedGrades: {
    id: 'progress.detailedGrades',
    defaultMessage: 'Detailed grades',
-    description: 'Headline for the (detailed grade) section in the progress tab',
  },
  detailedGradesEmpty: {
    id: 'progress.detailedGrades.emptyTable',
    defaultMessage: 'You currently have no graded problem scores.',
-    description: 'It indicate that there are no problem or assignments to be scored',
  },
  footnotesTitle: {
    id: 'progress.footnotes.title',
    defaultMessage: 'Grade summary footnotes',
-    description: 'Title for grade summary footnotes, if exists',
  },
  grade: {
    id: 'progress.gradeSummary.grade',
    defaultMessage: 'Grade',
-    description: 'Headline for (grade column) in grade summary table',
  },
  grades: {
    id: 'progress.courseGrade.grades',
    defaultMessage: 'Grades',
-    description: 'Headline for grades section in progress tab',
-  },
-  gradesAndCredit: {
-    id: 'progress.courseGrade.gradesAndCredit',
-    defaultMessage: 'Grades & Credit',
-    description: 'Headline for (grades and credit) section in progress tab',
  },
  gradeRangeTooltipAlt: {
    id: 'progress.courseGrade.gradeRange.Tooltip',
    defaultMessage: 'Grade range tooltip',
-    description: 'Alt text for icon which that triggers (tip box) for grade range',
  },
  gradeSummary: {
    id: 'progress.gradeSummary',
    defaultMessage: 'Grade summary',
-    description: 'Headline for the (grade summary) section in (grades) section in progress tab',
  },
  gradeSummaryLimitedAccessExplanation: {
    id: 'progress.gradeSummary.limitedAccessExplanation',
    defaultMessage: 'You have limited access to graded assignments as part of the audit track in this course.',
-    description: 'Text shown when learner has limited access to grade feature',
  },
  gradeSummaryTooltipAlt: {
    id: 'progress.gradeSummary.tooltip.alt',
    defaultMessage: 'Grade summary tooltip',
-    description: 'Alt text for icon which that triggers (tip box) for grade summary',
  },
  gradeSummaryTooltipBody: {
    id: 'progress.gradeSummary.tooltip.body',
    defaultMessage: "Your course assignment's weight is determined by your instructor. "
      + 'By multiplying your grade by the weight for that assignment type, your weighted grade is calculated. '
      + "Your weighted grade is what's used to determine if you pass the course.",
-    description: 'The content of (tip box) for the grade summary section',
-  },
-  noAccessToAssignmentType: {
-    id: 'progress.noAcessToAssignmentType',
-    defaultMessage: 'You do not have access to assignments of type {assignmentType}',
-    description: 'Its alt text for locked icon which is shown if assignment type in (grade summary table) is locked',
-  },
-  noAccessToSubsection: {
-    id: 'progress.noAcessToSubsection',
-    defaultMessage: 'You do not have access to subsection {displayName}',
-    description: 'Text shown when learner have limited access to grades feature',
  },
  passingGradeLabel: {
    id: 'progress.courseGrade.label.passingGrade',
    defaultMessage: 'Passing grade',
-    description: 'Label for mark on the (grade bar) chart which indicate the poisition of passing grade on the bar',
  },
  problemScoreLabel: {
    id: 'progress.detailedGrades.problemScore.label',
    defaultMessage: 'Problem Scores:',
-    description: 'Label text which precedes detailed view of all scores per assignment',
  },
  problemScoreToggleAltText: {
    id: 'progress.detailedGrades.problemScore.toggleButton',
    defaultMessage: 'Toggle individual problem scores for {subsectionTitle}',
-    description: 'Alt text for button which switches detailed view per module',
-  },
-  sectionGradeOverridden: {
-    id: 'progress.detailedGrades.overridden',
-    defaultMessage: 'Section grade has been overridden.',
-    description: 'This indicate that the graded score has been changed, it can happen if leaner initial assessment was not fair, might be for other reasons as well',
  },
  score: {
    id: 'progress.score',
    defaultMessage: 'Score',
-    description: 'It indicate how many points the learner have socred scored in particular assignment, or exam',
  },
  weight: {
    id: 'progress.weight',
    defaultMessage: 'Weight',
-    description: 'It indicate the weight of particular assignment on overall course grade, it is demeterined by course author',
  },
  weightedGrade: {
    id: 'progress.weightedGrade',
    defaultMessage: 'Weighted grade',
-    description: 'Weighed grade is calculated by (weight %) * (grade score) ',
  },
  weightedGradeSummary: {
    id: 'progress.weightedGradeSummary',
    defaultMessage: 'Your current weighted grade summary',
-    description: 'It the text precede the sum of weighted grades of all the assignment',
  },
-
+  noAccessToAssignmentType: {
+    id: 'progress.noAcessToAssignmentType',
+    defaultMessage: 'You do not have access to assignments of type {assignmentType}',
+  },
+  noAccessToSubsection: {
+    id: 'progress.noAcessToSubsection',
+    defaultMessage: 'You do not have access to subsection {displayName}',
+  },
 });

 export default messages;
--- a/src/course-home/progress-tab/messages.js
+++ b/src/course-home/progress-tab/messages.js
@@ -4,7 +4,6 @@ const messages = defineMessages({
  progressHeader: {
    id: 'progress.header',
    defaultMessage: 'Your progress',
-    description: 'Headline or title for the progress tab',
  },
  progressHeaderForTargetUser: {
    id: 'progress.header.targetUser',
@@ -14,7 +13,6 @@ const messages = defineMessages({
  studioLink: {
    id: 'progress.link.studio',
    defaultMessage: 'View grading in Studio',
-    description: 'Text shown for button that redirects to the studio if the user is a staff memember',
  },
 });

--- a/src/course-home/progress-tab/related-links/messages.js
+++ b/src/course-home/progress-tab/related-links/messages.js
@@ -4,27 +4,22 @@ const messages = defineMessages({
  datesCardDescription: {
    id: 'progress.relatedLinks.datesCard.description',
    defaultMessage: 'A schedule view of your course due dates and upcoming assignments.',
-    description: 'It explain the content of the dates tab',
  },
  datesCardLink: {
    id: 'progress.relatedLinks.datesCard.link',
    defaultMessage: 'Dates',
-    description: 'Anchor text for link that redirects to dates tab',
  },
  outlineCardDescription: {
    id: 'progress.relatedLinks.outlineCard.description',
    defaultMessage: 'A birds-eye view of your course content.',
-    description: 'It explain the content of the course outline tab',
  },
  outlineCardLink: {
    id: 'progress.relatedLinks.outlineCard.link',
    defaultMessage: 'Course Outline',
-    description: 'Anchor text for link that redirects to course outline tab',
  },
  relatedLinks: {
    id: 'progress.relatedLinks',
    defaultMessage: 'Related links',
-    description: 'Headline for (related links) section in progress tab',
  },
 });

--- a/src/course-home/suggested-schedule-messaging/messages.js
+++ b/src/course-home/suggested-schedule-messaging/messages.js
@@ -5,7 +5,6 @@ const messages = defineMessages({
    id: 'datesBanner.suggestedSchedule',
    defaultMessage: 'We’ve built a suggested schedule to help you stay on track. But don’t worry—it’s flexible so you'
      + ' can learn at your own pace.',
-    description: 'Messaging that explain the gaol and the effect fo the suggested schedule',
  },
  upgradeToCompleteHeader: {
    id: 'datesBanner.upgradeToCompleteGradedBanner.header',
@@ -16,7 +15,6 @@ const messages = defineMessages({
    id: 'datesBanner.upgradeToCompleteGradedBanner.body',
    defaultMessage: 'You are auditing this course, which means that you are unable to participate in graded'
      + ' assignments. To complete graded assignments as part of this course, you can upgrade today.',
-    description: 'It explain the effect of upgrading the course',
  },
  upgradeToCompleteButton: {
    id: 'datesBanner.upgradeToCompleteGradedBanner.button',
@@ -27,7 +25,6 @@ const messages = defineMessages({
    id: 'datesBanner.upgradeToResetBanner.body',
    defaultMessage: 'To keep yourself on track, you can update this schedule and shift the past due assignments into'
      + ' the future. Don’t worry—you won’t lose any of the progress you’ve made when you shift your due dates.',
-    description: 'Text that explain the consequences of resetting dates when learner needs to upgrade to do so',
  },
  upgradeToShiftButton: {
    id: 'datesBanner.upgradeToResetBanner.button',
@@ -38,13 +35,11 @@ const messages = defineMessages({
  missedDeadlines: {
    id: 'datesBanner.resetDatesBanner.header',
    defaultMessage: 'It looks like you missed some important deadlines based on our suggested schedule.',
-    description: 'Text shown when leaner missed assignment due date',
  },
  shiftDatesBody: {
    id: 'datesBanner.resetDatesBanner.body',
    defaultMessage: 'To keep yourself on track, you can update this schedule and shift the past due assignments into'
      + ' the future. Don’t worry—you won’t lose any of the progress you’ve made when you shift your due dates.',
-    description: 'Text that explain the consequences of resetting dates',
  },
  shiftDatesButton: {
    id: 'datesBanner.resetDatesBanner.button',
--- a/src/course-tabs/CourseTabsNavigation.jsx
+++ b/src/course-tabs/CourseTabsNavigation.jsx
@@ -10,7 +10,7 @@ function CourseTabsNavigation({
  activeTabSlug, className, tabs, intl,
 }) {
  return (
-    <div id="courseTabsNavigation" className={classNames('course-tabs-navigation', className)}>
+    <div className={classNames('course-tabs-navigation', className)}>
      <div className="container-xl">
        <Tabs
          className="nav-underline-tabs"
--- a/src/course-tabs/CourseTabsNavigation.test.jsx
+++ b/src/course-tabs/CourseTabsNavigation.test.jsx
@@ -23,10 +23,12 @@ describe('Course Tabs Navigation', () => {
    };
    render(<CourseTabsNavigation {...mockData} />);

-    expect(screen.getByRole('link', { name: tabs[0].title })).toHaveAttribute('href', tabs[0].url);
-    expect(screen.getByRole('link', { name: tabs[0].title })).toHaveClass('active');
+    expect(screen.getByRole('link', { name: tabs[0].title }))
+      .toHaveAttribute('href', tabs[0].url)
+      .toHaveClass('active');

-    expect(screen.getByRole('link', { name: tabs[1].title })).toHaveAttribute('href', tabs[1].url);
-    expect(screen.getByRole('link', { name: tabs[1].title })).not.toHaveClass('active');
+    expect(screen.getByRole('link', { name: tabs[1].title }))
+      .toHaveAttribute('href', tabs[1].url)
+      .not.toHaveClass('active');
  });
 });
--- a/src/courseware/CoursewareContainer.jsx
+++ b/src/courseware/CoursewareContainer.jsx
@@ -10,7 +10,6 @@ import {
  fetchCourse,
  fetchSequence,
  getResumeBlock,
-  getSequenceForUnitDeprecated,
  saveSequencePosition,
 } from './data';
 import { TabPage } from '../tab-page';
@@ -18,7 +17,6 @@ import { TabPage } from '../tab-page';
 import Course from './course';
 import { handleNextSectionCelebration } from './course/celebration';

-// Look at where this is called in componentDidUpdate for more info about its usage
 const checkResumeRedirect = memoize((courseStatus, courseId, sequenceId, firstSequenceId) => {
  if (courseStatus === 'loaded' && !sequenceId) {
    // Note that getResumeBlock is just an API call, not a redux thunk.
@@ -33,14 +31,12 @@ const checkResumeRedirect = memoize((courseStatus, courseId, sequenceId, firstSe
  }
 });

-// Look at where this is called in componentDidUpdate for more info about its usage
 const checkSectionUnitToUnitRedirect = memoize((courseStatus, courseId, sequenceStatus, section, unitId) => {
  if (courseStatus === 'loaded' && sequenceStatus === 'failed' && section && unitId) {
    history.replace(`/course/${courseId}/${unitId}`);
  }
 });

-// Look at where this is called in componentDidUpdate for more info about its usage
 const checkSectionToSequenceRedirect = memoize((courseStatus, courseId, sequenceStatus, section, unitId) => {
  if (courseStatus === 'loaded' && sequenceStatus === 'failed' && section && !unitId) {
    // If the section is non-empty, redirect to its first sequence.
@@ -53,35 +49,14 @@ const checkSectionToSequenceRedirect = memoize((courseStatus, courseId, sequence
  }
 });

-// Look at where this is called in componentDidUpdate for more info about its usage
-const checkUnitToSequenceUnitRedirect = memoize((
-  courseStatus, courseId, sequenceStatus, sequenceMightBeUnit, sequenceId, section, routeUnitId,
-) => {
-  if (courseStatus === 'loaded' && sequenceStatus === 'failed' && !section && !routeUnitId) {
-    if (sequenceMightBeUnit) {
-      // If the sequence failed to load as a sequence, but it is marked as a possible unit, then we need to look up the
-      // correct parent sequence for it, and redirect there.
-      const unitId = sequenceId; // just for clarity during the rest of this method
-      getSequenceForUnitDeprecated(courseId, unitId).then(
-        parentId => {
-          if (parentId) {
-            history.replace(`/course/${courseId}/${parentId}/${unitId}`);
-          } else {
-            history.replace(`/course/${courseId}`);
-          }
-        },
-        () => { // error case
-          history.replace(`/course/${courseId}`);
-        },
-      );
-    } else {
-      // Invalid sequence that isn't a unit either. Redirect up to main course.
-      history.replace(`/course/${courseId}`);
-    }
+const checkUnitToSequenceUnitRedirect = memoize((courseStatus, courseId, sequenceStatus, unit) => {
+  if (courseStatus === 'loaded' && sequenceStatus === 'failed' && unit) {
+    // If the sequence failed to load as a sequence, but it *did* load as a unit, then
+    // insert the unit's parent sequenceId into the URL.
+    history.replace(`/course/${courseId}/${unit.sequenceId}/${unit.id}`);
  }
 });

-// Look at where this is called in componentDidUpdate for more info about its usage
 const checkSequenceToSequenceUnitRedirect = memoize((courseId, sequenceStatus, sequence, unitId) => {
  if (sequenceStatus === 'loaded' && sequence.id && !unitId) {
    if (sequence.unitIds !== undefined && sequence.unitIds.length > 0) {
@@ -92,33 +67,6 @@ const checkSequenceToSequenceUnitRedirect = memoize((courseId, sequenceStatus, s
  }
 });

-// Look at where this is called in componentDidUpdate for more info about its usage
-const checkSequenceUnitMarkerToSequenceUnitRedirect = memoize((courseId, sequenceStatus, sequence, unitId) => {
-  if (sequenceStatus !== 'loaded' || !sequence.id) {
-    return;
-  }
-
-  const hasUnits = sequence.unitIds?.length > 0;
-
-  if (unitId === 'first') {
-    if (hasUnits) {
-      const firstUnitId = sequence.unitIds[0];
-      history.replace(`/course/${courseId}/${sequence.id}/${firstUnitId}`);
-    } else {
-      // No units... go to general sequence page
-      history.replace(`/course/${courseId}/${sequence.id}`);
-    }
-  } else if (unitId === 'last') {
-    if (hasUnits) {
-      const lastUnitId = sequence.unitIds[sequence.unitIds.length - 1];
-      history.replace(`/course/${courseId}/${sequence.id}/${lastUnitId}`);
-    } else {
-      // No units... go to general sequence page
-      history.replace(`/course/${courseId}/${sequence.id}`);
-    }
-  }
-});
-
 class CoursewareContainer extends Component {
  checkSaveSequencePosition = memoize((unitId) => {
    const {
@@ -163,9 +111,9 @@ class CoursewareContainer extends Component {
      sequenceId,
      courseStatus,
      sequenceStatus,
-      sequenceMightBeUnit,
      sequence,
      firstSequenceId,
+      unitViaSequenceId,
      sectionViaSequenceId,
      match: {
        params: {
@@ -180,24 +128,12 @@ class CoursewareContainer extends Component {
    this.checkFetchCourse(routeCourseId);
    this.checkFetchSequence(routeSequenceId);

-    // Check if we should save our sequence position.  Only do this when the route unit ID changes.
-    this.checkSaveSequencePosition(routeUnitId);
-
-    // Coerce the route ids into null here because they can be undefined, but the redux ids would be null instead.
-    if (courseId !== (routeCourseId || null) || sequenceId !== (routeSequenceId || null)) {
-      // The non-route ids are pulled from redux state - they are changed at the same time as the status variables.
-      // But the route ids are pulled directly from the route. So if the route changes, and we start a fetch above,
-      // there's a race condition where the route ids are for one course, but the status and the other ids are for a
-      // different course. Since all the logic below depends on the status variables and the route unit id, we'll wait
-      // until the ids match and thus the redux states got updated. So just bail for now.
-      return;
-    }
-
    // All courseware URLs should normalize to the format /course/:courseId/:sequenceId/:unitId
    // via the series of redirection rules below.
    // See docs/decisions/0008-liberal-courseware-path-handling.md for more context.
    // (It would be ideal to move this logic into the thunks layer and perform
-    //  all URL-changing checks at once. See TNL-8182.)
+    //  all URL-changing checks at once. This should be done once the MFE is moved
+    //  to the new Outlines API. See TNL-8182.)

    // Check resume redirect:
    //   /course/:courseId -> /course/:courseId/:sequenceId/:unitId
@@ -225,22 +161,16 @@ class CoursewareContainer extends Component {
    // Check unit to sequence-unit redirect:
    //    /course/:courseId/:unitId -> /course/:courseId/:sequenceId/:unitId
    // by filling in the ID of the parent sequence of :unitId.
-    checkUnitToSequenceUnitRedirect(
-      courseStatus, courseId, sequenceStatus, sequenceMightBeUnit, sequenceId, sectionViaSequenceId, routeUnitId,
-    );
+    checkUnitToSequenceUnitRedirect(courseStatus, courseId, sequenceStatus, unitViaSequenceId);

-    // Check sequence to sequence-unit redirect:
+    // Check to sequence to sequence-unit redirect:
    //    /course/:courseId/:sequenceId -> /course/:courseId/:sequenceId/:unitId
    // by filling in the ID the most-recently-active unit in the sequence, OR
    // the ID of the first unit the sequence if none is active.
    checkSequenceToSequenceUnitRedirect(courseId, sequenceStatus, sequence, routeUnitId);

-    // Check sequence-unit marker to sequence-unit redirect:
-    //    /course/:courseId/:sequenceId/first -> /course/:courseId/:sequenceId/:unitId
-    //    /course/:courseId/:sequenceId/last -> /course/:courseId/:sequenceId/:unitId
-    // by filling in the ID the first or last unit in the sequence.
-    // "Sequence unit marker" is an invented term used only in this component.
-    checkSequenceUnitMarkerToSequenceUnitRedirect(courseId, sequenceStatus, sequence, routeUnitId);
+    // Check if we should save our sequence position.  Only do this when the route unit ID changes.
+    this.checkSaveSequencePosition(routeUnitId);
  }

  handleUnitNavigationClick = (nextUnitId) => {
@@ -267,11 +197,18 @@ class CoursewareContainer extends Component {
    } = this.props;

    if (nextSequence !== null) {
-      history.push(`/course/${courseId}/${nextSequence.id}/first`);
+      let nextUnitId = null;
+      if (nextSequence.unitIds.length > 0) {
+        [nextUnitId] = nextSequence.unitIds;
+        history.push(`/course/${courseId}/${nextSequence.id}/${nextUnitId}`);
+      } else {
+        // Some sequences have no units.  This will show a blank page with prev/next buttons.
+        history.push(`/course/${courseId}/${nextSequence.id}`);
+      }

      const celebrateFirstSection = course && course.celebrations && course.celebrations.firstSection;
      if (celebrateFirstSection && sequence.sectionId !== nextSequence.sectionId) {
-        handleNextSectionCelebration(sequenceId, nextSequence.id);
+        handleNextSectionCelebration(sequenceId, nextSequence.id, nextUnitId);
      }
    }
  }
@@ -279,7 +216,13 @@ class CoursewareContainer extends Component {
  handlePreviousSequenceClick = () => {
    const { previousSequence, courseId } = this.props;
    if (previousSequence !== null) {
-      history.push(`/course/${courseId}/${previousSequence.id}/last`);
+      if (previousSequence.unitIds.length > 0) {
+        const previousUnitId = previousSequence.unitIds[previousSequence.unitIds.length - 1];
+        history.push(`/course/${courseId}/${previousSequence.id}/${previousUnitId}`);
+      } else {
+        // Some sequences have no units.  This will show a blank page with prev/next buttons.
+        history.push(`/course/${courseId}/${previousSequence.id}`);
+      }
    }
  }

@@ -316,10 +259,18 @@ class CoursewareContainer extends Component {
  }
 }

+const unitShape = PropTypes.shape({
+  id: PropTypes.string.isRequired,
+  sequenceId: PropTypes.string.isRequired,
+});
+
 const sequenceShape = PropTypes.shape({
  id: PropTypes.string.isRequired,
-  unitIds: PropTypes.arrayOf(PropTypes.string),
+  unitIds: PropTypes.arrayOf(PropTypes.string).isRequired,
  sectionId: PropTypes.string.isRequired,
+  isTimeLimited: PropTypes.bool,
+  isProctored: PropTypes.bool,
+  legacyWebUrl: PropTypes.string,
 });

 const sectionShape = PropTypes.shape({
@@ -346,9 +297,9 @@ CoursewareContainer.propTypes = {
  firstSequenceId: PropTypes.string,
  courseStatus: PropTypes.oneOf(['loaded', 'loading', 'failed', 'denied']).isRequired,
  sequenceStatus: PropTypes.oneOf(['loaded', 'loading', 'failed']).isRequired,
-  sequenceMightBeUnit: PropTypes.bool.isRequired,
  nextSequence: sequenceShape,
  previousSequence: sequenceShape,
+  unitViaSequenceId: unitShape,
  sectionViaSequenceId: sectionShape,
  course: courseShape,
  sequence: sequenceShape,
@@ -364,6 +315,7 @@ CoursewareContainer.defaultProps = {
  firstSequenceId: null,
  nextSequence: null,
  previousSequence: null,
+  unitViaSequenceId: null,
  sectionViaSequenceId: null,
  course: null,
  sequence: null,
@@ -446,13 +398,18 @@ const sectionViaSequenceIdSelector = createSelector(
  (sectionsById, sequenceId) => (sectionsById[sequenceId] ? sectionsById[sequenceId] : null),
 );

+const unitViaSequenceIdSelector = createSelector(
+  (state) => state.models.units || {},
+  (state) => state.courseware.sequenceId,
+  (unitsById, sequenceId) => (unitsById[sequenceId] ? unitsById[sequenceId] : null),
+);
+
 const mapStateToProps = (state) => {
  const {
    courseId,
    sequenceId,
    courseStatus,
    sequenceStatus,
-    sequenceMightBeUnit,
  } = state.courseware;

  return {
@@ -460,13 +417,13 @@ const mapStateToProps = (state) => {
    sequenceId,
    courseStatus,
    sequenceStatus,
-    sequenceMightBeUnit,
    course: currentCourseSelector(state),
    sequence: currentSequenceSelector(state),
    previousSequence: previousSequenceSelector(state),
    nextSequence: nextSequenceSelector(state),
    firstSequenceId: firstSequenceIdSelector(state),
    sectionViaSequenceId: sectionViaSequenceIdSelector(state),
+    unitViaSequenceId: unitViaSequenceIdSelector(state),
  };
 };

--- a/src/courseware/CoursewareContainer.test.jsx
+++ b/src/courseware/CoursewareContainer.test.jsx
@@ -17,7 +17,6 @@ import CoursewareContainer from './CoursewareContainer';
 import { buildSimpleCourseBlocks, buildBinaryCourseBlocks } from '../shared/data/__factories__/courseBlocks.factory';
 import initializeStore from '../store';
 import { appendBrowserTimezoneToUrl } from '../utils';
-import { buildOutlineFromBlocks } from './data/__factories__/learningSequencesOutline.factory';

 // NOTE: Because the unit creates an iframe, we choose to mock it out as its rendering isn't
 // pertinent to this test.  Instead, we render a simple div that displays the properties we expect
@@ -48,7 +47,6 @@ describe('CoursewareContainer', () => {
  // By default, `setUpMockRequests()` will configure the mock LMS API to return use this data.
  // Certain test cases override these in order to test with special blocks/metadata.
  const defaultCourseMetadata = Factory.build('courseMetadata');
-  const defaultCourseHomeMetadata = Factory.build('courseHomeMetadata');
  const defaultCourseId = defaultCourseMetadata.id;
  const defaultUnitBlocks = [
    Factory.build(
@@ -72,7 +70,7 @@ describe('CoursewareContainer', () => {
    sequenceBlocks: [defaultSequenceBlock],
  } = buildSimpleCourseBlocks(
    defaultCourseId,
-    defaultCourseHomeMetadata.title,
+    defaultCourseMetadata.name,
    { unitBlocks: defaultUnitBlocks },
  );

@@ -102,9 +100,7 @@ describe('CoursewareContainer', () => {
  function setUpMockRequests(options = {}) {
    // If we weren't given course blocks or metadata, use the defaults.
    const courseBlocks = options.courseBlocks || defaultCourseBlocks;
-    const courseOutline = buildOutlineFromBlocks(courseBlocks);
    const courseMetadata = options.courseMetadata || defaultCourseMetadata;
-    const courseHomeMetadata = options.courseHomeMetadata || defaultCourseHomeMetadata;
    const courseId = courseMetadata.id;
    // If we weren't given a list of sequence metadatas for URL mocking,
    // then construct it ourselves by looking at courseBlocks.
@@ -122,34 +118,21 @@ describe('CoursewareContainer', () => {
        ))
    );

+    const courseBlocksUrlRegExp = new RegExp(`${getConfig().LMS_BASE_URL}/api/courses/v2/blocks/*`);
+    axiosMock.onGet(courseBlocksUrlRegExp).reply(200, courseBlocks);
+
    const learningSequencesUrlRegExp = new RegExp(`${getConfig().LMS_BASE_URL}/api/learning_sequences/v1/course_outline/*`);
-    axiosMock.onGet(learningSequencesUrlRegExp).reply(200, courseOutline);
+    axiosMock.onGet(learningSequencesUrlRegExp).reply(403, {});

    const courseMetadataUrl = appendBrowserTimezoneToUrl(`${getConfig().LMS_BASE_URL}/api/courseware/course/${courseId}`);
    axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);

-    const courseHomeMetadataUrl = appendBrowserTimezoneToUrl(`${getConfig().LMS_BASE_URL}/api/course_home/course_metadata/${courseId}`);
-    axiosMock.onGet(courseHomeMetadataUrl).reply(200, courseHomeMetadata);
-
    sequenceMetadatas.forEach(sequenceMetadata => {
      const sequenceMetadataUrl = `${getConfig().LMS_BASE_URL}/api/courseware/sequence/${sequenceMetadata.item_id}`;
      axiosMock.onGet(sequenceMetadataUrl).reply(200, sequenceMetadata);
      const proctoredExamApiUrl = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/proctored_exam/attempt/course_id/${courseId}/content_id/${sequenceMetadata.item_id}?is_learning_mfe=true`;
      axiosMock.onGet(proctoredExamApiUrl).reply(200, { exam: {}, active_attempt: {} });
    });
-
-    // Set up handlers for noticing when units are in the sequence spot
-    const courseBlocksUrlRegExp = new RegExp(`${getConfig().LMS_BASE_URL}/api/courses/v2/blocks/*`);
-    axiosMock.onGet(courseBlocksUrlRegExp).reply(200, courseBlocks);
-    Object.values(courseBlocks.blocks)
-      .filter(block => block.type === 'vertical')
-      .forEach(unitBlock => {
-        const sequenceMetadataUrl = `${getConfig().LMS_BASE_URL}/api/courseware/sequence/${unitBlock.id}`;
-        axiosMock.onGet(sequenceMetadataUrl).reply(422, {});
-      });
-
-    const discussionConfigUrl = new RegExp(`${getConfig().LMS_BASE_URL}/api/discussion/v1/courses/*`);
-    axiosMock.onGet(discussionConfigUrl).reply(200, { provider: 'legacy' });
  }

  async function loadContainer() {
@@ -173,16 +156,15 @@ describe('CoursewareContainer', () => {

  describe('when receiving successful course data', () => {
    const courseMetadata = defaultCourseMetadata;
-    const courseHomeMetadata = defaultCourseHomeMetadata;
    const courseId = defaultCourseId;

    function assertLoadedHeader(container) {
      const courseHeader = container.querySelector('.learning-header');
      // Ensure the course number and org appear - this proves we loaded course metadata properly.
-      expect(courseHeader).toHaveTextContent(courseHomeMetadata.number);
-      expect(courseHeader).toHaveTextContent(courseHomeMetadata.org);
+      expect(courseHeader).toHaveTextContent(courseMetadata.number);
+      expect(courseHeader).toHaveTextContent(courseMetadata.org);
      // Ensure the course title is showing up in the header.  This means we loaded course blocks properly.
-      expect(courseHeader.querySelector('.course-title')).toHaveTextContent(courseHomeMetadata.title);
+      expect(courseHeader.querySelector('.course-title')).toHaveTextContent(courseMetadata.name);
    }

    function assertSequenceNavigation(container, expectedUnitCount = 3) {
@@ -206,7 +188,7 @@ describe('CoursewareContainer', () => {
      const sequenceBlock = defaultSequenceBlock;
      const unitBlocks = defaultUnitBlocks;

-      it('should use the resume block response to pick a unit if it contains one', async () => {
+      it('should use the resume block repsonse to pick a unit if it contains one', async () => {
        axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/courseware/resume/${courseId}`).reply(200, {
          sectionId: sequenceBlock.id,
          unitId: unitBlocks[1].id,
@@ -251,7 +233,7 @@ describe('CoursewareContainer', () => {
      const {
        courseBlocks, unitTree, sequenceTree, sectionTree,
      } = buildBinaryCourseBlocks(
-        courseId, courseHomeMetadata.title,
+        courseId, courseMetadata.name,
      );

      function setUrl(urlSequenceId, urlUnitId = null) {
@@ -277,12 +259,6 @@ describe('CoursewareContainer', () => {
          assertSequenceNavigation(container, 2);
          assertLocation(container, sequenceTree[1][1].id, urlUnit.id);
        });
-
-        it('should ignore invalid unit IDs and redirect to the course root', async () => {
-          setUrl(sectionTree[1].id, 'foobar');
-          await loadContainer();
-          expect(global.location.href).toEqual(`http://localhost/course/${courseId}`);
-        });
      });

      describe('when the URL does not contain a unit ID', () => {
@@ -319,20 +295,13 @@ describe('CoursewareContainer', () => {
          await loadContainer();
          expect(global.location.href).toEqual(`http://localhost/course/${courseId}`);
        });
-      });
-    });

-    describe('when the URL contains a unit marker', () => {
-      it('should redirect /first to the first unit', async () => {
-        history.push(`/course/${courseId}/${defaultSequenceBlock.id}/first`);
-        await loadContainer();
-        expect(global.location.href).toEqual(`http://localhost/course/${courseId}/${defaultSequenceBlock.id}/${defaultUnitBlocks[0].id}`);
-      });
-
-      it('should redirect /last to the last unit', async () => {
-        history.push(`/course/${courseId}/${defaultSequenceBlock.id}/last`);
-        await loadContainer();
-        expect(global.location.href).toEqual(`http://localhost/course/${courseId}/${defaultSequenceBlock.id}/${defaultUnitBlocks[2].id}`);
+        it('should ignore the section and unit IDs and instead to the course root', async () => {
+          // Specific unit ID used here shouldn't matter; is ignored due to empty section.
+          setUrl(sectionTree[1].id, unitTree[0][0][0]);
+          await loadContainer();
+          expect(global.location.href).toEqual(`http://localhost/course/${courseId}`);
+        });
      });
    });

@@ -444,19 +413,17 @@ describe('CoursewareContainer', () => {

  describe('when receiving a course_access error_code', () => {
    function setUpWithDeniedStatus(errorCode) {
-      const courseMetadata = Factory.build('courseMetadata');
-      const courseHomeMetadata = Factory.build('courseHomeMetadata', {
+      const courseMetadata = Factory.build('courseMetadata', {
        course_access: {
          has_access: false,
          error_code: errorCode,
          additional_context_user_message: 'uhoh oh no', // only used by audit_expired
        },
      });
-
      const courseId = courseMetadata.id;

      const { courseBlocks, sequenceBlocks, unitBlocks } = buildSimpleCourseBlocks(courseId, courseMetadata.name);
-      setUpMockRequests({ courseBlocks, courseMetadata, courseHomeMetadata });
+      setUpMockRequests({ courseBlocks, courseMetadata });
      history.push(`/course/${courseId}/${sequenceBlocks[0].id}/${unitBlocks[0].id}`);
      return { courseMetadata, unitBlocks };
    }
@@ -475,6 +442,13 @@ describe('CoursewareContainer', () => {
      expect(global.location.href).toEqual(`http://localhost/redirect/survey/${courseMetadata.id}`);
    });

+    it('should go to legacy courseware for a microfrontend_disabled error code', async () => {
+      const { courseMetadata, unitBlocks } = setUpWithDeniedStatus('microfrontend_disabled');
+      await loadContainer();
+
+      expect(global.location.href).toEqual(`http://localhost/redirect/courseware/${courseMetadata.id}/unit/${unitBlocks[0].id}`);
+    });
+
    it('should go to course home for an authentication_required error code', async () => {
      const { courseMetadata } = setUpWithDeniedStatus('authentication_required');
      await loadContainer();
@@ -504,21 +478,4 @@ describe('CoursewareContainer', () => {
      expect(global.location.href).toEqual(`http://localhost/redirect/dashboard?notlive=${startDate}`);
    });
  });
-
-  describe('redirects when canLoadCourseware is false', () => {
-    it('should go to legacy courseware for disabled frontend', async () => {
-      const courseMetadata = Factory.build('courseMetadata');
-      const courseHomeMetadata = Factory.build('courseHomeMetadata', {
-        can_load_courseware: false,
-      });
-      const courseId = courseMetadata.id;
-      const { courseBlocks, sequenceBlocks, unitBlocks } = buildSimpleCourseBlocks(courseId, courseMetadata.name);
-      setUpMockRequests({ courseBlocks, courseMetadata, courseHomeMetadata });
-      history.push(`/course/${courseId}/${sequenceBlocks[0].id}/${unitBlocks[0].id}`);
-
-      await loadContainer();
-
-      expect(global.location.href).toEqual(`http://localhost/redirect/courseware/${courseMetadata.id}/unit/${unitBlocks[0].id}`);
-    });
-  });
 });
--- a/src/courseware/CoursewareRedirect.jsx
+++ b/src/courseware/CoursewareRedirect.jsx
@@ -0,0 +1,14 @@
+import { getConfig } from '@edx/frontend-platform';
+
+import { useModel } from '../generic/model-store';
+
+export default function CourseRedirect({ match }) {
+  const {
+    courseId,
+    unitId,
+  } = match.params;
+  const unit = useModel('units', unitId) || {};
+  const coursewareUrl = unit.legacyWebUrl || `${getConfig().LMS_BASE_URL}/courses/${courseId}/courseware/`;
+  global.location.assign(coursewareUrl);
+  return null;
+}
--- a/src/courseware/CoursewareRedirectLandingPage.jsx
+++ b/src/courseware/CoursewareRedirectLandingPage.jsx
@@ -5,6 +5,7 @@ import { FormattedMessage } from '@edx/frontend-platform/i18n';
 import { PageRoute } from '@edx/frontend-platform/react';

 import PageLoading from '../generic/PageLoading';
+import CoursewareRedirect from './CoursewareRedirect';

 export default () => {
  const { path } = useRouteMatch();
@@ -22,9 +23,7 @@ export default () => {
      <Switch>
        <PageRoute
          path={`${path}/courseware/:courseId/unit/:unitId`}
-          render={({ match }) => {
-            global.location.assign(`${getConfig().LMS_BASE_URL}/courses/${match.params.courseId}/jump_to/${match.params.unitId}?experience=legacy`);
-          }}
+          component={CoursewareRedirect}
        />
        <PageRoute
          path={`${path}/course-home/:courseId`}
--- a/src/courseware/course/Course.jsx
+++ b/src/courseware/course/Course.jsx
@@ -3,20 +3,19 @@ import PropTypes from 'prop-types';
 import { Helmet } from 'react-helmet';
 import { useDispatch } from 'react-redux';
 import { getConfig } from '@edx/frontend-platform';
-import { breakpoints, useWindowSize } from '@edx/paragon';

 import { AlertList } from '../../generic/user-messages';

 import Sequence from './sequence';

-import { CelebrationModal, shouldCelebrateOnSectionLoad, WeeklyGoalCelebrationModal } from './celebration';
+import { CelebrationModal, shouldCelebrateOnSectionLoad } from './celebration';
 import ContentTools from './content-tools';
 import CourseBreadcrumbs from './CourseBreadcrumbs';
-import SidebarProvider from './sidebar/SidebarContextProvider';
-import SidebarTriggers from './sidebar/SidebarTriggers';
+import NotificationTrigger from './NotificationTrigger';

 import { useModel } from '../../generic/model-store';
-import { getSessionStorage, setSessionStorage } from '../../data/sessionStorage';
+import useWindowSize, { responsiveBreakpoints } from '../../generic/tabs/useWindowSize';
+import { getLocalStorage, setLocalStorage } from '../../data/localStorage';

 /** [MM-P2P] Experiment */
 import { initCoursewareMMP2P, MMP2PBlockModal } from '../../experiments/mm-p2p';
@@ -28,13 +27,8 @@ function Course({
  nextSequenceHandler,
  previousSequenceHandler,
  unitNavigationHandler,
-  windowWidth,
 }) {
  const course = useModel('coursewareMeta', courseId);
-  const {
-    celebrations,
-    isStaff,
-  } = useModel('courseHomeMeta', courseId);
  const sequence = useModel('sequences', sequenceId);
  const section = useModel('sections', sequence ? sequence.sectionId : null);

@@ -44,54 +38,73 @@ function Course({
    course,
  ].filter(element => element != null).map(element => element.title);

+  const {
+    celebrations,
+    verifiedMode,
+  } = course;
+
  // Below the tabs, above the breadcrumbs alerts (appearing in the order listed here)
  const dispatch = useDispatch();
  const celebrateFirstSection = celebrations && celebrations.firstSection;
-  const [firstSectionCelebrationOpen, setFirstSectionCelebrationOpen] = useState(shouldCelebrateOnSectionLoad(
-    courseId, sequenceId, celebrateFirstSection, dispatch, celebrations,
-  ));
-  // If streakLengthToCelebrate is populated, that modal takes precedence. Wait til the next load to display
-  // the weekly goal celebration modal.
-  const [weeklyGoalCelebrationOpen, setWeeklyGoalCelebrationOpen] = useState(
-    celebrations && !celebrations.streakLengthToCelebrate && celebrations.weeklyGoal,
+  const celebrationOpen = shouldCelebrateOnSectionLoad(
+    courseId, sequenceId, unitId, celebrateFirstSection, dispatch, celebrations,
  );
-  const shouldDisplayTriggers = windowWidth >= breakpoints.small.minWidth;
-  const daysPerWeek = course?.courseGoals?.selectedGoal?.daysPerWeek;

-  // Responsive breakpoints for showing the notification button/tray
-  const shouldDisplayNotificationTrayOpenOnLoad = windowWidth > breakpoints.medium.minWidth;
+  const shouldDisplayNotificationTrigger = useWindowSize().width >= responsiveBreakpoints.small.minWidth;

-  // Course specific notification tray open/closed persistance by browser session
-  if (!getSessionStorage(`notificationTrayStatus.${courseId}`)) {
-    if (shouldDisplayNotificationTrayOpenOnLoad) {
-      setSessionStorage(`notificationTrayStatus.${courseId}`, 'open');
-    } else {
-      // responsive version displays the tray closed on initial load, set the sessionStorage to closed
-      setSessionStorage(`notificationTrayStatus.${courseId}`, 'closed');
-    }
+  const shouldDisplayNotificationTrayOpen = useWindowSize().width > responsiveBreakpoints.medium.minWidth;
+
+  const [notificationTrayVisible, setNotificationTray] = verifiedMode
+    && shouldDisplayNotificationTrayOpen ? useState(true) : useState(false);
+  const isNotificationTrayVisible = () => notificationTrayVisible && setNotificationTray;
+  const toggleNotificationTray = () => {
+    if (notificationTrayVisible) { setNotificationTray(false); } else { setNotificationTray(true); }
+  };
+
+  if (!getLocalStorage('notificationStatus')) {
+    setLocalStorage('notificationStatus', 'active'); // Show red dot on notificationTrigger until seen
  }

+  if (!getLocalStorage('upgradeNotificationCurrentState')) {
+    setLocalStorage('upgradeNotificationCurrentState', 'initialize');
+  }
+
+  const [notificationStatus, setNotificationStatus] = useState(getLocalStorage('notificationStatus'));
+  const [upgradeNotificationCurrentState, setupgradeNotificationCurrentState] = useState(getLocalStorage('upgradeNotificationCurrentState'));
+
+  const onNotificationSeen = () => {
+    setNotificationStatus('inactive');
+    setLocalStorage('notificationStatus', 'inactive');
+  };
+
  /** [MM-P2P] Experiment */
  const MMP2P = initCoursewareMMP2P(courseId, sequenceId, unitId);

  return (
-    <SidebarProvider courseId={courseId} unitId={unitId}>
+    <>
      <Helmet>
        <title>{`${pageTitleBreadCrumbs.join(' | ')} | ${getConfig().SITE_NAME}`}</title>
      </Helmet>
-      <div className="position-relative d-flex align-items-start">
+      <div className="position-relative">
        <CourseBreadcrumbs
          courseId={courseId}
          sectionId={section ? section.id : null}
          sequenceId={sequenceId}
-          isStaff={isStaff}
+          isStaff={course ? course.isStaff : null}
          unitId={unitId}
          //* * [MM-P2P] Experiment */
          mmp2p={MMP2P}
        />
-        {shouldDisplayTriggers && (
-          <SidebarTriggers />
-        )}
+
+        { shouldDisplayNotificationTrigger ? (
+          <NotificationTrigger
+            toggleNotificationTray={toggleNotificationTray}
+            isNotificationTrayVisible={isNotificationTrayVisible}
+            notificationStatus={notificationStatus}
+            setNotificationStatus={setNotificationStatus}
+            upgradeNotificationCurrentState={upgradeNotificationCurrentState}
+          />
+        ) : null}
      </div>

      <AlertList topic="sequence" />
@@ -102,24 +115,27 @@ function Course({
        unitNavigationHandler={unitNavigationHandler}
        nextSequenceHandler={nextSequenceHandler}
        previousSequenceHandler={previousSequenceHandler}
+        toggleNotificationTray={toggleNotificationTray}
+        isNotificationTrayVisible={isNotificationTrayVisible}
+        notificationTrayVisible={notificationTrayVisible}
+        notificationStatus={notificationStatus}
+        setNotificationStatus={setNotificationStatus}
+        onNotificationSeen={onNotificationSeen}
+        upgradeNotificationCurrentState={upgradeNotificationCurrentState}
+        setupgradeNotificationCurrentState={setupgradeNotificationCurrentState}
        //* * [MM-P2P] Experiment */
        mmp2p={MMP2P}
      />
-      <CelebrationModal
-        courseId={courseId}
-        isOpen={firstSectionCelebrationOpen}
-        onClose={() => setFirstSectionCelebrationOpen(false)}
-      />
-      <WeeklyGoalCelebrationModal
-        courseId={courseId}
-        daysPerWeek={daysPerWeek}
-        isOpen={weeklyGoalCelebrationOpen}
-        onClose={() => setWeeklyGoalCelebrationOpen(false)}
-      />
+      {celebrationOpen && (
+        <CelebrationModal
+          courseId={courseId}
+          open
+        />
+      )}
      <ContentTools course={course} />
      { /** [MM-P2P] Experiment */ }
      { MMP2P.meta.modalLock && <MMP2PBlockModal options={MMP2P} /> }
-    </SidebarProvider>
+    </>
  );
 }

@@ -130,7 +146,6 @@ Course.propTypes = {
  nextSequenceHandler: PropTypes.func.isRequired,
  previousSequenceHandler: PropTypes.func.isRequired,
  unitNavigationHandler: PropTypes.func.isRequired,
-  windowWidth: PropTypes.number.isRequired,
 };

 Course.defaultProps = {
@@ -139,18 +154,4 @@ Course.defaultProps = {
  unitId: null,
 };

-function CourseWrapper(props) {
-  // useWindowSize initially returns an undefined width intentionally at first.
-  // See https://www.joshwcomeau.com/react/the-perils-of-rehydration/ for why.
-  // But <Course> has some tricky window-size-dependent, session-storage-setting logic and React would yell at us if
-  // we exited that component early, before hitting all the useState() calls.
-  // So just skip all that until we have a window size available.
-  const windowWidth = useWindowSize().width;
-  if (windowWidth === undefined) {
-    return null;
-  }
-
-  return <Course {...props} windowWidth={windowWidth} />;
-}
-
-export default CourseWrapper;
+export default Course;
--- a/src/courseware/course/Course.test.jsx
+++ b/src/courseware/course/Course.test.jsx
@@ -1,22 +1,22 @@
 import React from 'react';
 import { Factory } from 'rosie';
-import { breakpoints } from '@edx/paragon';
 import {
-  fireEvent, getByRole, initializeTestStore, loadUnit, render, screen, waitFor,
+  loadUnit, render, screen, waitFor, getByRole, initializeTestStore, fireEvent,
 } from '../../setupTest';
+import Course from './Course';
 import { handleNextSectionCelebration } from './celebration';
 import * as celebrationUtils from './celebration/utils';
-import Course from './Course';
+import useWindowSize from '../../generic/tabs/useWindowSize';

 jest.mock('@edx/frontend-platform/analytics');
+jest.mock('../../generic/tabs/useWindowSize');
+useWindowSize.mockReturnValue({ width: 1200 });

 const recordFirstSectionCelebration = jest.fn();
 celebrationUtils.recordFirstSectionCelebration = recordFirstSectionCelebration;

 describe('Course', () => {
  let store;
-  let getItemSpy;
-  let setItemSpy;
  const mockData = {
    nextSequenceHandler: () => {},
    previousSequenceHandler: () => {},
@@ -32,14 +32,6 @@ describe('Course', () => {
      sequenceId,
      unitId: Object.values(models.units)[0].id,
    });
-    getItemSpy = jest.spyOn(Object.getPrototypeOf(window.sessionStorage), 'getItem');
-    setItemSpy = jest.spyOn(Object.getPrototypeOf(window.sessionStorage), 'setItem');
-    global.innerWidth = breakpoints.extraLarge.minWidth;
-  });
-
-  afterAll(() => {
-    getItemSpy.mockRestore();
-    setItemSpy.mockRestore();
  });

  it('loads learning sequence', async () => {
@@ -63,9 +55,13 @@ describe('Course', () => {
    );
  });

-  it('displays first section celebration modal', async () => {
-    const courseHomeMetadata = Factory.build('courseHomeMetadata', { celebrations: { firstSection: true } });
-    const testStore = await initializeTestStore({ courseHomeMetadata }, false);
+  it('displays celebration modal', async () => {
+    // TODO: Remove these console mocks after merging https://github.com/edx/paragon/pull/526.
+    jest.spyOn(console, 'warn').mockImplementation(() => {});
+    jest.spyOn(console, 'error').mockImplementation(() => {});
+
+    const courseMetadata = Factory.build('courseMetadata', { celebrations: { firstSection: true } });
+    const testStore = await initializeTestStore({ courseMetadata }, false);
    const { courseware, models } = testStore.getState();
    const { courseId, sequenceId } = courseware;
    const testData = {
@@ -78,86 +74,21 @@ describe('Course', () => {
    handleNextSectionCelebration(sequenceId, sequenceId, testData.unitId);
    render(<Course {...testData} />, { store: testStore });

-    const firstSectionCelebrationModal = screen.getByRole('dialog');
-    expect(firstSectionCelebrationModal).toBeInTheDocument();
-    expect(getByRole(firstSectionCelebrationModal, 'heading', { name: 'Congratulations!' })).toBeInTheDocument();
-  });
-
-  it('displays weekly goal celebration modal', async () => {
-    const courseHomeMetadata = Factory.build('courseHomeMetadata', { celebrations: { weeklyGoal: true } });
-    const testStore = await initializeTestStore({ courseHomeMetadata }, false);
-    const { courseware, models } = testStore.getState();
-    const { courseId, sequenceId } = courseware;
-    const testData = {
-      ...mockData,
-      courseId,
-      sequenceId,
-      unitId: Object.values(models.units)[0].id,
-    };
-    render(<Course {...testData} />, { store: testStore });
-
-    const weeklyGoalCelebrationModal = screen.getByRole('dialog');
-    expect(weeklyGoalCelebrationModal).toBeInTheDocument();
-    expect(getByRole(weeklyGoalCelebrationModal, 'heading', { name: 'You met your goal!' })).toBeInTheDocument();
+    const celebrationModal = screen.getByRole('dialog');
+    expect(celebrationModal).toBeInTheDocument();
+    expect(getByRole(celebrationModal, 'heading', { name: 'Congratulations!' })).toBeInTheDocument();
  });

  it('displays notification trigger and toggles active class on click', async () => {
+    useWindowSize.mockReturnValue({ width: 1200 });
    render(<Course {...mockData} />);

    const notificationTrigger = screen.getByRole('button', { name: /Show notification tray/i });
+
    expect(notificationTrigger).toBeInTheDocument();
-    expect(notificationTrigger.parentNode).toHaveClass('border-primary-700');
+    expect(notificationTrigger).toHaveClass('trigger-active');
    fireEvent.click(notificationTrigger);
-    expect(notificationTrigger.parentNode).not.toHaveClass('border-primary-700');
-  });
-
-  it('handles click to open/close notification tray', async () => {
-    sessionStorage.clear();
-    render(<Course {...mockData} />);
-    expect(sessionStorage.getItem(`notificationTrayStatus.${mockData.courseId}`)).toBe('"open"');
-    const notificationShowButton = await screen.findByRole('button', { name: /Show notification tray/i });
-    expect(screen.queryByRole('region', { name: /notification tray/i })).toBeInTheDocument();
-    fireEvent.click(notificationShowButton);
-    expect(sessionStorage.getItem(`notificationTrayStatus.${mockData.courseId}`)).toBe('"closed"');
-    expect(screen.queryByRole('region', { name: /notification tray/i })).not.toBeInTheDocument();
-  });
-
-  it('handles reload persisting notification tray status', async () => {
-    sessionStorage.clear();
-    render(<Course {...mockData} />);
-    const notificationShowButton = await screen.findByRole('button', { name: /Show notification tray/i });
-    fireEvent.click(notificationShowButton);
-    expect(sessionStorage.getItem(`notificationTrayStatus.${mockData.courseId}`)).toBe('"closed"');
-
-    // Mock reload window, this doesn't happen in the Course component,
-    // calling the reload to check if the tray remains closed
-    const { location } = window;
-    delete window.location;
-    window.location = { reload: jest.fn() };
-    window.location.reload();
-    expect(window.location.reload).toHaveBeenCalled();
-    window.location = location;
-    expect(sessionStorage.getItem(`notificationTrayStatus.${mockData.courseId}`)).toBe('"closed"');
-    expect(screen.queryByTestId('NotificationTray')).not.toBeInTheDocument();
-  });
-
-  it('handles sessionStorage from a different course for the notification tray', async () => {
-    sessionStorage.clear();
-    const courseMetadataSecondCourse = Factory.build('courseMetadata', { id: 'second_course' });
-
-    // set sessionStorage for a different course before rendering Course
-    sessionStorage.setItem(`notificationTrayStatus.${courseMetadataSecondCourse.id}`, '"open"');
-
-    render(<Course {...mockData} />);
-    expect(sessionStorage.getItem(`notificationTrayStatus.${mockData.courseId}`)).toBe('"open"');
-    const notificationShowButton = await screen.findByRole('button', { name: /Show notification tray/i });
-    fireEvent.click(notificationShowButton);
-
-    // Verify sessionStorage was updated for the original course
-    expect(sessionStorage.getItem(`notificationTrayStatus.${mockData.courseId}`)).toBe('"closed"');
-
-    // Verify the second course sessionStorage was not changed
-    expect(sessionStorage.getItem(`notificationTrayStatus.${courseMetadataSecondCourse.id}`)).toBe('"open"');
+    expect(notificationTrigger).not.toHaveClass('trigger-active');
  });

  it('renders course breadcrumbs as expected', async () => {
@@ -181,8 +112,8 @@ describe('Course', () => {
    loadUnit();
    await waitFor(() => expect(screen.queryByText('Loading learning sequence...')).not.toBeInTheDocument());
    // expect the section and sequence "titles" to be loaded in as breadcrumb labels.
-    expect(screen.getByText(Object.values(models.sections)[0].title)).toBeInTheDocument();
-    expect(screen.getByText(Object.values(models.sequences)[0].title)).toBeInTheDocument();
+    expect(screen.getByText('cdabcdabcdabcdabcdabcdabcdabcd13')).toBeInTheDocument();
+    expect(screen.getByText('cdabcdabcdabcdabcdabcdabcdabcd12')).toBeInTheDocument();
  });

  it('passes handlers to the sequence', async () => {
@@ -220,94 +151,4 @@ describe('Course', () => {
    expect(nextSequenceHandler).not.toHaveBeenCalled();
    expect(unitNavigationHandler).toHaveBeenCalledTimes(4);
  });
-
-  describe('Sequence alerts display', () => {
-    it('renders banner text alert', async () => {
-      const courseMetadata = Factory.build('courseMetadata');
-      const sequenceBlocks = [Factory.build(
-        'block', { type: 'sequential', banner_text: 'Some random banner text to display.' },
-      )];
-      const sequenceMetadata = [Factory.build(
-        'sequenceMetadata', { banner_text: sequenceBlocks[0].banner_text },
-        { courseId: courseMetadata.id, sequenceBlock: sequenceBlocks[0] },
-      )];
-
-      const testStore = await initializeTestStore({ courseMetadata, sequenceBlocks, sequenceMetadata });
-      const testData = {
-        ...mockData,
-        courseId: courseMetadata.id,
-        sequenceId: sequenceBlocks[0].id,
-      };
-      render(<Course {...testData} />, { store: testStore });
-      await waitFor(() => expect(screen.getByText('Some random banner text to display.')).toBeInTheDocument());
-    });
-
-    it('renders Entrance Exam alert with passing score', async () => {
-      const sectionId = 'block-v1:edX+DemoX+Demo_Course+type@chapter+block@entrance_exam';
-      const testCourseMetadata = Factory.build('courseMetadata', {
-        entrance_exam_data: {
-          entrance_exam_current_score: 1.0,
-          entrance_exam_enabled: true,
-          entrance_exam_id: sectionId,
-          entrance_exam_minimum_score_pct: 0.7,
-          entrance_exam_passed: true,
-        },
-      });
-      const sequenceBlocks = [Factory.build(
-        'block',
-        { type: 'sequential', sectionId },
-        { courseId: testCourseMetadata.id },
-      )];
-      const sectionBlocks = [Factory.build(
-        'block',
-        { type: 'chapter', children: sequenceBlocks.map(block => block.id), id: sectionId },
-        { courseId: testCourseMetadata.id },
-      )];
-
-      const testStore = await initializeTestStore({
-        courseMetadata: testCourseMetadata, sequenceBlocks, sectionBlocks,
-      });
-      const testData = {
-        ...mockData,
-        courseId: testCourseMetadata.id,
-        sequenceId: sequenceBlocks[0].id,
-      };
-      render(<Course {...testData} />, { store: testStore });
-      await waitFor(() => expect(screen.getByText('Your score is 100%. You have passed the entrance exam.')).toBeInTheDocument());
-    });
-
-    it('renders Entrance Exam alert with non-passing score', async () => {
-      const sectionId = 'block-v1:edX+DemoX+Demo_Course+type@chapter+block@entrance_exam';
-      const testCourseMetadata = Factory.build('courseMetadata', {
-        entrance_exam_data: {
-          entrance_exam_current_score: 0.3,
-          entrance_exam_enabled: true,
-          entrance_exam_id: sectionId,
-          entrance_exam_minimum_score_pct: 0.7,
-          entrance_exam_passed: false,
-        },
-      });
-      const sequenceBlocks = [Factory.build(
-        'block',
-        { type: 'sequential', sectionId },
-        { courseId: testCourseMetadata.id },
-      )];
-      const sectionBlocks = [Factory.build(
-        'block',
-        { type: 'chapter', children: sequenceBlocks.map(block => block.id), id: sectionId },
-        { courseId: testCourseMetadata.id },
-      )];
-
-      const testStore = await initializeTestStore({
-        courseMetadata: testCourseMetadata, sequenceBlocks, sectionBlocks,
-      });
-      const testData = {
-        ...mockData,
-        courseId: testCourseMetadata.id,
-        sequenceId: sequenceBlocks[0].id,
-      };
-      render(<Course {...testData} />, { store: testStore });
-      await waitFor(() => expect(screen.getByText('To access course materials, you must score 70% or higher on this exam. Your current score is 30%.')).toBeInTheDocument());
-    });
-  });
 });
--- a/src/courseware/course/CourseBreadcrumbs.jsx
+++ b/src/courseware/course/CourseBreadcrumbs.jsx
@@ -13,13 +13,14 @@ import { MMP2PFlyoverTrigger } from '../../experiments/mm-p2p';
 import JumpNavMenuItem from './JumpNavMenuItem';

 function CourseBreadcrumb({
-  content, withSeparator, courseId, sequenceId, unitId, isStaff,
+  content, withSeparator, courseId, unitId, isStaff,
 }) {
-  const defaultContent = content.filter(destination => destination.default)[0] || { id: courseId, label: '', sequences: [] };
+  const defaultContent = content.filter(destination => destination.default)[0] || { id: courseId, label: '' };
+
  return (
    <>
      {withSeparator && (
-        <li className="col-auto p-0 mx-2 text-primary-500 text-truncate text-nowrap" role="presentation" aria-hidden>/</li>
+        <li className="mx-2 text-primary-500 text-truncate text-nowrap" role="presentation" aria-hidden>/</li>
      )}

      <li style={{
@@ -32,9 +33,7 @@ function CourseBreadcrumb({
          ? (
            <Link
              className="text-primary-500"
-              to={defaultContent.sequences.length
-                ? `/course/${courseId}/${defaultContent.sequences[0].id}`
-                : `/course/${courseId}/${defaultContent.id}`}
+              to={`/course/${courseId}/${defaultContent.id}`}
            >
              {defaultContent.label}
            </Link>
@@ -47,7 +46,6 @@ function CourseBreadcrumb({
                  sequences={item.sequences}
                  courseId={courseId}
                  title={item.label}
-                  currentSequence={sequenceId}
                  currentUnit={unitId}
                />
              ))}
@@ -66,7 +64,6 @@ CourseBreadcrumb.propTypes = {
      label: PropTypes.string,
    }),
  ).isRequired,
-  sequenceId: PropTypes.string,
  unitId: PropTypes.string,
  withSeparator: PropTypes.bool,
  courseId: PropTypes.string,
@@ -75,7 +72,6 @@ CourseBreadcrumb.propTypes = {

 CourseBreadcrumb.defaultProps = {
  withSeparator: false,
-  sequenceId: null,
  unitId: null,
  courseId: null,
  isStaff: null,
@@ -129,7 +125,7 @@ export default function CourseBreadcrumbs({
  return (
    <nav aria-label="breadcrumb" className="my-4 d-inline-block col-sm-10">
      <ol className="list-unstyled d-flex  flex-nowrap align-items-center m-0">
-        <li className="list-unstyled col-auto m-0 p-0">
+        <li className="list-unstyled d-flex m-0">
          <Link
            className="flex-shrink-0 text-primary"
            to={`/course/${courseId}/home`}
--- a/src/courseware/course/JumpNavMenuItem.jsx
+++ b/src/courseware/course/JumpNavMenuItem.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable consistent-return */
 import React from 'react';
 import PropTypes from 'prop-types';
 import { history } from '@edx/frontend-platform';
@@ -7,15 +8,18 @@ import {
  sendTrackingLogEvent,
  sendTrackEvent,
 } from '@edx/frontend-platform/analytics';
+import { useDispatch } from 'react-redux';
+import { checkBlockCompletion } from '../data';

 export default function JumpNavMenuItem({
  title,
  courseId,
-  currentSequence,
  currentUnit,
  sequences,
  isDefault,
+
 }) {
+  const dispatch = useDispatch();
  function logEvent(targetUrl) {
    const eventName = 'edx.ui.lms.jump_nav.selected';
    const payload = {
@@ -28,14 +32,22 @@ export default function JumpNavMenuItem({
    sendTrackingLogEvent(eventName, payload);
  }

-  function destinationUrl() {
+  function lazyloadUrl() {
    if (isDefault) {
-      return `/course/${courseId}/${currentSequence}/${currentUnit}`;
+      return `/course/${courseId}/${currentUnit}`;
    }
-    return `/course/${courseId}/${sequences[0].id}`;
+    const destinationString = sequences.forEach(sequence => sequence.unitIds.forEach(unitId => {
+      const complete = dispatch(checkBlockCompletion(
+        courseId,
+        sequence.id, unitId,
+      ))
+        .then(value => value);
+      if (!complete) { return `/course/${courseId}/${unitId}`; }
+    }));
+    return destinationString || `/course/${courseId}/${sequences[0].unitIds[0]}`;
  }
  function handleClick() {
-    const url = destinationUrl();
+    const url = lazyloadUrl();
    logEvent(url);
    history.push(url);
  }
@@ -52,6 +64,11 @@ export default function JumpNavMenuItem({

 const sequenceShape = PropTypes.shape({
  id: PropTypes.string.isRequired,
+  unitIds: PropTypes.arrayOf(PropTypes.string).isRequired,
+  sectionId: PropTypes.string.isRequired,
+  isTimeLimited: PropTypes.bool,
+  isProctored: PropTypes.bool,
+  legacyWebUrl: PropTypes.string,
 });

 JumpNavMenuItem.propTypes = {
@@ -59,6 +76,5 @@ JumpNavMenuItem.propTypes = {
  sequences: PropTypes.arrayOf(sequenceShape).isRequired,
  isDefault: PropTypes.bool.isRequired,
  courseId: PropTypes.string.isRequired,
-  currentSequence: PropTypes.string.isRequired,
  currentUnit: PropTypes.string.isRequired,
 };
--- a/src/courseware/course/JumpNavMenuItem.test.jsx
+++ b/src/courseware/course/JumpNavMenuItem.test.jsx
@@ -6,6 +6,12 @@ import { fireEvent } from '../../setupTest';
 jest.mock('@edx/frontend-platform');
 jest.mock('@edx/frontend-platform/analytics');

+const mockCheckBlock = jest.fn(() => Promise.resolve(true)); // check all units
+
+jest.mock('react-redux', () => ({
+  useDispatch: () => mockCheckBlock,
+}));
+
 const mockData = {
  sectionId: 'block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations',
  sequenceId: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions',
@@ -16,9 +22,33 @@ const mockData = {
  sequences: [
    {
      id: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@19a30717eff543078a5d94ae9d6c18a5',
+      blockType: 'sequential',
+      unitIds: [
+        'block-v1:edX+DemoX+Demo_Course+type@vertical+block@867dddb6f55d410caaa9c1eb9c6743ec',
+        'block-v1:edX+DemoX+Demo_Course+type@vertical+block@4f6c1b4e316a419ab5b6bf30e6c708e9',
+        'block-v1:edX+DemoX+Demo_Course+type@vertical+block@3dc16db8d14842e38324e95d4030b8a0',
+        'block-v1:edX+DemoX+Demo_Course+type@vertical+block@4a1bba2a403f40bca5ec245e945b0d76',
+        'block-v1:edX+DemoX+Demo_Course+type@vertical+block@256f17a44983429fb1a60802203ee4e0',
+        'block-v1:edX+DemoX+Demo_Course+type@vertical+block@e3601c0abee6427d8c17e6d6f8fdddd1',
+        'block-v1:edX+DemoX+Demo_Course+type@vertical+block@134df56c516a4a0dbb24dd5facef746e',
+      ],
+      legacyWebUrl: 'http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/jump_to/block-v1:edX+DemoX+Demo_Course+type@sequential+block@19a30717eff543078a5d94ae9d6c18a5?experience=legacy',
+      sectionId: 'block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations',
    },
    {
      id: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions',
+      title: 'Homework - Question Styles',
+      legacyWebUrl: 'http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/jump_to/block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions?experience=legacy',
+      unitIds: [
+        'block-v1:edX+DemoX+Demo_Course+type@vertical+block@2152d4a4aadc4cb0af5256394a3d1fc7',
+        'block-v1:edX+DemoX+Demo_Course+type@vertical+block@47dbd5f836544e61877a483c0b75606c',
+        'block-v1:edX+DemoX+Demo_Course+type@vertical+block@54bb9b142c6c4c22afc62bcb628f0e68',
+        'block-v1:edX+DemoX+Demo_Course+type@vertical+block@vertical_0c92347a5c00',
+        'block-v1:edX+DemoX+Demo_Course+type@vertical+block@vertical_1fef54c2b23b',
+        'block-v1:edX+DemoX+Demo_Course+type@vertical+block@2889db1677a549abb15eb4d886f95d1c',
+        'block-v1:edX+DemoX+Demo_Course+type@vertical+block@e8a5cc2aed424838853defab7be45e42',
+      ],
+      sectionId: 'block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations',
    },
  ],
  isDefault: false,
@@ -34,5 +64,6 @@ describe('JumpNavMenuItem', () => {
    expect(screen.getByText('Demo Menu Item'));
    const navButton = screen.queryAllByRole('button')[0];
    fireEvent.click(navButton);
+    expect(mockCheckBlock).toBeCalledTimes(14); // number of units to check on load.
  });
 });
--- a/src/courseware/course/sidebar/sidebars/notifications/NotificationIcon.jsx
+++ b/src/courseware/course/sidebar/sidebars/notifications/NotificationIcon.jsx
@@ -1,33 +1,20 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Icon } from '@edx/paragon';
 import { WatchOutline } from '@edx/paragon/icons';
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
-import React from 'react';

-import messages from '../../../messages';
+import messages from './messages';

-function NotificationIcon({
-  intl,
-  status,
-  notificationColor,
-}) {
+function NotificationIcon({ intl, status, notificationColor }) {
  return (
-    <>
+    <div className="icon-container">
      <Icon src={WatchOutline} className="m-0 m-auto" alt={intl.formatMessage(messages.openNotificationTrigger)} />
      {status === 'active'
-        ? (
-          <span
-            className={classNames(notificationColor, 'rounded-circle p-1 position-absolute')}
-            data-testid="notification-dot"
-            style={{
-              top: '0.3rem',
-              right: '0.55rem',
-            }}
-          />
-        )
+        ? <span className={classNames(notificationColor, 'notification-dot')} data-testid="notification-dot" />
        : null}
-    </>
+    </div>
  );
 }

--- a/src/courseware/course/NotificationIcon.scss
+++ b/src/courseware/course/NotificationIcon.scss
@@ -0,0 +1,15 @@
+.icon-container {
+    position: relative;
+    display: flex;
+    align-items: center;
+    width: 2.4rem;
+    height: 2rem;
+}
+
+.notification-dot {
+    position: absolute;
+    top: 0.3rem;
+    right: 0.55rem;
+    border-radius: 50% !important;
+    padding: 0.25rem !important;
+}
--- a/src/courseware/course/NotificationTray.jsx
+++ b/src/courseware/course/NotificationTray.jsx
@@ -0,0 +1,92 @@
+import React, { useEffect } from 'react';
+import { useSelector } from 'react-redux';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { Icon, IconButton } from '@edx/paragon';
+import { ArrowBackIos, Close } from '@edx/paragon/icons';
+
+import messages from './messages';
+import { useModel } from '../../generic/model-store';
+import useWindowSize, { responsiveBreakpoints } from '../../generic/tabs/useWindowSize';
+import UpgradeNotification from '../../generic/upgrade-notification/UpgradeNotification';
+
+function NotificationTray({
+  intl, toggleNotificationTray, onNotificationSeen, upgradeNotificationCurrentState, setupgradeNotificationCurrentState,
+}) {
+  const {
+    courseId,
+  } = useSelector(state => state.courseware);
+
+  const course = useModel('coursewareMeta', courseId);
+
+  const {
+    accessExpiration,
+    contentTypeGatingEnabled,
+    offer,
+    org,
+    timeOffsetMillis,
+    userTimezone,
+    verifiedMode,
+  } = course;
+
+  const shouldDisplayFullScreen = useWindowSize().width < responsiveBreakpoints.large.minWidth;
+
+  // After three seconds, update notificationSeen (to hide red dot)
+  useEffect(() => { setTimeout(onNotificationSeen, 3000); }, []);
+
+  return (
+    <section className={classNames('notification-tray-container ml-0 ml-lg-4', { 'no-notification': !verifiedMode && !shouldDisplayFullScreen })} aria-label={intl.formatMessage(messages.notificationTray)}>
+      {shouldDisplayFullScreen ? (
+        <div className="mobile-close-container" onClick={() => { toggleNotificationTray(); }} onKeyDown={() => { toggleNotificationTray(); }} role="button" tabIndex="0" alt={intl.formatMessage(messages.responsiveCloseNotificationTray)}>
+          <Icon src={ArrowBackIos} />
+          <span className="mobile-close">{intl.formatMessage(messages.responsiveCloseNotificationTray)}</span>
+        </div>
+      ) : null}
+      <div>
+        <span className="notification-tray-title">{intl.formatMessage(messages.notificationTitle)}</span>
+        {shouldDisplayFullScreen
+          ? null
+          : (
+            <div className="d-inline-flex close-btn">
+              <IconButton src={Close} size="sm" iconAs={Icon} onClick={() => { toggleNotificationTray(); }} variant="primary" alt={intl.formatMessage(messages.closeNotificationTrigger)} />
+            </div>
+          )}
+      </div>
+      <div className="notification-tray-divider" />
+      <div>{verifiedMode
+        ? (
+          <UpgradeNotification
+            offer={offer}
+            verifiedMode={verifiedMode}
+            accessExpiration={accessExpiration}
+            contentTypeGatingEnabled={contentTypeGatingEnabled}
+            upsellPageName="in_course"
+            userTimezone={userTimezone}
+            shouldDisplayBorder={false}
+            timeOffsetMillis={timeOffsetMillis}
+            courseId={courseId}
+            org={org}
+            upgradeNotificationCurrentState={upgradeNotificationCurrentState}
+            setupgradeNotificationCurrentState={setupgradeNotificationCurrentState}
+          />
+        ) : <p className="notification-tray-content">{intl.formatMessage(messages.noNotificationsMessage)}</p>}
+      </div>
+    </section>
+  );
+}
+
+NotificationTray.propTypes = {
+  intl: intlShape.isRequired,
+  toggleNotificationTray: PropTypes.func,
+  onNotificationSeen: PropTypes.func,
+  upgradeNotificationCurrentState: PropTypes.string.isRequired,
+  setupgradeNotificationCurrentState: PropTypes.func.isRequired,
+};
+
+NotificationTray.defaultProps = {
+  toggleNotificationTray: null,
+  onNotificationSeen: null,
+};
+
+export default injectIntl(NotificationTray);
--- a/src/courseware/course/NotificationTray.scss
+++ b/src/courseware/course/NotificationTray.scss
@@ -0,0 +1,66 @@
+.notification-tray-container {
+    border: 1px solid $light-400;
+    border-radius: 4px;
+    width: 31rem;
+    vertical-align: top;
+    height: 100%;
+
+    @media (max-width: -1 + map-get($grid-breakpoints, 'lg')) {
+        position: fixed; 
+        top: 0; 
+        bottom: 0; 
+        left: 0; 
+        right: 0;
+        width: 100%;
+        background-color: white;
+        margin: 0;
+        border: none;
+        border-radius: 0;
+    }
+}
+
+.no-notification {
+    height: 15rem;
+}
+
+.notification-tray-title {
+    display: inline-block;
+    padding: 0.625rem 0 0.625rem 1.25rem;
+}
+
+.close-btn {
+    float: right;
+    margin-right: 0.5rem;
+    margin-top: 0.35rem;
+}
+
+.notification-tray-divider {
+    height: 0.5rem;
+    background: $gray-100;
+    border-top: 1px solid $light-400;
+    border-bottom: 1px solid $light-400;
+}
+
+.notification-tray-content {
+    padding: 1rem;
+    font-size: 0.875rem;
+}
+
+.mobile-close-container {
+    padding-top: 0.5rem;
+    padding-bottom: 0.75rem;
+    border-bottom: 1px solid $light-400;
+
+    span {
+        display: inline-block;
+    }
+    svg {
+        top: 0.4rem;
+        left: 0.8rem;
+    }
+}
+
+.mobile-close {
+    font-weight: 500;
+    margin-left: 1.2rem;
+}
--- a/src/courseware/course/NotificationTray.test.jsx
+++ b/src/courseware/course/NotificationTray.test.jsx
@@ -0,0 +1,100 @@
+import React from 'react';
+import { Factory } from 'rosie';
+import MockAdapter from 'axios-mock-adapter';
+import { getConfig } from '@edx/frontend-platform';
+import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
+
+import { fetchCourse } from '../data';
+import {
+  render, initializeMockApp, screen, fireEvent, waitFor,
+} from '../../setupTest';
+import initializeStore from '../../store';
+import { appendBrowserTimezoneToUrl, executeThunk } from '../../utils';
+import NotificationTray from './NotificationTray';
+import useWindowSize from '../../generic/tabs/useWindowSize';
+
+initializeMockApp();
+jest.mock('../../generic/tabs/useWindowSize');
+jest.mock('@edx/frontend-platform/analytics');
+
+describe('NotificationTray', () => {
+  let mockData;
+  let axiosMock;
+  let store;
+
+  const courseId = 'course-v1:edX+DemoX+Demo_Course';
+
+  const defaultMetadata = Factory.build('courseMetadata', { id: courseId });
+  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/courseware/course/${defaultMetadata.id}`;
+  courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);
+
+  function setMetadata(attributes, options) {
+    const courseMetadata = Factory.build('courseMetadata', { id: courseId, ...attributes }, options);
+    axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);
+  }
+
+  async function fetchAndRender(component) {
+    await executeThunk(fetchCourse(defaultMetadata.id), store.dispatch);
+    render(component, { store });
+  }
+
+  beforeEach(async () => {
+    store = initializeStore();
+    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
+    axiosMock.onGet(courseMetadataUrl).reply(200, defaultMetadata);
+    mockData = {
+      toggleNotificationTray: () => {},
+    };
+  });
+
+  it('renders notification tray and close tray button', async () => {
+    useWindowSize.mockReturnValue({ width: 1200 });
+    const toggleNotificationTray = jest.fn();
+    const testData = {
+      ...mockData,
+      toggleNotificationTray,
+    };
+    await fetchAndRender(<NotificationTray {...testData} />);
+
+    expect(screen.getByText('Notifications')).toBeInTheDocument();
+    const notificationCloseIconButton = screen.getByRole('button', { name: /Close notification tray/i });
+    expect(notificationCloseIconButton).toBeInTheDocument();
+    expect(notificationCloseIconButton).toHaveClass('btn-icon-primary');
+    fireEvent.click(notificationCloseIconButton);
+    expect(toggleNotificationTray).toHaveBeenCalledTimes(1);
+
+    // should not render responsive "Back to course" to close the tray
+    expect(screen.queryByText('Back to course')).not.toBeInTheDocument();
+  });
+
+  it('renders upgrade card', async () => {
+    await fetchAndRender(<NotificationTray />);
+    const UpgradeNotification = document.querySelector('.upgrade-notification');
+
+    expect(UpgradeNotification).toBeInTheDocument();
+    expect(screen.getByRole('link', { name: 'Upgrade for $149' })).toBeInTheDocument();
+    expect(screen.queryByText('You have no new notifications at this time.')).not.toBeInTheDocument();
+  });
+
+  it('renders no notifications message if no verified mode', async () => {
+    setMetadata({ verified_mode: null });
+    await fetchAndRender(<NotificationTray />);
+    expect(screen.queryByText('You have no new notifications at this time.')).toBeInTheDocument();
+  });
+
+  it('renders notification tray with full screen "Back to course" at responsive view', async () => {
+    useWindowSize.mockReturnValue({ width: 991 });
+    const toggleNotificationTray = jest.fn();
+    const testData = {
+      ...mockData,
+      toggleNotificationTray,
+    };
+    await fetchAndRender(<NotificationTray {...testData} />);
+
+    const responsiveCloseButton = screen.getByRole('button', { name: 'Back to course' });
+    await waitFor(() => expect(responsiveCloseButton).toBeInTheDocument());
+
+    fireEvent.click(responsiveCloseButton);
+    expect(toggleNotificationTray).toHaveBeenCalledTimes(1);
+  });
+});
--- a/src/courseware/course/NotificationTrigger.jsx
+++ b/src/courseware/course/NotificationTrigger.jsx
@@ -0,0 +1,50 @@
+import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { getLocalStorage, setLocalStorage } from '../../data/localStorage';
+
+import NotificationIcon from './NotificationIcon';
+import messages from './messages';
+
+function NotificationTrigger({
+  intl, toggleNotificationTray, isNotificationTrayVisible, notificationStatus, setNotificationStatus,
+  upgradeNotificationCurrentState,
+}) {
+  /* Re-show a red dot beside the notification trigger for each of the 7 UpgradeNotification stages
+   The upgradeNotificationCurrentState prop will be available after UpgradeNotification mounts. Once available,
+  compare with the last state they've seen, and if it's different then set dot back to red */
+  function UpdateUpgradeNotificationLastSeen() {
+    if (upgradeNotificationCurrentState) {
+      if (getLocalStorage('upgradeNotificationLastSeen') !== upgradeNotificationCurrentState) {
+        setNotificationStatus('active');
+        setLocalStorage('notificationStatus', 'active');
+        setLocalStorage('upgradeNotificationLastSeen', upgradeNotificationCurrentState);
+      }
+    }
+  }
+
+  useEffect(() => { UpdateUpgradeNotificationLastSeen(); });
+
+  return (
+    <button
+      className={classNames('notification-trigger-btn', { 'trigger-active': isNotificationTrayVisible() })}
+      type="button"
+      onClick={() => { toggleNotificationTray(); }}
+      aria-label={intl.formatMessage(messages.openNotificationTrigger)}
+    >
+      <NotificationIcon status={notificationStatus} notificationColor="bg-danger-500" />
+    </button>
+  );
+}
+
+NotificationTrigger.propTypes = {
+  intl: intlShape.isRequired,
+  toggleNotificationTray: PropTypes.func.isRequired,
+  notificationStatus: PropTypes.string.isRequired,
+  setNotificationStatus: PropTypes.func.isRequired,
+  isNotificationTrayVisible: PropTypes.func.isRequired,
+  upgradeNotificationCurrentState: PropTypes.string.isRequired,
+};
+
+export default injectIntl(NotificationTrigger);
--- a/src/courseware/course/NotificationTrigger.scss
+++ b/src/courseware/course/NotificationTrigger.scss
@@ -0,0 +1,24 @@
+.notification-trigger-btn {
+    border: 1px solid $light-400;
+    background: none;
+    margin-top: 1rem;
+
+    position: absolute;
+    right: 0;
+
+    @media (max-width: -1 + map-get($grid-breakpoints, 'sm')) {
+        border: none;
+        margin: 0.3rem 1.25rem 0 0.25rem;
+        top: 0.1rem;
+        right: -3rem;
+    }
+}
+
+.trigger-active::after {
+    content: '';
+    position: absolute;
+    border-bottom: 2px solid $primary-700;
+    right: 0;
+    left: 0;
+    bottom: -1px;
+}
--- a/src/courseware/course/NotificationTrigger.test.jsx
+++ b/src/courseware/course/NotificationTrigger.test.jsx
@@ -0,0 +1,79 @@
+import React from 'react';
+import { Factory } from 'rosie';
+import {
+  render, initializeTestStore, screen, fireEvent,
+} from '../../setupTest';
+import NotificationTrigger from './NotificationTrigger';
+import { getLocalStorage } from '../../data/localStorage';
+
+describe('Notification Trigger', () => {
+  let mockData;
+  // let mockDataSameState;
+  // let mockDataDifferentState;
+  const courseMetadata = Factory.build('courseMetadata');
+
+  beforeEach(async () => {
+    await initializeTestStore({ courseMetadata, excludeFetchCourse: true, excludeFetchSequence: true });
+    mockData = {
+      toggleNotificationTray: () => {},
+      isNotificationTrayVisible: () => {},
+      notificationStatus: 'active',
+      setNotificationStatus: () => {},
+      upgradeNotificationCurrentState: 'FPDdaysLeft',
+    };
+  });
+
+  it('renders notification trigger icon with red dot when notificationStatus is active', async () => {
+    const { container } = render(<NotificationTrigger {...mockData} />);
+    expect(container).toBeInTheDocument();
+    const buttonIcon = container.querySelectorAll('svg');
+    expect(buttonIcon).toHaveLength(1);
+    expect(screen.getByTestId('notification-dot')).toBeInTheDocument();
+  });
+
+  it('renders notification trigger icon WITHOUT red dot 3 seconds later', async () => {
+    const { container } = render(<NotificationTrigger {...mockData} />);
+    expect(container).toBeInTheDocument();
+    jest.useFakeTimers();
+    setTimeout(() => {
+      expect(screen.queryByRole('notification-dot')).not.toBeInTheDocument();
+    }, 3000);
+    jest.runAllTimers();
+  });
+
+  it('renders notification trigger icon WITHOUT red dot within the same phase', async () => {
+    const { container } = render(
+      <NotificationTrigger {...mockData} upgradeNotificationCurrentState="sameState" upgradeNotificationLastSeen="sameState" />,
+    );
+    expect(container).toBeInTheDocument();
+    const buttonIcon = container.querySelectorAll('svg');
+    expect(buttonIcon).toHaveLength(1);
+    expect(screen.queryByRole('notification-dot')).not.toBeInTheDocument();
+  });
+
+  it('handles onClick event toggling the notification tray', async () => {
+    const toggleNotificationTray = jest.fn();
+    const testData = {
+      ...mockData,
+      toggleNotificationTray,
+    };
+    render(<NotificationTrigger {...testData} />);
+
+    const notificationTrigger = screen.getByRole('button', { name: /Show notification tray/i });
+    expect(notificationTrigger).toBeInTheDocument();
+    fireEvent.click(notificationTrigger);
+    expect(toggleNotificationTray).toHaveBeenCalledTimes(1);
+  });
+
+  // rendering NotificationTrigger has the effect of calling UpdateUpgradeNotificationLastSeen()
+  // Verify that local storage was updated accordingly
+  it('we make the right updates when rendering a new phase (before -> after)', async () => {
+    const { container } = render(
+      <NotificationTrigger {...mockData} upgradeNotificationLastSeen="before" upgradeNotificationCurrentState="after" />,
+    );
+    expect(container).toBeInTheDocument();
+
+    expect(getLocalStorage('notificationStatus')).toBe('active');
+    expect(getLocalStorage('upgradeNotificationLastSeen')).toBe('after');
+  });
+});
--- a/src/courseware/course/celebration/CelebrationModal.jsx
+++ b/src/courseware/course/celebration/CelebrationModal.jsx
@@ -1,13 +1,8 @@
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import {
-  ActionRow,
-  breakpoints,
-  Button,
-  StandardModal,
-  useWindowSize,
-} from '@edx/paragon';
+import { Modal } from '@edx/paragon';
+import { layoutGenerator } from 'react-break';

 import ClapsMobile from './assets/claps_280x201.gif';
 import ClapsTablet from './assets/claps_456x328.gif';
@@ -17,55 +12,63 @@ import { recordFirstSectionCelebration } from './utils';
 import { useModel } from '../../../generic/model-store';

 function CelebrationModal({
-  courseId, intl, isOpen, onClose, ...rest
+  courseId, intl, open, ...rest
 }) {
-  const { org } = useModel('courseHomeMeta', courseId);
-  const wideScreen = useWindowSize().width >= breakpoints.small.minWidth;
+  const { org } = useModel('coursewareMeta', courseId);
+
+  const layout = layoutGenerator({
+    mobile: 0,
+    tablet: 400,
+  });
+
+  const OnMobile = layout.is('mobile');
+  const OnAtLeastTablet = layout.isAtLeast('tablet');

  useEffect(() => {
-    if (isOpen) {
+    if (open) {
      recordFirstSectionCelebration(org, courseId);
    }
-  }, [isOpen]);
+  }, [open]);

  return (
-    <StandardModal
-      footerNode={(
-        <ActionRow isStacked className="pb-2">
-          <Button onClick={onClose}>{intl.formatMessage(messages.forward)}</Button>
-        </ActionRow>
-      )}
-      hasCloseButton={false}
-      isOpen={isOpen}
-      onClose={onClose}
-      title={(
-        <p className="h2 text-center mr-n5 pt-4">{intl.formatMessage(messages.congrats)}</p>
+    <Modal
+      body={(
+        <>
+          <p>{intl.formatMessage(messages.completed)}</p>
+          <OnMobile>
+            <img src={ClapsMobile} alt="" className="img-fluid" />
+          </OnMobile>
+          <OnAtLeastTablet>
+            <img src={ClapsTablet} alt="" className="img-fluid w-100" />
+          </OnAtLeastTablet>
+          <p className="mt-3">
+            <strong>{intl.formatMessage(messages.earned)}</strong> {intl.formatMessage(messages.share)}
+          </p>
+          <SocialIcons
+            analyticsId="edx.ui.lms.celebration.social_share.clicked"
+            courseId={courseId}
+            emailSubject={messages.emailSubject}
+            socialMessage={messages.socialMessage}
+          />
+        </>
      )}
+      closeText={intl.formatMessage(messages.forward)}
+      onClose={() => {}} // Don't do anything special, just having the modal close is enough (this is a required prop)
+      open={open}
+      title={intl.formatMessage(messages.congrats)}
      {...rest}
-    >
-      <>
-        <p className="text-center">{intl.formatMessage(messages.completed)}</p>
-        {!wideScreen && <img src={ClapsMobile} alt="" className="img-fluid" />}
-        {wideScreen && <img src={ClapsTablet} alt="" className="img-fluid w-100" />}
-        <p className="mt-3 text-center">
-          <strong>{intl.formatMessage(messages.earned)}</strong> {intl.formatMessage(messages.share)}
-        </p>
-        <SocialIcons
-          analyticsId="edx.ui.lms.celebration.social_share.clicked"
-          courseId={courseId}
-          emailSubject={messages.emailSubject}
-          socialMessage={messages.socialMessage}
-        />
-      </>
-    </StandardModal>
+    />
  );
 }

+CelebrationModal.defaultProps = {
+  open: false,
+};
+
 CelebrationModal.propTypes = {
  courseId: PropTypes.string.isRequired,
  intl: intlShape.isRequired,
-  isOpen: PropTypes.bool.isRequired,
-  onClose: PropTypes.func.isRequired,
+  open: PropTypes.bool,
 };

 export default injectIntl(CelebrationModal);
--- a/src/courseware/course/celebration/WeeklyGoalCelebrationModal.jsx
+++ b/src/courseware/course/celebration/WeeklyGoalCelebrationModal.jsx
@@ -1,82 +0,0 @@
-import React, { useEffect } from 'react';
-import PropTypes from 'prop-types';
-import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import {
-  ActionRow, Button, Icon, StandardModal,
-} from '@edx/paragon';
-import { Lightbulb } from '@edx/paragon/icons';
-
-import Target from './assets/target.svg';
-import messages from './messages';
-import { recordWeeklyGoalCelebration } from './utils';
-import { useModel } from '../../../generic/model-store';
-
-function WeeklyGoalCelebrationModal({
-  courseId, daysPerWeek, intl, isOpen, onClose, ...rest
-}) {
-  const { org } = useModel('courseHomeMeta', courseId);
-
-  useEffect(() => {
-    if (isOpen) {
-      recordWeeklyGoalCelebration(org, courseId);
-    }
-  }, [isOpen]);
-
-  return (
-    <StandardModal
-      footerNode={(
-        <ActionRow isStacked className="pb-2">
-          <Button onClick={onClose}>{intl.formatMessage(messages.keepItUp)}</Button>
-        </ActionRow>
-      )}
-      hasCloseButton={false}
-      isOpen={isOpen}
-      onClose={onClose}
-      title={(
-        <p className="h2 text-center mr-n5 pt-4">{intl.formatMessage(messages.goalMet)}</p>
-      )}
-      {...rest}
-    >
-      <>
-        <div className="text-center px-3">
-          <FormattedMessage
-            id="learning.celebration.goalCongrats"
-            defaultMessage="Congratulations, you met your learning goal of {nTimes} a week."
-            description="Greeting for learners for their weekly goal, it as well indicate their gaol, i.e. (1,3 or 5 time(s) a week)"
-            values={{
-              nTimes: (<strong>{daysPerWeek} {daysPerWeek === 1 ? 'time' : 'times'}</strong>),
-            }}
-          />
-        </div>
-        <div className="d-flex justify-content-center py-4.5">
-          <img src={Target} alt="" />
-        </div>
-        <div className="py-3 pl-3 bg-light-300 small d-inline-flex">
-          <Icon
-            src={Lightbulb}
-            className="mr-2"
-            style={{ height: '21px', width: '22px' }}
-          />
-          <FormattedMessage
-            id="learning.celebration.setGoal"
-            defaultMessage="Setting a goal can help you {strongText} in your course."
-            description="It explain the advantages of setting goal"
-            values={{
-              strongText: (<strong>achieve higher performance</strong>),
-            }}
-          />
-        </div>
-      </>
-    </StandardModal>
-  );
-}
-
-WeeklyGoalCelebrationModal.propTypes = {
-  courseId: PropTypes.string.isRequired,
-  daysPerWeek: PropTypes.number.isRequired,
-  intl: intlShape.isRequired,
-  isOpen: PropTypes.bool.isRequired,
-  onClose: PropTypes.func.isRequired,
-};
-
-export default injectIntl(WeeklyGoalCelebrationModal);
--- a/src/courseware/course/celebration/assets/target.svg
+++ b/src/courseware/course/celebration/assets/target.svg
@@ -1,24 +0,0 @@
-<svg width="139" height="160" viewBox="0 0 139 160" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M76.031 156.25V3.88753C76.0452 3.25836 75.8196 2.64733 75.4 2.17819C74.9803 1.70906 74.398 1.4169 73.7709 1.36091C73.4464 1.34336 73.1218 1.39213 72.8168 1.50427C72.5119 1.61641 72.233 1.78955 71.9973 2.0131C71.7615 2.23664 71.5739 2.50591 71.4459 2.80442C71.3178 3.10293 71.252 3.42441 71.2524 3.74921V156.25C71.2524 156.884 71.5042 157.491 71.9523 157.939C72.4003 158.387 73.0081 158.638 73.6417 158.638C74.2754 158.638 74.8831 158.387 75.3312 157.939C75.7793 157.491 76.031 156.884 76.031 156.25Z" fill="#2D494E"/>
-<path d="M73.6419 159.561C72.7636 159.561 71.9212 159.212 71.3001 158.591C70.679 157.97 70.3301 157.128 70.3301 156.25V3.74917C70.3281 3.29891 70.4184 2.85302 70.5952 2.43889C70.772 2.02477 71.0317 1.65118 71.3583 1.34111C71.685 1.03103 72.0716 0.791028 72.4944 0.635847C72.9173 0.480666 73.3674 0.413593 73.8172 0.438751C74.6825 0.502353 75.4904 0.895619 76.074 1.53738C76.6577 2.17913 76.9726 3.02039 76.9537 3.88749V156.25C76.9537 157.128 76.6047 157.97 75.9837 158.591C75.3626 159.212 74.5202 159.561 73.6419 159.561ZM73.6419 2.283C73.4486 2.28052 73.2567 2.31675 73.0777 2.38956C72.8986 2.46236 72.7359 2.57027 72.5992 2.70691C72.4625 2.84355 72.3546 3.00618 72.2817 3.18518C72.2089 3.36418 72.1726 3.55595 72.1751 3.74917V156.25C72.1751 156.639 72.3297 157.012 72.6047 157.287C72.8798 157.562 73.2529 157.716 73.6419 157.716C74.0309 157.716 74.404 157.562 74.6791 157.287C74.9541 157.012 75.1087 156.639 75.1087 156.25V3.88749C75.1228 3.49496 74.988 3.11158 74.7315 2.81408C74.4749 2.51658 74.1154 2.32691 73.7249 2.283H73.6419Z" fill="#2D494E"/>
-<path d="M29.399 156.97C37.7015 130.846 45.1738 108.097 52.5907 86.1505C52.8018 85.5776 52.7932 84.9468 52.5667 84.3798C52.3401 83.8129 51.9116 83.3498 51.3638 83.0798C51.0594 82.941 50.7292 82.8676 50.3947 82.8644C50.0601 82.8612 49.7286 82.9282 49.4216 83.0612C49.1146 83.1942 48.839 83.3902 48.6126 83.6364C48.3862 83.8827 48.2141 84.1737 48.1073 84.4907C40.6628 106.493 33.1905 129.324 24.8419 155.494C24.727 155.853 24.6986 156.233 24.7588 156.605C24.8189 156.976 24.9661 157.328 25.1882 157.632C25.4104 157.936 25.7012 158.183 26.0369 158.353C26.3727 158.523 26.744 158.612 27.1205 158.611C27.625 158.613 28.1172 158.455 28.5265 158.16C28.9358 157.865 29.2413 157.449 29.399 156.97Z" fill="#2D494E"/>
-<path d="M27.1204 159.56C26.5983 159.561 26.0836 159.438 25.6181 159.201C25.1526 158.965 24.7496 158.622 24.442 158.2C24.1344 157.779 23.9309 157.29 23.8481 156.775C23.7653 156.26 23.8055 155.732 23.9654 155.236C32.3418 128.918 39.7402 106.363 47.2309 84.232C47.3812 83.7936 47.6215 83.3914 47.9362 83.0512C48.251 82.7109 48.6334 82.4401 49.0589 82.2561C49.4844 82.0721 49.9436 81.9789 50.4072 81.9825C50.8708 81.9861 51.3286 82.0865 51.7512 82.2771C52.5022 82.6469 53.0915 83.2791 53.4077 84.0539C53.7239 84.8288 53.745 85.6926 53.467 86.482C45.9947 108.613 38.624 131.076 30.2753 157.283C30.061 157.949 29.6393 158.529 29.0717 158.939C28.5042 159.349 27.8205 159.566 27.1204 159.56ZM50.3674 83.7894C50.0614 83.7892 49.763 83.8852 49.5146 84.064C49.2663 84.2427 49.0805 84.4951 48.9837 84.7853C41.4929 106.916 34.1037 129.49 25.7182 155.789C25.6479 156.01 25.6313 156.246 25.6698 156.475C25.7083 156.704 25.8008 156.921 25.9396 157.107C26.0735 157.295 26.2508 157.448 26.4564 157.552C26.662 157.656 26.8898 157.71 27.1204 157.707C27.4317 157.703 27.7341 157.603 27.9855 157.42C28.2368 157.236 28.4246 156.979 28.5226 156.683C36.8251 130.458 44.2051 107.949 51.7235 85.8457C51.8242 85.6211 51.8666 85.3748 51.847 85.1294C51.8274 84.8841 51.7463 84.6476 51.6112 84.4418C51.4761 84.236 51.2914 84.0676 51.074 83.9519C50.8566 83.8363 50.6136 83.7772 50.3674 83.7802V83.7894Z" fill="#2D494E"/>
-<path d="M120.164 158.639C120.54 158.637 120.91 158.548 121.245 158.377C121.579 158.206 121.869 157.959 122.091 157.656C122.313 157.353 122.46 157.001 122.521 156.631C122.582 156.26 122.555 155.88 122.442 155.522C114.14 129.352 106.64 106.548 99.2046 84.5738C99.0332 84.0351 98.6802 83.5726 98.2059 83.2649C97.7315 82.9572 97.1651 82.8234 96.6032 82.8863C96.2525 82.9317 95.9163 83.0544 95.6188 83.2454C95.3213 83.4365 95.0699 83.6912 94.8828 83.9911C94.6957 84.291 94.5776 84.6287 94.5369 84.9799C94.4962 85.331 94.5339 85.6867 94.6475 86.0215C102.074 107.996 109.546 130.8 117.876 156.97C118.032 157.454 118.337 157.876 118.748 158.176C119.159 158.476 119.655 158.638 120.164 158.639Z" fill="#2D494E"/>
-<path d="M120.164 159.56C119.458 159.563 118.77 159.339 118.201 158.923C117.632 158.506 117.211 157.919 117 157.245C108.633 130.974 101.253 108.437 93.7711 86.3157C93.6175 85.8593 93.5668 85.3746 93.6226 84.8964C93.6784 84.4181 93.8394 83.9581 94.094 83.5493C94.3524 83.131 94.701 82.7756 95.1144 82.5092C95.5278 82.2428 95.9954 82.072 96.4833 82.0094C97.2575 81.9163 98.0399 82.0955 98.6964 82.5161C99.3528 82.9367 99.8424 83.5726 100.081 84.3147C107.553 106.446 114.942 128.982 123.319 155.318C123.477 155.814 123.516 156.341 123.432 156.855C123.348 157.369 123.145 157.856 122.837 158.277C122.53 158.697 122.128 159.039 121.663 159.275C121.198 159.511 120.685 159.634 120.164 159.634V159.56ZM96.9076 83.7891H96.7323C96.516 83.8162 96.3083 83.8909 96.1243 84.0078C95.9403 84.1247 95.7845 84.2809 95.668 84.4652C95.5516 84.6494 95.4775 84.8572 95.4509 85.0735C95.4244 85.2899 95.4462 85.5094 95.5146 85.7163C103.005 107.847 110.385 130.393 118.762 156.72C118.858 157.016 119.046 157.274 119.298 157.458C119.549 157.641 119.852 157.741 120.164 157.743C120.395 157.743 120.623 157.688 120.829 157.583C121.035 157.478 121.213 157.326 121.348 157.139C121.484 156.952 121.574 156.735 121.61 156.507C121.646 156.279 121.628 156.045 121.557 155.825C113.19 129.545 105.81 106.999 98.3283 84.8956C98.2363 84.5862 98.0499 84.3133 97.7952 84.1149C97.5405 83.9165 97.2302 83.8026 96.9076 83.7891Z" fill="#2D494E"/>
-<path d="M73.6419 138.628C108.878 138.628 137.442 110.076 137.442 74.8542C137.442 39.6327 108.878 11.0801 73.6419 11.0801C38.4061 11.0801 9.8418 39.6327 9.8418 74.8542C9.8418 110.076 38.4061 138.628 73.6419 138.628Z" fill="#03C7E8"/>
-<path d="M73.642 139.559C60.8388 139.561 48.3227 135.768 37.6764 128.659C27.0301 121.55 18.7318 111.445 13.831 99.622C8.93017 87.7988 7.64693 74.7884 10.1436 62.2362C12.6402 49.6839 18.8046 38.1537 27.8572 29.1035C36.9097 20.0534 48.4438 13.8899 61.0008 11.3924C73.5578 8.89502 86.5737 10.1759 98.4024 15.073C110.231 19.9701 120.341 28.2636 127.455 38.9045C134.568 49.5455 138.365 62.056 138.365 74.8539C138.345 92.0073 131.52 108.453 119.387 120.583C107.253 132.713 90.8023 139.537 73.642 139.559ZM73.642 12.0019C61.2033 12.0001 49.0435 15.6855 38.7004 22.5921C28.3573 29.4987 20.2956 39.3162 15.5347 50.8029C10.7738 62.2897 9.52761 74.9297 11.9538 87.1245C14.38 99.3192 20.3696 110.521 29.165 119.313C37.9605 128.105 49.1667 134.092 61.3664 136.517C73.5661 138.942 86.2113 137.697 97.7027 132.938C109.194 128.179 119.016 120.12 125.925 109.781C132.834 99.4423 136.521 87.2875 136.52 74.8539C136.5 58.1905 129.869 42.2152 118.082 30.4324C106.294 18.6496 90.3121 12.0215 73.642 12.0019Z" fill="#2D494E"/>
-<path d="M73.6419 127.701C102.84 127.701 126.51 104.04 126.51 74.8538C126.51 45.6672 102.84 22.0068 73.6419 22.0068C44.4435 22.0068 20.7734 45.6672 20.7734 74.8538C20.7734 104.04 44.4435 127.701 73.6419 127.701Z" fill="white"/>
-<path d="M73.6421 128.623C63.0032 128.623 52.6033 125.47 43.7574 119.561C34.9115 113.653 28.017 105.256 23.9457 95.4306C19.8744 85.6056 18.8091 74.7944 20.8847 64.3642C22.9602 53.934 28.0833 44.3533 35.6061 36.8336C43.1289 29.3138 52.7136 24.1928 63.148 22.1181C73.5824 20.0435 84.398 21.1083 94.227 25.1779C104.056 29.2476 112.457 36.1393 118.368 44.9816C124.278 53.8238 127.433 64.2195 127.433 74.854C127.418 89.11 121.746 102.778 111.662 112.858C101.577 122.939 87.9038 128.608 73.6421 128.623ZM73.6421 22.9385C63.3677 22.9385 53.3242 25.984 44.7815 31.69C36.2388 37.396 29.5808 45.5061 25.6494 54.9946C21.718 64.4832 20.6898 74.924 22.6949 84.9967C24.7 95.0694 29.6483 104.321 36.914 111.583C44.1797 118.844 53.4364 123.789 63.5136 125.791C73.5907 127.794 84.0356 126.764 93.5273 122.833C103.019 118.901 111.131 112.245 116.838 103.704C122.545 95.1642 125.59 85.1242 125.588 74.854C125.571 61.0888 120.092 47.8924 110.354 38.1598C100.616 28.4272 87.4129 22.9531 73.6421 22.9385Z" fill="#2D494E"/>
-<path d="M73.642 114.091C95.3205 114.091 112.894 96.5242 112.894 74.8545C112.894 53.1849 95.3205 35.6182 73.642 35.6182C51.9635 35.6182 34.3896 53.1849 34.3896 74.8545C34.3896 96.5242 51.9635 114.091 73.642 114.091Z" fill="#03C7E8"/>
-<path d="M73.6419 115.041C65.693 115.05 57.92 112.702 51.3061 108.295C44.6922 103.887 39.5345 97.6184 36.4855 90.2806C33.4364 82.9428 32.633 74.8658 34.1768 67.0715C35.7206 59.2772 39.5423 52.1157 45.1585 46.4928C50.7746 40.8699 57.9329 37.0382 65.7279 35.4825C73.5229 33.9268 81.6044 34.717 88.9501 37.753C96.2957 40.789 102.576 45.9345 106.995 52.5386C111.415 59.1427 113.776 66.9088 113.78 74.8544C113.773 85.499 109.543 95.7065 102.02 103.239C94.4956 110.772 84.2908 115.016 73.6419 115.041ZM73.6419 36.5585C66.056 36.5494 58.6379 38.79 52.3264 42.9967C46.0149 47.2034 41.0937 53.1872 38.1856 60.1907C35.2776 67.1942 34.5134 74.9026 35.9897 82.3404C37.4661 89.7783 41.1166 96.6111 46.4794 101.974C51.8421 107.337 58.676 110.99 66.1161 112.469C73.5563 113.948 81.2682 113.188 88.276 110.285C95.2837 107.381 101.272 102.465 105.484 96.1581C109.695 89.8512 111.94 82.4372 111.935 74.8544C111.923 64.7029 107.885 54.9702 100.708 47.7886C93.5302 40.6069 83.7974 36.5621 73.6419 36.5401V36.5585Z" fill="#2D494E"/>
-<path d="M73.6421 101.688C88.4681 101.688 100.487 89.6742 100.487 74.8543C100.487 60.0344 88.4681 48.0205 73.6421 48.0205C58.8162 48.0205 46.7974 60.0344 46.7974 74.8543C46.7974 89.6742 58.8162 101.688 73.6421 101.688Z" fill="white"/>
-<path d="M73.6417 102.611C68.1495 102.612 62.7801 100.986 58.2126 97.9373C53.645 94.8885 50.0846 90.5543 47.9816 85.4827C45.8785 80.4112 45.3273 74.8301 46.3977 69.4453C47.468 64.0606 50.1119 59.1141 53.9948 55.2314C57.8778 51.3488 62.8254 48.7044 68.212 47.6326C73.5985 46.5609 79.1821 47.11 84.2564 49.2106C89.3308 51.3111 93.668 54.8686 96.7195 59.4333C99.771 63.9979 101.4 69.3646 101.4 74.8546C101.392 82.2121 98.4659 89.2663 93.2621 94.4697C88.0583 99.6731 81.0022 102.601 73.6417 102.611ZM73.6417 48.9521C68.514 48.9503 63.5009 50.4687 59.2366 53.3152C54.9723 56.1617 51.6484 60.2085 49.6852 64.9436C47.7221 69.6787 47.208 74.8894 48.2079 79.9167C49.2078 84.9439 51.6769 89.5618 55.3027 93.1861C58.9286 96.8105 63.5483 99.2786 68.5776 100.278C73.6069 101.278 78.8197 100.764 83.5568 98.8013C88.2938 96.839 92.3422 93.5164 95.1899 89.2538C98.0376 84.9913 99.5566 79.9802 99.5547 74.8546C99.545 67.9878 96.8117 61.4051 91.9542 56.5496C87.0967 51.694 80.5113 48.9619 73.6417 48.9521Z" fill="#2D494E"/>
-<path d="M73.6422 89.7185C81.8551 89.7185 88.5129 83.0634 88.5129 74.8539C88.5129 66.6444 81.8551 59.9893 73.6422 59.9893C65.4293 59.9893 58.7715 66.6444 58.7715 74.8539C58.7715 83.0634 65.4293 89.7185 73.6422 89.7185Z" fill="#03C7E8"/>
-<path d="M73.6418 90.6409C70.5182 90.6409 67.4648 89.7151 64.8676 87.9804C62.2704 86.2457 60.2462 83.7802 59.0508 80.8955C57.8555 78.0108 57.5427 74.8366 58.1521 71.7743C58.7615 68.712 60.2656 65.899 62.4744 63.6912C64.6831 61.4834 67.4972 59.9799 70.5607 59.3707C73.6243 58.7616 76.7998 59.0742 79.6856 60.2691C82.5715 61.4639 85.038 63.4874 86.7734 66.0835C88.5088 68.6796 89.435 71.7318 89.435 74.8542C89.4302 79.0396 87.7647 83.0522 84.8039 86.0117C81.8432 88.9712 77.829 90.636 73.6418 90.6409ZM73.6418 60.9116C70.8832 60.9116 68.1864 61.7293 65.8926 63.2614C63.5989 64.7934 61.8111 66.9709 60.7554 69.5186C59.6997 72.0662 59.4234 74.8696 59.9616 77.5742C60.4998 80.2788 61.8283 82.7631 63.779 84.713C65.7297 86.6629 68.215 87.9908 70.9207 88.5288C73.6264 89.0668 76.4309 88.7906 78.9796 87.7354C81.5283 86.6801 83.7067 84.8931 85.2393 82.6002C86.772 80.3074 87.59 77.6117 87.59 74.8542C87.5852 71.1579 86.1141 67.6144 83.4993 65.0007C80.8846 62.387 77.3396 60.9165 73.6418 60.9116Z" fill="#2D494E"/>
-<path d="M16.087 29.3936L1.55762 35.9222L22.6737 52.1884L37.8764 46.25L16.087 29.3936Z" fill="#D23228"/>
-<path d="M22.6738 53.1101C22.4686 53.1095 22.2687 53.045 22.1019 52.9256L0.995066 36.6594C0.869677 36.5619 0.771571 36.4338 0.710241 36.2874C0.648911 36.141 0.626435 35.9812 0.644991 35.8235C0.663546 35.6659 0.722505 35.5157 0.816158 35.3875C0.90981 35.2593 1.03499 35.1574 1.17957 35.0918L15.7089 28.5631C15.8587 28.4983 16.0231 28.4744 16.1851 28.4939C16.3472 28.5133 16.5012 28.5754 16.6314 28.6738L38.4209 45.5302C38.5517 45.6298 38.6535 45.7626 38.7158 45.9147C38.778 46.0669 38.7984 46.2329 38.7749 46.3956C38.7514 46.5583 38.6848 46.7118 38.582 46.8401C38.4792 46.9684 38.3439 47.067 38.1903 47.1255L22.9875 53.064C22.8859 53.0952 22.7801 53.1108 22.6738 53.1101ZM3.30132 36.1245L22.7845 51.1459L35.9855 45.9913L15.9949 30.4627L3.30132 36.1245Z" fill="#2D494E"/>
-<path d="M15.7734 28.4801L20.8564 15.1738L39.5832 33.063L37.8765 46.2494L15.7734 28.4801Z" fill="#D23228"/>
-<path d="M37.8765 47.1723C37.6653 47.1732 37.4601 47.1016 37.2953 46.9694L15.1553 29.2001C15.0021 29.0779 14.8918 28.9102 14.8404 28.7212C14.789 28.5322 14.7991 28.3317 14.8693 28.1489L19.9523 14.8518C20.0069 14.709 20.0962 14.5819 20.2121 14.4821C20.3281 14.3823 20.4671 14.3129 20.6165 14.2801C20.777 14.2353 20.9467 14.2347 21.1075 14.2786C21.2683 14.3224 21.4143 14.409 21.5298 14.5291L40.2658 32.4183C40.3701 32.5182 40.4494 32.6411 40.4975 32.7773C40.5456 32.9134 40.561 33.0589 40.5425 33.2021L38.8267 46.3885C38.8056 46.5512 38.7415 46.7053 38.641 46.835C38.5404 46.9647 38.4071 47.0652 38.2547 47.1262C38.1332 47.1677 38.0044 47.1834 37.8765 47.1723ZM16.9173 28.1765L37.2123 44.5074L38.6514 33.4419L21.253 16.8436L16.9173 28.1765Z" fill="#2D494E"/>
-<path d="M73.8816 77.2336C73.3986 77.2305 72.9306 77.0649 72.5532 76.7634L6.86202 24.5804C6.62514 24.4106 6.42525 24.1945 6.27454 23.9451C6.12382 23.6958 6.02541 23.4184 5.9853 23.1298C5.94518 22.8412 5.9642 22.5475 6.04119 22.2666C6.11818 21.9856 6.25153 21.7232 6.43315 21.4953C6.61476 21.2674 6.84085 21.0789 7.09764 20.9411C7.35444 20.8033 7.63658 20.7191 7.92693 20.6937C8.21728 20.6683 8.50976 20.7022 8.7866 20.7934C9.06343 20.8845 9.31883 21.0309 9.53727 21.2238L75.2193 73.4253C75.5669 73.703 75.8198 74.0819 75.9428 74.5094C76.0659 74.937 76.0531 75.3922 75.9063 75.8122C75.7595 76.2322 75.4859 76.5963 75.1232 76.8542C74.7606 77.1121 74.3267 77.2512 73.8816 77.2521V77.2336Z" fill="#F0CC00"/>
-<path d="M73.8816 78.1551C73.19 78.153 72.5198 77.9156 71.9812 77.482L6.28997 25.299C5.65946 24.7849 5.25872 24.0418 5.17571 23.2327C5.09269 22.4237 5.33418 21.6147 5.84717 20.9834C6.35467 20.3496 7.09197 19.9418 7.89873 19.8485C8.70548 19.7553 9.51645 19.9842 10.1552 20.4855L75.8465 72.6961C76.3434 73.0936 76.7046 73.6356 76.88 74.2472C77.0555 74.8587 77.0366 75.5097 76.8259 76.11C76.6152 76.7104 76.2232 77.2305 75.704 77.5985C75.1849 77.9665 74.5641 78.1642 73.9277 78.1643L73.8816 78.1551ZM8.19955 21.6566C7.94584 21.6583 7.69891 21.7386 7.49274 21.8864C7.28658 22.0342 7.13133 22.2423 7.04837 22.4819C6.96541 22.7216 6.95881 22.9811 7.02951 23.2247C7.1002 23.4683 7.24469 23.6839 7.44309 23.842L73.1251 76.0434C73.3815 76.2369 73.7024 76.3247 74.0217 76.2886C74.3409 76.2526 74.6341 76.0955 74.841 75.8498C74.9416 75.7239 75.0164 75.5794 75.0611 75.4246C75.1058 75.2697 75.1196 75.1076 75.1016 74.9475C75.0836 74.7873 75.0342 74.6323 74.9562 74.4912C74.8783 74.3502 74.7733 74.2259 74.6472 74.1254L8.96523 21.9055C8.74169 21.7479 8.47301 21.667 8.19955 21.675V21.6566Z" fill="#2D494E"/>
-</svg>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ihor-romaniuk	eac884bd59	fix: add support for legacy theme static for the LmsHtmlFragment	2022-01-18 18:19:33 +00:00
Carla Duarte	2be382d01f	fix: RTL bug on progress tab (#804 )	2022-01-18 18:19:06 +00:00
ihor-romaniuk	c828a43d0e	feat: add rtl support for chart on progress tab	2022-01-18 18:19:06 +00:00
Michael Terry	1eca5522cd	fix: don't log errors when we ask for sequence metadata for units (#790 )	2022-01-14 09:34:09 +00:00
Peter Pinch	a21abde463	squash! update package-lock.json	2021-12-20 17:55:30 +01:00
Peter Pinch	37d9646629	chore: update frontend-component-header 2.4.3	2021-12-20 17:55:30 +01:00
Peter Pinch	ad72980ad7	chore: update frontend-build to 9.0.5	2021-12-20 17:55:30 +01:00
Peter Pinch	71bcb6ba62	squash! remove duplicate code from cherry pick	2021-12-20 17:55:30 +01:00
Asad Iqbal	da867d0ef6	feat: Removed course header stuff (#715 )	2021-12-20 17:55:30 +01:00
Asad Iqbal	131096b4a5	chore: update paragon	2021-12-20 17:55:30 +01:00
Régis Behmo	76e83cc737	fix: Use Link from router to fix path based routing issue (#780 ) Co-authored-by: Arslan <arslan.ashraf@arbisoft.com>	2021-12-20 15:40:25 +00:00