fix: handle new 403 "redirect" responses from backend

To make it easier to redirect the user to an another page or an access denied error page, this PR deprecates the old custom 401 & 404 error handling, replacing them both with a generic 403 error code that contains a URL to redirect the user to. Before this change, we weren't handling all the error cases, and when we didn't, we ended up showing a broken page to the user.
2021-07-20 13:30:27 -04:00
180 changed files with 11124 additions and 15309 deletions
--- a/.env
+++ b/.env
@@ -1,10 +1,6 @@
-# See README.rst for explanations of these.
-# 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=''
 CSRF_TOKEN_API_PATH=''
 DISCOVERY_API_BASE_URL=''
@@ -20,7 +16,6 @@ LOGO_URL=''
 LOGO_TRADEMARK_URL=''
 LOGO_WHITE_URL=''
 FAVICON_URL=''
-LEGACY_THEME_NAME=''
 MARKETING_SITE_BASE_URL=''
 ORDER_HISTORY_URL=''
 REFRESH_ACCESS_TOKEN_ENDPOINT=''
@@ -37,6 +32,4 @@ TERMS_OF_SERVICE_URL=''
 TWITTER_HASHTAG=''
 TWITTER_URL=''
 USER_INFO_COOKIE_NAME=''
-SESSION_COOKIE_DOMAIN=''
-ENABLE_JUMPNAV='true'
-ENABLE_NOTICES=''
+SESSION_COOKIE_DOMAIN=''
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,6 @@
-# See README.rst for explanations of these.
-# 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'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
 DISCOVERY_API_BASE_URL='http://localhost:18381'
@@ -19,7 +15,6 @@ 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'
 PORT=2000
@@ -37,6 +32,4 @@ 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'
-SESSION_COOKIE_DOMAIN='localhost'
-ENABLE_JUMPNAV='true'
-ENABLE_NOTICES=''
+SESSION_COOKIE_DOMAIN='localhost'
--- a/.env.test
+++ b/.env.test
@@ -1,10 +1,6 @@
-# See README.rst for explanations of these.
-# 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'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
 DISCOVERY_API_BASE_URL='http://localhost:18381'
@@ -19,7 +15,6 @@ 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'
 PORT=2000
@@ -37,5 +32,3 @@ 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/commitlint.yml
+++ b/.github/workflows/commitlint.yml
@@ -1,10 +0,0 @@
-# Run commitlint on the commit messages in a pull request.
-
-name: Lint Commit Messages
-
-on:
-  - pull_request
-
-jobs:
-  commitlint:
-    uses: edx/.github/.github/workflows/commitlint.yml@master
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -11,11 +11,11 @@ jobs:
        - 12
    steps:
    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
+    - uses: actions/setup-node@v1
      with:
        node-version: ${{ matrix.node-version }}
    - run: make validate.ci
    - name: Upload coverage
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v1
      with:
        fail_ci_if_error: true
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ coverage
 dist/
 src/i18n/transifex_input.json
 temp/babel-plugin-react-intl
-logs

 ### pyenv ###
 .python-version
@@ -20,6 +19,3 @@ logs

 # Local package dependencies
 module.config.js
-
-# Local environment overrides
-.env.private
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npm run lint
--- a/README.rst
+++ b/README.rst
@@ -1,21 +1,23 @@
-|codecov| |license|
+|Coveralls| |npm_version| |npm_downloads| |license|

 frontend-app-learning
 =========================

+Please tag **@edx/teaching-and-learning** on any PRs or issues.  Thanks.
+
 Introduction
 ------------

-This is the Learning MFE (micro-frontend application), which renders all
-learner-facing course pages (like the course outline, the progress page,
-actual course content, etc).
+React app for edX learning.

-Please tag **@edx/engage-squad** on any PRs or issues.  Thanks.
-
-.. |codecov| image:: https://codecov.io/gh/edx/frontend-app-learning/branch/master/graph/badge.svg?token=3z7XvuzTq3
-   :target: https://codecov.io/gh/edx/frontend-app-learning
-.. |license| image:: https://img.shields.io/badge/license-AGPL-informational
-   :target: https://github.com/edx/frontend-app-account/blob/master/LICENSE
+.. |Coveralls| image:: https://img.shields.io/coveralls/edx/frontend-app-learning.svg?branch=master
+   :target: https://coveralls.io/github/edx/frontend-app-learning
+.. |npm_version| image:: https://img.shields.io/npm/v/@edx/frontend-app-learning.svg
+   :target: @edx/frontend-app-learning
+.. |npm_downloads| image:: https://img.shields.io/npm/dt/@edx/frontend-app-learning.svg
+   :target: @edx/frontend-app-learning
+.. |license| image:: https://img.shields.io/npm/l/@edx/frontend-app-learning.svg
+   :target: @edx/frontend-app-learning

 Development
 -----------
@@ -23,10 +25,22 @@ Development
 Start Devstack
 ^^^^^^^^^^^^^^

-To use this application, `devstack <https://github.com/edx/devstack>`__ must be running and you must be logged into it.
+To use this application `devstack <https://github.com/edx/devstack>`__ must be running and you must be logged into it.

- Run ``make dev.up.lms``
- Visit http://localhost:2000/course/course-v1:edX+DemoX+Demo_Course to view the demo course.  You can replace ``course-v1:edX+DemoX+Demo_Course`` with a different course key.
+-  Start devstack
+-  Log in (http://localhost:18000/login)
+
+Start the development server
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In this project, install requirements and start the development server by running:
+
+.. code:: bash
+
+   npm install
+   npm start # The server will run on port 1995
+
+Once the dev server is up, visit http://localhost:2000/course/course-v1:edX+DemoX+Demo_Course to view the demo course.  You can replace ``course-v1:edX+DemoX+Demo_Course`` with a different course key.

 Local module development
 ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -53,65 +67,3 @@ file (which is git-ignored) that defines where to find your local modules, for i
   };

 See https://github.com/edx/frontend-build#local-module-configuration-for-webpack for more details.
-
-Deployment
----------
-
-The Learning MFE is similar to all the other Open edX MFEs. Read the Open
-edX Developer Guide's section on
-`MFE applications <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html>`_.
-
-Environment Variables
-^^^^^^^^^^^^^^^^^^^^^
-
-This MFE is configured via environment variables supplied at build time.
-All micro-frontends have a shared set of required environment variables,
-as documented in the Open edX Developer Guide under
-`Required Environment Variables <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`_.
-
-The learning micro-frontend also supports the following additional variables:
-
-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.
-
-  Example: ``milestone``
-
-SUPPORT_URL_CALCULATOR_MATH
-  A link that explains how to use the in-course calculator. You can use the
-  one in the example below, if you don't want to have your own branded version.
-
-  Example: https://support.edx.org/hc/en-us/articles/360000038428-Entering-math-expressions-in-assignments-or-the-calculator
-
-SUPPORT_URL_ID_VERIFICATION
-  A link that explains how to verify your ID. Shown in contexts where you need
-  to verify yourself to earn a certificate. The example link below is probably too
-  edx.org-specific to use for your own site.
-
-  Example: https://support.edx.org/hc/en-us/articles/206503858-How-do-I-verify-my-identity
-
-SUPPORT_URL_VERIFIED_CERTIFICATE
-  A link that explains what a verified certificate is.  You can use the
-  one in the example below, if you don't want to have your own branded version.
-  Optional.
-
-  Example: https://support.edx.org/hc/en-us/articles/206502008-What-is-a-verified-certificate
-
-TWITTER_HASHTAG
-  This value is used in the Twitter social-share link when celebrating learning
-  milestones in the course. Will prefill the suggested post with this hashtag.
-  Optional.
-
-  Example: ``brandedhashtag``
-
-TWITTER_URL
-  A link to your Twitter account. The Twitter social-share link won't appear
-  unless this is set. Optional.
-
-  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/docs/decisions/0002-courseware-page-decisions.md
+++ b/docs/decisions/0002-courseware-page-decisions.md
@@ -1,7 +1,5 @@
 # Courseware Page Decisions

-**See [0009-courseware-api-direction.md](0009-courseware-api-direction.md) for updates!**
-
 ## Courseware data loading

 Today we have strictly hierarchical courses - a course contains sections, which contain sequences, which contain units, which contain components.
--- a/docs/decisions/0009-courseware-api-direction.md
+++ b/docs/decisions/0009-courseware-api-direction.md
@@ -1,62 +0,0 @@
-# Direction of Courseware APIs
-
-In order to allow for greater flexibility and separation of concerns, we're going to stop using the Course Blocks API for navigational data, and pull that data from the Learning Sequences Outlines API instead. The intention is to give us four distinct layers of courseware that can eventually be composed in different ways:
-
-* Learning Context Metadata
-* Learning Context Navigation
-* Sequence Navigation
-* Unit Rendering
-
-Note that "Learning Context" is a generalization of "Course" that includes other things like Content Libraries, Learning Pathways, and potentially other logical groupings of content.
-
-This is a refinement of [0002-courseware-page-decisions.md](0002-courseware-page-decisions.md). The fundamental layers remain the same, but this document tries to better clarify the boundaries and path forward for these layers. We're not making these layers completely swappable/pluggable now, but we should separate the data access in a way that allows for that in the future.
-
-## Background
-
-We currently make four primary requests to the LMS when rendering courseware instructional content:
-
-1. Course Metadata: `/api/courseware/course/{courseId}` (REST API)
-2. Course Blocks API: `/api/courses/v2/blocks/?course_id={courseId}` (REST API)
-3. Sequence Metadata: `/api/courseware/sequence/{sequenceUsageKey}` (REST API)
-4. Unit: `/xblock/{unitBlockUsageKey}` (rendered in an iframe)
-
-There is a significant amount of overlap between the Course Blocks API and the others at the moment, since Course Blocks takes a static snapshot of the entire tree of course content at once. There are a few problems with the current arrangement:
-
-* It's slow and complex. The Course Blocks API can be difficult to maintain and reason about, and trickier to optimize.
-* Assuming that all course structures are the same makes it difficult to support other content types, like LabXchange Learning Pathways or adaptive content.
-* The overlap between Course Blocks and the other APIs means that there can be conflicts about the state.
-
-## Motivating Vision
-
-We have seen a desire to extend or enhance the courseware experience in various ways:
-
-Learning Context Navigation
-* Allowing for shorter, human-readable URLs in courseware.
-* Smaller courses that do not need the current navigational hierarchy.
-* LabXchange pathways.
-
-Sequence Navigation
-* Adaptive content, where the full list of units is not known up front.
-* More limited navigation, where content is pushed linearly, without the ability to jump ahead.
-* Different layouts for content browsing.
-
-Unit Rendering
-* Use of QTI content (currently serviced by cc2olx conversion).
-* Desire to experiment with a next-gen version of XBlock.
-* Use of entirely LTI units.
-
-The idea would be to insulate each layer from the layers above and below it. Sequence rendering shouldn't be affected by whether or not it's in a two level hierarchy (Course → Section → Sequence), or a flat one (Course → Sequence). Learning Context Navigation should be able to reference Sequences without caring if a Sequence is an adaptive one or not. Sequences should be able to have a common interface to call Unit iframes, whether those Units are rendering XBlocks or QTI content.
-
-Note that supporting these types of course structures would require downstream changes in other systems as well (e.g. analytics).
-
-## Next Step: Removing use of the Course Blocks API.
-
-The next step in this process is to remove the call to the Course Blocks API, and split its responsibilities across just the existing Learning Sequences Outline and Sequence Metadata APIs. This will involve at least a couple of steps.
-
-### Complete rollout of Learning Sequences Outline calls.
-
-We're currently in a transitional state between these APIs where the Learning Sequences Outline calls are only rolled out on a small handful of courses.
-
-### Shift Sequence and Unit metadata to only come from Sequence Metadata API.
-
-We currently pull this information from both Course Blocks and the Sequence Metadata API. We can consolidate on just the Sequence Metadata API. There is also server side optimization that can be done with the Sequence Metadata API calls as part of this work.
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -16,11 +16,15 @@
    "is-es5": "es-check es5 ./dist/*.js",
    "lint": "fedx-scripts eslint --ext .js --ext .jsx .",
    "lint:fix": "fedx-scripts eslint --fix --ext .js --ext .jsx .",
-    "prepare": "husky install",
    "snapshot": "fedx-scripts jest --updateSnapshot",
    "start": "fedx-scripts webpack-dev-server --progress",
    "test": "fedx-scripts jest --coverage --passWithNoTests"
  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run lint"
+    }
+  },
  "author": "edX",
  "license": "AGPL-3.0",
  "homepage": "https://github.com/edx/frontend-app-learning#readme",
@@ -32,52 +36,49 @@
  },
  "dependencies": {
    "@edx/brand": "npm:@edx/brand-openedx@1.1.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.15",
-    "@pact-foundation/pact": "9.16.4",
-    "@reduxjs/toolkit": "1.6.2",
-    "classnames": "2.3.1",
-    "core-js": "3.18.3",
-    "js-cookie": "3.0.1",
-    "lodash.camelcase": "4.3.0",
+    "@edx/frontend-component-footer": "10.1.5",
+    "@edx/frontend-enterprise": "4.2.3",
+    "@edx/frontend-lib-special-exams": "1.9.0",
+    "@edx/frontend-platform": "1.11.0",
+    "@edx/paragon": "15.2.2",
+    "@fortawesome/fontawesome-svg-core": "1.2.34",
+    "@fortawesome/free-brands-svg-icons": "5.13.1",
+    "@fortawesome/free-regular-svg-icons": "5.13.1",
+    "@fortawesome/free-solid-svg-icons": "5.13.1",
+    "@fortawesome/react-fontawesome": "0.1.14",
+    "@reduxjs/toolkit": "1.3.6",
+    "classnames": "2.2.6",
+    "core-js": "3.6.5",
+    "js-cookie": "2.2.1",
+    "lodash.camelcase": "^4.3.0",
    "prop-types": "15.7.2",
-    "react": "17.0.2",
+    "react": "16.13.1",
    "react-break": "1.3.2",
-    "react-dom": "17.0.2",
-    "react-helmet": "6.1.0",
-    "react-redux": "7.2.5",
-    "react-router": "5.2.1",
-    "react-router-dom": "5.3.0",
-    "react-share": "4.4.0",
-    "redux": "4.1.1",
-    "regenerator-runtime": "0.13.9",
+    "react-dom": "16.13.1",
+    "react-helmet": "6.0.0",
+    "react-redux": "7.2.4",
+    "react-router": "5.2.0",
+    "react-router-dom": "5.2.0",
+    "react-share": "4.2.1",
+    "redux": "4.0.5",
+    "regenerator-runtime": "0.13.7",
    "reselect": "4.0.0",
-    "truncate-html": "1.0.4",
-    "util": "0.12.4"
+    "truncate-html": "1.0.3"
  },
  "devDependencies": {
-    "@edx/frontend-build": "9.0.5",
+    "@edx/frontend-build": "5.5.5",
    "@testing-library/dom": "7.16.3",
-    "@testing-library/jest-dom": "5.14.1",
+    "@testing-library/jest-dom": "5.10.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.0.0",
-    "glob": "7.2.0",
-    "husky": "7.0.2",
-    "jest": "27.2.5",
+    "@testing-library/user-event": "12.0.17",
+    "axios-mock-adapter": "1.18.2",
+    "codecov": "3.8.2",
+    "es-check": "5.1.4",
+    "glob": "7.1.7",
+    "husky": "3.1.0",
+    "jest": "24.9.0",
    "jest-chain": "1.1.5",
    "reactifex": "1.1.1",
-    "rosie": "2.1.0"
+    "rosie": "2.0.1"
  }
 }
--- a/public/index.html
+++ b/public/index.html
--- a/src/alerts/access-expiration-alert/AccessExpirationAlert.jsx
+++ b/src/alerts/access-expiration-alert/AccessExpirationAlert.jsx
@@ -4,11 +4,12 @@ import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import {
  FormattedMessage, FormattedDate, injectIntl, intlShape,
 } from '@edx/frontend-platform/i18n';
-import { Alert, Hyperlink } from '@edx/paragon';
-import { Info } from '@edx/paragon/icons';
+import { Hyperlink } from '@edx/paragon';

+import { Alert, ALERT_TYPES } from '../../generic/user-messages';
 import messages from './messages';
 import AccessExpirationAlertMMP2P from './AccessExpirationAlertMMP2P';
+import AccessExpirationAlertMasquerade from './AccessExpirationAlertMasquerade';

 function AccessExpirationAlert({ intl, payload }) {
  /** [MM-P2P] Experiment */
@@ -35,10 +36,17 @@ function AccessExpirationAlert({ intl, payload }) {

  const {
    expirationDate,
+    masqueradingExpiredCourse,
    upgradeDeadline,
    upgradeUrl,
  } = accessExpiration;

+  if (masqueradingExpiredCourse) {
+    return (
+      <AccessExpirationAlertMasquerade payload={payload} />
+    );
+  }
+
  /** [MM-P2P] Experiment */
  if (showMMP2P) {
    return (
@@ -92,7 +100,7 @@ function AccessExpirationAlert({ intl, payload }) {
  }

  return (
-    <Alert variant="info" icon={Info}>
+    <Alert type={ALERT_TYPES.INFO}>
      <span className="font-weight-bold">
        <FormattedMessage
          id="learning.accessExpiration.header"
--- a/src/alerts/access-expiration-alert/AccessExpirationAlertMMP2P.jsx
+++ b/src/alerts/access-expiration-alert/AccessExpirationAlertMMP2P.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedDate, injectIntl } from '@edx/frontend-platform/i18n';
-import { Alert, Hyperlink } from '@edx/paragon';
-import { Info } from '@edx/paragon/icons';
+import { Hyperlink } from '@edx/paragon';

+import { Alert, ALERT_TYPES } from '../../generic/user-messages';
 import messages from './messages';

 function AccessExpirationAlertMMP2P({ payload }) {
@@ -52,7 +52,7 @@ function AccessExpirationAlertMMP2P({ payload }) {
  }

  return (
-    <Alert variant="info" icon={Info}>
+    <Alert type={ALERT_TYPES.INFO}>
      <span className="font-weight-bold">
        Unlock full course content by {formatDate(upgradeDeadline, 'upgradeTitle')}
      </span>
--- a/src/alerts/access-expiration-alert/AccessExpirationAlertMasquerade.jsx
+++ b/src/alerts/access-expiration-alert/AccessExpirationAlertMasquerade.jsx
@@ -0,0 +1,60 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormattedMessage, FormattedDate } from '@edx/frontend-platform/i18n';
+
+import { Alert, ALERT_TYPES } from '../../generic/user-messages';
+
+function AccessExpirationAlertMasquerade({ payload }) {
+  const {
+    accessExpiration,
+    userTimezone,
+  } = payload;
+
+  if (!accessExpiration) {
+    return null;
+  }
+
+  const {
+    expirationDate,
+    masqueradingExpiredCourse,
+  } = accessExpiration;
+
+  if (!masqueradingExpiredCourse) {
+    return null;
+  }
+
+  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
+
+  return (
+    <Alert type={ALERT_TYPES.INFO}>
+      <FormattedMessage
+        id="learning.accessExpiration.expired"
+        defaultMessage="This learner does not have access to this course. Their access expired on {date}."
+        values={{
+          date: (
+            <FormattedDate
+              key="accessExpirationExpiredDate"
+              day="numeric"
+              month="short"
+              year="numeric"
+              value={expirationDate}
+              {...timezoneFormatArgs}
+            />
+          ),
+        }}
+      />
+    </Alert>
+  );
+}
+
+AccessExpirationAlertMasquerade.propTypes = {
+  payload: PropTypes.shape({
+    accessExpiration: PropTypes.shape({
+      expirationDate: PropTypes.string.isRequired,
+      masqueradingExpiredCourse: PropTypes.bool.isRequired,
+    }).isRequired,
+    userTimezone: PropTypes.string.isRequired,
+  }).isRequired,
+};
+
+export default AccessExpirationAlertMasquerade;
--- a/src/alerts/access-expiration-alert/AccessExpirationMasqueradeBanner.jsx
+++ b/src/alerts/access-expiration-alert/AccessExpirationMasqueradeBanner.jsx
@@ -1,38 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { FormattedMessage, FormattedDate } from '@edx/frontend-platform/i18n';
-import { PageBanner } from '@edx/paragon';
-
-function AccessExpirationMasqueradeBanner({ payload }) {
-  const {
-    expirationDate,
-    userTimezone,
-  } = payload;
-
-  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
-
-  return (
-    <PageBanner variant="warning">
-      <FormattedMessage
-        id="instructorToolbar.pageBanner.courseHasExpired"
-        defaultMessage="This learner no longer has access to this course. Their access expired on {date}."
-        values={{
-          date: <FormattedDate
-            key="instructorToolbar.pageBanner.accessExpirationDate"
-            value={expirationDate}
-            {...timezoneFormatArgs}
-          />,
-        }}
-      />
-    </PageBanner>
-  );
-}
-
-AccessExpirationMasqueradeBanner.propTypes = {
-  payload: PropTypes.shape({
-    expirationDate: PropTypes.string.isRequired,
-    userTimezone: PropTypes.string.isRequired,
-  }).isRequired,
-};
-
-export default AccessExpirationMasqueradeBanner;
--- a/src/alerts/access-expiration-alert/hooks.js
+++ b/src/alerts/access-expiration-alert/hooks.js
@@ -1,12 +1,11 @@
 import React, { useMemo } from 'react';
 import { useAlert } from '../../generic/user-messages';
-import { useModel } from '../../generic/model-store';

 const AccessExpirationAlert = React.lazy(() => import('./AccessExpirationAlert'));
-const AccessExpirationMasqueradeBanner = React.lazy(() => import('./AccessExpirationMasqueradeBanner'));
+const AccessExpirationAlertMasquerade = React.lazy(() => import('./AccessExpirationAlertMasquerade'));

 function useAccessExpirationAlert(accessExpiration, courseId, org, userTimezone, topic, analyticsPageName) {
-  const isVisible = accessExpiration && !accessExpiration.masqueradingExpiredCourse; // If it exists, show it.
+  const isVisible = !!accessExpiration; // If it exists, show it.
  const payload = {
    accessExpiration,
    courseId,
@@ -24,28 +23,20 @@ function useAccessExpirationAlert(accessExpiration, courseId, org, userTimezone,
  return { clientAccessExpirationAlert: AccessExpirationAlert };
 }

-export function useAccessExpirationMasqueradeBanner(courseId, tab) {
-  const {
-    userTimezone,
-  } = useModel('courseHomeMeta', courseId);
-  const {
-    accessExpiration,
-  } = useModel(tab, courseId);
-
-  const isVisible = accessExpiration && accessExpiration.masqueradingExpiredCourse;
-  const expirationDate = accessExpiration && accessExpiration.expirationDate;
+export function useAccessExpirationAlertMasquerade(accessExpiration, userTimezone, topic) {
+  const isVisible = !!accessExpiration; // If it exists, show it.
  const payload = {
-    expirationDate,
+    accessExpiration,
    userTimezone,
  };

  useAlert(isVisible, {
-    code: 'clientAccessExpirationMasqueradeBanner',
+    code: 'clientAccessExpirationAlertMasquerade',
    payload: useMemo(() => payload, Object.values(payload).sort()),
-    topic: 'instructor-toolbar-alerts',
+    topic,
  });

-  return { clientAccessExpirationMasqueradeBanner: AccessExpirationMasqueradeBanner };
+  return { clientAccessExpirationAlertMasquerade: AccessExpirationAlertMasquerade };
 }

 export default useAccessExpirationAlert;
--- a/src/alerts/access-expiration-alert/index.js
+++ b/src/alerts/access-expiration-alert/index.js
@@ -1 +1 @@
-export { default, useAccessExpirationMasqueradeBanner } from './hooks';
+export { default, useAccessExpirationAlertMasquerade } from './hooks';
--- a/src/alerts/course-start-alert/CourseStartMasqueradeBanner.jsx
+++ b/src/alerts/course-start-alert/CourseStartMasqueradeBanner.jsx
@@ -1,43 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { FormattedMessage, FormattedDate } from '@edx/frontend-platform/i18n';
-import { PageBanner } from '@edx/paragon';
-
-import { useModel } from '../../generic/model-store';
-
-function CourseStartMasqueradeBanner({ payload }) {
-  const {
-    courseId,
-  } = payload;
-
-  const {
-    start,
-    userTimezone,
-  } = useModel('courseHomeMeta', courseId);
-
-  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
-
-  return (
-    <PageBanner variant="warning">
-      <FormattedMessage
-        id="instructorToolbar.pageBanner.courseHasNotStarted"
-        defaultMessage="This learner does not yet have access to this course. The course starts on {date}."
-        values={{
-          date: <FormattedDate
-            key="instructorToolbar.pageBanner.courseStartDate"
-            value={start}
-            {...timezoneFormatArgs}
-          />,
-        }}
-      />
-    </PageBanner>
-  );
-}
-
-CourseStartMasqueradeBanner.propTypes = {
-  payload: PropTypes.shape({
-    courseId: PropTypes.string.isRequired,
-  }).isRequired,
-};
-
-export default CourseStartMasqueradeBanner;
--- a/src/alerts/course-start-alert/hooks.js
+++ b/src/alerts/course-start-alert/hooks.js
@@ -1,62 +0,0 @@
-import React, { useMemo } from 'react';
-import { useAlert } from '../../generic/user-messages';
-import { useModel } from '../../generic/model-store';
-
-const CourseStartAlert = React.lazy(() => import('./CourseStartAlert'));
-const CourseStartMasqueradeBanner = React.lazy(() => import('./CourseStartMasqueradeBanner'));
-
-function isStartDateInFuture(courseId) {
-  const {
-    start,
-  } = useModel('courseHomeMeta', courseId);
-
-  const today = new Date();
-  const startDate = new Date(start);
-  return startDate > today;
-}
-
-function useCourseStartAlert(courseId) {
-  const {
-    isEnrolled,
-  } = useModel('courseHomeMeta', courseId);
-
-  const isVisible = isEnrolled && isStartDateInFuture(courseId);
-
-  const payload = {
-    courseId,
-  };
-
-  useAlert(isVisible, {
-    code: 'clientCourseStartAlert',
-    payload: useMemo(() => payload, Object.values(payload).sort()),
-    topic: 'outline-course-alerts',
-  });
-
-  return {
-    clientCourseStartAlert: CourseStartAlert,
-  };
-}
-
-export function useCourseStartMasqueradeBanner(courseId, tab) {
-  const {
-    isMasquerading,
-  } = useModel('courseHomeMeta', courseId);
-
-  const isVisible = isMasquerading && tab === 'progress' && isStartDateInFuture(courseId);
-
-  const payload = {
-    courseId,
-  };
-
-  useAlert(isVisible, {
-    code: 'clientCourseStartMasqueradeBanner',
-    payload: useMemo(() => payload, Object.values(payload).sort()),
-    topic: 'instructor-toolbar-alerts',
-  });
-
-  return {
-    clientCourseStartMasqueradeBanner: CourseStartMasqueradeBanner,
-  };
-}
-
-export default useCourseStartAlert;
--- a/src/alerts/course-start-alert/index.js
+++ b/src/alerts/course-start-alert/index.js
@@ -1 +0,0 @@
-export { default, useCourseStartMasqueradeBanner } from './hooks';
--- a/src/alerts/enrollment-alert/EnrollmentAlert.jsx
+++ b/src/alerts/enrollment-alert/EnrollmentAlert.jsx
@@ -1,15 +1,15 @@
 import React from 'react';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import PropTypes from 'prop-types';
-import { Alert, Button } from '@edx/paragon';
-import { Info, WarningFilled } from '@edx/paragon/icons';
+import { Button } from '@edx/paragon';

 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faSpinner } from '@fortawesome/free-solid-svg-icons';
 import { useModel } from '../../generic/model-store';
+import { Alert, ALERT_TYPES } from '../../generic/user-messages';

 import messages from './messages';
-import useEnrollClickHandler from './clickHook';
+import { useEnrollClickHandler } from './hooks';

 function EnrollmentAlert({ intl, payload }) {
  const {
@@ -30,29 +30,27 @@ function EnrollmentAlert({ intl, payload }) {
  );

  let text = intl.formatMessage(messages.alert);
-  let type = 'warning';
-  let icon = WarningFilled;
+  let type = ALERT_TYPES.ERROR;
  if (isStaff) {
    text = intl.formatMessage(messages.staffAlert);
-    type = 'info';
-    icon = Info;
+    type = ALERT_TYPES.INFO;
  } else if (extraText) {
    text = `${text} ${extraText}`;
  }

  const button = canEnroll && (
-    <Button disabled={loading} variant="link" className="p-0 border-0 align-top mx-1" size="sm" style={{ textDecoration: 'underline' }} onClick={enrollClickHandler}>
+    <Button disabled={loading} variant="link" className="p-0 border-0 align-top" style={{ textDecoration: 'underline' }} onClick={enrollClickHandler}>
      {intl.formatMessage(messages.enrollNowSentence)}
    </Button>
  );

  return (
-    <Alert variant={type} icon={icon}>
-      <div className="d-flex">
-        {text}
-        {button}
-        {loading && <FontAwesomeIcon icon={faSpinner} spin />}
-      </div>
+    <Alert type={type}>
+      {text}
+      {' '}
+      {button}
+      {' '}
+      {loading && <FontAwesomeIcon icon={faSpinner} spin />}
    </Alert>
  );
 }
--- a/src/alerts/enrollment-alert/clickHook.js
+++ b/src/alerts/enrollment-alert/clickHook.js
@@ -1,35 +0,0 @@
-import { useContext, useState, useCallback } from 'react';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
-
-import { UserMessagesContext, ALERT_TYPES } from '../../generic/user-messages';
-
-import { postCourseEnrollment } from './data/api';
-
-// Separated into its own file to avoid a circular dependency inside this directory
-
-function useEnrollClickHandler(courseId, orgId, successText) {
-  const [loading, setLoading] = useState(false);
-  const { addFlash } = useContext(UserMessagesContext);
-  const enrollClickHandler = useCallback(() => {
-    setLoading(true);
-    postCourseEnrollment(courseId).then(() => {
-      addFlash({
-        dismissible: true,
-        flash: true,
-        text: successText,
-        type: ALERT_TYPES.SUCCESS,
-        topic: 'course',
-      });
-      setLoading(false);
-      sendTrackEvent('edx.bi.user.course-home.enrollment', {
-        org_key: orgId,
-        courserun_key: courseId,
-      });
-      global.location.reload();
-    });
-  }, [courseId]);
-
-  return { enrollClickHandler, loading };
-}
-
-export default useEnrollClickHandler;
--- a/src/alerts/enrollment-alert/hooks.js
+++ b/src/alerts/enrollment-alert/hooks.js
@@ -1,12 +1,15 @@
 /* eslint-disable import/prefer-default-export */
 import React, {
-  useContext, useMemo,
+  useContext, useState, useCallback, useMemo,
 } from 'react';
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { AppContext } from '@edx/frontend-platform/react';

-import { useAlert } from '../../generic/user-messages';
+import { UserMessagesContext, ALERT_TYPES, useAlert } from '../../generic/user-messages';
 import { useModel } from '../../generic/model-store';

+import { postCourseEnrollment } from './data/api';
+
 const EnrollmentAlert = React.lazy(() => import('./EnrollmentAlert'));

 export function useEnrollmentAlert(courseId) {
@@ -37,3 +40,28 @@ export function useEnrollmentAlert(courseId) {

  return { clientEnrollmentAlert: EnrollmentAlert };
 }
+
+export function useEnrollClickHandler(courseId, orgId, successText) {
+  const [loading, setLoading] = useState(false);
+  const { addFlash } = useContext(UserMessagesContext);
+  const enrollClickHandler = useCallback(() => {
+    setLoading(true);
+    postCourseEnrollment(courseId).then(() => {
+      addFlash({
+        dismissible: true,
+        flash: true,
+        text: successText,
+        type: ALERT_TYPES.SUCCESS,
+        topic: 'course',
+      });
+      setLoading(false);
+      sendTrackEvent('edx.bi.user.course-home.enrollment', {
+        org_key: orgId,
+        courserun_key: courseId,
+      });
+      global.location.reload();
+    });
+  }, [courseId]);
+
+  return { enrollClickHandler, loading };
+}
--- a/src/alerts/logistration-alert/LogistrationAlert.jsx
+++ b/src/alerts/logistration-alert/LogistrationAlert.jsx
@@ -2,9 +2,9 @@ import React from 'react';
 import { getConfig } from '@edx/frontend-platform';
 import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
 import { getLoginRedirectUrl } from '@edx/frontend-platform/auth';
-import { Alert, Hyperlink } from '@edx/paragon';
-import { WarningFilled } from '@edx/paragon/icons';
+import { Hyperlink } from '@edx/paragon';

+import { Alert } from '../../generic/user-messages';
 import genericMessages from '../../generic/messages';

 function LogistrationAlert({ intl }) {
@@ -29,7 +29,7 @@ function LogistrationAlert({ intl }) {
  );

  return (
-    <Alert variant="warning" icon={WarningFilled}>
+    <Alert type="error">
      <FormattedMessage
        id="learning.logistration.alert"
        description="Prompts the user to sign in or register to see course content."
--- a/src/course-header/AnonymousUserMenu.jsx
+++ b/src/course-header/AnonymousUserMenu.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+
+import { getConfig } from '@edx/frontend-platform';
+import { getLoginRedirectUrl } from '@edx/frontend-platform/auth';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { Button } from '@edx/paragon';
+
+import genericMessages from '../generic/messages';
+
+function AnonymousUserMenu({ intl }) {
+  return (
+    <div>
+      <Button
+        className="mr-3"
+        variant="outline-primary"
+        href={`${getConfig().LMS_BASE_URL}/register?next=${encodeURIComponent(global.location.href)}`}
+      >
+        {intl.formatMessage(genericMessages.registerSentenceCase)}
+      </Button>
+      <Button
+        variant="primary"
+        href={`${getLoginRedirectUrl(global.location.href)}`}
+      >
+        {intl.formatMessage(genericMessages.signInSentenceCase)}
+      </Button>
+    </div>
+  );
+}
+
+AnonymousUserMenu.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(AnonymousUserMenu);
--- a/src/course-header/AuthenticatedUserDropdown.jsx
+++ b/src/course-header/AuthenticatedUserDropdown.jsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faUserCircle } from '@fortawesome/free-solid-svg-icons';
+
+import { getConfig } from '@edx/frontend-platform';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { Dropdown } from '@edx/paragon';
+
+import messages from './messages';
+
+function AuthenticatedUserDropdown({ enterpriseLearnerPortalLink, intl, username }) {
+  let dashboardMenuItem = (
+    <Dropdown.Item href={`${getConfig().LMS_BASE_URL}/dashboard`}>
+      {intl.formatMessage(messages.dashboard)}
+    </Dropdown.Item>
+  );
+  if (enterpriseLearnerPortalLink && Object.keys(enterpriseLearnerPortalLink).length > 0) {
+    dashboardMenuItem = (
+      <Dropdown.Item
+        href={enterpriseLearnerPortalLink.href}
+      >
+        {enterpriseLearnerPortalLink.content}
+      </Dropdown.Item>
+    );
+  }
+  return (
+    <>
+      <a className="text-gray-700 mr-3" href={`${getConfig().SUPPORT_URL}`}>{intl.formatMessage(messages.help)}</a>
+      <Dropdown className="user-dropdown">
+        <Dropdown.Toggle variant="outline-primary">
+          <FontAwesomeIcon icon={faUserCircle} className="d-md-none" size="lg" />
+          <span data-hj-suppress className="d-none d-md-inline">
+            {username}
+          </span>
+        </Dropdown.Toggle>
+        <Dropdown.Menu className="dropdown-menu-right">
+          {dashboardMenuItem}
+          <Dropdown.Item href={`${getConfig().LMS_BASE_URL}/u/${username}`}>
+            {intl.formatMessage(messages.profile)}
+          </Dropdown.Item>
+          <Dropdown.Item href={`${getConfig().LMS_BASE_URL}/account/settings`}>
+            {intl.formatMessage(messages.account)}
+          </Dropdown.Item>
+          {!enterpriseLearnerPortalLink && (
+            // Users should only see Order History if they do not have an available
+            // learner portal, because an available learner portal currently means
+            // that they access content via Subscriptions, in which context an "order"
+            // is not relevant.
+            <Dropdown.Item href={getConfig().ORDER_HISTORY_URL}>
+              {intl.formatMessage(messages.orderHistory)}
+            </Dropdown.Item>
+          )}
+          <Dropdown.Item href={getConfig().LOGOUT_URL}>
+            {intl.formatMessage(messages.signOut)}
+          </Dropdown.Item>
+        </Dropdown.Menu>
+      </Dropdown>
+    </>
+  );
+}
+
+AuthenticatedUserDropdown.propTypes = {
+  enterpriseLearnerPortalLink: PropTypes.string,
+  intl: intlShape.isRequired,
+  username: PropTypes.string.isRequired,
+};
+
+AuthenticatedUserDropdown.defaultProps = {
+  enterpriseLearnerPortalLink: '',
+};
+
+export default injectIntl(AuthenticatedUserDropdown);
--- a/src/course-header/CourseTabsNavigation.jsx
+++ b/src/course-header/CourseTabsNavigation.jsx
@@ -11,7 +11,7 @@ function CourseTabsNavigation({
 }) {
  return (
    <div className={classNames('course-tabs-navigation', className)}>
-      <div className="container-xl">
+      <div className="container-fluid">
        <Tabs
          className="nav-underline-tabs"
          aria-label={intl.formatMessage(messages.courseMaterial)}
--- a/src/course-header/CourseTabsNavigation.test.jsx
+++ b/src/course-header/CourseTabsNavigation.test.jsx
--- a/src/course-header/Header.jsx
+++ b/src/course-header/Header.jsx
@@ -0,0 +1,97 @@
+import React, { useContext } from 'react';
+import PropTypes from 'prop-types';
+import { useEnterpriseConfig } from '@edx/frontend-enterprise';
+import { getConfig } from '@edx/frontend-platform';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { AppContext } from '@edx/frontend-platform/react';
+
+import AnonymousUserMenu from './AnonymousUserMenu';
+import AuthenticatedUserDropdown from './AuthenticatedUserDropdown';
+import messages from './messages';
+
+function LinkedLogo({
+  href,
+  src,
+  alt,
+  ...attributes
+}) {
+  return (
+    <a href={href} {...attributes}>
+      <img className="d-block" src={src} alt={alt} />
+    </a>
+  );
+}
+
+LinkedLogo.propTypes = {
+  href: PropTypes.string.isRequired,
+  src: PropTypes.string.isRequired,
+  alt: PropTypes.string.isRequired,
+};
+
+function Header({
+  courseOrg, courseNumber, courseTitle, intl,
+}) {
+  const { authenticatedUser } = useContext(AppContext);
+
+  const { enterpriseLearnerPortalLink, enterpriseCustomerBrandingConfig } = useEnterpriseConfig(
+    authenticatedUser,
+    getConfig().ENTERPRISE_LEARNER_PORTAL_HOSTNAME,
+    getConfig().LMS_BASE_URL,
+  );
+
+  let headerLogo = (
+    <LinkedLogo
+      className="logo"
+      href={`${getConfig().LMS_BASE_URL}/dashboard`}
+      src={getConfig().LOGO_URL}
+      alt={getConfig().SITE_NAME}
+    />
+  );
+  if (enterpriseCustomerBrandingConfig && Object.keys(enterpriseCustomerBrandingConfig).length > 0) {
+    headerLogo = (
+      <LinkedLogo
+        className="logo"
+        href={enterpriseCustomerBrandingConfig.logoDestination}
+        src={enterpriseCustomerBrandingConfig.logo}
+        alt={enterpriseCustomerBrandingConfig.logoAltText}
+      />
+    );
+  }
+
+  return (
+    <header className="course-header">
+      <a className="sr-only sr-only-focusable" href="#main-content">{intl.formatMessage(messages.skipNavLink)}</a>
+      <div className="container-fluid py-2 d-flex align-items-center">
+        {headerLogo}
+        <div className="flex-grow-1 course-title-lockup" style={{ lineHeight: 1 }}>
+          <span className="d-block small m-0">{courseOrg} {courseNumber}</span>
+          <span className="d-block m-0 font-weight-bold course-title">{courseTitle}</span>
+        </div>
+        {authenticatedUser && (
+          <AuthenticatedUserDropdown
+            enterpriseLearnerPortalLink={enterpriseLearnerPortalLink}
+            username={authenticatedUser.username}
+          />
+        )}
+        {!authenticatedUser && (
+          <AnonymousUserMenu />
+        )}
+      </div>
+    </header>
+  );
+}
+
+Header.propTypes = {
+  courseOrg: PropTypes.string,
+  courseNumber: PropTypes.string,
+  courseTitle: PropTypes.string,
+  intl: intlShape.isRequired,
+};
+
+Header.defaultProps = {
+  courseOrg: null,
+  courseNumber: null,
+  courseTitle: null,
+};
+
+export default injectIntl(Header);
--- a/src/course-header/Header.test.jsx
+++ b/src/course-header/Header.test.jsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import {
+  authenticatedUser, initializeMockApp, render, screen,
+} from '../setupTest';
+import { Header } from './index';
+
+describe('Header', () => {
+  beforeAll(async () => {
+    // We need to mock AuthService to implicitly use `getAuthenticatedUser` within `AppContext.Provider`.
+    await initializeMockApp();
+  });
+
+  it('displays user button', () => {
+    render(<Header />);
+    expect(screen.getByRole('button')).toHaveTextContent(authenticatedUser.username);
+  });
+
+  it('displays course data', () => {
+    const courseData = {
+      courseOrg: 'course-org',
+      courseNumber: 'course-number',
+      courseTitle: 'course-title',
+    };
+    render(<Header {...courseData} />);
+
+    expect(screen.getByText(`${courseData.courseOrg} ${courseData.courseNumber}`)).toBeInTheDocument();
+    expect(screen.getByText(courseData.courseTitle)).toBeInTheDocument();
+  });
+});
--- a/src/course-header/index.js
+++ b/src/course-header/index.js
@@ -1,2 +1,2 @@
-/* eslint-disable import/prefer-default-export */
+export { default as Header } from './Header';
 export { default as CourseTabsNavigation } from './CourseTabsNavigation';
--- a/src/course-header/messages.js
+++ b/src/course-header/messages.js
@@ -0,0 +1,46 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  courseMaterial: {
+    id: 'learn.navigation.course.tabs.label',
+    defaultMessage: 'Course Material',
+    description: 'The accessible label for course tabs navigation',
+  },
+  dashboard: {
+    id: 'header.menu.dashboard.label',
+    defaultMessage: 'Dashboard',
+    description: 'The text for the user menu Dashboard navigation link.',
+  },
+  help: {
+    id: 'header.help.label',
+    defaultMessage: 'Help',
+    description: 'The text for the link to the Help Center',
+  },
+  profile: {
+    id: 'header.menu.profile.label',
+    defaultMessage: 'Profile',
+    description: 'The text for the user menu Profile navigation link.',
+  },
+  account: {
+    id: 'header.menu.account.label',
+    defaultMessage: 'Account',
+    description: 'The text for the user menu Account navigation link.',
+  },
+  orderHistory: {
+    id: 'header.menu.orderHistory.label',
+    defaultMessage: 'Order History',
+    description: 'The text for the user menu Order History navigation link.',
+  },
+  skipNavLink: {
+    id: 'header.navigation.skipNavLink',
+    defaultMessage: 'Skip to main content.',
+    description: 'A link used by screen readers to allow users to skip to the main content of the page.',
+  },
+  signOut: {
+    id: 'header.menu.signOut.label',
+    defaultMessage: 'Sign Out',
+    description: 'The label for the user menu Sign Out action.',
+  },
+});
+
+export default messages;
--- a/src/course-home/data/factories/courseHomeMetadata.factory.js
+++ b/src/course-home/data/factories/courseHomeMetadata.factory.js
@@ -10,14 +10,4 @@ Factory.define('courseHomeMetadata')
    is_self_paced: false,
    is_enrolled: false,
    can_load_courseware: false,
-    course_access: {
-      additional_context_user_message: null,
-      developer_message: null,
-      error_code: null,
-      has_access: true,
-      user_fragment: null,
-      user_message: null,
-    },
-    start: '2013-02-05T05:00:00Z',
-    user_timezone: 'UTC',
  });
--- a/src/course-home/data/factories/datesTabData.factory.js
+++ b/src/course-home/data/factories/datesTabData.factory.js
@@ -219,4 +219,5 @@ Factory.define('datesTabData')
    ],
    has_ended: false,
    learner_is_full_access: true,
+    user_timezone: 'America/New_York',
  });
--- a/src/course-home/data/factories/outlineTabData.factory.js
+++ b/src/course-home/data/factories/outlineTabData.factory.js
@@ -14,6 +14,7 @@ Factory.define('outlineTabData')
  })
  .attr('dates_widget', ['date_blocks'], (dateBlocks) => ({
    course_date_blocks: dateBlocks,
+    user_timezone: 'UTC',
  }))
  .attr('resume_course', ['host', 'courseId'], (host, courseId) => ({
    has_visited_course: false,
@@ -47,6 +48,11 @@ Factory.define('outlineTabData')
        title: 'Bookmarks',
        url: 'https://example.com/bookmarks',
      },
+      {
+        analytics_id: 'edx.tool.verified_upgrade',
+        title: 'Upgrade to Verified',
+        url: 'https://example.com/upgrade',
+      },
    ],
    dates_banner_info: {
      content_type_gating_enabled: false,
--- a/src/course-home/data/factories/progressTabData.factory.js
+++ b/src/course-home/data/factories/progressTabData.factory.js
@@ -4,7 +4,6 @@ import { Factory } from 'rosie'; // eslint-disable-line import/no-extraneous-dep
 // This set of data may not be realistic, but it is intended to demonstrate many UI results.
 Factory.define('progressTabData')
  .attrs({
-    access_expiration: null,
    end: '3027-03-31T00:00:00Z',
    certificate_data: {},
    completion_summary: {
@@ -25,12 +24,10 @@ Factory.define('progressTabData')
            assignment_type: 'Homework',
            block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
            display_name: 'First subsection',
-            learner_has_access: true,
            has_graded_assignment: true,
            num_points_earned: 0,
-            num_points_possible: 3,
+            num_points_possible: 1,
            percent_graded: 0.0,
-            problem_scores: [{ earned: 0, possible: 1 }, { earned: 0, possible: 1 }, { earned: 0, possible: 1 }],
            show_correctness: 'always',
            show_grades: true,
            url: 'http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection',
@@ -47,7 +44,6 @@ Factory.define('progressTabData')
            num_points_earned: 1,
            num_points_possible: 1,
            percent_graded: 1.0,
-            problem_scores: [{ earned: 1, possible: 1 }],
            show_correctness: 'always',
            show_grades: true,
            url: 'http://learning.edx.org/course/course-v1:edX+Test+run/second_subsection',
--- a/src/course-home/data/factories/upgradeNotificationData.factory.js
+++ b/src/course-home/data/factories/upgradeNotificationData.factory.js
@@ -8,7 +8,6 @@ Factory.define('upgradeNotificationData')
  .option('accessExpiration', null)
  .option('contentTypeGatingEnabled', false)
  .attr('courseId', 'course-v1:edX+DemoX+Demo_Course')
-  .attr('upsellPageName', 'test')
  .attr('verifiedMode', ['host'], (host) => ({
    access_expiration_date: '2050-01-01T12:00:00',
    currency: 'USD',
--- a/src/course-home/data/snapshots/redux.test.js.snap
+++ b/src/course-home/data/snapshots/redux.test.js.snap
@@ -5,6 +5,7 @@ Object {
  "courseHome": Object {
    "courseId": "course-v1:edX+DemoX+Demo_Course_1",
    "courseStatus": "loaded",
+    "gradesFeatureIsLocked": false,
    "targetUserId": undefined,
    "toastBodyLink": null,
    "toastBodyText": null,
@@ -13,30 +14,22 @@ Object {
  "courseware": Object {
    "courseId": null,
    "courseStatus": "loading",
+    "proctoredExamsEnabledWaffleFlag": false,
    "sequenceId": null,
    "sequenceStatus": "loading",
+    "specialExamsEnabledWaffleFlag": false,
  },
  "models": Object {
    "courseHomeMeta": Object {
      "course-v1:edX+DemoX+Demo_Course_1": Object {
        "canLoadCourseware": false,
-        "courseAccess": Object {
-          "additionalContextUserMessage": null,
-          "developerMessage": null,
-          "errorCode": null,
-          "hasAccess": true,
-          "userFragment": null,
-          "userMessage": null,
-        },
        "id": "course-v1:edX+DemoX+Demo_Course_1",
        "isEnrolled": false,
-        "isMasquerading": false,
        "isSelfPaced": false,
        "isStaff": false,
        "number": "DemoX",
        "org": "edX",
        "originalUserIsStaff": false,
-        "start": "2013-02-05T05:00:00Z",
        "tabs": Array [
          Object {
            "slug": "outline",
@@ -70,7 +63,6 @@ Object {
          },
        ],
        "title": "Demonstration Course",
-        "userTimezone": "UTC",
        "verifiedMode": Object {
          "currencySymbol": "$",
          "price": 10,
@@ -295,6 +287,7 @@ Object {
        "hasEnded": false,
        "id": "course-v1:edX+DemoX+Demo_Course_1",
        "learnerIsFullAccess": true,
+        "userTimezone": "America/New_York",
      },
    },
  },
@@ -309,6 +302,7 @@ Object {
  "courseHome": Object {
    "courseId": "course-v1:edX+DemoX+Demo_Course_1",
    "courseStatus": "loaded",
+    "gradesFeatureIsLocked": false,
    "targetUserId": undefined,
    "toastBodyLink": null,
    "toastBodyText": null,
@@ -317,30 +311,22 @@ Object {
  "courseware": Object {
    "courseId": null,
    "courseStatus": "loading",
+    "proctoredExamsEnabledWaffleFlag": false,
    "sequenceId": null,
    "sequenceStatus": "loading",
+    "specialExamsEnabledWaffleFlag": false,
  },
  "models": Object {
    "courseHomeMeta": Object {
      "course-v1:edX+DemoX+Demo_Course_1": Object {
        "canLoadCourseware": false,
-        "courseAccess": Object {
-          "additionalContextUserMessage": null,
-          "developerMessage": null,
-          "errorCode": null,
-          "hasAccess": true,
-          "userFragment": null,
-          "userMessage": null,
-        },
        "id": "course-v1:edX+DemoX+Demo_Course_1",
        "isEnrolled": false,
-        "isMasquerading": false,
        "isSelfPaced": false,
        "isStaff": false,
        "number": "DemoX",
        "org": "edX",
        "originalUserIsStaff": false,
-        "start": "2013-02-05T05:00:00Z",
        "tabs": Array [
          Object {
            "slug": "outline",
@@ -374,7 +360,6 @@ Object {
          },
        ],
        "title": "Demonstration Course",
-        "userTimezone": "UTC",
        "verifiedMode": Object {
          "currencySymbol": "$",
          "price": 10,
@@ -395,6 +380,8 @@ Object {
        "courseBlocks": Object {
          "courses": Object {
            "block-v1:edX+DemoX+Demo_Course+type@course+block@bcdabcdabcdabcdabcdabcdabcdabcd3": Object {
+              "effortActivities": undefined,
+              "effortTime": undefined,
              "hasScheduledContent": false,
              "id": "course-v1:edX+DemoX+Demo_Course_1",
              "sectionIds": Array [
@@ -407,6 +394,8 @@ Object {
            "block-v1:edX+DemoX+Demo_Course+type@chapter+block@bcdabcdabcdabcdabcdabcdabcdabcd2": Object {
              "complete": false,
              "courseId": "course-v1:edX+DemoX+Demo_Course_1",
+              "effortActivities": 2,
+              "effortTime": 15,
              "id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@bcdabcdabcdabcdabcdabcdabcdabcd2",
              "resumeBlock": false,
              "sequenceIds": Array [
@@ -420,8 +409,8 @@ Object {
              "complete": false,
              "description": null,
              "due": null,
-              "effortActivities": 2,
-              "effortTime": 15,
+              "effortActivities": undefined,
+              "effortTime": undefined,
              "icon": null,
              "id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@bcdabcdabcdabcdabcdabcdabcdabcd1",
              "legacyWebUrl": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/jump_to/block-v1:edX+DemoX+Demo_Course+type@sequential+block@bcdabcdabcdabcdabcdabcdabcdabcd1?experience=legacy",
@@ -441,6 +430,11 @@ Object {
            "title": "Bookmarks",
            "url": "https://example.com/bookmarks",
          },
+          Object {
+            "analyticsId": "edx.tool.verified_upgrade",
+            "title": "Upgrade to Verified",
+            "url": "https://example.com/upgrade",
+          },
        ],
        "datesBannerInfo": Object {
          "contentTypeGatingEnabled": false,
@@ -449,12 +443,12 @@ Object {
        },
        "datesWidget": Object {
          "courseDateBlocks": Array [],
+          "userTimezone": "UTC",
        },
        "enrollAlert": Object {
          "canEnroll": true,
          "extraText": "Contact the administrator.",
        },
-        "enrollmentMode": undefined,
        "handoutsHtml": "<ul><li>Handout 1</li></ul>",
        "hasEnded": undefined,
        "hasScheduledContent": null,
@@ -465,7 +459,6 @@ Object {
          "url": "http://localhost:18000/courses/course-v1:edX+DemoX+Demo_Course/jump_to/block-v1:edX+Test+Block@12345abcde",
        },
        "timeOffsetMillis": 0,
-        "userHasPassingGrade": undefined,
        "verifiedMode": Object {
          "accessExpirationDate": "2050-01-01T12:00:00",
          "currency": "USD",
@@ -489,6 +482,7 @@ Object {
  "courseHome": Object {
    "courseId": "course-v1:edX+DemoX+Demo_Course_1",
    "courseStatus": "loaded",
+    "gradesFeatureIsLocked": false,
    "targetUserId": undefined,
    "toastBodyLink": null,
    "toastBodyText": null,
@@ -497,30 +491,22 @@ Object {
  "courseware": Object {
    "courseId": null,
    "courseStatus": "loading",
+    "proctoredExamsEnabledWaffleFlag": false,
    "sequenceId": null,
    "sequenceStatus": "loading",
+    "specialExamsEnabledWaffleFlag": false,
  },
  "models": Object {
    "courseHomeMeta": Object {
      "course-v1:edX+DemoX+Demo_Course_1": Object {
        "canLoadCourseware": false,
-        "courseAccess": Object {
-          "additionalContextUserMessage": null,
-          "developerMessage": null,
-          "errorCode": null,
-          "hasAccess": true,
-          "userFragment": null,
-          "userMessage": null,
-        },
        "id": "course-v1:edX+DemoX+Demo_Course_1",
        "isEnrolled": false,
-        "isMasquerading": false,
        "isSelfPaced": false,
        "isStaff": false,
        "number": "DemoX",
        "org": "edX",
        "originalUserIsStaff": false,
-        "start": "2013-02-05T05:00:00Z",
        "tabs": Array [
          Object {
            "slug": "outline",
@@ -554,7 +540,6 @@ Object {
          },
        ],
        "title": "Demonstration Course",
-        "userTimezone": "UTC",
        "verifiedMode": Object {
          "currencySymbol": "$",
          "price": 10,
@@ -564,7 +549,6 @@ Object {
    },
    "progress": Object {
      "course-v1:edX+DemoX+Demo_Course_1": Object {
-        "accessExpiration": null,
        "certificateData": Object {},
        "completionSummary": Object {
          "completeCount": 1,
@@ -580,8 +564,6 @@ Object {
        "courseId": "course-v1:edX+DemoX+Demo_Course_1",
        "end": "3027-03-31T00:00:00Z",
        "enrollmentMode": "audit",
-        "gradesFeatureIsFullyLocked": false,
-        "gradesFeatureIsPartiallyLocked": false,
        "gradingPolicy": Object {
          "assignmentPolicies": Array [
            Object {
@@ -608,24 +590,9 @@ Object {
                "blockKey": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345",
                "displayName": "First subsection",
                "hasGradedAssignment": true,
-                "learnerHasAccess": true,
                "numPointsEarned": 0,
-                "numPointsPossible": 3,
+                "numPointsPossible": 1,
                "percentGraded": 0,
-                "problemScores": Array [
-                  Object {
-                    "earned": 0,
-                    "possible": 1,
-                  },
-                  Object {
-                    "earned": 0,
-                    "possible": 1,
-                  },
-                  Object {
-                    "earned": 0,
-                    "possible": 1,
-                  },
-                ],
                "showCorrectness": "always",
                "showGrades": true,
                "url": "http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection",
@@ -642,12 +609,6 @@ Object {
                "numPointsEarned": 1,
                "numPointsPossible": 1,
                "percentGraded": 1,
-                "problemScores": Array [
-                  Object {
-                    "earned": 1,
-                    "possible": 1,
-                  },
-                ],
                "showCorrectness": "always",
                "showGrades": true,
                "url": "http://learning.edx.org/course/course-v1:edX+Test+run/second_subsection",
--- a/src/course-home/data/api.js
+++ b/src/course-home/data/api.js
@@ -98,7 +98,6 @@ function normalizeCourseHomeCourseMetadata(metadata) {
      title: tab.title,
      url: tab.url,
    })),
-    isMasquerading: data.originalUserIsStaff && !data.isStaff,
  };
 }

@@ -112,6 +111,8 @@ export function normalizeOutlineBlocks(courseId, blocks) {
    switch (block.type) {
      case 'course':
        models.courses[block.id] = {
+          effortActivities: block.effort_activities,
+          effortTime: block.effort_time,
          id: courseId,
          title: block.display_name,
          sectionIds: block.children || [],
@@ -122,6 +123,8 @@ export function normalizeOutlineBlocks(courseId, blocks) {
      case 'chapter':
        models.sections[block.id] = {
          complete: block.complete,
+          effortActivities: block.effort_activities,
+          effortTime: block.effort_time,
          id: block.id,
          title: block.display_name,
          resumeBlock: block.resume_block,
@@ -179,8 +182,28 @@ export function normalizeOutlineBlocks(courseId, blocks) {
  return models;
 }

+function processTabDataErrorRedirect(error) {
+  const { httpErrorResponseData, httpErrorStatus } = error && error.customAttributes;
+
+  if (httpErrorStatus === 403) {
+    // Currently, only 403 errors contain redirect content
+    try {
+      const { redirect } = JSON.parse(httpErrorResponseData);
+      if (redirect) {
+        global.location.replace(redirect);
+        return true;
+      }
+    } catch (exc) {
+      // ignore any json parse errors, might be an actual 403 without redirect json content
+    }
+  }
+
+  // Did not do any redirecting
+  return false;
+}
+
 export async function getCourseHomeCourseMetadata(courseId) {
-  let url = `${getConfig().LMS_BASE_URL}/api/course_home/course_metadata/${courseId}`;
+  let url = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`;
  url = appendBrowserTimezoneToUrl(url);
  const { data } = await getAuthenticatedHttpClient().get(url);
  return normalizeCourseHomeCourseMetadata(data);
@@ -192,27 +215,32 @@ export async function getCourseHomeCourseMetadata(courseId) {
 // import './__factories__';
 export async function getDatesTabData(courseId) {
  // return camelCaseObject(Factory.build('datesTabData'));
-  const url = `${getConfig().LMS_BASE_URL}/api/course_home/dates/${courseId}`;
+  const url = `${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`;
  try {
    const { data } = await getAuthenticatedHttpClient().get(url);
    return camelCaseObject(data);
  } catch (error) {
    const { httpErrorStatus } = error && error.customAttributes;
    if (httpErrorStatus === 404) {
+      // TODO: remove this - not needed once the backend uses 403s for redirects
      global.location.replace(`${getConfig().LMS_BASE_URL}/courses/${courseId}/dates`);
-      return {};
+      return null;
    }
+    // 401 can be returned for unauthenticated users or users who are not enrolled
    if (httpErrorStatus === 401) {
-      // The backend sends this for unenrolled and unauthenticated learners, but we handle those cases by examining
-      // courseAccess in the metadata call, so just ignore this status for now.
-      return {};
+      // TODO: remove this - not needed once the backend uses 403s for redirects
+      global.location.replace(`${getConfig().BASE_URL}/course/${courseId}/home`);
+      return null;
+    }
+    if (processTabDataErrorRedirect(error)) {
+      return null; // keeps loading screen active
    }
    throw error;
  }
 }

 export async function getProgressTabData(courseId, targetUserId) {
-  let url = `${getConfig().LMS_BASE_URL}/api/course_home/progress/${courseId}`;
+  let url = `${getConfig().LMS_BASE_URL}/api/course_home/v1/progress/${courseId}`;

  // If targetUserId is passed in, we will get the progress page data
  // for the user with the provided id, rather than the requesting user.
@@ -244,44 +272,29 @@ export async function getProgressTabData(courseId, targetUserId) {
    // in order to preserve a course team's desired grade formatting.
    camelCasedData.gradingPolicy.gradeRange = data.grading_policy.grade_range;

-    camelCasedData.gradesFeatureIsFullyLocked = camelCasedData.completionSummary.lockedCount > 0;
-
-    camelCasedData.gradesFeatureIsPartiallyLocked = false;
-    if (camelCasedData.gradesFeatureIsFullyLocked) {
-      camelCasedData.sectionScores.forEach((chapter) => {
-        chapter.subsections.forEach((subsection) => {
-          // If something is eligible to be gated by content type gating and would show up on the progress page
-          if (subsection.assignmentType !== null && subsection.hasGradedAssignment && subsection.showGrades
-            && (subsection.numPointsPossible > 0 || subsection.numPointsEarned > 0)) {
-            // but the learner still has access to it, then we are in a partially locked, rather than fully locked state
-            // since the learner has access to some (but not all) content that would normally be locked
-            if (subsection.learnerHasAccess) {
-              camelCasedData.gradesFeatureIsPartiallyLocked = true;
-              camelCasedData.gradesFeatureIsFullyLocked = false;
-            }
-          }
-        });
-      });
-    }
-
    return camelCasedData;
  } catch (error) {
    const { httpErrorStatus } = error && error.customAttributes;
    if (httpErrorStatus === 404) {
+      // TODO: remove this - not needed once the backend uses 403s for redirects
      global.location.replace(`${getConfig().LMS_BASE_URL}/courses/${courseId}/progress`);
-      return {};
+      return null;
    }
+    // 401 can be returned for unauthenticated users or users who are not enrolled
    if (httpErrorStatus === 401) {
-      // The backend sends this for unenrolled and unauthenticated learners, but we handle those cases by examining
-      // courseAccess in the metadata call, so just ignore this status for now.
-      return {};
+      // TODO: remove this - not needed once the backend uses 403s for redirects
+      global.location.replace(`${getConfig().BASE_URL}/course/${courseId}/home`);
+      return null;
+    }
+    if (processTabDataErrorRedirect(error)) {
+      return null; // keeps loading screen active
    }
    throw error;
  }
 }

 export async function getProctoringInfoData(courseId, username) {
-  let url = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/user_onboarding/status?is_learning_mfe=true&course_id=${encodeURIComponent(courseId)}`;
+  let url = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/user_onboarding/status?course_id=${encodeURIComponent(courseId)}`;
  if (username) {
    url += `&username=${encodeURIComponent(username)}`;
  }
@@ -313,7 +326,7 @@ export function getTimeOffsetMillis(headerDate, requestTime, responseTime) {
 }

 export async function getOutlineTabData(courseId) {
-  const url = `${getConfig().LMS_BASE_URL}/api/course_home/outline/${courseId}`;
+  const url = `${getConfig().LMS_BASE_URL}/api/course_home/v1/outline/${courseId}`;
  let { tabData } = {};
  let requestTime = Date.now();
  let responseTime = requestTime;
@@ -324,8 +337,12 @@ export async function getOutlineTabData(courseId) {
  } catch (error) {
    const { httpErrorStatus } = error && error.customAttributes;
    if (httpErrorStatus === 404) {
+      // TODO: remove this - not needed once the backend uses 403s for redirects
      global.location.replace(`${getConfig().LMS_BASE_URL}/courses/${courseId}/course/`);
-      return {};
+      return null;
+    }
+    if (processTabDataErrorRedirect(error)) {
+      return null; // keeps loading screen active
    }
    throw error;
  }
@@ -344,14 +361,12 @@ export async function getOutlineTabData(courseId) {
  const datesBannerInfo = camelCaseObject(data.dates_banner_info);
  const datesWidget = camelCaseObject(data.dates_widget);
  const enrollAlert = camelCaseObject(data.enroll_alert);
-  const enrollmentMode = data.enrollment_mode;
  const handoutsHtml = data.handouts_html;
  const hasScheduledContent = data.has_scheduled_content;
  const hasEnded = data.has_ended;
  const offer = camelCaseObject(data.offer);
  const resumeCourse = camelCaseObject(data.resume_course);
  const timeOffsetMillis = getTimeOffsetMillis(headers && headers.date, requestTime, responseTime);
-  const userHasPassingGrade = data.user_has_passing_grade;
  const verifiedMode = camelCaseObject(data.verified_mode);
  const welcomeMessageHtml = data.welcome_message_html;

@@ -365,14 +380,12 @@ export async function getOutlineTabData(courseId) {
    datesBannerInfo,
    datesWidget,
    enrollAlert,
-    enrollmentMode,
    handoutsHtml,
    hasScheduledContent,
    hasEnded,
    offer,
    resumeCourse,
    timeOffsetMillis, // This should move to a global time correction reference
-    userHasPassingGrade,
    verifiedMode,
    welcomeMessageHtml,
  };
@@ -387,12 +400,12 @@ export async function postCourseDeadlines(courseId, model) {
 }

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

 export async function postDismissWelcomeMessage(courseId) {
-  const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_home/dismiss_welcome_message`);
+  const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_home/v1/dismiss_welcome_message`);
  await getAuthenticatedHttpClient().post(url.href, { course_id: courseId });
 }

@@ -408,9 +421,3 @@ export async function executePostFromPostEvent(postData, researchEventData) {
    research_event_data: researchEventData,
  });
 }
-
-export async function unsubscribeFromCourseGoal(token) {
-  const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_home/unsubscribe_from_course_goal/${token}`);
-  return getAuthenticatedHttpClient().post(url.href)
-    .then(res => camelCaseObject(res));
-}
--- a/src/course-home/data/pact-tests/lmsPact.test.jsx
+++ b/src/course-home/data/pact-tests/lmsPact.test.jsx
@@ -1,223 +0,0 @@
-import { Pact, Matchers } from '@pact-foundation/pact';
-import path from 'path';
-import { mergeConfig, getConfig } from '@edx/frontend-platform';
-
-import {
-  getCourseHomeCourseMetadata,
-  getDatesTabData,
-} from '../api';
-
-import { initializeMockApp } from '../../../setupTest';
-import {
-  courseId, dateRegex, opaqueKeysRegex, dateTypeRegex,
-} from '../../../pacts/constants';
-
-const {
-  somethingLike: like, term, boolean, string, eachLike,
-} = Matchers;
-const provider = new Pact({
-  consumer: 'frontend-app-learning',
-  provider: 'lms',
-  log: path.resolve(process.cwd(), 'src/course-home/data/pact-tests/logs', 'pact.log'),
-  dir: path.resolve(process.cwd(), 'src/pacts'),
-  pactfileWriteMode: 'merge',
-  logLevel: 'DEBUG',
-  cors: true,
-});
-
-describe('Course Home Service', () => {
-  beforeAll(async () => {
-    initializeMockApp();
-    await provider
-      .setup()
-      .then((options) => mergeConfig({
-        LMS_BASE_URL: `http://localhost:${options.port}`,
-      }, 'Custom app config for pact tests'));
-  });
-
-  afterEach(() => provider.verify());
-  afterAll(() => provider.finalize());
-  describe('When a request to fetch tab is made', () => {
-    it('returns tab data for a course_id', async () => {
-      await provider.addInteraction({
-        state: `Tab data exists for course_id ${courseId}`,
-        uponReceiving: 'a request to fetch tab',
-        withRequest: {
-          method: 'GET',
-          path: `/api/course_home/course_metadata/${courseId}`,
-        },
-        willRespondWith: {
-          status: 200,
-          body: {
-            can_show_upgrade_sock: boolean(false),
-            verified_mode: like({
-              access_expiration_date: null,
-              currency: 'USD',
-              currency_symbol: '$',
-              price: 149,
-              sku: '8CF08E5',
-              upgrade_url: `${getConfig().ECOMMERCE_BASE_URL}/basket/add/?sku=8CF08E5`,
-            }),
-            can_load_courseware: boolean(true),
-            celebrations: like({
-              first_section: false,
-              streak_length_to_celebrate: null,
-              streak_discount_enabled: false,
-            }),
-            course_access: {
-              has_access: boolean(true),
-              error_code: null,
-              developer_message: null,
-              user_message: null,
-              additional_context_user_message: null,
-              user_fragment: null,
-            },
-            course_id: term({
-              generate: 'course-v1:edX+DemoX+Demo_Course',
-              matcher: opaqueKeysRegex,
-            }),
-            is_enrolled: boolean(true),
-            is_self_paced: boolean(false),
-            is_staff: boolean(true),
-            number: string('DemoX'),
-            org: string('edX'),
-            original_user_is_staff: boolean(true),
-            start: term({
-              generate: '2013-02-05T05:00:00Z',
-              matcher: dateRegex,
-            }),
-            tabs: eachLike({
-              tab_id: 'courseware',
-              title: 'Course',
-              url: `${getConfig().BASE_URL}/course/course-v1:edX+DemoX+Demo_Course/home`,
-            }),
-            title: string('Demonstration Course'),
-            username: string('edx'),
-          },
-        },
-      });
-      const normalizedTabData = {
-        canShowUpgradeSock: false,
-        verifiedMode: {
-          accessExpirationDate: null,
-          currency: 'USD',
-          currencySymbol: '$',
-          price: 149,
-          sku: '8CF08E5',
-          upgradeUrl: `${getConfig().ECOMMERCE_BASE_URL}/basket/add/?sku=8CF08E5`,
-        },
-        canLoadCourseware: true,
-        celebrations: {
-          firstSection: false,
-          streakLengthToCelebrate: null,
-          streakDiscountEnabled: false,
-        },
-        courseAccess: {
-          hasAccess: true,
-          errorCode: null,
-          developerMessage: null,
-          userMessage: null,
-          additionalContextUserMessage: null,
-          userFragment: null,
-        },
-        courseId: 'course-v1:edX+DemoX+Demo_Course',
-        isEnrolled: true,
-        isMasquerading: false,
-        isSelfPaced: false,
-        isStaff: true,
-        number: 'DemoX',
-        org: 'edX',
-        originalUserIsStaff: true,
-        start: '2013-02-05T05:00:00Z',
-        tabs: [
-          {
-            slug: 'outline',
-            title: 'Course',
-            url: `${getConfig().BASE_URL}/course/course-v1:edX+DemoX+Demo_Course/home`,
-          },
-        ],
-        title: 'Demonstration Course',
-        username: 'edx',
-      };
-      const response = await getCourseHomeCourseMetadata(courseId);
-      expect(response).toBeTruthy();
-      expect(response).toEqual(normalizedTabData);
-    });
-  });
-
-  describe('When a request to fetch dates tab is made', () => {
-    it('returns course date blocks for a course_id', async () => {
-      await provider.addInteraction({
-        state: `course date blocks exist for course_id ${courseId}`,
-        uponReceiving: 'a request to fetch dates tab',
-        withRequest: {
-          method: 'GET',
-          path: `/api/course_home/dates/${courseId}`,
-        },
-        willRespondWith: {
-          status: 200,
-          body: {
-            dates_banner_info: like({
-              missed_deadlines: false,
-              content_type_gating_enabled: false,
-              missed_gated_content: false,
-              verified_upgrade_link: `${getConfig().ECOMMERCE_BASE_URL}/basket/add/?sku=8CF08E5`,
-            }),
-            course_date_blocks: eachLike({
-              assignment_type: null,
-              complete: null,
-              date: term({
-                generate: '2013-02-05T05:00:00Z',
-                matcher: dateRegex,
-              }),
-              date_type: term({
-                generate: 'verified-upgrade-deadline',
-                matcher: dateTypeRegex,
-              }),
-              description: 'You are still eligible to upgrade to a Verified Certificate! Pursue it to highlight the knowledge and skills you gain in this course.',
-              learner_has_access: true,
-              link: `${getConfig().ECOMMERCE_BASE_URL}/basket/add/?sku=8CF08E5`,
-              link_text: 'Upgrade to Verified Certificate',
-              title: 'Verification Upgrade Deadline',
-              extra_info: null,
-              first_component_block_id: '',
-            }),
-            has_ended: boolean(false),
-            learner_is_full_access: boolean(true),
-            user_timezone: null,
-          },
-        },
-      });
-      const camelCaseResponse = {
-        datesBannerInfo: {
-          missedDeadlines: false,
-          contentTypeGatingEnabled: false,
-          missedGatedContent: false,
-          verifiedUpgradeLink: `${getConfig().ECOMMERCE_BASE_URL}/basket/add/?sku=8CF08E5`,
-        },
-        courseDateBlocks: [
-          {
-            assignmentType: null,
-            complete: null,
-            date: '2013-02-05T05:00:00Z',
-            dateType: 'verified-upgrade-deadline',
-            description: 'You are still eligible to upgrade to a Verified Certificate! Pursue it to highlight the knowledge and skills you gain in this course.',
-            learnerHasAccess: true,
-            link: `${getConfig().ECOMMERCE_BASE_URL}/basket/add/?sku=8CF08E5`,
-            linkText: 'Upgrade to Verified Certificate',
-            title: 'Verification Upgrade Deadline',
-            extraInfo: null,
-            firstComponentBlockId: '',
-          },
-        ],
-        hasEnded: false,
-        learnerIsFullAccess: true,
-        userTimezone: null,
-      };
-
-      const response = await getDatesTabData(courseId);
-      expect(response).toBeTruthy();
-      expect(response).toEqual(camelCaseResponse);
-    });
-  });
-});
--- a/src/course-home/data/redux.test.js
+++ b/src/course-home/data/redux.test.js
@@ -18,7 +18,7 @@ const axiosMock = new MockAdapter(getAuthenticatedHttpClient());
 describe('Data layer integration tests', () => {
  const courseHomeMetadata = Factory.build('courseHomeMetadata');
  const { id: courseId } = courseHomeMetadata;
-  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/course_metadata/${courseId}`;
+  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`;
  courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);

  let store;
@@ -31,7 +31,7 @@ describe('Data layer integration tests', () => {
  });

  describe('Test fetchDatesTab', () => {
-    const datesBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/dates`;
+    const datesBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/dates`;

    it('Should fail to fetch if error occurs', async () => {
      axiosMock.onGet(courseMetadataUrl).networkError();
@@ -60,7 +60,7 @@ describe('Data layer integration tests', () => {
  });

  describe('Test fetchOutlineTab', () => {
-    const outlineBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/outline`;
+    const outlineBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/outline`;

    it('Should result in fetch failure if error occurs', async () => {
      axiosMock.onGet(courseMetadataUrl).networkError();
@@ -89,7 +89,7 @@ describe('Data layer integration tests', () => {
  });

  describe('Test fetchProgressTab', () => {
-    const progressBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/progress`;
+    const progressBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/progress`;

    it('Should result in fetch failure if error occurs', async () => {
      axiosMock.onGet(courseMetadataUrl).networkError();
@@ -133,7 +133,7 @@ describe('Data layer integration tests', () => {

  describe('Test saveCourseGoal', () => {
    it('Should save course goal', async () => {
-      const goalUrl = `${getConfig().LMS_BASE_URL}/api/course_home/save_course_goal`;
+      const goalUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/save_course_goal`;
      axiosMock.onPost(goalUrl).reply(200, {});

      await thunks.saveCourseGoal(courseId, 'unsure');
@@ -164,7 +164,7 @@ describe('Data layer integration tests', () => {

  describe('Test dismissWelcomeMessage', () => {
    it('Should dismiss welcome message', async () => {
-      const dismissUrl = `${getConfig().LMS_BASE_URL}/api/course_home/dismiss_welcome_message`;
+      const dismissUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/dismiss_welcome_message`;
      axiosMock.onPost(dismissUrl).reply(201);

      await executeThunk(thunks.dismissWelcomeMessage(courseId), store.dispatch);
--- a/src/course-home/data/slice.js
+++ b/src/course-home/data/slice.js
@@ -4,26 +4,18 @@ import { createSlice } from '@reduxjs/toolkit';
 export const LOADING = 'loading';
 export const LOADED = 'loaded';
 export const FAILED = 'failed';
-export const DENIED = 'denied';

 const slice = createSlice({
  name: 'course-home',
  initialState: {
    courseStatus: 'loading',
    courseId: null,
+    gradesFeatureIsLocked: false,
    toastBodyText: null,
    toastBodyLink: null,
    toastHeader: '',
  },
  reducers: {
-    fetchTabDenied: (state, { payload }) => {
-      state.courseId = payload.courseId;
-      state.courseStatus = DENIED;
-    },
-    fetchTabFailure: (state, { payload }) => {
-      state.courseId = payload.courseId;
-      state.courseStatus = FAILED;
-    },
    fetchTabRequest: (state, { payload }) => {
      state.courseId = payload.courseId;
      state.courseStatus = LOADING;
@@ -33,6 +25,10 @@ const slice = createSlice({
      state.targetUserId = payload.targetUserId;
      state.courseStatus = LOADED;
    },
+    fetchTabFailure: (state, { payload }) => {
+      state.courseId = payload.courseId;
+      state.courseStatus = FAILED;
+    },
    setCallToActionToast: (state, { payload }) => {
      const {
        header,
@@ -43,15 +39,18 @@ const slice = createSlice({
      state.toastBodyText = linkText;
      state.toastHeader = header;
    },
+    setGradesFeatureStatus: (state, { payload }) => {
+      state.gradesFeatureIsLocked = payload.gradesFeatureIsLocked;
+    },
  },
 });

 export const {
-  fetchTabDenied,
-  fetchTabFailure,
  fetchTabRequest,
  fetchTabSuccess,
+  fetchTabFailure,
  setCallToActionToast,
+  setGradesFeatureStatus,
 } = slice.actions;

 export const {
--- a/src/course-home/data/thunks.js
+++ b/src/course-home/data/thunks.js
@@ -17,7 +17,6 @@ import {
 } from '../../generic/model-store';

 import {
-  fetchTabDenied,
  fetchTabFailure,
  fetchTabRequest,
  fetchTabSuccess,
@@ -50,6 +49,11 @@ export function fetchTab(courseId, tab, getTabData, targetUserId) {
        logError(courseHomeCourseMetadataResult.reason);
      }

+      if (fetchedTabData && tabDataResult.value === null) {
+        // null tab data indicates that we have redirected elsewhere - just exit and don't visibly stop loading
+        return;
+      }
+
      if (fetchedTabData) {
        dispatch(addModel({
          modelType: tab,
@@ -62,10 +66,7 @@ export function fetchTab(courseId, tab, getTabData, targetUserId) {
        logError(tabDataResult.reason);
      }

-      // Disable the access-denied path for now - it caused a regression
-      if (fetchedCourseHomeCourseMetadata && !courseHomeCourseMetadataResult.value.courseAccess.hasAccess) {
-        dispatch(fetchTabDenied({ courseId }));
-      } else if (fetchedCourseHomeCourseMetadata && fetchedTabData) {
+      if (fetchedCourseHomeCourseMetadata && fetchedTabData) {
        dispatch(fetchTabSuccess({ courseId, targetUserId }));
      } else {
        dispatch(fetchTabFailure({ courseId }));
--- a/src/course-home/dates-tab/DatesTab.test.jsx
+++ b/src/course-home/dates-tab/DatesTab.test.jsx
@@ -23,31 +23,26 @@ jest.mock('@edx/frontend-platform/analytics');

 describe('DatesTab', () => {
  let axiosMock;
-  let store;
-  let component;

-  beforeEach(() => {
-    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
-    store = initializeStore();
-    component = (
-      <AppProvider store={store}>
-        <UserMessagesProvider>
-          <Route path="/course/:courseId/dates">
-            <TabContainer tab="dates" fetch={fetchDatesTab} slice="courseHome">
-              <DatesTab />
-            </TabContainer>
-          </Route>
-        </UserMessagesProvider>
-      </AppProvider>
-    );
-  });
+  const store = initializeStore();
+  const component = (
+    <AppProvider store={store}>
+      <UserMessagesProvider>
+        <Route path="/course/:courseId/dates">
+          <TabContainer tab="dates" fetch={fetchDatesTab} slice="courseHome">
+            <DatesTab />
+          </TabContainer>
+        </Route>
+      </UserMessagesProvider>
+    </AppProvider>
+  );

  const datesTabData = Factory.build('datesTabData');
-  let courseMetadata = Factory.build('courseHomeMetadata', { user_timezone: 'America/New_York' });
+  let courseMetadata = Factory.build('courseHomeMetadata');
  const { id: courseId } = courseMetadata;

-  const datesUrl = `${getConfig().LMS_BASE_URL}/api/course_home/dates/${courseId}`;
-  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/course_metadata/${courseId}`;
+  const datesUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/dates/${courseId}`;
+  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata/${courseId}`;
  courseMetadataUrl = appendBrowserTimezoneToUrl(courseMetadataUrl);

  function setMetadata(attributes, options) {
@@ -79,6 +74,7 @@ describe('DatesTab', () => {

  describe('when receiving a full set of dates data', () => {
    beforeEach(() => {
+      axiosMock = new MockAdapter(getAuthenticatedHttpClient());
      axiosMock.onGet(courseMetadataUrl).reply(200, courseMetadata);
      axiosMock.onGet(datesUrl).reply(200, datesTabData);
      history.push(`/course/${courseId}/dates`); // so tab can pull course id from url
@@ -146,6 +142,7 @@ describe('DatesTab', () => {

  describe('Suggested schedule messaging', () => {
    beforeEach(() => {
+      axiosMock = new MockAdapter(getAuthenticatedHttpClient());
      setMetadata({ is_self_paced: true, is_enrolled: true });
      history.push(`/course/${courseId}/dates`);
    });
@@ -298,55 +295,4 @@ describe('DatesTab', () => {
      });
    });
  });
-
-  describe('when receiving an access denied error', () => {
-    // These tests could go into any particular tab, as they all go through the same flow. But dates tab works.
-
-    async function renderDenied(errorCode) {
-      setMetadata({
-        course_access: {
-          has_access: false,
-          error_code: errorCode,
-          additional_context_user_message: 'uhoh oh no', // only used by audit_expired
-        },
-      });
-      render(component);
-      await waitForElementToBeRemoved(screen.getByRole('status'));
-    }
-
-    beforeEach(() => {
-      axiosMock.onGet(datesUrl).reply(200, datesTabData);
-      history.push(`/course/${courseId}/dates`); // so tab can pull course id from url
-    });
-
-    it('redirects to course survey for a survey_required error code', async () => {
-      await renderDenied('survey_required');
-      expect(global.location.href).toEqual(`http://localhost/redirect/survey/${courseMetadata.id}`);
-    });
-
-    it('redirects to dashboard for an unfulfilled_milestones error code', async () => {
-      await renderDenied('unfulfilled_milestones');
-      expect(global.location.href).toEqual('http://localhost/redirect/dashboard');
-    });
-
-    it('redirects to the dashboard with an attached access_response_error for an audit_expired error code', async () => {
-      await renderDenied('audit_expired');
-      expect(global.location.href).toEqual('http://localhost/redirect/dashboard?access_response_error=uhoh%20oh%20no');
-    });
-
-    it('redirects to the dashboard with a notlive start date for a course_not_started error code', async () => {
-      await renderDenied('course_not_started');
-      expect(global.location.href).toEqual('http://localhost/redirect/dashboard?notlive=2/5/2013'); // date from factory
-    });
-
-    it('redirects to the home page when unauthenticated', async () => {
-      await renderDenied('authentication_required');
-      expect(global.location.href).toEqual(`http://localhost/redirect/course-home/${courseMetadata.id}`);
-    });
-
-    it('redirects to the home page when unenrolled', async () => {
-      await renderDenied('enrollment_required');
-      expect(global.location.href).toEqual(`http://localhost/redirect/course-home/${courseMetadata.id}`);
-    });
-  });
 });
--- a/src/course-home/dates-tab/timeline/Day.jsx
+++ b/src/course-home/dates-tab/timeline/Day.jsx
@@ -29,10 +29,10 @@ function Day({
  const {
    courseId,
  } = useSelector(state => state.courseHome);
+
  const {
    userTimezone,
-  } = useModel('courseHomeMeta', courseId);
-
+  } = useModel('dates', courseId);
  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};

  const { color, badges } = getBadgeListAndColor(date, intl, null, items);
--- a/src/course-home/goal-unsubscribe/GoalUnsubscribe.jsx
+++ b/src/course-home/goal-unsubscribe/GoalUnsubscribe.jsx
@@ -1,52 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useParams } from 'react-router-dom';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-
-import { LearningHeader as Header } from '@edx/frontend-component-header';
-import PageLoading from '../../generic/PageLoading';
-import { unsubscribeFromCourseGoal } from '../data/api';
-
-import messages from './messages';
-import ResultPage from './ResultPage';
-
-function GoalUnsubscribe({ intl }) {
-  const { token } = useParams();
-  const [error, setError] = useState(false);
-  const [isLoading, setIsLoading] = useState(true);
-  const [data, setData] = useState({});
-
-  // We don't need to bother with redux for this simple page. We're not sharing state with other pages at all.
-  useEffect(() => {
-    unsubscribeFromCourseGoal(token)
-      .then(
-        (result) => {
-          setIsLoading(false);
-          setData(result.data);
-        },
-        () => {
-          setIsLoading(false);
-          setError(true);
-        },
-      );
-  }, []); // deps=[] to only run once
-
-  return (
-    <>
-      <Header showUserDropdown={false} />
-      <main id="main-content" className="container my-5 text-center">
-        {isLoading && (
-          <PageLoading srMessage={`${intl.formatMessage(messages.loading)}`} />
-        )}
-        {!isLoading && (
-          <ResultPage error={error} courseTitle={data.courseTitle} />
-        )}
-      </main>
-    </>
-  );
-}
-
-GoalUnsubscribe.propTypes = {
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(GoalUnsubscribe);
--- a/src/course-home/goal-unsubscribe/GoalUnsubscribe.test.jsx
+++ b/src/course-home/goal-unsubscribe/GoalUnsubscribe.test.jsx
@@ -1,62 +0,0 @@
-import React from 'react';
-import { Route } from 'react-router';
-import MockAdapter from 'axios-mock-adapter';
-import { getConfig, history } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import { AppProvider } from '@edx/frontend-platform/react';
-import { render, screen } from '@testing-library/react';
-
-import GoalUnsubscribe from './GoalUnsubscribe';
-import { act, initializeMockApp } from '../../setupTest';
-import initializeStore from '../../store';
-import { UserMessagesProvider } from '../../generic/user-messages';
-
-initializeMockApp();
-jest.mock('@edx/frontend-platform/analytics');
-
-describe('GoalUnsubscribe', () => {
-  let axiosMock;
-  let store;
-  let component;
-  const unsubscribeUrl = `${getConfig().LMS_BASE_URL}/api/course_home/unsubscribe_from_course_goal/TOKEN`;
-
-  beforeEach(() => {
-    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
-    store = initializeStore();
-    component = (
-      <AppProvider store={store}>
-        <UserMessagesProvider>
-          <Route path="/goal-unsubscribe/:token" component={GoalUnsubscribe} />
-        </UserMessagesProvider>
-      </AppProvider>
-    );
-    history.push('/goal-unsubscribe/TOKEN'); // so we can pull token from url
-  });
-
-  it('starts with a spinner', () => {
-    render(component);
-    expect(screen.getByRole('status')).toBeInTheDocument();
-  });
-
-  it('loads a real token', async () => {
-    const response = { course_title: 'My Sample Course' };
-    axiosMock.onPost(unsubscribeUrl).reply(200, response);
-    await act(async () => render(component));
-
-    expect(screen.getByText('You’ve unsubscribed from goal reminders')).toBeInTheDocument();
-    expect(screen.getByText(/your goal for My Sample Course/)).toBeInTheDocument();
-    expect(screen.getByRole('link', { name: 'Go to dashboard' }))
-      .toHaveAttribute('href', 'http://localhost:18000/dashboard');
-  });
-
-  it('loads a bad token with an error page', async () => {
-    axiosMock.onPost(unsubscribeUrl).reply(404, {});
-    await act(async () => render(component));
-
-    expect(screen.getByText('Something went wrong')).toBeInTheDocument();
-    expect(screen.getByRole('link', { name: 'Go to dashboard' }))
-      .toHaveAttribute('href', 'http://localhost:18000/dashboard');
-    expect(screen.getByRole('link', { name: 'contact support' }))
-      .toHaveAttribute('href', 'http://localhost:18000/contact');
-  });
-});
--- a/src/course-home/goal-unsubscribe/ResultPage.jsx
+++ b/src/course-home/goal-unsubscribe/ResultPage.jsx
@@ -1,58 +0,0 @@
-import PropTypes from 'prop-types';
-import { getConfig } from '@edx/frontend-platform';
-import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Button, Hyperlink } from '@edx/paragon';
-
-import messages from './messages';
-import { ReactComponent as UnsubscribeIcon } from './unsubscribe.svg';
-
-function ResultPage({ courseTitle, error, intl }) {
-  const errorDescription = (
-    <FormattedMessage
-      id="learning.goals.unsubscribe.errorDescription"
-      defaultMessage="We were unable to unsubscribe you from goal reminder emails. Please try again later or {contactSupport} for help."
-      values={{
-        contactSupport: (
-          <Hyperlink
-            className="text-reset"
-            style={{ textDecoration: 'underline' }}
-            destination={`${getConfig().CONTACT_URL}`}
-          >
-            {intl.formatMessage(messages.contactSupport)}
-          </Hyperlink>
-        ),
-      }}
-    />
-  );
-
-  const header = error
-    ? intl.formatMessage(messages.errorHeader)
-    : intl.formatMessage(messages.header);
-  const description = error
-    ? errorDescription
-    : intl.formatMessage(messages.description, { courseTitle });
-
-  return (
-    <>
-      <UnsubscribeIcon className="text-primary" alt="" />
-      <div role="heading" aria-level="1" className="h2">{header}</div>
-      <div>{description}</div>
-      <Button variant="brand" href={`${getConfig().LMS_BASE_URL}/dashboard`} className="mt-4">
-        {intl.formatMessage(messages.goToDashboard)}
-      </Button>
-    </>
-  );
-}
-
-ResultPage.defaultProps = {
-  courseTitle: null,
-  error: false,
-};
-
-ResultPage.propTypes = {
-  courseTitle: PropTypes.string,
-  error: PropTypes.bool,
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(ResultPage);
--- a/src/course-home/goal-unsubscribe/index.jsx
+++ b/src/course-home/goal-unsubscribe/index.jsx
@@ -1,3 +0,0 @@
-import GoalUnsubscribe from './GoalUnsubscribe';
-
-export default GoalUnsubscribe;
--- a/src/course-home/goal-unsubscribe/messages.js
+++ b/src/course-home/goal-unsubscribe/messages.js
@@ -1,30 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  contactSupport: {
-    id: 'learning.goals.unsubscribe.contact',
-    defaultMessage: 'contact support',
-  },
-  description: {
-    id: 'learning.goals.unsubscribe.description',
-    defaultMessage: 'You will no longer receive email reminders about your goal for {courseTitle}.',
-  },
-  errorHeader: {
-    id: 'learning.goals.unsubscribe.errorHeader',
-    defaultMessage: 'Something went wrong',
-  },
-  goToDashboard: {
-    id: 'learning.goals.unsubscribe.goToDashboard',
-    defaultMessage: 'Go to dashboard',
-  },
-  header: {
-    id: 'learning.goals.unsubscribe.header',
-    defaultMessage: 'You’ve unsubscribed from goal reminders',
-  },
-  loading: {
-    id: 'learning.goals.unsubscribe.loading',
-    defaultMessage: 'Unsubscribing…',
-  },
-});
-
-export default messages;
--- a/src/course-home/goal-unsubscribe/unsubscribe.svg
+++ b/src/course-home/goal-unsubscribe/unsubscribe.svg
@@ -1,5 +0,0 @@
-<svg width="167" height="153" viewBox="0 0 167 153" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M140.25 25.5H12.75V127.5H140.25V25.5ZM127.5 46L76.5 77.875L25.5 46V38.25L76.5 70.125L127.5 38.25V46Z" fill="currentColor"/>
-<circle cx="134" cy="39" r="33" transform="rotate(-90 134 39)" fill="white"/>
-<path d="M134 11C118.544 11 106 23.544 106 39C106 54.456 118.544 67 134 67C149.456 67 162 54.456 162 39C162 23.544 149.456 11 134 11ZM134 61.4C121.624 61.4 111.6 51.376 111.6 39C111.6 33.82 113.364 29.06 116.332 25.28L147.72 56.668C143.94 59.636 139.18 61.4 134 61.4ZM151.668 52.72L120.28 21.332C124.06 18.364 128.82 16.6 134 16.6C146.376 16.6 156.4 26.624 156.4 39C156.4 44.18 154.636 48.94 151.668 52.72Z" fill="#D23228"/>
-</svg>
--- a/src/course-home/outline-tab/LmsHtmlFragment.jsx
+++ b/src/course-home/outline-tab/LmsHtmlFragment.jsx
@@ -13,7 +13,7 @@ export default function LmsHtmlFragment({
    <html>
      <head>
        <base href="${getConfig().LMS_BASE_URL}" target="_parent">
-        <link rel="stylesheet" href="/static/${getConfig().LEGACY_THEME_NAME ? `${getConfig().LEGACY_THEME_NAME}/` : ''}css/bootstrap/lms-main.css">
+        <link rel="stylesheet" href="/static/css/bootstrap/lms-main.css">
        <link rel="stylesheet" type="text/css" href="${getConfig().BASE_URL}/src/course-home/outline-tab/LmsHtmlFragment.css">
      </head>
      <body class="${className}">${html}</body>
--- a/src/course-home/outline-tab/OutlineTab.jsx
+++ b/src/course-home/outline-tab/OutlineTab.jsx
@@ -1,7 +1,6 @@
 import React, { useState } from 'react';
 import { useSelector } from 'react-redux';
 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, Toast } from '@edx/paragon';
@@ -18,10 +17,11 @@ import Section from './Section';
 import ShiftDatesAlert from '../suggested-schedule-messaging/ShiftDatesAlert';
 import UpdateGoalSelector from './widgets/UpdateGoalSelector';
 import UpgradeNotification from '../../generic/upgrade-notification/UpgradeNotification';
+import { useAccessExpirationAlertMasquerade } from '../../alerts/access-expiration-alert';
 import UpgradeToShiftDatesAlert from '../suggested-schedule-messaging/UpgradeToShiftDatesAlert';
 import useCertificateAvailableAlert from './alerts/certificate-status-alert';
 import useCourseEndAlert from './alerts/course-end-alert';
-import useCourseStartAlert from '../../alerts/course-start-alert';
+import useCourseStartAlert from './alerts/course-start-alert';
 import usePrivateCourseAlert from './alerts/private-course-alert';
 import useScheduledContentAlert from './alerts/scheduled-content-alert';
 import { useModel } from '../../generic/model-store';
@@ -42,7 +42,6 @@ function OutlineTab({ intl }) {
    org,
    title,
    username,
-    userTimezone,
  } = useModel('courseHomeMeta', courseId);

  const {
@@ -58,6 +57,7 @@ function OutlineTab({ intl }) {
    datesBannerInfo,
    datesWidget: {
      courseDateBlocks,
+      userTimezone,
    },
    resumeCourse: {
      hasVisitedCourse,
@@ -86,6 +86,7 @@ function OutlineTab({ intl }) {
  };

  // Below the course title alerts (appearing in the order listed here)
+  const accessExpirationAlertMasquerade = useAccessExpirationAlertMasquerade(accessExpiration, userTimezone, 'outline-course-alerts');
  const courseStartAlert = useCourseStartAlert(courseId);
  const courseEndAlert = useCourseEndAlert(courseId);
  const certificateAvailableAlert = useCertificateAvailableAlert(courseId);
@@ -106,19 +107,9 @@ function OutlineTab({ intl }) {
    });
  };

-  const isEnterpriseUser = () => {
-    const authenticatedUser = getAuthenticatedUser();
-    const userRoleNames = authenticatedUser ? authenticatedUser.roles.map(role => role.split(':')[0]) : [];
-
-    return userRoleNames.includes('enterprise_learner');
-  };
-
  /** [[MM-P2P] Experiment */
  const MMP2P = initHomeMMP2P(courseId);

-  /** show post enrolment survey to only B2C learners */
-  const learnerType = isEnterpriseUser() ? 'enterprise_learner' : 'b2c_learner';
-
  return (
    <>
      <Toast
@@ -128,7 +119,7 @@ function OutlineTab({ intl }) {
      >
        {goalToastHeader}
      </Toast>
-      <div data-learner-type={learnerType} className="row w-100 mx-0 my-3 justify-content-between">
+      <div 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>
@@ -159,6 +150,7 @@ function OutlineTab({ intl }) {
              topic="outline-course-alerts"
              className="mb-3"
              customAlerts={{
+                ...accessExpirationAlertMasquerade,
                ...certificateAvailableAlert,
                ...courseEndAlert,
                ...courseStartAlert,
@@ -232,12 +224,11 @@ function OutlineTab({ intl }) {
                  verifiedMode={verifiedMode}
                  accessExpiration={accessExpiration}
                  contentTypeGatingEnabled={datesBannerInfo.contentTypeGatingEnabled}
-                  upsellPageName="course_home"
                  userTimezone={userTimezone}
-                  shouldDisplayBorder
                  timeOffsetMillis={timeOffsetMillis}
                  courseId={courseId}
                  org={org}
+                  shouldDisplayBorder
                />
              )}
            <CourseDates
--- a/src/course-home/outline-tab/OutlineTab.test.jsx
+++ b/src/course-home/outline-tab/OutlineTab.test.jsx
@@ -16,7 +16,6 @@ import * as thunks from '../data/thunks';
 import initializeStore from '../../store';
 import { CERT_STATUS_TYPE } from './alerts/certificate-status-alert/CertificateStatusAlert';
 import OutlineTab from './OutlineTab';
-import LoadedTabPage from '../../tab-page/LoadedTabPage';

 initializeMockApp();
 jest.mock('@edx/frontend-platform/analytics');
@@ -25,13 +24,12 @@ describe('Outline Tab', () => {
  let axiosMock;

  const courseId = 'course-v1:edX+Test+run';
-  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/course_metadata/${courseId}`;
+  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/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)}`;
+  const goalUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/save_course_goal`;
+  const outlineUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/outline/${courseId}`;
+  const proctoringInfoUrl = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/user_onboarding/status?course_id=${encodeURIComponent(courseId)}`;

  const store = initializeStore();
  const defaultMetadata = Factory.build('courseHomeMetadata', { id: courseId });
@@ -59,7 +57,6 @@ describe('Outline Tab', () => {
    axiosMock.onGet(courseMetadataUrl).reply(200, defaultMetadata);
    axiosMock.onPost(enrollmentUrl).reply(200, {});
    axiosMock.onPost(goalUrl).reply(200, { header: 'Success' });
-    axiosMock.onGet(masqueradeUrl).reply(200, { success: true });
    axiosMock.onGet(outlineUrl).reply(200, defaultTabData);
    axiosMock.onGet(proctoringInfoUrl).reply(200, {
      onboarding_status: 'created',
@@ -440,6 +437,35 @@ describe('Outline Tab', () => {
      await fetchAndRender();
      expect(screen.queryByRole('heading', { name: 'Course Tools' })).not.toBeInTheDocument();
    });
+
+    it('analytics sent when upgrade link clicked', async () => {
+      await fetchAndRender();
+      expect(screen.getByRole('heading', { name: 'Course Tools' })).toBeInTheDocument();
+      sendTrackEvent.mockClear();
+      sendTrackingLogEvent.mockClear();
+
+      const upgradeLink = screen.getByRole('link', { name: 'Upgrade to Verified' });
+      fireEvent.click(upgradeLink);
+
+      expect(sendTrackEvent).toHaveBeenCalledTimes(1);
+      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.upsell_links_clicked', {
+        org_key: 'edX',
+        courserun_key: courseId,
+        linkCategory: '(none)',
+        linkName: 'course_home_course_tools',
+        linkType: 'link',
+        pageName: 'course_home',
+      });
+
+      expect(sendTrackingLogEvent).toHaveBeenCalledTimes(1);
+      expect(sendTrackingLogEvent).toHaveBeenCalledWith('edx.course.tool.accessed', {
+        org_key: 'edX',
+        courserun_key: courseId,
+        course_id: courseId,
+        is_staff: false,
+        tool_name: 'edx.tool.verified_upgrade',
+      });
+    });
  });

  describe('Alert List', () => {
@@ -459,8 +485,8 @@ describe('Outline Tab', () => {
        });
        await fetchAndRender();

-        const alert = await screen.findByTestId('private-course-alert');
-        expect(alert).toHaveAttribute('role', 'alert');
+        const alert = await screen.findByText('Welcome to Demonstration Course');
+        expect(alert.parentElement).toHaveAttribute('role', 'alert');

        expect(screen.queryByRole('button', { name: 'Enroll now' })).not.toBeInTheDocument();
        expect(screen.getByText('You must be enrolled in the course to see course content.')).toBeInTheDocument();
@@ -469,8 +495,8 @@ describe('Outline Tab', () => {
      it('displays alert for unenrolled user', async () => {
        await fetchAndRender();

-        const alert = await screen.findByTestId('private-course-alert');
-        expect(alert).toHaveAttribute('role', 'alert');
+        const alert = await screen.findByText('Welcome to Demonstration Course');
+        expect(alert.parentElement).toHaveAttribute('role', 'alert');

        expect(screen.getByRole('button', { name: 'Enroll now' })).toBeInTheDocument();
      });
@@ -495,35 +521,32 @@ describe('Outline Tab', () => {
    });

    describe('Access Expiration Alert', () => {
-      it('renders page banner on masquerade', async () => {
-        setMetadata({ is_enrolled: true, original_user_is_staff: true });
+      it('has special masquerade text', async () => {
        setTabData({
          access_expiration: {
            expiration_date: '2020-01-01T12:00:00Z',
            masquerading_expired_course: true,
+            upgrade_deadline: null,
+            upgrade_url: null,
          },
        });
-        await executeThunk(thunks.fetchOutlineTab(courseId), store.dispatch);
-        await act(async () => render(<LoadedTabPage courseId={courseId} activeTabSlug="outline">...</LoadedTabPage>, { store }));
-        const instructorToolbar = await screen.getByTestId('instructor-toolbar');
-        expect(instructorToolbar).toBeInTheDocument();
-        expect(screen.getByText('This learner no longer has access to this course. Their access expired on', { exact: false })).toBeInTheDocument();
-        expect(screen.getByText('1/1/2020')).toBeInTheDocument();
+        await fetchAndRender();
+        const check = await screen.queryByText('This learner does not have access to this course.', { exact: false });
+        expect(check).toBeInTheDocument();
      });

-      it('does not render banner when not masquerading', async () => {
-        setMetadata({ is_enrolled: true, original_user_is_staff: true });
+      it('does not have special masquerade text', async () => {
        setTabData({
          access_expiration: {
            expiration_date: '2020-01-01T12:00:00Z',
            masquerading_expired_course: false,
+            upgrade_deadline: null,
+            upgrade_url: null,
          },
        });
-        await executeThunk(thunks.fetchOutlineTab(courseId), store.dispatch);
-        await act(async () => render(<LoadedTabPage courseId={courseId} activeTabSlug="outline">...</LoadedTabPage>, { store }));
-        const instructorToolbar = await screen.getByTestId('instructor-toolbar');
-        expect(instructorToolbar).toBeInTheDocument();
-        expect(screen.queryByText('This learner no longer has access to this course. Their access expired on', { exact: false })).not.toBeInTheDocument();
+        await fetchAndRender();
+        const check = await screen.queryByText('This learner does not have access to this course.', { exact: false });
+        expect(check).not.toBeInTheDocument();
      });
    });

@@ -532,7 +555,16 @@ describe('Outline Tab', () => {
      it('appears several days out', async () => {
        const startDate = new Date();
        startDate.setDate(startDate.getDate() + 100);
-        setMetadata({ is_enrolled: true, start: '2999-01-01T00:00:00Z' });
+        setMetadata({ is_enrolled: true });
+        setTabData({}, {
+          date_blocks: [
+            {
+              date_type: 'course-start-date',
+              date: startDate.toISOString(),
+              title: 'Start',
+            },
+          ],
+        });
        await fetchAndRender();
        const node = await screen.findByText('Course starts', { exact: false });
        expect(node.textContent).toMatch(/.* on .*/); // several days away uses "on" before date
@@ -541,7 +573,16 @@ describe('Outline Tab', () => {
      it('appears today', async () => {
        const startDate = new Date();
        startDate.setHours(startDate.getHours() + 1);
-        setMetadata({ is_enrolled: true, start: startDate });
+        setMetadata({ is_enrolled: true });
+        setTabData({}, {
+          date_blocks: [
+            {
+              date_type: 'course-start-date',
+              date: startDate.toISOString(),
+              title: 'Start',
+            },
+          ],
+        });
        await fetchAndRender();
        const node = await screen.findByText('Course starts', { exact: false });
        expect(node.textContent).toMatch(/.* at .*/); // same day uses "at" before date
@@ -652,40 +693,6 @@ describe('Outline Tab', () => {
        await fetchAndRender();
        expect(screen.queryByText('Verify your identity to earn a certificate!')).toBeInTheDocument();
      });
-      it('renders non passing grade', async () => {
-        const now = new Date();
-        const yesterday = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 1);
-        const tomorrow = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
-        setMetadata({ is_enrolled: true });
-        setTabData({
-          cert_data: {},
-          user_has_passing_grade: false,
-          has_ended: true,
-          enrollment_mode: 'verified',
-        }, {
-          date_blocks: [
-            {
-              date_type: 'course-end-date',
-              date: yesterday.toISOString(),
-              title: 'End',
-            },
-            {
-              date_type: 'certificate-available-date',
-              date: tomorrow.toISOString(),
-              title: 'Cert Available',
-            },
-            {
-              date_type: 'verification-deadline-date',
-              date: tomorrow.toISOString(),
-              link_text: 'Verify',
-              title: 'Verification Upgrade Deadline',
-            },
-          ],
-        });
-        await fetchAndRender();
-        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();
        const now = new Date();
--- a/src/course-home/outline-tab/Section.jsx
+++ b/src/course-home/outline-tab/Section.jsx
@@ -6,6 +6,7 @@ import { faCheckCircle as fasCheckCircle, faMinus, faPlus } from '@fortawesome/f
 import { faCheckCircle as farCheckCircle } from '@fortawesome/free-regular-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

+import EffortEstimate from '../../shared/effort-estimate';
 import SequenceLink from './SequenceLink';
 import { useModel } from '../../generic/model-store';

@@ -66,6 +67,7 @@ function Section({
        <span className="sr-only">
          , {intl.formatMessage(complete ? messages.completedSection : messages.incompleteSection)}
        </span>
+        <EffortEstimate className="ml-3 align-middle" block={section} />
      </div>
    </div>
  );
--- a/src/course-home/outline-tab/SequenceLink.jsx
+++ b/src/course-home/outline-tab/SequenceLink.jsx
@@ -33,7 +33,9 @@ function SequenceLink({
    title,
  } = sequence;
  const {
-    userTimezone,
+    datesWidget: {
+      userTimezone,
+    },
  } = useModel('outline', courseId);
  const {
    canLoadCourseware,
--- a/src/course-home/outline-tab/alerts/certificate-status-alert/CertificateStatusAlert.jsx
+++ b/src/course-home/outline-tab/alerts/certificate-status-alert/CertificateStatusAlert.jsx
@@ -36,8 +36,6 @@ function CertificateStatusAlert({ intl, payload }) {
    isWebCert,
    userTimezone,
    org,
-    notPassingCourseEnded,
-    tabs,
  } = payload;

  // eslint-disable-next-line react/prop-types
@@ -120,24 +118,6 @@ function CertificateStatusAlert({ intl, payload }) {
    return alertProps;
  };

-  const renderNotPassingCourseEnded = () => {
-    const progressTab = tabs.find(tab => tab.slug === 'progress');
-    const progressLink = progressTab && progressTab.url;
-
-    const alertProps = {
-      header: intl.formatMessage(certMessages.certStatusNotPassingHeader),
-      buttonMessage: intl.formatMessage(certMessages.certStatusNotPassingButton),
-      body: intl.formatMessage(certStatusMessages.notPassingBody),
-      buttonVisible: true,
-      buttonLink: progressLink,
-      buttonAction: () => {
-        sendAlertClickTracking('edx.ui.lms.course_outline.certificate_alert_view_grades_button.clicked');
-      },
-    };
-
-    return alertProps;
-  };
-
  let alertProps = {};
  switch (certStatus) {
    case CERT_STATUS_TYPE.EARNED_NOT_AVAILABLE:
@@ -149,9 +129,6 @@ function CertificateStatusAlert({ intl, payload }) {
      alertProps = renderNotIDVerifiedStatus();
      break;
    default:
-      if (notPassingCourseEnded) {
-        alertProps = renderNotPassingCourseEnded();
-      }
      break;
  }

@@ -207,12 +184,6 @@ CertificateStatusAlert.propTypes = {
    isWebCert: PropTypes.bool,
    userTimezone: PropTypes.string,
    org: PropTypes.string,
-    notPassingCourseEnded: PropTypes.bool,
-    tabs: PropTypes.arrayOf(PropTypes.shape({
-      tab_id: PropTypes.string,
-      title: PropTypes.string,
-      url: PropTypes.string,
-    })),
  }).isRequired,
 };

--- a/src/course-home/outline-tab/alerts/certificate-status-alert/hooks.js
+++ b/src/course-home/outline-tab/alerts/certificate-status-alert/hooks.js
@@ -21,30 +21,17 @@ function verifyCertStatusType(status) {
 }

 function useCertificateStatusAlert(courseId) {
-  const VERIFIED_MODES = {
-    PROFESSIONAL: 'professional',
-    VERIFIED: 'verified',
-    NO_ID_PROFESSIONAL_MODE: 'no-id-professional',
-    CREDIT_MODE: 'credit',
-    MASTERS: 'masters',
-    EXECUTIVE_EDUCATION: 'executive-education',
-  };
-
  const {
    isEnrolled,
    org,
-    tabs,
  } = useModel('courseHomeMeta', courseId);

  const {
    datesWidget: {
      courseDateBlocks,
+      userTimezone,
    },
    certData,
-    hasEnded,
-    userHasPassingGrade,
-    userTimezone,
-    enrollmentMode,
  } = useModel('outline', courseId);

  const {
@@ -55,11 +42,7 @@ function useCertificateStatusAlert(courseId) {
  } = certData || {};
  const endBlock = courseDateBlocks.find(b => b.dateType === 'course-end-date');
  const isWebCert = downloadUrl === null;
-  const isVerifiedEnrollmentMode = (
-    enrollmentMode !== null
-    && enrollmentMode !== undefined
-    && !!Object.values(VERIFIED_MODES).find(mode => mode === enrollmentMode)
-  );
+
  let certURL = '';
  if (certWebViewUrl) {
    certURL = `${getConfig().LMS_BASE_URL}${certWebViewUrl}`;
@@ -69,17 +52,8 @@ function useCertificateStatusAlert(courseId) {
  }
  const hasAlertingCertStatus = verifyCertStatusType(certStatus);

-  // Only show if:
-  // - there is a known cert status that we want provide status on.
-  // - Or the course has ended and the learner does not have a passing grade.
+  // Only show if there is a known cert status that we want provide status on.
  const isVisible = isEnrolled && hasAlertingCertStatus;
-  const notPassingCourseEnded = (
-    isEnrolled
-    && isVerifiedEnrollmentMode
-    && !hasAlertingCertStatus
-    && hasEnded
-    && !userHasPassingGrade
-  );
  const payload = {
    certificateAvailableDate,
    certURL,
@@ -89,11 +63,9 @@ function useCertificateStatusAlert(courseId) {
    userTimezone,
    isWebCert,
    org,
-    notPassingCourseEnded,
-    tabs,
  };

-  useAlert(isVisible || notPassingCourseEnded, {
+  useAlert(isVisible, {
    code: 'clientCertificateStatusAlert',
    payload: useMemo(() => payload, Object.values(payload).sort()),
    topic: 'outline-course-alerts',
--- a/src/course-home/outline-tab/alerts/certificate-status-alert/messages.js
+++ b/src/course-home/outline-tab/alerts/certificate-status-alert/messages.js
@@ -11,14 +11,6 @@ const messages = defineMessages({
    defaultMessage: 'Congratulations! Your certificate is ready.',
    description: 'Header alerting the user that their certificate is ready.',
  },
-  certStatusNotPassingHeader: {
-    id: 'cert.alert.notPassing.header',
-    defaultMessage: 'You are not eligible for a certificate',
-  },
-  certStatusNotPassingButton: {
-    id: 'cert.alert.notPassing.button',
-    defaultMessage: 'View grades',
-  },
 });

 export default messages;
--- a/src/course-home/outline-tab/alerts/course-end-alert/CourseEndAlert.jsx
+++ b/src/course-home/outline-tab/alerts/course-end-alert/CourseEndAlert.jsx
@@ -6,8 +6,8 @@ import {
  FormattedRelative,
  FormattedTime,
 } from '@edx/frontend-platform/i18n';
-import { Alert } from '@edx/paragon';
-import { Info } from '@edx/paragon/icons';
+
+import { Alert, ALERT_TYPES } from '../../../../generic/user-messages';

 const DAY_MS = 24 * 60 * 60 * 1000; // in ms

@@ -78,7 +78,7 @@ function CourseEndAlert({ payload }) {
  }

  return (
-    <Alert variant="info" icon={Info}>
+    <Alert type={ALERT_TYPES.INFO}>
      <strong>{msg}</strong><br />
      {description}
    </Alert>
--- a/src/course-home/outline-tab/alerts/course-end-alert/hooks.js
+++ b/src/course-home/outline-tab/alerts/course-end-alert/hooks.js
@@ -15,8 +15,8 @@ export function useCourseEndAlert(courseId) {
  const {
    datesWidget: {
      courseDateBlocks,
+      userTimezone,
    },
-    userTimezone,
  } = useModel('outline', courseId);

  const endBlock = courseDateBlocks.find(b => b.dateType === 'course-end-date');
--- a/src/course-home/outline-tab/alerts/course-start-alert/CourseStartAlert.jsx
+++ b/src/course-home/outline-tab/alerts/course-start-alert/CourseStartAlert.jsx
@@ -6,22 +6,16 @@ import {
  FormattedRelative,
  FormattedTime,
 } from '@edx/frontend-platform/i18n';
-import { Alert } from '@edx/paragon';
-import { Info } from '@edx/paragon/icons';

-import { useModel } from '../../generic/model-store';
+import { Alert, ALERT_TYPES } from '../../../../generic/user-messages';

 const DAY_MS = 24 * 60 * 60 * 1000; // in ms

 function CourseStartAlert({ payload }) {
  const {
-    courseId,
-  } = payload;
-
-  const {
-    start: startDate,
+    startDate,
    userTimezone,
-  } = useModel('courseHomeMeta', courseId);
+  } = payload;

  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};

@@ -36,7 +30,7 @@ function CourseStartAlert({ payload }) {
  const delta = new Date(startDate) - new Date();
  if (delta < DAY_MS) {
    return (
-      <Alert variant="info" icon={Info}>
+      <Alert type={ALERT_TYPES.INFO}>
        <FormattedMessage
          id="learning.outline.alert.start.short"
          defaultMessage="Course starts {timeRemaining} at {courseStartTime}."
@@ -61,7 +55,7 @@ function CourseStartAlert({ payload }) {
  }

  return (
-    <Alert variant="info" icon={Info}>
+    <Alert type={ALERT_TYPES.INFO}>
      <strong>
        <FormattedMessage
          id="learning.outline.alert.end.long"
@@ -93,7 +87,8 @@ function CourseStartAlert({ payload }) {

 CourseStartAlert.propTypes = {
  payload: PropTypes.shape({
-    courseId: PropTypes.string,
+    startDate: PropTypes.string,
+    userTimezone: PropTypes.string,
  }).isRequired,
 };

--- a/src/course-home/outline-tab/alerts/course-start-alert/hooks.js
+++ b/src/course-home/outline-tab/alerts/course-start-alert/hooks.js
@@ -0,0 +1,37 @@
+import React, { useMemo } from 'react';
+import { useAlert } from '../../../../generic/user-messages';
+import { useModel } from '../../../../generic/model-store';
+
+const CourseStartAlert = React.lazy(() => import('./CourseStartAlert'));
+
+function useCourseStartAlert(courseId) {
+  const {
+    isEnrolled,
+  } = useModel('courseHomeMeta', courseId);
+  const {
+    datesWidget: {
+      courseDateBlocks,
+      userTimezone,
+    },
+  } = useModel('outline', courseId);
+
+  const startBlock = courseDateBlocks.find(b => b.dateType === 'course-start-date');
+  const delta = startBlock ? new Date(startBlock.date) - new Date() : 0;
+  const isVisible = isEnrolled && startBlock && delta > 0;
+  const payload = {
+    startDate: startBlock && startBlock.date,
+    userTimezone,
+  };
+
+  useAlert(isVisible, {
+    code: 'clientCourseStartAlert',
+    payload: useMemo(() => payload, Object.values(payload).sort()),
+    topic: 'outline-course-alerts',
+  });
+
+  return {
+    clientCourseStartAlert: CourseStartAlert,
+  };
+}
+
+export default useCourseStartAlert;
--- a/src/course-home/outline-tab/alerts/course-start-alert/index.js
+++ b/src/course-home/outline-tab/alerts/course-start-alert/index.js
@@ -0,0 +1 @@
+export { default } from './hooks';
--- a/src/course-home/outline-tab/alerts/private-course-alert/PrivateCourseAlert.jsx
+++ b/src/course-home/outline-tab/alerts/private-course-alert/PrivateCourseAlert.jsx
@@ -3,15 +3,15 @@ import PropTypes from 'prop-types';
 import { getConfig } from '@edx/frontend-platform';
 import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
 import { getLoginRedirectUrl } from '@edx/frontend-platform/auth';
-import { Alert, Button, Hyperlink } from '@edx/paragon';
+import { Button, Hyperlink } from '@edx/paragon';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faSpinner } from '@fortawesome/free-solid-svg-icons';

+import { Alert } from '../../../../generic/user-messages';
 import enrollmentMessages from '../../../../alerts/enrollment-alert/messages';
 import genericMessages from '../../../../generic/messages';
-import messages from './messages';
 import outlineMessages from '../../messages';
-import useEnrollClickHandler from '../../../../alerts/enrollment-alert/clickHook';
+import { useEnrollClickHandler } from '../../../../alerts/enrollment-alert/hooks';
 import { useModel } from '../../../../generic/model-store';

 function PrivateCourseAlert({ intl, payload }) {
@@ -32,13 +32,12 @@ function PrivateCourseAlert({ intl, payload }) {
    intl.formatMessage(enrollmentMessages.success),
  );

-  const enrollNowButton = (
+  const enrollNow = (
    <Button
      disabled={loading}
      variant="link"
-      className="p-0 border-0 align-top mr-1"
+      className="p-0 border-0 align-top"
      style={{ textDecoration: 'underline' }}
-      size="sm"
      onClick={enrollClickHandler}
    >
      {intl.formatMessage(enrollmentMessages.enrollNowInline)}
@@ -64,7 +63,7 @@ function PrivateCourseAlert({ intl, payload }) {
  );

  return (
-    <Alert variant="light" data-testid="private-course-alert">
+    <Alert type="welcome">
      {anonymousUser && (
        <>
          <p className="font-weight-bold">
@@ -85,11 +84,15 @@ function PrivateCourseAlert({ intl, payload }) {
        <>
          <p className="font-weight-bold">{intl.formatMessage(outlineMessages.welcomeTo)} {title}</p>
          {canEnroll && (
-            <div className="d-flex">
-              {enrollNowButton}
-              {intl.formatMessage(messages.toAccess)}
+            <>
+              <FormattedMessage
+                id="learning.privateCourse.canEnroll"
+                description="Prompts the user to enroll in the course to see course content."
+                defaultMessage="{enrollNow} to access the full course."
+                values={{ enrollNow }}
+              />
              {loading && <FontAwesomeIcon icon={faSpinner} spin />}
-            </div>
+            </>
          )}
          {!canEnroll && (
            <>
--- a/src/course-home/outline-tab/alerts/private-course-alert/messages.js
+++ b/src/course-home/outline-tab/alerts/private-course-alert/messages.js
@@ -1,11 +1,10 @@
 import { defineMessages } from '@edx/frontend-platform/i18n';

 const messages = defineMessages({
-  toAccess: {
+  enroll: {
    id: 'alert.enroll',
-    defaultMessage: ' to access the full course.',
-    description: 'Text instructing the learner to enroll in the course in order to see course content. The full string'
-      + 'would say "Enroll now to access the full course", where "Enroll now" is a button.',
+    defaultMessage: 'You must be enrolled in the course to see course content.',
+    description: 'Text instructing the learner to enroll in the course in order to see course content.',
  },
 });

--- a/src/course-home/outline-tab/messages.js
+++ b/src/course-home/outline-tab/messages.js
@@ -216,10 +216,6 @@ const messages = defineMessages({
    id: 'learning.proctoringPanel.reviewRequirementsButton',
    defaultMessage: 'Review instructions and system requirements',
  },
-  proctoringOnboardingButtonPastDue: {
-    id: 'learning.proctoringPanel.onboardingButtonPastDue',
-    defaultMessage: 'Onboarding Past Due',
-  },
 });

 export default messages;
--- a/src/course-home/outline-tab/widgets/CourseDates.jsx
+++ b/src/course-home/outline-tab/widgets/CourseDates.jsx
@@ -13,13 +13,11 @@ function CourseDates({
  /** [MM-P2P] Experiment */
  mmp2p,
 }) {
-  const {
-    userTimezone,
-  } = useModel('courseHomeMeta', courseId);
  const {
    datesWidget: {
      courseDateBlocks,
      datesTabLink,
+      userTimezone,
    },
  } = useModel('outline', courseId);

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

-import { sendTrackingLogEvent } 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 { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -36,6 +36,16 @@ function CourseTools({ courseId, intl }) {
      is_staff: administrator,
      tool_name: analyticsId,
    });
+
+    if (analyticsId === 'edx.tool.verified_upgrade') {
+      sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
+        ...eventProperties,
+        linkCategory: '(none)',
+        linkName: 'course_home_course_tools',
+        linkType: 'link',
+        pageName: 'course_home',
+      });
+    }
  };

  const renderIcon = (iconClasses) => {
--- a/src/course-home/outline-tab/widgets/ProctoringInfoPanel.jsx
+++ b/src/course-home/outline-tab/widgets/ProctoringInfoPanel.jsx
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import camelCase from 'lodash.camelcase';
 import PropTypes from 'prop-types';

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

@@ -9,12 +10,10 @@ import messages from '../messages';
 import { getProctoringInfoData } from '../../data/api';

 function ProctoringInfoPanel({ courseId, username, intl }) {
-  const [link, setLink] = useState('');
-  const [onboardingPastDue, setOnboardingPastDue] = useState(false);
-  const [showInfoPanel, setShowInfoPanel] = useState(false);
  const [status, setStatus] = useState('');
-  const [readableStatus, setReadableStatus] = useState('');
+  const [link, setLink] = useState('');
  const [releaseDate, setReleaseDate] = useState(null);
+  const [readableStatus, setReadableStatus] = useState('');

  const readableStatuses = {
    notStarted: 'notStarted',
@@ -79,10 +78,6 @@ function ProctoringInfoPanel({ courseId, username, intl }) {
      .then(
        response => {
          if (response) {
-            if (Object.keys(response).length > 0) {
-              setShowInfoPanel(true);
-            }
-
            setStatus(response.onboarding_status);
            setLink(response.onboarding_link);
            const expirationDate = response.expiration_date;
@@ -92,54 +87,14 @@ function ProctoringInfoPanel({ courseId, username, intl }) {
              setReadableStatus(getReadableStatusClass(response.onboarding_status));
            }
            setReleaseDate(new Date(response.onboarding_release_date));
-            setOnboardingPastDue(response.onboarding_past_due);
          }
        },
      );
  }, []);

-  let onboardingExamButton = null;
-
-  if (isNotYetReleased(releaseDate)) {
-    onboardingExamButton = (
-      <Button variant="secondary" block disabled aria-disabled="true">
-        {intl.formatMessage(
-          messages.proctoringOnboardingButtonNotOpen,
-          {
-            releaseDate: intl.formatDate(releaseDate, {
-              day: 'numeric',
-              month: 'short',
-              year: 'numeric',
-            }),
-          },
-        )}
-      </Button>
-    );
-  } else if (onboardingPastDue) {
-    onboardingExamButton = (
-      <Button variant="secondary" block disabled aria-disabled="true">
-        {intl.formatMessage(messages.proctoringOnboardingButtonPastDue)}
-      </Button>
-    );
-  } else if (!isNotYetReleased(releaseDate)) {
-    if (readableStatus === readableStatuses.otherCourseApproved) {
-      onboardingExamButton = (
-        <Button variant="primary" block href={link}>
-          {intl.formatMessage(messages.proctoringOnboardingPracticeButton)}
-        </Button>
-      );
-    } else if (readableStatus !== readableStatuses.otherCourseApproved) {
-      onboardingExamButton = (
-        <Button variant="primary" block href={link}>
-          {intl.formatMessage(messages.proctoringOnboardingButton)}
-        </Button>
-      );
-    }
-  }
-
  return (
    <>
-      { showInfoPanel && (
+      { link && (
        <section className={`mb-4 p-3 outline-sidebar-proctoring-panel ${getBorderClass()}`}>
          <h2 className="h4" id="outline-sidebar-upgrade-header">{intl.formatMessage(messages.proctoringInfoPanel)}</h2>
          <div>
@@ -160,17 +115,50 @@ function ProctoringInfoPanel({ courseId, username, intl }) {
              <>
                <p>
                  {isNotYetSubmitted(status) && (
-                    intl.formatMessage(messages.proctoringPanelGeneralInfo)
+                    <>
+                      {intl.formatMessage(messages.proctoringPanelGeneralInfo)}
+                    </>
                  )}
                  {!isNotYetSubmitted(status) && (
-                    intl.formatMessage(messages.proctoringPanelGeneralInfoSubmitted)
+                    <>
+                      {intl.formatMessage(messages.proctoringPanelGeneralInfoSubmitted)}
+                    </>
                  )}
                </p>
                <p>{intl.formatMessage(messages.proctoringPanelGeneralTime)}</p>
              </>
            )}
            {isNotYetSubmitted(status) && (
-              onboardingExamButton
+              <>
+                {!isNotYetReleased(releaseDate) && (
+                  <Button variant="primary" block href={`${getConfig().LMS_BASE_URL}${link}`}>
+                    {readableStatus === readableStatuses.otherCourseApproved && (
+                      <>
+                        {intl.formatMessage(messages.proctoringOnboardingPracticeButton)}
+                      </>
+                    )}
+                    {readableStatus !== readableStatuses.otherCourseApproved && (
+                      <>
+                        {intl.formatMessage(messages.proctoringOnboardingButton)}
+                      </>
+                    )}
+                  </Button>
+                )}
+                {isNotYetReleased(releaseDate) && (
+                  <Button variant="secondary" block disabled aria-disabled="true">
+                    {intl.formatMessage(
+                      messages.proctoringOnboardingButtonNotOpen,
+                      {
+                        releaseDate: intl.formatDate(releaseDate, {
+                          day: 'numeric',
+                          month: 'short',
+                          year: 'numeric',
+                        }),
+                      },
+                    )}
+                  </Button>
+                )}
+              </>
            )}
            <Button variant="outline-primary" block href="https://support.edx.org/hc/en-us/sections/115004169247-Taking-Timed-and-Proctored-Exams">
              {intl.formatMessage(messages.proctoringReviewRequirementsButton)}
--- a/src/course-home/outline-tab/widgets/WelcomeMessage.jsx
+++ b/src/course-home/outline-tab/widgets/WelcomeMessage.jsx
@@ -2,13 +2,14 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';

 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Alert, Button, TransitionReplace } from '@edx/paragon';
+import { Button, TransitionReplace } from '@edx/paragon';
 import truncate from 'truncate-html';

 import { useDispatch } from 'react-redux';
 import LmsHtmlFragment from '../LmsHtmlFragment';
 import messages from '../messages';
 import { useModel } from '../../../generic/model-store';
+import { Alert } from '../../../generic/user-messages';
 import { dismissWelcomeMessage } from '../../data/thunks';

 function WelcomeMessage({ courseId, intl }) {
@@ -26,47 +27,52 @@ function WelcomeMessage({ courseId, intl }) {
  const messageCanBeShortened = shortWelcomeMessageHtml.length < welcomeMessageHtml.length;
  const [showShortMessage, setShowShortMessage] = useState(messageCanBeShortened);
  const dispatch = useDispatch();
+
  return (
-    <Alert
-      data-testid="alert-container-welcome"
-      variant="light"
-      stacked
-      dismissible
-      show={display}
-      onClose={() => {
-        setDisplay(false);
-        dispatch(dismissWelcomeMessage(courseId));
-      }}
-      actions={messageCanBeShortened ? [
-        <Button
-          onClick={() => setShowShortMessage(!showShortMessage)}
-          variant="outline-primary"
-        >
-          {showShortMessage ? intl.formatMessage(messages.welcomeMessageShowMoreButton)
-            : intl.formatMessage(messages.welcomeMessageShowLessButton)}
-        </Button>,
-      ] : []}
-    >
-      <TransitionReplace className="mb-3" enterDuration={400} exitDuration={200}>
-        {showShortMessage ? (
-          <LmsHtmlFragment
-            className="inline-link"
-            data-testid="short-welcome-message-iframe"
-            key="short-html"
-            html={shortWelcomeMessageHtml}
-            title={intl.formatMessage(messages.welcomeMessage)}
-          />
-        ) : (
-          <LmsHtmlFragment
-            className="inline-link"
-            data-testid="long-welcome-message-iframe"
-            key="full-html"
-            html={welcomeMessageHtml}
-            title={intl.formatMessage(messages.welcomeMessage)}
-          />
+    display && (
+      <Alert
+        type="welcome"
+        dismissible
+        onDismiss={() => {
+          setDisplay(false);
+          dispatch(dismissWelcomeMessage(courseId));
+        }}
+        footer={messageCanBeShortened && (
+          <div className="row w-100 m-0">
+            <div className="col-12 col-sm-auto p-0">
+              <Button
+                block
+                onClick={() => setShowShortMessage(!showShortMessage)}
+                variant="outline-primary"
+              >
+                {showShortMessage ? intl.formatMessage(messages.welcomeMessageShowMoreButton)
+                  : intl.formatMessage(messages.welcomeMessageShowLessButton)}
+              </Button>
+            </div>
+          </div>
        )}
-      </TransitionReplace>
-    </Alert>
+      >
+        <TransitionReplace className="mb-3" enterDuration={200} exitDuration={200}>
+          {showShortMessage ? (
+            <LmsHtmlFragment
+              className="inline-link"
+              data-testid="short-welcome-message-iframe"
+              key="short-html"
+              html={shortWelcomeMessageHtml}
+              title={intl.formatMessage(messages.welcomeMessage)}
+            />
+          ) : (
+            <LmsHtmlFragment
+              className="inline-link"
+              data-testid="long-welcome-message-iframe"
+              key="full-html"
+              html={welcomeMessageHtml}
+              title={intl.formatMessage(messages.welcomeMessage)}
+            />
+          )}
+        </TransitionReplace>
+      </Alert>
+    )
  );
 }

--- 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 React, { useEffect } from 'react';
 import { layoutGenerator } from 'react-break';
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';

 import CertificateStatus from './certificate-status/CertificateStatus';
 import CourseCompletion from './course-completion/CourseCompletion';
@@ -10,6 +10,7 @@ import GradeSummary from './grades/grade-summary/GradeSummary';
 import ProgressHeader from './ProgressHeader';
 import RelatedLinks from './related-links/RelatedLinks';

+import { setGradesFeatureStatus } from '../data/slice';
 import { useModel } from '../../generic/model-store';

 function ProgressTab() {
@@ -18,10 +19,18 @@ function ProgressTab() {
  } = useSelector(state => state.courseHome);

  const {
-    gradesFeatureIsFullyLocked,
+    completionSummary: {
+      lockedCount,
+    },
  } = useModel('progress', courseId);

-  const applyLockedOverlay = gradesFeatureIsFullyLocked ? 'locked-overlay' : '';
+  const gradesFeatureIsLocked = lockedCount > 0;
+  const applyLockedOverlay = gradesFeatureIsLocked ? 'locked-overlay' : '';
+
+  const dispatch = useDispatch();
+  useEffect(() => {
+    dispatch(setGradesFeatureStatus({ gradesFeatureIsLocked }));
+  }, []);

  const layout = layoutGenerator({
    mobile: 0,
@@ -41,7 +50,7 @@ function ProgressTab() {
            <CertificateStatus />
          </OnMobile>
          <CourseGrade />
-          <div className={`grades my-4 p-4 rounded shadow-sm ${applyLockedOverlay}`} aria-hidden={gradesFeatureIsFullyLocked}>
+          <div className={`grades my-4 p-4 rounded shadow-sm ${applyLockedOverlay}`} aria-hidden={gradesFeatureIsLocked}>
            <GradeSummary />
            <DetailedGrades />
          </div>
--- a/src/course-home/progress-tab/ProgressTab.test.jsx
+++ b/src/course-home/progress-tab/ProgressTab.test.jsx
@@ -12,7 +12,6 @@ import { appendBrowserTimezoneToUrl, executeThunk } from '../../utils';
 import * as thunks from '../data/thunks';
 import initializeStore from '../../store';
 import ProgressTab from './ProgressTab';
-import LoadedTabPage from '../../tab-page/LoadedTabPage';

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

  const courseId = 'course-v1:edX+Test+run';
-  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/course_metadata/${courseId}`;
+  let courseMetadataUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/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 progressUrl = new RegExp(`${getConfig().LMS_BASE_URL}/api/course_home/v1/progress/*`);

  const store = initializeStore();
  const defaultMetadata = Factory.build('courseHomeMetadata', { id: courseId });
@@ -51,7 +49,6 @@ describe('Progress Tab', () => {
    // Set defaults for network requests
    axiosMock.onGet(courseMetadataUrl).reply(200, defaultMetadata);
    axiosMock.onGet(progressUrl).reply(200, defaultTabData);
-    axiosMock.onGet(masqueradeUrl).reply(200, { success: true });

    logUnhandledRequests(axiosMock);
  });
@@ -114,7 +111,6 @@ describe('Progress Tab', () => {
                assignment_type: 'Homework',
                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
                display_name: 'First subsection',
-                learner_has_access: true,
                has_graded_assignment: true,
                num_points_earned: 1,
                num_points_possible: 2,
@@ -180,7 +176,6 @@ describe('Progress Tab', () => {
                assignment_type: 'Homework',
                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
                display_name: 'First subsection',
-                learner_has_access: true,
                has_graded_assignment: true,
                num_points_earned: 8,
                num_points_possible: 10,
@@ -257,26 +252,6 @@ describe('Progress Tab', () => {
          sku: 'ABCD1234',
          upgrade_url: 'edx.org/upgrade',
        },
-        section_scores: [
-          {
-            display_name: 'First section',
-            subsections: [
-              {
-                assignment_type: 'Homework',
-                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
-                display_name: 'First subsection',
-                learner_has_access: false,
-                has_graded_assignment: true,
-                num_points_earned: 8,
-                num_points_possible: 10,
-                percent_graded: 1.0,
-                show_correctness: 'always',
-                show_grades: true,
-                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection',
-              },
-            ],
-          },
-        ],
      });
      await fetchAndRender();
      expect(screen.getByText('locked feature')).toBeInTheDocument();
@@ -284,7 +259,7 @@ describe('Progress Tab', () => {
      expect(screen.getAllByRole('link', 'Unlock now')).toHaveLength(3);
    });

-    it('sends events on click of upgrade button in locked content header (CourseGradeHeader)', async () => {
+    it('sends event on click of upgrade button in locked content header (CourseGradeHeader)', async () => {
      sendTrackEvent.mockClear();
      setTabData({
        completion_summary: {
@@ -300,26 +275,6 @@ describe('Progress Tab', () => {
          sku: 'ABCD1234',
          upgrade_url: 'edx.org/upgrade',
        },
-        section_scores: [
-          {
-            display_name: 'First section',
-            subsections: [
-              {
-                assignment_type: 'Homework',
-                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
-                display_name: 'First subsection',
-                learner_has_access: false,
-                has_graded_assignment: true,
-                num_points_earned: 8,
-                num_points_possible: 10,
-                percent_graded: 1.0,
-                show_correctness: 'always',
-                show_grades: true,
-                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection',
-              },
-            ],
-          },
-        ],
      });
      await fetchAndRender();
      expect(screen.getByText('locked feature')).toBeInTheDocument();
@@ -328,20 +283,12 @@ describe('Progress Tab', () => {
      const upgradeButton = screen.getAllByRole('link', 'Unlock now')[0];
      fireEvent.click(upgradeButton);

-      expect(sendTrackEvent).toHaveBeenCalledTimes(2);
+      expect(sendTrackEvent).toHaveBeenCalledTimes(1);
      expect(sendTrackEvent).toHaveBeenCalledWith('edx.ui.lms.course_progress.grades_upgrade.clicked', {
        org_key: 'edX',
        courserun_key: courseId,
        is_staff: false,
      });
-      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.upsell_links_clicked', {
-        org_key: 'edX',
-        courserun_key: courseId,
-        linkCategory: '(none)',
-        linkName: 'progress_locked',
-        linkType: 'button',
-        pageName: 'progress',
-      });
    });

    it('renders locked feature preview with no upgrade button when user has locked content but cannot upgrade', async () => {
@@ -351,26 +298,6 @@ describe('Progress Tab', () => {
          incomplete_count: 1,
          locked_count: 1,
        },
-        section_scores: [
-          {
-            display_name: 'First section',
-            subsections: [
-              {
-                assignment_type: 'Homework',
-                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
-                display_name: 'First subsection',
-                learner_has_access: false,
-                has_graded_assignment: true,
-                num_points_earned: 1,
-                num_points_possible: 2,
-                percent_graded: 1.0,
-                show_correctness: 'always',
-                show_grades: true,
-                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection',
-              },
-            ],
-          },
-        ],
      });
      await fetchAndRender();
      expect(screen.getByText('locked feature')).toBeInTheDocument();
@@ -382,62 +309,6 @@ describe('Progress Tab', () => {
      expect(screen.queryByText('locked feature')).not.toBeInTheDocument();
    });

-    it('renders limited feature preview with upgrade button when user has access to some content that would typically be locked', async () => {
-      setTabData({
-        completion_summary: {
-          complete_count: 1,
-          incomplete_count: 1,
-          locked_count: 1,
-        },
-        verified_mode: {
-          access_expiration_date: '2050-01-01T12:00:00',
-          currency: 'USD',
-          currency_symbol: '$',
-          price: 149,
-          sku: 'ABCD1234',
-          upgrade_url: 'edx.org/upgrade',
-        },
-        section_scores: [
-          {
-            display_name: 'First section',
-            subsections: [
-              {
-                assignment_type: 'Homework',
-                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@123456',
-                display_name: 'First subsection',
-                learner_has_access: false,
-                has_graded_assignment: true,
-                num_points_earned: 8,
-                num_points_possible: 10,
-                percent_graded: 1.0,
-                show_correctness: 'always',
-                show_grades: true,
-                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection',
-              },
-              {
-                assignment_type: 'Exam',
-                display_name: 'Second subsection',
-                learner_has_access: true,
-                has_graded_assignment: true,
-                num_points_earned: 1,
-                num_points_possible: 1,
-                percent_graded: 1.0,
-                show_correctness: 'always',
-                show_grades: true,
-                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/second_subsection',
-              },
-            ],
-          },
-        ],
-      });
-      await fetchAndRender();
-      expect(screen.getByText('limited feature')).toBeInTheDocument();
-      expect(screen.getByText('Unlock to work towards a certificate.')).toBeInTheDocument();
-      expect(screen.queryAllByText('You have limited access to graded assignments as part of the audit track in this course.')).toHaveLength(2);
-
-      expect(screen.queryAllByTestId('blocked-icon')).toHaveLength(4);
-    });
-
    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%.
@@ -450,7 +321,6 @@ describe('Progress Tab', () => {
                assignment_type: 'Homework',
                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
                display_name: 'First subsection',
-                learner_has_access: true,
                has_graded_assignment: true,
                num_points_earned: 1,
                num_points_possible: 2,
@@ -467,7 +337,6 @@ describe('Progress Tab', () => {
              {
                assignment_type: 'Homework',
                display_name: 'Second subsection',
-                learner_has_access: true,
                has_graded_assignment: true,
                num_points_earned: 1,
                num_points_possible: 1,
@@ -662,7 +531,6 @@ describe('Progress Tab', () => {
              {
                assignment_type: 'Homework',
                display_name: 'Second subsection',
-                learner_has_access: true,
                has_graded_assignment: true,
                num_points_earned: 1,
                num_points_possible: 1,
@@ -686,8 +554,8 @@ describe('Progress Tab', () => {
      await fetchAndRender();
      expect(screen.getByText('Detailed grades')).toBeInTheDocument();

-      expect(screen.getByText('First subsection'));
-      expect(screen.getByText('Second subsection'));
+      expect(screen.getByRole('link', { name: 'First subsection' }));
+      expect(screen.getByRole('link', { name: 'Second subsection' }));
    });

    it('sends event on click of subsection link', async () => {
@@ -723,20 +591,6 @@ describe('Progress Tab', () => {
      });
    });

-    it('renders individual problem score drawer', async () => {
-      sendTrackEvent.mockClear();
-      await fetchAndRender();
-      expect(screen.getByText('Detailed grades')).toBeInTheDocument();
-
-      const problemScoreDrawerToggle = screen.getByRole('button', { name: 'Toggle individual problem scores for First subsection' });
-      expect(problemScoreDrawerToggle).toBeInTheDocument();
-
-      // Open the problem score drawer
-      fireEvent.click(problemScoreDrawerToggle);
-      expect(screen.getByText('Problem Scores:')).toBeInTheDocument();
-      expect(screen.getAllByText('0/1')).toHaveLength(3);
-    });
-
    it('render message when section scores are not populated', async () => {
      setTabData({
        section_scores: [],
@@ -1104,21 +958,13 @@ describe('Progress Tab', () => {
        const upgradeLink = screen.getByRole('link', { name: 'Upgrade now' });
        fireEvent.click(upgradeLink);

-        expect(sendTrackEvent).toHaveBeenCalledTimes(3);
+        expect(sendTrackEvent).toHaveBeenCalledTimes(2);
        expect(sendTrackEvent).toHaveBeenNthCalledWith(2, 'edx.ui.lms.course_progress.certificate_status.clicked', {
          org_key: 'edX',
          courserun_key: courseId,
          is_staff: false,
          certificate_status_variant: 'audit_passing',
        });
-        expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.ecommerce.upsell_links_clicked', {
-          org_key: 'edX',
-          courserun_key: courseId,
-          linkCategory: '(none)',
-          linkName: 'progress_certificate',
-          linkType: 'button',
-          pageName: 'progress',
-        });
      });

      it('Displays nothing if audit only', async () => {
@@ -1189,64 +1035,6 @@ describe('Progress Tab', () => {
    });
  });

-  describe('Access expiration masquerade banner', () => {
-    it('renders banner when masquerading as a user', async () => {
-      setMetadata({ is_enrolled: true, original_user_is_staff: true });
-      setTabData({
-        access_expiration: {
-          expiration_date: '2020-01-01T12:00:00Z',
-          masquerading_expired_course: true,
-        },
-      });
-      await executeThunk(thunks.fetchProgressTab(courseId), store.dispatch);
-      await act(async () => render(<LoadedTabPage courseId={courseId} activeTabSlug="progress">...</LoadedTabPage>, { store }));
-      expect(screen.getByTestId('instructor-toolbar')).toBeInTheDocument();
-      expect(screen.getByText('This learner no longer has access to this course. Their access expired on', { exact: false })).toBeInTheDocument();
-      expect(screen.getByText('1/1/2020')).toBeInTheDocument();
-    });
-    it('does not render banner when not masquerading', async () => {
-      setMetadata({ is_enrolled: true, original_user_is_staff: true });
-      setTabData({
-        access_expiration: {
-          expiration_date: '2020-01-01T12:00:00Z',
-          masquerading_expired_course: false,
-        },
-      });
-      await executeThunk(thunks.fetchProgressTab(courseId), store.dispatch);
-      await act(async () => render(<LoadedTabPage courseId={courseId} activeTabSlug="progress">...</LoadedTabPage>, { store }));
-      expect(screen.queryByText('This learner no longer has access to this course. Their access expired on', { exact: false })).not.toBeInTheDocument();
-      expect(screen.queryByText('1/1/2020')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('Course start masquerade banner', () => {
-    it('renders banner when masquerading as a user', async () => {
-      setMetadata({
-        is_enrolled: true,
-        original_user_is_staff: true,
-        is_staff: false,
-        start: '2999-01-01T00:00:00Z',
-      });
-      await executeThunk(thunks.fetchProgressTab(courseId), store.dispatch);
-      await act(async () => render(<LoadedTabPage courseId={courseId} activeTabSlug="progress">...</LoadedTabPage>, { store }));
-      expect(screen.getByTestId('instructor-toolbar')).toBeInTheDocument();
-      expect(screen.getByText('This learner does not yet have access to this course. The course starts on', { exact: false })).toBeInTheDocument();
-      expect(screen.getByText('1/1/2999')).toBeInTheDocument();
-    });
-    it('does not render banner when not masquerading', async () => {
-      setMetadata({
-        is_enrolled: true,
-        original_user_is_staff: true,
-        is_staff: true,
-        start: '2999-01-01T00:00:00Z',
-      });
-      await executeThunk(thunks.fetchProgressTab(courseId), store.dispatch);
-      await act(async () => render(<LoadedTabPage courseId={courseId} activeTabSlug="progress">...</LoadedTabPage>, { store }));
-      expect(screen.queryByText('This learner does not yet have access to this course. The course starts on', { exact: false })).not.toBeInTheDocument();
-      expect(screen.queryByText('1/1/2999')).not.toBeInTheDocument();
-    });
-  });
-
  describe('Viewing progress page of other students by changing url', () => {
    it('Changing the url changes the header', async () => {
      setMetadata({ is_enrolled: true });
--- a/src/course-home/progress-tab/certificate-status/CertificateStatus.jsx
+++ b/src/course-home/progress-tab/certificate-status/CertificateStatus.jsx
@@ -46,12 +46,6 @@ function CertificateStatus({ intl }) {
    isEnrolled,
    userHasPassingGrade,
  );
-
-  const eventProperties = {
-    org_key: org,
-    courserun_key: courseId,
-  };
-
  const dispatch = useDispatch();
  const { administrator } = getAuthenticatedUser();

@@ -83,21 +77,17 @@ function CertificateStatus({ intl }) {
  const idVerificationSupportLink = <IdVerificationSupportLink />;
  const profileLink = <ProfileLink />;

-  // Some learners have a valid ("downloadable") certificate without being in a passing
-  // state (e.g. learners who have been added to a course's allowlist), so we need to
-  // skip grade validation for these learners
-  const certIsDownloadable = certStatus === 'downloadable';
  if (mode === COURSE_EXIT_MODES.disabled) {
    certEventName = 'certificate_status_disabled';
-  } else if (mode === COURSE_EXIT_MODES.nonPassing && !certIsDownloadable) {
+  } else if (mode === COURSE_EXIT_MODES.nonPassing) {
    certCase = 'notPassing';
    certEventName = 'not_passing';
    body = intl.formatMessage(messages[`${certCase}Body`]);
-  } else if (mode === COURSE_EXIT_MODES.inProgress && !certIsDownloadable) {
+  } else if (mode === COURSE_EXIT_MODES.inProgress) {
    certCase = 'inProgress';
    certEventName = 'has_scheduled_content';
    body = intl.formatMessage(messages[`${certCase}Body`]);
-  } else if (mode === COURSE_EXIT_MODES.celebration || certIsDownloadable) {
+  } else if (mode === COURSE_EXIT_MODES.celebration) {
    switch (certStatus) {
      case 'requesting':
        certCase = 'requestable';
@@ -130,7 +120,7 @@ function CertificateStatus({ intl }) {
          <FormattedMessage
            id="progress.certificateStatus.downloadableBody"
            defaultMessage="
-              Showcase your accomplishment on LinkedIn or your resumé today.
+              Showcase your accomplishment on LinkedIn or your resume today.
              You can download your certificate now and access it any time from your
              {dashboardLink} and {profileLink}."
            values={{ dashboardLink, profileLink }}
@@ -208,15 +198,6 @@ function CertificateStatus({ intl }) {
      is_staff: administrator,
      certificate_status_variant: certEventName,
    });
-    if (certCase === 'upgrade') {
-      sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
-        ...eventProperties,
-        linkCategory: '(none)',
-        linkName: 'progress_certificate',
-        linkType: 'button',
-        pageName: 'progress',
-      });
-    }
  };

  return (
--- a/src/course-home/progress-tab/certificate-status/messages.js
+++ b/src/course-home/progress-tab/certificate-status/messages.js
@@ -47,7 +47,7 @@ const messages = defineMessages({
  },
  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.',
+    defaultMessage: 'Showcase your accomplishment on LinkedIn or your resume today. You can download your certificate now and access it any time from your Dashboard and Profile.',
  },
  downloadableButton: {
    id: 'progress.certificateStatus.downloadableButton',
--- a/src/course-home/progress-tab/grades/course-grade/CourseGrade.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/CourseGrade.jsx
@@ -13,11 +13,10 @@ import messages from '../messages';
 function CourseGrade({ intl }) {
  const {
    courseId,
+    gradesFeatureIsLocked,
  } = useSelector(state => state.courseHome);

  const {
-    gradesFeatureIsFullyLocked,
-    gradesFeatureIsPartiallyLocked,
    gradingPolicy: {
      gradeRange,
    },
@@ -25,12 +24,12 @@ function CourseGrade({ intl }) {

  const passingGrade = Number((Math.min(...Object.values(gradeRange)) * 100).toFixed(0));

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

  return (
    <section className="text-dark-700 my-4 rounded shadow-sm">
-      {(gradesFeatureIsFullyLocked || gradesFeatureIsPartiallyLocked) && <CourseGradeHeader />}
-      <div className={applyLockedOverlay} aria-hidden={gradesFeatureIsFullyLocked}>
+      {gradesFeatureIsLocked && <CourseGradeHeader />}
+      <div className={applyLockedOverlay} aria-hidden={gradesFeatureIsLocked}>
        <div className="row w-100 m-0 p-4">
          <div className="col-12 col-sm-6 p-0 pr-sm-2">
            <h2>{intl.formatMessage(messages.grades)}</h2>
--- a/src/course-home/progress-tab/grades/course-grade/CourseGradeHeader.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/CourseGradeHeader.jsx
@@ -19,14 +19,8 @@ function CourseGradeHeader({ intl }) {
  } = useModel('courseHomeMeta', courseId);
  const {
    verifiedMode,
-    gradesFeatureIsFullyLocked,
  } = useModel('progress', courseId);

-  const eventProperties = {
-    org_key: org,
-    courserun_key: courseId,
-  };
-
  const { administrator } = getAuthenticatedUser();
  const logUpgradeButtonClick = () => {
    sendTrackEvent('edx.ui.lms.course_progress.grades_upgrade.clicked', {
@@ -34,22 +28,7 @@ function CourseGradeHeader({ intl }) {
      courserun_key: courseId,
      is_staff: administrator,
    });
-    sendTrackEvent('edx.bi.ecommerce.upsell_links_clicked', {
-      ...eventProperties,
-      linkCategory: '(none)',
-      linkName: 'progress_locked',
-      linkType: 'button',
-      pageName: 'progress',
-    });
  };
-  let previewText;
-  if (verifiedMode) {
-    previewText = gradesFeatureIsFullyLocked
-      ? intl.formatMessage(messages.courseGradePreviewUnlockCertificateBody)
-      : intl.formatMessage(messages.courseGradePartialPreviewUnlockCertificateBody);
-  } else {
-    previewText = intl.formatMessage(messages.courseGradePreviewUpgradeDeadlinePassedBody);
-  }
  return (
    <div className="row w-100 m-0 p-4 rounded-top bg-primary-500 text-white">
      <div className={`col-12 ${verifiedMode ? 'col-md-9' : ''} p-0`}>
@@ -61,14 +40,13 @@ function CourseGradeHeader({ intl }) {
            <span aria-hidden="true">
              {intl.formatMessage(messages.courseGradePreviewHeaderAriaHidden)}
            </span>
-            {gradesFeatureIsFullyLocked
-              ? intl.formatMessage(messages.courseGradePreviewHeaderLocked)
-              : intl.formatMessage(messages.courseGradePreviewHeaderLimited)}
+            {intl.formatMessage(messages.courseGradePreviewHeader)}
          </div>
        </div>
        <div className="row w-100 m-0 p-0 justify-content-end">
          <div className="col-11 px-2 p-sm-0 small">
-            {previewText}
+            {verifiedMode ? intl.formatMessage(messages.courseGradePreviewUnlockCertificateBody)
+              : intl.formatMessage(messages.courseGradePreviewUpgradeDeadlinePassedBody)}
          </div>
        </div>
      </div>
--- a/src/course-home/progress-tab/grades/course-grade/CurrentGradeTooltip.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/CurrentGradeTooltip.jsx
@@ -2,9 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';

-import {
-  getLocale, injectIntl, intlShape, isRtl,
-} from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { OverlayTrigger, Popover } from '@edx/paragon';

 import { useModel } from '../../../../generic/model-store';
@@ -25,14 +23,6 @@ function CurrentGradeTooltip({ intl, tooltipClassName }) {

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

-  let currentGradeDirection = currentGrade < 50 ? '' : '-';
-
-  const isLocaleRtl = isRtl(getLocale());
-
-  if (isLocaleRtl) {
-    currentGradeDirection = currentGrade < 50 ? '-' : '';
-  }
-
  return (
    <>
      <OverlayTrigger
@@ -47,16 +37,16 @@ function CurrentGradeTooltip({ intl, tooltipClassName }) {
        )}
      >
        <g>
-          <circle cx={`${Math.min(...[isLocaleRtl ? 100 - currentGrade : currentGrade, 100])}%`} cy="50%" r="8.5" fill="transparent" />
-          <rect className="grade-bar__divider" x={`${Math.min(...[isLocaleRtl ? 100 - currentGrade : currentGrade, 100])}%`} style={{ transform: 'translateY(2.61em)' }} />
+          <circle cx={`${Math.min(...[currentGrade, 100])}%`} cy="50%" r="8.5" fill="transparent" />
+          <rect className="grade-bar__divider" x={`${Math.min(...[currentGrade, 100])}%`} style={{ transform: 'translateY(2.61em)' }} />
        </g>
      </OverlayTrigger>
      <text
        className="x-small"
        textAnchor={currentGrade < 50 ? 'start' : 'end'}
-        x={`${Math.min(...[isLocaleRtl ? 100 - currentGrade : currentGrade, 100])}%`}
+        x={`${Math.min(...[currentGrade, 100])}%`}
        y="20px"
-        style={{ transform: `translateX(${currentGradeDirection}3.4em)` }}
+        style={{ transform: `translateX(${currentGrade < 50 ? '' : '-'}3.4em)` }}
      >
        {intl.formatMessage(messages.currentGradeLabel)}
      </text>
--- a/src/course-home/progress-tab/grades/course-grade/GradeBar.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/GradeBar.jsx
@@ -12,6 +12,7 @@ import messages from '../messages';
 function GradeBar({ intl, passingGrade }) {
  const {
    courseId,
+    gradesFeatureIsLocked,
  } = useSelector(state => state.courseHome);

  const {
@@ -19,12 +20,11 @@ function GradeBar({ intl, passingGrade }) {
      isPassing,
      visiblePercent,
    },
-    gradesFeatureIsFullyLocked,
  } = useModel('progress', courseId);

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

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

  return (
    <div className="col-12 col-sm-6 align-self-center">
--- a/src/course-home/progress-tab/grades/course-grade/GradeRangeTooltip.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/GradeRangeTooltip.jsx
@@ -14,10 +14,10 @@ import messages from '../messages';
 function GradeRangeTooltip({ intl, iconButtonClassName, passingGrade }) {
  const {
    courseId,
+    gradesFeatureIsLocked,
  } = useSelector(state => state.courseHome);

  const {
-    gradesFeatureIsFullyLocked,
    gradingPolicy: {
      gradeRange,
    },
@@ -68,7 +68,7 @@ function GradeRangeTooltip({ intl, iconButtonClassName, passingGrade }) {
        src={InfoOutline}
        iconAs={Icon}
        size="inline"
-        disabled={gradesFeatureIsFullyLocked}
+        disabled={gradesFeatureIsLocked}
      />
    </OverlayTrigger>
  );
--- a/src/course-home/progress-tab/grades/course-grade/PassingGradeTooltip.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/PassingGradeTooltip.jsx
@@ -1,22 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';

-import {
-  getLocale, injectIntl, intlShape, isRtl,
-} from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { OverlayTrigger, Popover } from '@edx/paragon';

 import messages from '../messages';

 function PassingGradeTooltip({ intl, passingGrade, tooltipClassName }) {
-  const isLocaleRtl = isRtl(getLocale());
-
-  let passingGradeDirection = passingGrade < 50 ? '' : '-';
-
-  if (isLocaleRtl) {
-    passingGradeDirection = passingGrade < 50 ? '-' : '';
-  }
-
  return (
    <>
      <OverlayTrigger
@@ -31,17 +21,17 @@ function PassingGradeTooltip({ intl, passingGrade, tooltipClassName }) {
        )}
      >
        <g>
-          <circle cx={`${isLocaleRtl ? 100 - passingGrade : passingGrade}%`} cy="50%" r="8.5" fill="transparent" />
-          <circle className="grade-bar--passing" cx={`${isLocaleRtl ? 100 - passingGrade : passingGrade}%`} cy="50%" r="4.5" />
+          <circle cx={`${passingGrade}%`} cy="50%" r="8.5" fill="transparent" />
+          <circle className="grade-bar--passing" cx={`${passingGrade}%`} cy="50%" r="4.5" />
        </g>
      </OverlayTrigger>

      <text
        className="x-small"
        textAnchor={passingGrade < 50 ? 'start' : 'end'}
-        x={`${isLocaleRtl ? 100 - passingGrade : passingGrade}%`}
+        x={`${passingGrade}%`}
        y="90px"
-        style={{ transform: `translateX(${passingGradeDirection}3.4em)` }}
+        style={{ transform: `translateX(${passingGrade < 50 ? '' : '-'}3.4em)` }}
      >
        {intl.formatMessage(messages.passingGradeLabel)}
      </text>
--- a/src/course-home/progress-tab/grades/detailed-grades/DetailedGrades.jsx
+++ b/src/course-home/progress-tab/grades/detailed-grades/DetailedGrades.jsx
@@ -5,8 +5,7 @@ import { getConfig } from '@edx/frontend-platform';
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Blocked } from '@edx/paragon/icons';
-import { Icon, Hyperlink } from '@edx/paragon';
+import { Hyperlink } from '@edx/paragon';
 import { useModel } from '../../../../generic/model-store';

 import DetailedGradesTable from './DetailedGradesTable';
@@ -17,13 +16,12 @@ function DetailedGrades({ intl }) {
  const { administrator } = getAuthenticatedUser();
  const {
    courseId,
+    gradesFeatureIsLocked,
  } = useSelector(state => state.courseHome);
  const {
    org,
  } = useModel('courseHomeMeta', courseId);
  const {
-    gradesFeatureIsFullyLocked,
-    gradesFeatureIsPartiallyLocked,
    sectionScores,
  } = useModel('progress', courseId);

@@ -42,7 +40,7 @@ function DetailedGrades({ intl }) {
      className="muted-link inline-link"
      destination={`${getConfig().LMS_BASE_URL}/courses/${courseId}/course`}
      onClick={logOutlineLinkClick}
-      tabIndex={gradesFeatureIsFullyLocked ? '-1' : '0'}
+      tabIndex={gradesFeatureIsLocked ? '-1' : '0'}
    >
      {intl.formatMessage(messages.courseOutline)}
    </Hyperlink>
@@ -51,14 +49,8 @@ function DetailedGrades({ intl }) {
  return (
    <section className="text-dark-700">
      <h3 className="h4 mb-3">{intl.formatMessage(messages.detailedGrades)}</h3>
-      {gradesFeatureIsPartiallyLocked && (
-        <div className="mb-3 small ml-0 d-inline">
-          <Icon className="mr-1 mt-1 d-inline-flex" style={{ height: '1rem', width: '1rem' }} src={Blocked} data-testid="blocked-icon" />
-          {intl.formatMessage(messages.gradeSummaryLimitedAccessExplanation)}
-        </div>
-      )}
      {hasSectionScores && (
-        <DetailedGradesTable />
+        <DetailedGradesTable sectionScores={sectionScores} />
      )}
      {!hasSectionScores && (
        <p className="small">{intl.formatMessage(messages.detailedGradesEmpty)}</p>
--- a/src/course-home/progress-tab/grades/detailed-grades/DetailedGradesTable.jsx
+++ b/src/course-home/progress-tab/grades/detailed-grades/DetailedGradesTable.jsx
@@ -1,22 +1,32 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
+import PropTypes from 'prop-types';

+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
+import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { DataTable } from '@edx/paragon';

-import { useModel } from '../../../../generic/model-store';
 import messages from '../messages';
-import SubsectionTitleCell from './SubsectionTitleCell';
+import { useModel } from '../../../../generic/model-store';

-function DetailedGradesTable({ intl }) {
+function DetailedGradesTable({ intl, sectionScores }) {
  const {
    courseId,
+    gradesFeatureIsLocked,
  } = useSelector(state => state.courseHome);
-
  const {
-    sectionScores,
-  } = useModel('progress', courseId);
-
+    org,
+  } = useModel('courseHomeMeta', courseId);
+  const { administrator } = getAuthenticatedUser();
+  const logSubsectionClicked = (blockKey) => {
+    sendTrackEvent('edx.ui.lms.course_progress.detailed_grades_assignment.clicked', {
+      org_key: org,
+      courserun_key: courseId,
+      is_staff: administrator,
+      assignment_block_key: blockKey,
+    });
+  };
  return (
    sectionScores.map((chapter) => {
      const subsectionScores = chapter.subsections.filter(
@@ -30,10 +40,24 @@ function DetailedGradesTable({ intl }) {
        return null;
      }

-      const detailedGradesData = subsectionScores.map((subsection) => ({
-        subsectionTitle: <SubsectionTitleCell subsection={subsection} />,
-        score: <span className={subsection.learnerHasAccess ? '' : 'greyed-out'}>{subsection.numPointsEarned}/{subsection.numPointsPossible}</span>,
-      }));
+      const detailedGradesData = subsectionScores.map((subsection) => {
+        const title = (
+          <a
+            href={subsection.url}
+            className="muted-link small"
+            onClick={() => {
+              logSubsectionClicked(subsection.blockKey);
+            }}
+            tabIndex={gradesFeatureIsLocked ? '-1' : '0'}
+          >
+            {subsection.displayName}
+          </a>
+        );
+        return {
+          subsectionTitle: title,
+          score: `${subsection.numPointsEarned}/${subsection.numPointsPossible}`,
+        };
+      });

      return (
        <div className="my-3" key={`${chapter.displayName}-grades-table`}>
@@ -51,7 +75,7 @@ function DetailedGradesTable({ intl }) {
                Header: `${intl.formatMessage(messages.score)}`,
                accessor: 'score',
                headerClassName: 'justify-content-end h5 mb-0',
-                cellClassName: 'align-top text-right small',
+                cellClassName: 'float-right text-right small',
              },
            ]}
          >
@@ -65,6 +89,21 @@ function DetailedGradesTable({ intl }) {

 DetailedGradesTable.propTypes = {
  intl: intlShape.isRequired,
+  sectionScores: PropTypes.arrayOf(PropTypes.shape({
+    displayName: PropTypes.string.isRequired,
+    subsections: PropTypes.arrayOf(PropTypes.shape({
+      displayName: PropTypes.string.isRequired,
+      numPointsEarned: PropTypes.number.isRequired,
+      numPointsPossible: PropTypes.number.isRequired,
+      url: PropTypes.string.isRequired,
+    })),
+  })).isRequired,
+};
+
+DetailedGradesTable.defaultProps = {
+  sectionScores: {
+    subsections: [],
+  },
 };

 export default injectIntl(DetailedGradesTable);
--- a/src/course-home/progress-tab/grades/detailed-grades/ProblemScoreDrawer.jsx
+++ b/src/course-home/progress-tab/grades/detailed-grades/ProblemScoreDrawer.jsx
@@ -1,33 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-
-import messages from '../messages';
-
-function ProblemScoreDrawer({ intl, problemScores, subsection }) {
-  return (
-    <span className="row w-100 m-0 x-small ml-4 pt-2 pl-1 text-gray-700 flex-nowrap">
-      <span id="problem-score-label" className="col-auto p-0">{intl.formatMessage(messages.problemScoreLabel)}</span>
-      <div className={classNames('col', 'p-0', { 'greyed-out': !subsection.learnerHasAccess })}>
-        <ul className="list-unstyled row w-100 m-0" aria-labelledby="problem-score-label">
-          {problemScores.map(problemScore => (
-            <li className="ml-3">{problemScore.earned}/{problemScore.possible}</li>
-          ))}
-        </ul>
-      </div>
-    </span>
-  );
-}
-
-ProblemScoreDrawer.propTypes = {
-  intl: intlShape.isRequired,
-  problemScores: PropTypes.arrayOf(PropTypes.shape({
-    earned: PropTypes.number.isRequired,
-    possible: PropTypes.number.isRequired,
-  })).isRequired,
-  subsection: PropTypes.shape({ learnerHasAccess: PropTypes.bool }).isRequired,
-};
-
-export default injectIntl(ProblemScoreDrawer);
--- a/src/course-home/progress-tab/grades/detailed-grades/SubsectionTitleCell.jsx
+++ b/src/course-home/progress-tab/grades/detailed-grades/SubsectionTitleCell.jsx
@@ -1,93 +0,0 @@
-import React from 'react';
-import { useSelector } from 'react-redux';
-import PropTypes from 'prop-types';
-
-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 } from '@edx/paragon/icons';
-
-import messages from '../messages';
-import { useModel } from '../../../../generic/model-store';
-import ProblemScoreDrawer from './ProblemScoreDrawer';
-
-function SubsectionTitleCell({ intl, subsection }) {
-  const {
-    courseId,
-  } = useSelector(state => state.courseHome);
-  const {
-    org,
-  } = useModel('courseHomeMeta', courseId);
-  const {
-    gradesFeatureIsFullyLocked,
-  } = useModel('progress', courseId);
-
-  const {
-    blockKey,
-    displayName,
-    problemScores,
-    url,
-  } = subsection;
-
-  const { administrator } = getAuthenticatedUser();
-  const logSubsectionClicked = () => {
-    sendTrackEvent('edx.ui.lms.course_progress.detailed_grades_assignment.clicked', {
-      org_key: org,
-      courserun_key: courseId,
-      is_staff: administrator,
-      assignment_block_key: blockKey,
-    });
-  };
-
-  return (
-    <Collapsible.Advanced>
-      <Row className="w-100 m-0">
-        <Collapsible.Trigger
-          className="mr-1 position-absolute"
-          aria-label={intl.formatMessage(messages.problemScoreToggleAltText, { subsectionTitle: displayName })}
-          tabIndex={gradesFeatureIsFullyLocked ? '-1' : '0'}
-        >
-          <Collapsible.Visible whenClosed><Icon src={ArrowDropDown} /></Collapsible.Visible>
-          <Collapsible.Visible whenOpen><Icon src={ArrowDropUp} /></Collapsible.Visible>
-        </Collapsible.Trigger>
-        <span className="small d-inline ml-4 pl-1">
-          {gradesFeatureIsFullyLocked || subsection.learnerHasAccess ? ''
-            : (
-              <Icon
-                id={`detailedGradesBlockedIcon${subsection.blockKey}`}
-                aria-label={intl.formatMessage(messages.noAccessToSubsection, { displayName })}
-                className="mr-1 mt-1 d-inline-flex"
-                style={{ height: '1rem', width: '1rem' }}
-                src={Blocked}
-                data-testid="blocked-icon"
-              />
-            )}
-          {url ? (
-            <a
-              href={url}
-              className="muted-link small"
-              onClick={logSubsectionClicked}
-              tabIndex={gradesFeatureIsFullyLocked ? '-1' : '0'}
-              aria-labelledby={`detailedGradesBlockedIcon${subsection.blockKey}`}
-            >
-              {displayName}
-            </a>
-          ) : (
-            <span className="greyed-out small">{displayName}</span>
-          )}
-        </span>
-      </Row>
-      <Collapsible.Body className="d-flex w-100">
-        <ProblemScoreDrawer problemScores={problemScores} subsection={subsection} />
-      </Collapsible.Body>
-    </Collapsible.Advanced>
-  );
-}
-
-SubsectionTitleCell.propTypes = {
-  intl: intlShape.isRequired,
-  subsection: PropTypes.shape.isRequired,
-};
-
-export default injectIntl(SubsectionTitleCell);
--- a/src/course-home/progress-tab/grades/grade-summary/AssignmentTypeCell.jsx
+++ b/src/course-home/progress-tab/grades/grade-summary/AssignmentTypeCell.jsx
@@ -1,61 +1,40 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Blocked } from '@edx/paragon/icons';
-import { Icon } from '@edx/paragon';
-import { useModel } from '../../../../generic/model-store';
-import messages from '../messages';

-function AssignmentTypeCell({
-  intl, assignmentType, footnoteMarker, footnoteId, locked,
-}) {
+function AssignmentTypeCell({ assignmentType, footnoteMarker, footnoteId }) {
  const {
-    courseId,
+    gradesFeatureIsLocked,
  } = useSelector(state => state.courseHome);
-
-  const {
-    gradesFeatureIsFullyLocked,
-  } = useModel('progress', courseId);
-
-  const lockedIcon = locked ? <Icon id={`assignmentTypeBlockedIcon${assignmentType}`} aria-label={intl.formatMessage(messages.noAccessToAssignmentType, { assignmentType })} className="mr-1 mt-1 d-inline-flex" style={{ height: '1rem', width: '1rem' }} src={Blocked} data-testid="blocked-icon" /> : '';
-
  return (
-    <div className="d-flex small">
-      <div className="d-flex">{lockedIcon}</div>
-      <div>
-        {assignmentType}&nbsp;
-        {footnoteId && footnoteMarker && (
-          <sup>
-            <a
-              id={`${footnoteId}-ref`}
-              className="muted-link"
-              href={`#${footnoteId}-footnote`}
-              aria-describedby="grade-summary-footnote-label"
-              tabIndex={gradesFeatureIsFullyLocked ? '-1' : '0'}
-              aria-labelledby={`assignmentTypeBlockedIcon${assignmentType}`}
-            >
-              {footnoteMarker}
-            </a>
-          </sup>
-        )}
-      </div>
+    <div className="small">
+      {assignmentType}
+      {footnoteId && footnoteMarker && (
+        <sup>
+          <a
+            id={`${footnoteId}-ref`}
+            className="muted-link"
+            href={`#${footnoteId}-footnote`}
+            aria-describedby="grade-summary-footnote-label"
+            tabIndex={gradesFeatureIsLocked ? '-1' : '0'}
+          >
+            {footnoteMarker}
+          </a>
+        </sup>
+      )}
    </div>
  );
 }

 AssignmentTypeCell.propTypes = {
-  intl: intlShape.isRequired,
  assignmentType: PropTypes.string.isRequired,
  footnoteId: PropTypes.string,
  footnoteMarker: PropTypes.number,
-  locked: PropTypes.bool,
 };

 AssignmentTypeCell.defaultProps = {
  footnoteId: '',
  footnoteMarker: null,
-  locked: false,
 };

-export default injectIntl(AssignmentTypeCell);
+export default AssignmentTypeCell;
--- a/src/course-home/progress-tab/grades/grade-summary/DroppableAssignmentFootnote.jsx
+++ b/src/course-home/progress-tab/grades/grade-summary/DroppableAssignmentFootnote.jsx
@@ -5,15 +5,11 @@ import PropTypes from 'prop-types';
 import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';

 import messages from '../messages';
-import { useModel } from '../../../../generic/model-store';

 function DroppableAssignmentFootnote({ footnotes, intl }) {
  const {
-    courseId,
+    gradesFeatureIsLocked,
  } = useSelector(state => state.courseHome);
-  const {
-    gradesFeatureIsFullyLocked,
-  } = useModel('progress', courseId);
  return (
    <>
      <span id="grade-summary-footnote-label" className="sr-only">{intl.formatMessage(messages.footnotesTitle)}</span>
@@ -29,7 +25,7 @@ function DroppableAssignmentFootnote({ footnotes, intl }) {
                assignmentType: footnote.assignmentType,
              }}
            />
-            <a className="sr-only" href={`#${footnote.id}-ref`} tabIndex={gradesFeatureIsFullyLocked ? '-1' : '0'}>
+            <a className="sr-only" href={`#${footnote.id}-ref`} tabIndex={gradesFeatureIsLocked ? '-1' : '0'}>
              {intl.formatMessage(messages.backToContent)}
            </a>
          </li>
--- a/src/course-home/progress-tab/grades/grade-summary/GradeSummary.jsx
+++ b/src/course-home/progress-tab/grades/grade-summary/GradeSummary.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { useSelector } from 'react-redux';
 import { useModel } from '../../../../generic/model-store';

@@ -16,16 +16,14 @@ function GradeSummary() {
    },
  } = useModel('progress', courseId);

-  const [allOfSomeAssignmentTypeIsLocked, setAllOfSomeAssignmentTypeIsLocked] = useState(false);
-
  if (assignmentPolicies.length === 0) {
    return null;
  }

  return (
    <section className="text-dark-700 mb-4">
-      <GradeSummaryHeader allOfSomeAssignmentTypeIsLocked={allOfSomeAssignmentTypeIsLocked} />
-      <GradeSummaryTable setAllOfSomeAssignmentTypeIsLocked={setAllOfSomeAssignmentTypeIsLocked} />
+      <GradeSummaryHeader />
+      <GradeSummaryTable />
    </section>
  );
 }
--- a/src/course-home/progress-tab/grades/grade-summary/GradeSummaryHeader.jsx
+++ b/src/course-home/progress-tab/grades/grade-summary/GradeSummaryHeader.jsx
@@ -1,25 +1,19 @@
 import React, { useState } from 'react';
 import { useSelector } from 'react-redux';
-import PropTypes from 'prop-types';

 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import {
  Icon, IconButton, OverlayTrigger, Popover,
 } from '@edx/paragon';
-import { Blocked, InfoOutline } from '@edx/paragon/icons';
+import { InfoOutline } from '@edx/paragon/icons';

 import messages from '../messages';
-import { useModel } from '../../../../generic/model-store';

-function GradeSummaryHeader({ intl, allOfSomeAssignmentTypeIsLocked }) {
+function GradeSummaryHeader({ intl }) {
  const {
-    courseId,
+    gradesFeatureIsLocked,
  } = useSelector(state => state.courseHome);
-  const {
-    gradesFeatureIsFullyLocked,
-  } = useModel('progress', courseId);
  const [showTooltip, setShowTooltip] = useState(false);
-
  return (
    <div className="row w-100 m-0 align-items-center">
      <h3 className="h4 mb-3 mr-1">{intl.formatMessage(messages.gradeSummary)}</h3>
@@ -43,22 +37,15 @@ function GradeSummaryHeader({ intl, allOfSomeAssignmentTypeIsLocked }) {
          iconAs={Icon}
          className="mb-3"
          size="sm"
-          disabled={gradesFeatureIsFullyLocked}
+          disabled={gradesFeatureIsLocked}
        />
      </OverlayTrigger>
-      {!gradesFeatureIsFullyLocked && allOfSomeAssignmentTypeIsLocked && (
-        <div className="mb-3 small ml-0 d-inline">
-          <Icon className="mr-1 mt-1 d-inline-flex" style={{ height: '1rem', width: '1rem' }} src={Blocked} data-testid="blocked-icon" />
-          {intl.formatMessage(messages.gradeSummaryLimitedAccessExplanation)}
-        </div>
-      )}
    </div>
  );
 }

 GradeSummaryHeader.propTypes = {
  intl: intlShape.isRequired,
-  allOfSomeAssignmentTypeIsLocked: PropTypes.bool.isRequired,
 };

 export default injectIntl(GradeSummaryHeader);
--- a/src/course-home/progress-tab/grades/grade-summary/GradeSummaryTable.jsx
+++ b/src/course-home/progress-tab/grades/grade-summary/GradeSummaryTable.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';

 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
@@ -12,7 +11,7 @@ import GradeSummaryTableFooter from './GradeSummaryTableFooter';

 import messages from '../messages';

-function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {
+function GradeSummaryTable({ intl }) {
  const {
    courseId,
  } = useSelector(state => state.courseHome);
@@ -21,8 +20,6 @@ function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {
    gradingPolicy: {
      assignmentPolicies,
    },
-    gradesFeatureIsFullyLocked,
-    sectionScores,
  } = useModel('progress', courseId);

  const footnotes = [];
@@ -32,23 +29,6 @@ function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {
    return footnoteId.replace(/[^A-Za-z0-9.-_]+/g, '-');
  };

-  const hasNoAccessToAssignmentsOfType = (assignmentType) => {
-    const subsectionAssignmentsOfType = sectionScores.map((chapter) => chapter.subsections.filter((subsection) => (
-      subsection.assignmentType === assignmentType && subsection.hasGradedAssignment
-      && (subsection.numPointsPossible > 0 || subsection.numPointsEarned > 0)
-    ))).flat();
-    if (subsectionAssignmentsOfType.length) {
-      const noAccessToAssignmentsOfType = !subsectionAssignmentsOfType.some((subsection) => (
-        subsection.learnerHasAccess === true
-      ));
-      if (noAccessToAssignmentsOfType) {
-        setAllOfSomeAssignmentTypeIsLocked(true);
-        return true;
-      }
-    }
-    return false;
-  };
-
  const gradeSummaryData = assignmentPolicies.map((assignment) => {
    let footnoteId = '';
    let footnoteMarker;
@@ -64,15 +44,11 @@ function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {
      footnoteMarker = footnotes.length;
    }

-    const locked = !gradesFeatureIsFullyLocked && hasNoAccessToAssignmentsOfType(assignment.type) ? 'greyed-out' : '';
-
    return {
-      type: {
-        footnoteId, footnoteMarker, type: assignment.type, locked,
-      },
-      weight: { weight: `${(assignment.weight * 100).toFixed(0)}%`, locked },
-      grade: { grade: `${(assignment.averageGrade * 100).toFixed(0)}%`, locked },
-      weightedGrade: { weightedGrade: `${(assignment.weightedGrade * 100).toFixed(0)}%`, locked },
+      type: { footnoteId, footnoteMarker, type: assignment.type },
+      weight: `${(assignment.weight * 100).toFixed(0)}%`,
+      grade: `${(assignment.averageGrade * 100).toFixed(0)}%`,
+      weightedGrade: `${(assignment.weightedGrade * 100).toFixed(0)}%`,
    };
  });

@@ -91,7 +67,6 @@ function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {
                assignmentType={value.type} // eslint-disable-line react/prop-types
                footnoteId={value.footnoteId} // eslint-disable-line react/prop-types
                footnoteMarker={value.footnoteMarker} // eslint-disable-line react/prop-types
-                locked={value.locked} // eslint-disable-line react/prop-types
              />
            ),
            headerClassName: 'h5 mb-0',
@@ -100,31 +75,19 @@ function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {
            Header: `${intl.formatMessage(messages.weight)}`,
            accessor: 'weight',
            headerClassName: 'justify-content-end h5 mb-0',
-            // eslint-disable-next-line react/prop-types
-            Cell: ({ value }) => (
-              <span className={value.locked ? 'greyed-out' : ''}>{value.weight}</span> // eslint-disable-line react/prop-types
-            ),
-            cellClassName: 'text-right small',
+            cellClassName: 'float-right small',
          },
          {
            Header: `${intl.formatMessage(messages.grade)}`,
            accessor: 'grade',
            headerClassName: 'justify-content-end h5 mb-0',
-            // eslint-disable-next-line react/prop-types
-            Cell: ({ value }) => (
-              <span className={value.locked ? 'greyed-out' : ''}>{value.grade}</span> // eslint-disable-line react/prop-types
-            ),
-            cellClassName: 'text-right small',
+            cellClassName: 'float-right small',
          },
          {
            Header: `${intl.formatMessage(messages.weightedGrade)}`,
            accessor: 'weightedGrade',
            headerClassName: 'justify-content-end h5 mb-0 text-right',
-            // eslint-disable-next-line react/prop-types
-            Cell: ({ value }) => (
-              <span className={value.locked ? 'greyed-out' : ''}>{value.weightedGrade}</span> // eslint-disable-line react/prop-types
-            ),
-            cellClassName: 'text-right font-weight-bold small',
+            cellClassName: 'float-right font-weight-bold small',
          },
        ]}
      >
@@ -141,7 +104,6 @@ function GradeSummaryTable({ intl, setAllOfSomeAssignmentTypeIsLocked }) {

 GradeSummaryTable.propTypes = {
  intl: intlShape.isRequired,
-  setAllOfSomeAssignmentTypeIsLocked: PropTypes.func.isRequired,
 };

 export default injectIntl(GradeSummaryTable);
--- a/src/course-home/progress-tab/grades/messages.js
+++ b/src/course-home/progress-tab/grades/messages.js
@@ -29,14 +29,10 @@ const messages = defineMessages({
    id: 'progress.courseGrade.footer.passing',
    defaultMessage: 'You’re currently passing this course with a grade of {letterGrade} ({minGrade}-{maxGrade}%)',
  },
-  courseGradePreviewHeaderLocked: {
-    id: 'progress.courseGrade.preview.headerLocked',
+  courseGradePreviewHeader: {
+    id: 'progress.courseGrade.preview.header',
    defaultMessage: 'locked feature',
  },
-  courseGradePreviewHeaderLimited: {
-    id: 'progress.courseGrade.preview.headerLimited',
-    defaultMessage: 'limited feature',
-  },
  courseGradePreviewHeaderAriaHidden: {
    id: 'progress.courseGrade.preview.header.ariaHidden',
    defaultMessage: 'Preview of a ',
@@ -45,10 +41,6 @@ const messages = defineMessages({
    id: 'progress.courseGrade.preview.body.unlockCertificate',
    defaultMessage: 'Unlock to view grades and work towards a certificate.',
  },
-  courseGradePartialPreviewUnlockCertificateBody: {
-    id: 'progress.courseGrade.partialpreview.body.unlockCertificate',
-    defaultMessage: 'Unlock to work towards a certificate.',
-  },
  courseGradePreviewUpgradeDeadlinePassedBody: {
    id: 'progress.courseGrade.preview.body.upgradeDeadlinePassed',
    defaultMessage: 'The deadline to upgrade in this course has passed.',
@@ -97,10 +89,6 @@ const messages = defineMessages({
    id: 'progress.gradeSummary',
    defaultMessage: 'Grade summary',
  },
-  gradeSummaryLimitedAccessExplanation: {
-    id: 'progress.gradeSummary.limitedAccessExplanation',
-    defaultMessage: 'You have limited access to graded assignments as part of the audit track in this course.',
-  },
  gradeSummaryTooltipAlt: {
    id: 'progress.gradeSummary.tooltip.alt',
    defaultMessage: 'Grade summary tooltip',
@@ -115,14 +103,6 @@ const messages = defineMessages({
    id: 'progress.courseGrade.label.passingGrade',
    defaultMessage: 'Passing grade',
  },
-  problemScoreLabel: {
-    id: 'progress.detailedGrades.problemScore.label',
-    defaultMessage: 'Problem Scores:',
-  },
-  problemScoreToggleAltText: {
-    id: 'progress.detailedGrades.problemScore.toggleButton',
-    defaultMessage: 'Toggle individual problem scores for {subsectionTitle}',
-  },
  score: {
    id: 'progress.score',
    defaultMessage: 'Score',
@@ -139,14 +119,6 @@ const messages = defineMessages({
    id: 'progress.weightedGradeSummary',
    defaultMessage: 'Your current weighted grade summary',
  },
-  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-tabs/messages.js
+++ b/src/course-tabs/messages.js
@@ -1,11 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  courseMaterial: {
-    id: 'learn.navigation.course.tabs.label',
-    defaultMessage: 'Course Material',
-    description: 'The accessible label for course tabs navigation',
-  },
-});
-
-export default messages;
--- a/src/courseware/CoursewareContainer.jsx
+++ b/src/courseware/CoursewareContainer.jsx
@@ -2,6 +2,8 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { history } from '@edx/frontend-platform';
+import { getLocale } from '@edx/frontend-platform/i18n';
+import { Redirect } from 'react-router';
 import { createSelector } from '@reduxjs/toolkit';
 import { defaultMemoize as memoize } from 'reselect';

@@ -57,6 +59,16 @@ const checkUnitToSequenceUnitRedirect = memoize((courseStatus, courseId, sequenc
  }
 });

+const checkSpecialExamRedirect = memoize((sequenceStatus, sequence, specialExamsEnabled, proctoredExamsEnabled) => {
+  if (sequenceStatus === 'loaded') {
+    const shouldRedirectTimeLimited = sequence.isTimeLimited && !specialExamsEnabled;
+    const shouldRedirectProctored = sequence.isProctored && !proctoredExamsEnabled;
+    if ((shouldRedirectTimeLimited || shouldRedirectProctored) && sequence.legacyWebUrl !== undefined) {
+      global.location.assign(sequence.legacyWebUrl);
+    }
+  }
+});
+
 const checkSequenceToSequenceUnitRedirect = memoize((courseId, sequenceStatus, sequence, unitId) => {
  if (sequenceStatus === 'loaded' && sequence.id && !unitId) {
    if (sequence.unitIds !== undefined && sequence.unitIds.length > 0) {
@@ -111,6 +123,8 @@ class CoursewareContainer extends Component {
      sequenceId,
      courseStatus,
      sequenceStatus,
+      specialExamsEnabledWaffleFlag,
+      proctoredExamsEnabledWaffleFlag,
      sequence,
      firstSequenceId,
      unitViaSequenceId,
@@ -163,6 +177,11 @@ class CoursewareContainer extends Component {
    // by filling in the ID of the parent sequence of :unitId.
    checkUnitToSequenceUnitRedirect(courseStatus, courseId, sequenceStatus, unitViaSequenceId);

+    // Check special exam redirect:
+    //    /course/:courseId/:sequenceId(/:unitId) -> :legacyWebUrl
+    // because special exams are currently still served in the legacy LMS frontend.
+    checkSpecialExamRedirect(sequenceStatus, sequence, specialExamsEnabledWaffleFlag, proctoredExamsEnabledWaffleFlag);
+
    // 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
@@ -226,6 +245,42 @@ class CoursewareContainer extends Component {
    }
  }

+  renderDenied() {
+    const {
+      course,
+      courseId,
+      match: {
+        params: {
+          unitId: routeUnitId,
+        },
+      },
+    } = this.props;
+    let url = `/redirect/course-home/${courseId}`;
+    switch (course.canLoadCourseware.errorCode) {
+      case 'audit_expired':
+        url = `/redirect/dashboard?access_response_error=${course.canLoadCourseware.additionalContextUserMessage}`;
+        break;
+      case 'course_not_started':
+        // eslint-disable-next-line no-case-declarations
+        const startDate = (new Intl.DateTimeFormat(getLocale())).format(new Date(course.start));
+        url = `/redirect/dashboard?notlive=${startDate}`;
+        break;
+      case 'survey_required': // TODO: Redirect to the course survey
+      case 'unfulfilled_milestones':
+        url = '/redirect/dashboard';
+        break;
+      case 'microfrontend_disabled':
+        url = `/redirect/courseware/${courseId}/unit/${routeUnitId}`;
+        break;
+      case 'authentication_required':
+      case 'enrollment_required':
+      default:
+    }
+    return (
+      <Redirect to={url} />
+    );
+  }
+
  render() {
    const {
      courseStatus,
@@ -238,6 +293,10 @@ class CoursewareContainer extends Component {
      },
    } = this.props;

+    if (courseStatus === 'denied') {
+      return this.renderDenied();
+    }
+
    return (
      <TabPage
        activeTabSlug="courseware"
@@ -279,9 +338,10 @@ const sectionShape = PropTypes.shape({
 });

 const courseShape = PropTypes.shape({
-  celebrations: PropTypes.shape({
-    firstSection: PropTypes.bool,
-  }),
+  canLoadCourseware: PropTypes.shape({
+    errorCode: PropTypes.string,
+    additionalContextUserMessage: PropTypes.string,
+  }).isRequired,
 });

 CoursewareContainer.propTypes = {
@@ -307,6 +367,8 @@ CoursewareContainer.propTypes = {
  checkBlockCompletion: PropTypes.func.isRequired,
  fetchCourse: PropTypes.func.isRequired,
  fetchSequence: PropTypes.func.isRequired,
+  specialExamsEnabledWaffleFlag: PropTypes.bool.isRequired,
+  proctoredExamsEnabledWaffleFlag: PropTypes.bool.isRequired,
 };

 CoursewareContainer.defaultProps = {
@@ -410,6 +472,8 @@ const mapStateToProps = (state) => {
    sequenceId,
    courseStatus,
    sequenceStatus,
+    specialExamsEnabledWaffleFlag,
+    proctoredExamsEnabledWaffleFlag,
  } = state.courseware;

  return {
@@ -417,6 +481,8 @@ const mapStateToProps = (state) => {
    sequenceId,
    courseStatus,
    sequenceStatus,
+    specialExamsEnabledWaffleFlag,
+    proctoredExamsEnabledWaffleFlag,
    course: currentCourseSelector(state),
    sequence: currentSequenceSelector(state),
    previousSequence: previousSequenceSelector(state),
--- a/src/courseware/CoursewareContainer.test.jsx
+++ b/src/courseware/CoursewareContainer.test.jsx
@@ -159,7 +159,7 @@ describe('CoursewareContainer', () => {
    const courseId = defaultCourseId;

    function assertLoadedHeader(container) {
-      const courseHeader = container.querySelector('.learning-header');
+      const courseHeader = container.querySelector('.course-header');
      // Ensure the course number and org appear - this proves we loaded course metadata properly.
      expect(courseHeader).toHaveTextContent(courseMetadata.number);
      expect(courseHeader).toHaveTextContent(courseMetadata.org);
@@ -397,6 +397,8 @@ describe('CoursewareContainer', () => {

    describe('when the current sequence is an exam', () => {
      const { location } = window;
+      const sequenceBlock = defaultSequenceBlock;
+      const unitBlocks = defaultUnitBlocks;

      beforeEach(() => {
        delete window.location;
@@ -408,49 +410,48 @@ describe('CoursewareContainer', () => {
      afterEach(() => {
        window.location = location;
      });
+
+      it('should redirect to the sequence legacyWebUrl', async () => {
+        const sequenceMetadata = Factory.build(
+          'sequenceMetadata',
+          { is_time_limited: true }, // position index is 1-based and is converted to 0-based for activeUnitIndex
+          { courseId, unitBlocks, sequenceBlock },
+        );
+        setUpMockRequests({ sequenceMetadatas: [sequenceMetadata] });
+
+        history.push(`/course/${courseId}/${sequenceBlock.id}/${unitBlocks[2].id}`);
+        await loadContainer();
+
+        expect(global.location.assign).toHaveBeenCalledWith(sequenceBlock.legacy_web_url);
+      });
    });
  });

-  describe('when receiving a course_access error_code', () => {
+  describe('when receiving a can_load_courseware error_code', () => {
    function setUpWithDeniedStatus(errorCode) {
      const courseMetadata = Factory.build('courseMetadata', {
-        course_access: {
+        can_load_courseware: {
          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);
+      const { courseBlocks } = buildSimpleCourseBlocks(courseId, courseMetadata.name);
      setUpMockRequests({ courseBlocks, courseMetadata });
-      history.push(`/course/${courseId}/${sequenceBlocks[0].id}/${unitBlocks[0].id}`);
-      return { courseMetadata, unitBlocks };
+      history.push(`/course/${courseId}`);
+      return courseMetadata;
    }

    it('should go to course home for an enrollment_required error code', async () => {
-      const { courseMetadata } = setUpWithDeniedStatus('enrollment_required');
+      const courseMetadata = setUpWithDeniedStatus('enrollment_required');
      await loadContainer();

      expect(global.location.href).toEqual(`http://localhost/redirect/course-home/${courseMetadata.id}`);
    });

-    it('should go to course survey for a survey_required error code', async () => {
-      const { courseMetadata } = setUpWithDeniedStatus('survey_required');
-      await loadContainer();
-
-      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');
+      const courseMetadata = setUpWithDeniedStatus('authentication_required');
      await loadContainer();

      expect(global.location.href).toEqual(`http://localhost/redirect/course-home/${courseMetadata.id}`);
--- a/src/courseware/CoursewareRedirectLandingPage.jsx
+++ b/src/courseware/CoursewareRedirectLandingPage.jsx
@@ -31,12 +31,6 @@ export default () => {
            global.location.assign(`${getConfig().LMS_BASE_URL}/courses/${match.params.courseId}/course/`);
          }}
        />
-        <PageRoute
-          path={`${path}/survey/:courseId`}
-          render={({ match }) => {
-            global.location.assign(`${getConfig().LMS_BASE_URL}/courses/${match.params.courseId}/survey`);
-          }}
-        />
        <PageRoute
          path={`${path}/dashboard`}
          render={({ location }) => {
--- a/src/courseware/course/Course.jsx
+++ b/src/courseware/course/Course.jsx
@@ -13,9 +13,9 @@ import ContentTools from './content-tools';
 import CourseBreadcrumbs from './CourseBreadcrumbs';
 import NotificationTrigger from './NotificationTrigger';

+import CourseSock from '../../generic/course-sock';
 import { useModel } from '../../generic/model-store';
 import useWindowSize, { responsiveBreakpoints } from '../../generic/tabs/useWindowSize';
-import { getLocalStorage, setLocalStorage } from '../../data/localStorage';

 /** [MM-P2P] Experiment */
 import { initCoursewareMMP2P, MMP2PBlockModal } from '../../experiments/mm-p2p';
@@ -39,7 +39,10 @@ function Course({
  ].filter(element => element != null).map(element => element.title);

  const {
+    canShowUpgradeSock,
    celebrations,
+    offer,
+    org,
    verifiedMode,
  } = course;

@@ -61,22 +64,6 @@ function Course({
    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);

@@ -90,8 +77,6 @@ function Course({
          courseId={courseId}
          sectionId={section ? section.id : null}
          sequenceId={sequenceId}
-          isStaff={course ? course.isStaff : null}
-          unitId={unitId}
          //* * [MM-P2P] Experiment */
          mmp2p={MMP2P}
        />
@@ -100,9 +85,6 @@ function Course({
          <NotificationTrigger
            toggleNotificationTray={toggleNotificationTray}
            isNotificationTrayVisible={isNotificationTrayVisible}
-            notificationStatus={notificationStatus}
-            setNotificationStatus={setNotificationStatus}
-            upgradeNotificationCurrentState={upgradeNotificationCurrentState}
          />
        ) : null}
      </div>
@@ -118,11 +100,6 @@ function Course({
        toggleNotificationTray={toggleNotificationTray}
        isNotificationTrayVisible={isNotificationTrayVisible}
        notificationTrayVisible={notificationTrayVisible}
-        notificationStatus={notificationStatus}
-        setNotificationStatus={setNotificationStatus}
-        onNotificationSeen={onNotificationSeen}
-        upgradeNotificationCurrentState={upgradeNotificationCurrentState}
-        setupgradeNotificationCurrentState={setupgradeNotificationCurrentState}
        //* * [MM-P2P] Experiment */
        mmp2p={MMP2P}
      />
@@ -132,6 +109,15 @@ function Course({
          open
        />
      )}
+      {canShowUpgradeSock && (
+        <CourseSock
+          courseId={courseId}
+          offer={offer}
+          orgKey={org}
+          pageLocation="Course Content Page"
+          verifiedMode={verifiedMode}
+        />
+      )}
      <ContentTools course={course} />
      { /** [MM-P2P] Experiment */ }
      { MMP2P.meta.modalLock && <MMP2PBlockModal options={MMP2P} /> }
--- a/src/courseware/course/Course.test.jsx
+++ b/src/courseware/course/Course.test.jsx
@@ -79,6 +79,14 @@ describe('Course', () => {
    expect(getByRole(celebrationModal, 'heading', { name: 'Congratulations!' })).toBeInTheDocument();
  });

+  it('displays upgrade sock', async () => {
+    const courseMetadata = Factory.build('courseMetadata', { can_show_upgrade_sock: true });
+    const testStore = await initializeTestStore({ courseMetadata, excludeFetchSequence: true }, false);
+
+    render(<Course {...mockData} courseId={courseMetadata.id} />, { store: testStore });
+    expect(screen.getByRole('button', { name: 'Learn About Verified Certificates' })).toBeInTheDocument();
+  });
+
  it('displays notification trigger and toggles active class on click', async () => {
    useWindowSize.mockReturnValue({ width: 1200 });
    render(<Course {...mockData} />);
@@ -91,31 +99,6 @@ describe('Course', () => {
    expect(notificationTrigger).not.toHaveClass('trigger-active');
  });

-  it('renders course breadcrumbs as expected', async () => {
-    const courseMetadata = Factory.build('courseMetadata');
-    const unitBlocks = Array.from({ length: 3 }).map(() => Factory.build(
-      'block',
-      { type: 'vertical' },
-      { courseId: courseMetadata.id },
-    ));
-    const testStore = await initializeTestStore({ courseMetadata, unitBlocks }, false);
-    const { courseware, models } = testStore.getState();
-    const { courseId, sequenceId } = courseware;
-    const testData = {
-      ...mockData,
-      courseId,
-      sequenceId,
-      unitId: Object.values(models.units)[1].id, // Corner cases are already covered in `Sequence` tests.
-    };
-    render(<Course {...testData} />, { store: testStore });
-
-    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('cdabcdabcdabcdabcdabcdabcdabcd13')).toBeInTheDocument();
-    expect(screen.getByText('cdabcdabcdabcdabcdabcdabcdabcd12')).toBeInTheDocument();
-  });
-
  it('passes handlers to the sequence', async () => {
    const nextSequenceHandler = jest.fn();
    const previousSequenceHandler = jest.fn();
--- a/src/courseware/course/CourseBreadcrumbs.jsx
+++ b/src/courseware/course/CourseBreadcrumbs.jsx
@@ -5,151 +5,91 @@ import { FormattedMessage } from '@edx/frontend-platform/i18n';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faHome } from '@fortawesome/free-solid-svg-icons';
 import { useSelector } from 'react-redux';
-import { SelectMenu } from '@edx/paragon';
-import { Link } from 'react-router-dom';
-import { useModel, useModels } from '../../generic/model-store';
+import { useModel } from '../../generic/model-store';
+
 /** [MM-P2P] Experiment */
 import { MMP2PFlyoverTrigger } from '../../experiments/mm-p2p';
-import JumpNavMenuItem from './JumpNavMenuItem';

 function CourseBreadcrumb({
-  content, withSeparator, courseId, unitId, isStaff,
+  url, children, withSeparator, ...attrs
 }) {
-  const defaultContent = content.filter(destination => destination.default)[0] || { id: courseId, label: '' };
-
  return (
    <>
      {withSeparator && (
-        <li className="mx-2 text-primary-500 text-truncate text-nowrap" role="presentation" aria-hidden>/</li>
+        <li className="mx-2 text-primary-500" role="presentation" aria-hidden>/</li>
      )}
-
-      <li style={{
-        overflow: 'hidden',
-        textOverflow: 'ellipsis',
-        whiteSpace: 'nowrap',
-      }}
-      >
-        { getConfig().ENABLE_JUMPNAV !== 'true' || content.length < 2 || !isStaff
-          ? (
-            <Link
-              className="text-primary-500"
-              to={`/course/${courseId}/${defaultContent.id}`}
-            >
-              {defaultContent.label}
-            </Link>
-          )
-          : (
-            <SelectMenu isLink defaultMessage={defaultContent.label}>
-              {content.map(item => (
-                <JumpNavMenuItem
-                  isDefault={item.default}
-                  sequences={item.sequences}
-                  courseId={courseId}
-                  title={item.label}
-                  currentUnit={unitId}
-                />
-              ))}
-            </SelectMenu>
-          )}
-
+      <li {...attrs}>
+        <a className="text-primary-500" href={url}>{children}</a>
      </li>
    </>
  );
 }
+
 CourseBreadcrumb.propTypes = {
-  content: PropTypes.arrayOf(
-    PropTypes.shape({
-      default: PropTypes.bool,
-      id: PropTypes.string,
-      label: PropTypes.string,
-    }),
-  ).isRequired,
-  unitId: PropTypes.string,
+  url: PropTypes.string.isRequired,
+  children: PropTypes.node.isRequired,
  withSeparator: PropTypes.bool,
-  courseId: PropTypes.string,
-  isStaff: PropTypes.bool,
 };

 CourseBreadcrumb.defaultProps = {
  withSeparator: false,
-  unitId: null,
-  courseId: null,
-  isStaff: null,
 };

 export default function CourseBreadcrumbs({
  courseId,
  sectionId,
  sequenceId,
-  unitId,
-  isStaff,
  /** [MM-P2P] Experiment */
  mmp2p,
 }) {
  const course = useModel('coursewareMeta', courseId);
+  const sequence = useModel('sequences', sequenceId);
+  const section = useModel('sections', sectionId);
  const courseStatus = useSelector(state => state.courseware.courseStatus);
  const sequenceStatus = useSelector(state => state.courseware.sequenceStatus);

-  const allSequencesInSections = Object.fromEntries(useModels('sections', course.sectionIds).map(section => [section.id, {
-    default: section.id === sectionId,
-    title: section.title,
-    sequences: useModels('sequences', section.sequenceIds),
-  }]));
-
  const links = useMemo(() => {
-    const chapters = [];
-    const sequentials = [];
    if (courseStatus === 'loaded' && sequenceStatus === 'loaded') {
-      Object.entries(allSequencesInSections).forEach(([id, section]) => {
-        chapters.push({
-          id,
-          label: section.title,
-          default: section.default,
-          sequences: section.sequences,
-        });
-        if (section.default) {
-          section.sequences.forEach(sequence => {
-            sequentials.push({
-              id: sequence.id,
-              label: sequence.title,
-              default: sequence.id === sequenceId,
-              sequences: [sequence],
-            });
-          });
-        }
-      });
+      return [section, sequence].filter(node => !!node).map((node) => ({
+        id: node.id,
+        label: node.title,
+        url: `${getConfig().LMS_BASE_URL}/courses/${course.id}/course/#${node.id}`,
+      }));
    }
-    return [chapters, sequentials];
-  }, [courseStatus, sequenceStatus, allSequencesInSections]);
+    return [];
+  }, [courseStatus, sequenceStatus]);

  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 d-flex m-0">
-          <Link
-            className="flex-shrink-0 text-primary"
-            to={`/course/${courseId}/home`}
-          >
-            <FontAwesomeIcon icon={faHome} className="mr-2" />
-            <FormattedMessage
-              id="learn.breadcrumb.navigation.course.home"
-              description="The course home link in breadcrumbs nav"
-              defaultMessage="Course"
-            />
-          </Link>
-        </li>
-        {links.map(content => (
-          <CourseBreadcrumb
-            courseId={courseId}
-            sequenceId={sequenceId}
-            content={content}
-            unitId={unitId}
-            withSeparator
-            isStaff={isStaff}
+      <ol className="list-unstyled d-flex m-0">
+        <CourseBreadcrumb
+          url={`${getConfig().LMS_BASE_URL}/courses/${course.id}/course/`}
+          className="flex-shrink-0"
+        >
+          <FontAwesomeIcon icon={faHome} className="mr-2" />
+          <FormattedMessage
+            id="learn.breadcrumb.navigation.course.home"
+            description="The course home link in breadcrumbs nav"
+            defaultMessage="Course"
          />
+        </CourseBreadcrumb>
+        {links.map(({ id, url, label }) => (
+          <CourseBreadcrumb
+            key={id}
+            url={url}
+            withSeparator
+            style={{
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+              whiteSpace: 'nowrap',
+            }}
+          >
+            {label}
+          </CourseBreadcrumb>
        ))}
+
        {/** [MM-P2P] Experiment */}
-        {mmp2p.state && mmp2p.state.isEnabled && (
+        {mmp2p.state.isEnabled && (
          <MMP2PFlyoverTrigger options={mmp2p} />
        )}
      </ol>
@@ -161,8 +101,6 @@ CourseBreadcrumbs.propTypes = {
  courseId: PropTypes.string.isRequired,
  sectionId: PropTypes.string,
  sequenceId: PropTypes.string,
-  unitId: PropTypes.string,
-  isStaff: PropTypes.bool,
  /** [MM-P2P] Experiment */
  mmp2p: PropTypes.shape({
    state: PropTypes.shape({
@@ -174,8 +112,7 @@ CourseBreadcrumbs.propTypes = {
 CourseBreadcrumbs.defaultProps = {
  sectionId: null,
  sequenceId: null,
-  unitId: null,
-  isStaff: null,
+
  /** [MM-P2P] Experiment */
  mmp2p: {},
 };
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`export { default, useCourseStartMasqueradeBanner } from './hooks';`