fix: fixed module button href (#508 )

fix: added LMS_BASE_URL for brand logo (#498 )
fix: removed Program link from the header (#497 )
2024-12-12 10:30:30 +02:00 · 2024-11-20 13:19:08 +02:00 · 2024-11-18 16:59:27 +02:00 · 2024-11-14 23:35:40 +02:00 · 2024-06-10 11:35:01 -03:00 · 2024-06-06 15:05:35 -03:00
221 changed files with 27128 additions and 9305 deletions
--- a/.env
+++ b/.env
@@ -32,6 +32,7 @@ ENTERPRISE_MARKETING_UTM_SOURCE=''
 ENTERPRISE_MARKETING_UTM_CAMPAIGN=''
 ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM=''
 LEARNING_BASE_URL=''
+ZENDESK_KEY=''
 HOTJAR_APP_ID=''
 HOTJAR_VERSION='6'
 HOTJAR_DEBUG=''
@@ -39,5 +40,5 @@ ACCOUNT_SETTINGS_URL=''
 ACCOUNT_PROFILE_URL=''
 ENABLE_NOTICES=''
 CAREER_LINK_URL=''
+OPTIMIZELY_FULL_STACK_SDK_KEY=''
 ENABLE_EDX_PERSONAL_DASHBOARD=false
-ENABLE_PROGRAMS=false
--- a/.env.development
+++ b/.env.development
@@ -20,7 +20,7 @@ LMS_CLIENT_ID='login-service-client-id'
 SEGMENT_KEY=''
 FEATURE_FLAGS={}
 MARKETING_SITE_BASE_URL='http://localhost:18000'
-SUPPORT_URL=''
+SUPPORT_URL='http://localhost:18000/support'
 CONTACT_URL='http://localhost:18000/contact'
 OPEN_SOURCE_URL='http://localhost:18000/openedx'
 TERMS_OF_SERVICE_URL='http://localhost:18000/terms-of-service'
@@ -38,6 +38,7 @@ ENTERPRISE_MARKETING_UTM_CAMPAIGN='example.com Referral'
 ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM='Footer'
 LEARNING_BASE_URL='http://localhost:2000'
 SESSION_COOKIE_DOMAIN='localhost'
+ZENDESK_KEY=''
 HOTJAR_APP_ID=''
 HOTJAR_VERSION='6'
 HOTJAR_DEBUG=''
@@ -45,5 +46,5 @@ ACCOUNT_SETTINGS_URL='http://localhost:1997'
 ACCOUNT_PROFILE_URL='http://localhost:1995'
 ENABLE_NOTICES=''
 CAREER_LINK_URL=''
+OPTIMIZELY_FULL_STACK_SDK_KEY=''
 ENABLE_EDX_PERSONAL_DASHBOARD=false
-ENABLE_PROGRAMS=false
--- a/.env.test
+++ b/.env.test
@@ -20,7 +20,7 @@ LMS_CLIENT_ID='login-service-client-id'
 SEGMENT_KEY=''
 FEATURE_FLAGS={}
 MARKETING_SITE_BASE_URL='http://localhost:18000'
-SUPPORT_URL=''
+SUPPORT_URL='http://localhost:18000/support'
 CONTACT_URL='http://localhost:18000/contact'
 OPEN_SOURCE_URL='http://localhost:18000/openedx'
 TERMS_OF_SERVICE_URL='http://localhost:18000/terms-of-service'
@@ -37,6 +37,7 @@ ENTERPRISE_MARKETING_UTM_SOURCE='example.com'
 ENTERPRISE_MARKETING_UTM_CAMPAIGN='example.com Referral'
 ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM='Footer'
 LEARNING_BASE_URL='http://localhost:2000'
+ZENDESK_KEY='test-zendesk-key'
 HOTJAR_APP_ID='hot-jar-app-id'
 HOTJAR_VERSION='6'
 HOTJAR_DEBUG=''
@@ -44,5 +45,5 @@ ACCOUNT_SETTINGS_URL='http://account-settings-url.test'
 ACCOUNT_PROFILE_URL='http://account-profile-url.test'
 ENABLE_NOTICES=''
 CAREER_LINK_URL=''
+OPTIMIZELY_FULL_STACK_SDK_KEY='SDK Key'
 ENABLE_EDX_PERSONAL_DASHBOARD=true
-ENABLE_PROGRAMS=false
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1,8 @@
+# Root app is developed and owned by Aurora
 *   @openedx/2U-aperture
+
+# WIDGETS and experiments are developed and owned by separate teams below
+
+# Recommendations panel
+/src/widgets/RecommendationsPanel       @openedx/2U-vanguards
+/src/widgets/LookingForChallengeWidget  @openedx/2U-vanguards
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,7 +0,0 @@
-version: 2
-updates:
-    # Adding new check for github-actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-        interval: "weekly"
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,16 +10,18 @@ on:

 jobs:
  tests:
-    runs-on: ubuntu-latest
-
+    runs-on: ubuntu-20.04
    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
+
+    - name: Setup Nodejs Env
+      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV

    - name: Setup Nodejs
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v3
      with:
-        node-version-file: '.nvmrc'
+        node-version: ${{ env.NODE_VER }}

    - name: Install dependencies
      run: npm ci
@@ -37,7 +39,21 @@ jobs:
      run: npm run build

    - name: Run Coverage
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@v3
+
+    - name: Send failure notification
+      if: ${{ failure() }}
+      uses: dawidd6/action-send-mail@v3
      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        fail_ci_if_error: true
+        server_address: email-smtp.us-east-1.amazonaws.com
+        server_port: 465
+        username: ${{ secrets.EDX_SMTP_USERNAME }}
+        password: ${{ secrets.EDX_SMTP_PASSWORD }}
+        subject: CI workflow failed in ${{github.repository}}
+        to: masters-grades@edx.org,aperture@2u-internal.opsgenie.net
+        from: github-actions <github-actions@edx.org>
+        nodemailerlog: true
+        nodemailerdebug: true
+        body: CI workflow in ${{github.repository}} failed!
+          For details see "github.com/${{ github.repository }}/actions/runs/${{ github.run_id
+          }}"
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -0,0 +1,35 @@
+name: Release CI
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Nodejs Env
+        run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VER }}
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Create Build
+        run: npm run build
+
+      - name: Release Package
+        env:
+          GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }}
+        run: npm semantic-release
--- a/.husky/pre-push
+++ b/.husky/pre-push
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run lint
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20
+18.20
--- a/.releaserc
+++ b/.releaserc
@@ -0,0 +1,27 @@
+{
+  "branch": "master",
+  "tagFormat": "v${version}",
+  "verifyConditions": [
+    "@semantic-release/npm",
+    {
+      "path": "@semantic-release/github",
+      "assets": {
+        "path": "dist/*"
+      }
+    }
+  ],
+  "analyzeCommits": "@semantic-release/commit-analyzer",
+  "generateNotes": "@semantic-release/release-notes-generator",
+  "prepare": "@semantic-release/npm",
+  "publish": [
+    "@semantic-release/npm",
+    {
+      "path": "@semantic-release/github",
+      "assets": {
+        "path": "dist/*"
+      }
+    }
+  ],
+  "success": [],
+  "fail": []
+}
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -17,7 +17,6 @@ metadata:
    openedx.org/arch-interest-groups: ""
    # This can be multiple comma-separated projects.
    openedx.org/add-to-projects: "openedx:23"
-    openedx.org/release: "master"
 spec:
  type: 'service'
  lifecycle: 'production'
--- a/example.env.config.js
+++ b/example.env.config.js
@@ -59,6 +59,7 @@ module.exports = {
  ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM: 'Footer',
  LEARNING_BASE_URL: 'http://localhost:2000',
  SESSION_COOKIE_DOMAIN: 'localhost',
+  ZENDESK_KEY: '',
  HOTJAR_APP_ID: '',
  HOTJAR_VERSION: 6,
  HOTJAR_DEBUG: '',
@@ -68,5 +69,6 @@ module.exports = {
  ACCOUNT_PROFILE_URL: 'http://localhost:1995',
  ENABLE_NOTICES: '',
  CAREER_LINK_URL: '',
+  OPTIMIZELY_FULL_STACK_SDK_KEY: '',
  EXPERIMENT_08_23_VAN_PAINTED_DOOR: true,
 };
--- a/openedx.yaml
+++ b/openedx.yaml
@@ -0,0 +1,9 @@
+# This file describes this Open edX repo, as described in OEP-2:
+# http://open-edx-proposals.readthedocs.io/en/latest/oeps/oep-0002.html#specification
+
+tags:
+  - frontend-app
+  - masters
+oeps:
+  oep-2: true    # Repository metadata
+openedx-release: {ref: master}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -6,9 +6,6 @@
    "type": "git",
    "url": "git+https://github.com/edx/frontend-app-learner-dashboard.git"
  },
-  "browserslist": [
-    "extends @edx/browserslist-config"
-  ],
  "scripts": {
    "build": "fedx-scripts webpack",
    "i18n_extract": "fedx-scripts formatjs extract",
@@ -16,11 +13,11 @@
    "lint-fix": "fedx-scripts eslint --fix --ext .jsx,.js src/",
    "semantic-release": "semantic-release",
    "start": "fedx-scripts webpack-dev-server --progress",
-    "dev": "PUBLIC_PATH=/learner-dashboard/ MFE_CONFIG_API_URL='http://localhost:8000/api/mfe_config/v1' fedx-scripts webpack-dev-server --progress --host apps.local.openedx.io",
    "test": "TZ=GMT fedx-scripts jest --coverage --passWithNoTests",
    "quality": "npm run lint-fix && npm run test",
    "watch-tests": "jest --watch",
-    "snapshot": "fedx-scripts jest --updateSnapshot"
+    "snapshot": "fedx-scripts jest --updateSnapshot",
+    "prepare": "husky install"
  },
  "author": "edX",
  "license": "AGPL-3.0",
@@ -30,58 +27,72 @@
  },
  "dependencies": {
    "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
-    "@edx/frontend-component-footer": "^14.6.0",
-    "@edx/frontend-component-header": "^6.2.0",
-    "@edx/frontend-enterprise-hotjar": "7.2.0",
-    "@edx/frontend-platform": "^8.3.1",
+    "@edx/browserslist-config": "^1.1.0",
+    "@edx/frontend-enterprise-hotjar": "3.0.0",
+    "@edx/frontend-platform": "^7.1.4",
    "@edx/openedx-atlas": "^0.6.0",
-    "@edx/react-unit-test-utils": "^4.0.0",
+    "@edx/react-unit-test-utils": "2.0.0",
    "@fortawesome/fontawesome-svg-core": "^1.2.36",
    "@fortawesome/free-brands-svg-icons": "^5.15.4",
    "@fortawesome/free-solid-svg-icons": "^5.15.4",
    "@fortawesome/react-fontawesome": "^0.2.0",
-    "@openedx/frontend-plugin-framework": "^1.7.0",
-    "@openedx/paragon": "^22.16.0",
-    "@redux-devtools/extension": "3.3.0",
-    "@reduxjs/toolkit": "^2.0.0",
+    "@openedx/frontend-plugin-framework": "^1.1.2",
+    "@openedx/frontend-slot-footer": "^1.0.2",
+    "@openedx/paragon": "^22.2.2",
+    "@optimizely/react-sdk": "^2.9.2",
+    "@redux-beacon/segment": "^1.1.0",
+    "@reduxjs/toolkit": "^1.6.1",
+    "@testing-library/user-event": "^13.5.0",
+    "axios": "^0.28.0",
    "classnames": "^2.3.1",
-    "core-js": "3.40.0",
-    "filesize": "^10.0.0",
+    "core-js": "3.16.2",
+    "dompurify": "^2.3.1",
+    "email-prop-type": "^3.0.1",
+    "file-saver": "^2.0.5",
+    "filesize": "^8.0.6",
    "font-awesome": "4.7.0",
-    "history": "5.3.0",
+    "history": "5.0.1",
+    "html-react-parser": "^1.3.0",
+    "jest": "^29.7.0",
+    "jest-when": "^3.6.0",
    "lodash": "^4.17.21",
    "moment": "^2.29.4",
-    "prop-types": "15.8.1",
-    "query-string": "7.1.3",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "prop-types": "^15.7.2",
+    "query-string": "7.0.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
    "react-helmet": "^6.1.0",
-    "react-intl": "6.8.9",
+    "react-intl": "6.4.7",
+    "react-pdf": "^7.0.0",
    "react-redux": "^7.2.4",
-    "react-router-dom": "6.29.0",
+    "react-router-dom": "6.15.0",
    "react-share": "^4.4.0",
-    "redux": "4.2.1",
+    "react-zendesk": "^0.1.13",
+    "redux": "4.1.1",
+    "redux-beacon": "^2.1.0",
+    "redux-devtools-extension": "2.13.9",
    "redux-logger": "3.0.6",
-    "redux-thunk": "2.4.2",
-    "regenerator-runtime": "^0.14.0",
+    "redux-thunk": "2.3.0",
+    "regenerator-runtime": "^0.13.9",
    "reselect": "^4.0.0",
    "universal-cookie": "^4.0.4",
-    "util": "^0.12.4"
+    "util": "^0.12.4",
+    "whatwg-fetch": "^3.6.2"
  },
  "devDependencies": {
-    "@edx/browserslist-config": "^1.3.0",
    "@edx/reactifex": "^2.1.1",
-    "@openedx/frontend-build": "^14.3.3",
-    "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.2.0",
-    "copy-webpack-plugin": "^12.0.0",
+    "@openedx/frontend-build": "13.1.4",
+    "@testing-library/jest-dom": "^5.14.1",
+    "@testing-library/react": "^12.1.0",
+    "axios-mock-adapter": "^1.20.0",
+    "copy-webpack-plugin": "^11.0.0",
+    "fetch-mock": "^9.11.0",
+    "husky": "^7.0.0",
    "identity-obj-proxy": "^3.0.0",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-expect-message": "^1.1.3",
-    "jest-when": "^3.6.0",
-    "react-dev-utils": "^12.0.0",
-    "react-test-renderer": "^18.3.1",
-    "redux-mock-store": "^1.5.4"
+    "jest-expect-message": "^1.0.2",
+    "react-dev-utils": "^11.0.4",
+    "react-test-renderer": "^17.0.2",
+    "redux-mock-store": "^1.5.4",
+    "semantic-release": "^20.1.3"
  }
 }
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -6,7 +6,7 @@ import { logError } from '@edx/frontend-platform/logging';
 import { initializeHotjar } from '@edx/frontend-enterprise-hotjar';

 import { ErrorPage, AppContext } from '@edx/frontend-platform/react';
-import { FooterSlot } from '@edx/frontend-component-footer';
+import FooterSlot from '@openedx/frontend-slot-footer';
 import { Alert } from '@openedx/paragon';

 import { RequestKeys } from 'data/constants/requests';
@@ -17,6 +17,8 @@ import {
 } from 'data/redux';
 import { reduxHooks } from 'hooks';
 import Dashboard from 'containers/Dashboard';
+import ZendeskFab from 'components/ZendeskFab';
+import { ExperimentProvider } from 'ExperimentContext';

 import track from 'tracking';

@@ -40,6 +42,19 @@ export const App = () => {
  const { supportEmail } = reduxHooks.usePlatformSettingsData();
  const loadData = reduxHooks.useLoadData();

+  const optimizelyScript = () => {
+    if (getConfig().OPTIMIZELY_URL) {
+      return <script src={getConfig().OPTIMIZELY_URL} />;
+    } if (getConfig().OPTIMIZELY_PROJECT_ID) {
+      return (
+        <script
+          src={`${getConfig().MARKETING_SITE_BASE_URL}/optimizelyjs/${getConfig().OPTIMIZELY_PROJECT_ID}.js`}
+        />
+      );
+    }
+    return null;
+  };
+
  React.useEffect(() => {
    if (authenticatedUser?.administrator || getConfig().NODE_ENV === 'development') {
      window.loadEmptyData = () => {
@@ -76,22 +91,26 @@ export const App = () => {
      <Helmet>
        <title>{formatMessage(messages.pageTitle)}</title>
        <link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
+        {optimizelyScript()}
      </Helmet>
      <div>
        <AppWrapper>
          <LearnerDashboardHeader />
-          <main id="main">
+          <main>
            {hasNetworkFailure
              ? (
                <Alert variant="danger">
                  <ErrorPage message={formatMessage(messages.errorMessage, { supportEmail })} />
                </Alert>
              ) : (
-                <Dashboard />
+                <ExperimentProvider>
+                  <Dashboard />
+                </ExperimentProvider>
              )}
          </main>
        </AppWrapper>
        <FooterSlot />
+        <ZendeskFab />
      </div>
    </>
  );
--- a/src/App.scss
+++ b/src/App.scss
@@ -9,7 +9,6 @@ $fa-font-path: "~font-awesome/fonts";

 $input-focus-box-shadow: $input-box-shadow; // hack to get upgrade to paragon 4.0.0 to work

-@import "~@edx/frontend-component-header/dist/index";
@import "~@edx/frontend-component-footer/dist/_footer";

 .text-ellipsis {
--- a/src/App.test.jsx
+++ b/src/App.test.jsx
@@ -10,13 +10,18 @@ import { reduxHooks } from 'hooks';
 import Dashboard from 'containers/Dashboard';
 import LearnerDashboardHeader from 'containers/LearnerDashboardHeader';
 import AppWrapper from 'containers/WidgetContainers/AppWrapper';
+import { ExperimentProvider } from 'ExperimentContext';
 import { App } from './App';
 import messages from './messages';

-jest.mock('@edx/frontend-component-footer', () => ({ FooterSlot: 'FooterSlot' }));
+jest.mock('@edx/frontend-component-footer', () => ({ FooterSlot: 'Footer' }));

 jest.mock('containers/Dashboard', () => 'Dashboard');
 jest.mock('containers/LearnerDashboardHeader', () => 'LearnerDashboardHeader');
+jest.mock('components/ZendeskFab', () => 'ZendeskFab');
+jest.mock('ExperimentContext', () => ({
+  ExperimentProvider: 'ExperimentProvider',
+}));
 jest.mock('containers/WidgetContainers/AppWrapper', () => 'AppWrapper');
 jest.mock('data/redux', () => ({
  selectors: 'redux.selectors',
@@ -74,10 +79,11 @@ describe('App router component', () => {
      it('loads dashboard', () => {
        const main = el.instance.findByType('main')[0];
        expect(main.children.length).toEqual(1);
-        const dashboard = main.children[0];
-        expect(dashboard.type).toEqual('Dashboard');
+        const expProvider = main.children[0];
+        expect(expProvider.type).toEqual('ExperimentProvider');
+        expect(expProvider.children.length).toEqual(1);
        expect(
-          dashboard.matches(shallow(<Dashboard />)),
+          expProvider.matches(shallow(<ExperimentProvider><Dashboard /></ExperimentProvider>)),
        ).toEqual(true);
      });
    });
@@ -91,10 +97,11 @@ describe('App router component', () => {
      it('loads dashboard', () => {
        const main = el.instance.findByType('main')[0];
        expect(main.children.length).toEqual(1);
-        const dashboard = main.children[0];
-        expect(dashboard.type).toEqual('Dashboard');
+        const expProvider = main.children[0];
+        expect(expProvider.type).toEqual('ExperimentProvider');
+        expect(expProvider.children.length).toEqual(1);
        expect(
-          dashboard.matches(shallow(<Dashboard />)),
+          expProvider.matches(shallow(<ExperimentProvider><Dashboard /></ExperimentProvider>)),
        ).toEqual(true);
      });
    });
@@ -108,10 +115,11 @@ describe('App router component', () => {
      it('loads dashboard', () => {
        const main = el.instance.findByType('main')[0];
        expect(main.children.length).toEqual(1);
-        const dashboard = main.children[0];
-        expect(dashboard.type).toEqual('Dashboard');
+        const expProvider = main.children[0];
+        expect(expProvider.type).toEqual('ExperimentProvider');
+        expect(expProvider.children.length).toEqual(1);
        expect(
-          dashboard.matches(shallow(<Dashboard />)),
+          expProvider.matches(shallow(<ExperimentProvider><Dashboard /></ExperimentProvider>)),
        ).toEqual(true);
      });
    });
--- a/src/ExperimentContext.jsx
+++ b/src/ExperimentContext.jsx
@@ -0,0 +1,64 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useWindowSize, breakpoints } from '@openedx/paragon';
+import { StrictDict } from 'utils';
+import api from 'widgets/ProductRecommendations/api';
+import * as module from './ExperimentContext';
+
+export const state = StrictDict({
+  experiment: (val) => React.useState(val), // eslint-disable-line
+  countryCode: (val) => React.useState(val), // eslint-disable-line
+});
+
+export const useCountryCode = (setCountryCode) => {
+  React.useEffect(() => {
+    api
+      .fetchRecommendationsContext()
+      .then((response) => {
+        setCountryCode(response.data.countryCode);
+      })
+      .catch(() => {
+        setCountryCode('');
+      });
+    /* eslint-disable */
+  }, []);
+};
+
+export const ExperimentContext = React.createContext();
+
+export const ExperimentProvider = ({ children }) => {
+  const [countryCode, setCountryCode] = module.state.countryCode(null);
+  const [experiment, setExperiment] = module.state.experiment({
+    isExperimentActive: false,
+    inRecommendationsVariant: true,
+  });
+
+  module.useCountryCode(setCountryCode);
+  const { width } = useWindowSize();
+  const isMobile = width < breakpoints.small.minWidth;
+
+  const contextValue = React.useMemo(
+    () => ({
+      experiment,
+      countryCode,
+      setExperiment,
+      setCountryCode,
+      isMobile,
+    }),
+    [experiment, countryCode, setExperiment, setCountryCode, isMobile]
+  );
+
+  return (
+    <ExperimentContext.Provider value={contextValue}>
+      {children}
+    </ExperimentContext.Provider>
+  );
+};
+
+export const useExperimentContext = () => React.useContext(ExperimentContext);
+
+ExperimentProvider.propTypes = {
+  children: PropTypes.node.isRequired,
+};
+
+export default { useCountryCode, useExperimentContext };
--- a/src/ExperimentContext.test.jsx
+++ b/src/ExperimentContext.test.jsx
@@ -0,0 +1,122 @@
+import React from 'react';
+import { waitFor, render } from '@testing-library/react';
+import { useWindowSize } from '@openedx/paragon';
+
+import api from 'widgets/ProductRecommendations/api';
+import { MockUseState } from 'testUtils';
+
+import * as experiment from 'ExperimentContext';
+
+const state = new MockUseState(experiment);
+
+jest.unmock('react');
+jest.spyOn(React, 'useEffect').mockImplementation((cb, prereqs) => ({ useEffect: { cb, prereqs } }));
+
+jest.mock('widgets/ProductRecommendations/api', () => ({
+  fetchRecommendationsContext: jest.fn(),
+}));
+
+describe('experiments context', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('useCountryCode', () => {
+    describe('behaviour', () => {
+      describe('useEffect call', () => {
+        let calls;
+        let cb;
+        const setCountryCode = jest.fn();
+        const successfulFetch = { data: { countryCode: 'ZA' } };
+
+        beforeEach(() => {
+          experiment.useCountryCode(setCountryCode);
+
+          ({ calls } = React.useEffect.mock);
+          [[cb]] = calls;
+        });
+
+        it('calls useEffect once', () => {
+          expect(calls.length).toEqual(1);
+        });
+        describe('successful fetch', () => {
+          it('sets the country code', async () => {
+            let resolveFn;
+            api.fetchRecommendationsContext.mockReturnValueOnce(
+              new Promise((resolve) => {
+                resolveFn = resolve;
+              }),
+            );
+
+            cb();
+            expect(api.fetchRecommendationsContext).toHaveBeenCalled();
+            expect(setCountryCode).not.toHaveBeenCalled();
+            resolveFn(successfulFetch);
+            await waitFor(() => {
+              expect(setCountryCode).toHaveBeenCalledWith(successfulFetch.data.countryCode);
+            });
+          });
+        });
+        describe('unsuccessful fetch', () => {
+          it('sets the country code to an empty string', async () => {
+            let rejectFn;
+            api.fetchRecommendationsContext.mockReturnValueOnce(
+              new Promise((resolve, reject) => {
+                rejectFn = reject;
+              }),
+            );
+            cb();
+            expect(api.fetchRecommendationsContext).toHaveBeenCalled();
+            expect(setCountryCode).not.toHaveBeenCalled();
+            rejectFn();
+            await waitFor(() => {
+              expect(setCountryCode).toHaveBeenCalledWith('');
+            });
+          });
+        });
+      });
+    });
+  });
+
+  describe('ExperimentProvider', () => {
+    const { ExperimentProvider } = experiment;
+
+    const TestComponent = () => {
+      const {
+        experiment: exp,
+        setExperiment,
+        countryCode,
+        setCountryCode,
+        isMobile,
+      } = experiment.useExperimentContext();
+
+      expect(exp.isExperimentActive).toBeFalsy();
+      expect(exp.inRecommendationsVariant).toBeTruthy();
+      expect(countryCode).toBeNull();
+      expect(isMobile).toBe(false);
+      expect(setExperiment).toBeDefined();
+      expect(setCountryCode).toBeDefined();
+
+      return (
+        <div />
+      );
+    };
+
+    it('allows access to child components with the context stateful values', () => {
+      const countryCodeSpy = jest.spyOn(experiment, 'useCountryCode').mockImplementationOnce(() => {});
+      useWindowSize.mockImplementationOnce(() => ({ width: 577, height: 943 }));
+
+      state.mock();
+
+      render(
+        <ExperimentProvider>
+          <TestComponent />
+        </ExperimentProvider>,
+      );
+
+      expect(countryCodeSpy).toHaveBeenCalledWith(state.setState.countryCode);
+      state.expectInitializedWith(state.keys.countryCode, null);
+      state.expectInitializedWith(state.keys.experiment, { isExperimentActive: false, inRecommendationsVariant: true });
+    });
+  });
+});
--- a/src/snapshots/App.test.jsx.snap
+++ b/src/snapshots/App.test.jsx.snap
@@ -17,9 +17,7 @@ exports[`App router component component initialize failure snapshot 1`] = `
  <div>
    <AppWrapper>
      <LearnerDashboardHeader />
-      <main
-        id="main"
-      >
+      <main>
        <Alert
          variant="danger"
        >
@@ -30,6 +28,7 @@ exports[`App router component component initialize failure snapshot 1`] = `
      </main>
    </AppWrapper>
    <FooterSlot />
+    <ZendeskFab />
  </div>
 </Fragment>
 `;
@@ -51,13 +50,14 @@ exports[`App router component component no network failure snapshot 1`] = `
  <div>
    <AppWrapper>
      <LearnerDashboardHeader />
-      <main
-        id="main"
-      >
-        <Dashboard />
+      <main>
+        <ExperimentProvider>
+          <Dashboard />
+        </ExperimentProvider>
      </main>
    </AppWrapper>
    <FooterSlot />
+    <ZendeskFab />
  </div>
 </Fragment>
 `;
@@ -75,17 +75,21 @@ exports[`App router component component no network failure with optimizely proje
      rel="shortcut icon"
      type="image/x-icon"
    />
+    <script
+      src="undefined/optimizelyjs/fakeId.js"
+    />
  </HelmetWrapper>
  <div>
    <AppWrapper>
      <LearnerDashboardHeader />
-      <main
-        id="main"
-      >
-        <Dashboard />
+      <main>
+        <ExperimentProvider>
+          <Dashboard />
+        </ExperimentProvider>
      </main>
    </AppWrapper>
    <FooterSlot />
+    <ZendeskFab />
  </div>
 </Fragment>
 `;
@@ -103,17 +107,21 @@ exports[`App router component component no network failure with optimizely url s
      rel="shortcut icon"
      type="image/x-icon"
    />
+    <script
+      src="fake.url"
+    />
  </HelmetWrapper>
  <div>
    <AppWrapper>
      <LearnerDashboardHeader />
-      <main
-        id="main"
-      >
-        <Dashboard />
+      <main>
+        <ExperimentProvider>
+          <Dashboard />
+        </ExperimentProvider>
      </main>
    </AppWrapper>
    <FooterSlot />
+    <ZendeskFab />
  </div>
 </Fragment>
 `;
@@ -135,9 +143,7 @@ exports[`App router component component refresh failure snapshot 1`] = `
  <div>
    <AppWrapper>
      <LearnerDashboardHeader />
-      <main
-        id="main"
-      >
+      <main>
        <Alert
          variant="danger"
        >
@@ -148,6 +154,7 @@ exports[`App router component component refresh failure snapshot 1`] = `
      </main>
    </AppWrapper>
    <FooterSlot />
+    <ZendeskFab />
  </div>
 </Fragment>
 `;
--- a/src/snapshots/index.test.jsx.snap
+++ b/src/snapshots/index.test.jsx.snap
@@ -1,43 +1,40 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`app registry subscribe: APP_INIT_ERROR.  snapshot: displays an ErrorPage to root element 1`] = `
-<UNDEFINED>
-  <ErrorPage
-    message="test-error-message"
-  />
-</UNDEFINED>
+<ErrorPage
+  message="test-error-message"
+/>
 `;

 exports[`app registry subscribe: APP_READY.  links App to root element 1`] = `
-<UNDEFINED>
-  <AppProvider
-    store={
-      {
-        "redux": "store",
-      }
+<AppProvider
+  store={
+    Object {
+      "redux": "store",
    }
-  >
-    <NoticesWrapper>
-      <Routes>
-        <Route
-          element={
-            <PageWrap>
-              <App />
-            </PageWrap>
-          }
-          path="/"
-        />
-        <Route
-          element={
-            <Navigate
-              replace={true}
-              to="/"
-            />
-          }
-          path="*"
-        />
-      </Routes>
-    </NoticesWrapper>
-  </AppProvider>
-</UNDEFINED>
+  }
+  wrapWithRouter={true}
+>
+  <NoticesWrapper>
+    <Routes>
+      <Route
+        element={
+          <PageWrap>
+            <App />
+          </PageWrap>
+        }
+        path="/"
+      />
+      <Route
+        element={
+          <Navigate
+            replace={true}
+            to="/"
+          />
+        }
+        path="*"
+      />
+    </Routes>
+  </NoticesWrapper>
+</AppProvider>
 `;
--- a/src/components/ZendeskFab/snapshots/index.test.jsx.snap
+++ b/src/components/ZendeskFab/snapshots/index.test.jsx.snap
@@ -0,0 +1,65 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ZendeskFab snapshot 1`] = `
+<Zendesk
+  cookies={true}
+  defer={true}
+  webWidget={
+    Object {
+      "answerBot": Object {
+        "avatar": Object {
+          "name": Object {
+            "*": "edX Support",
+          },
+          "url": "https://edx-cdn.org/v3/prod/favicon.ico",
+        },
+        "contactOnlyAfterQuery": true,
+        "suppress": false,
+        "title": Object {
+          "*": "edX Support",
+        },
+      },
+      "chat": Object {
+        "departments": Object {
+          "enabled": Array [
+            "account settings",
+            "billing and payments",
+            "certificates",
+            "deadlines",
+            "errors and technical issues",
+            "other",
+            "proctoring",
+          ],
+        },
+        "suppress": false,
+      },
+      "contactForm": Object {
+        "attachments": true,
+        "selectTicketForm": Object {
+          "*": "Please choose your request type:",
+        },
+        "ticketForms": Array [
+          Object {
+            "fields": Array [
+              Object {
+                "id": "description",
+                "prefill": Object {
+                  "*": "",
+                },
+              },
+            ],
+            "id": 360003368814,
+            "subject": false,
+          },
+        ],
+      },
+      "contactOptions": Object {
+        "enabled": false,
+      },
+      "helpCenter": Object {
+        "originalArticleButton": true,
+      },
+    }
+  }
+/>
+`;
--- a/src/components/ZendeskFab/index.jsx
+++ b/src/components/ZendeskFab/index.jsx
@@ -0,0 +1,56 @@
+import React from 'react';
+
+import { getConfig } from '@edx/frontend-platform';
+import { useIntl } from '@edx/frontend-platform/i18n';
+
+import Zendesk from 'react-zendesk';
+import messages from './messages';
+
+const ZendeskFab = () => {
+  const { formatMessage } = useIntl();
+  const setting = {
+    cookies: true,
+    webWidget: {
+      contactOptions: {
+        enabled: false,
+      },
+      chat: {
+        suppress: false,
+        departments: {
+          enabled: ['account settings', 'billing and payments', 'certificates', 'deadlines', 'errors and technical issues', 'other', 'proctoring'],
+        },
+      },
+      contactForm: {
+        ticketForms: [
+          {
+            id: 360003368814,
+            subject: false,
+            fields: [{ id: 'description', prefill: { '*': '' } }],
+          },
+        ],
+        selectTicketForm: {
+          '*': formatMessage(messages.selectTicketForm),
+        },
+        attachments: true,
+      },
+      helpCenter: {
+        originalArticleButton: true,
+      },
+      answerBot: {
+        suppress: false,
+        contactOnlyAfterQuery: true,
+        title: { '*': formatMessage(messages.supportTitle) },
+        avatar: {
+          url: 'https://edx-cdn.org/v3/prod/favicon.ico',
+          name: { '*': formatMessage(messages.supportTitle) },
+        },
+      },
+    },
+  };
+
+  return (
+    <Zendesk defer zendeskKey={getConfig().ZENDESK_KEY} {...setting} />
+  );
+};
+
+export default ZendeskFab;
--- a/src/components/ZendeskFab/index.test.jsx
+++ b/src/components/ZendeskFab/index.test.jsx
@@ -0,0 +1,12 @@
+import { shallow } from '@edx/react-unit-test-utils';
+
+import ZendeskFab from '.';
+
+jest.mock('react-zendesk', () => 'Zendesk');
+
+describe('ZendeskFab', () => {
+  test('snapshot', () => {
+    const wrapper = shallow(<ZendeskFab />);
+    expect(wrapper.snapshot).toMatchSnapshot();
+  });
+});
--- a/src/components/ZendeskFab/messages.js
+++ b/src/components/ZendeskFab/messages.js
@@ -0,0 +1,16 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  supportTitle: {
+    id: 'zendesk.supportTitle',
+    description: 'Title for the support button',
+    defaultMessage: 'edX Support',
+  },
+  selectTicketForm: {
+    id: 'zendesk.selectTicketForm',
+    description: 'Select ticket form',
+    defaultMessage: 'Please choose your request type:',
+  },
+});
+
+export default messages;
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -12,13 +12,12 @@ const configuration = {
  // ACCESS_TOKEN_COOKIE_NAME: process.env.ACCESS_TOKEN_COOKIE_NAME,
  LEARNING_BASE_URL: process.env.LEARNING_BASE_URL,
  SESSION_COOKIE_DOMAIN: process.env.SESSION_COOKIE_DOMAIN || '',
+  ZENDESK_KEY: process.env.ZENDESK_KEY,
  SUPPORT_URL: process.env.SUPPORT_URL || null,
  ENABLE_NOTICES: process.env.ENABLE_NOTICES || null,
  CAREER_LINK_URL: process.env.CAREER_LINK_URL || null,
  LOGO_URL: process.env.LOGO_URL,
  ENABLE_EDX_PERSONAL_DASHBOARD: process.env.ENABLE_EDX_PERSONAL_DASHBOARD === 'true',
-  SEARCH_CATALOG_URL: process.env.SEARCH_CATALOG_URL || null,
-  ENABLE_PROGRAMS: process.env.ENABLE_PROGRAMS === 'true',
 };

 const features = {};
--- a/src/containers/CourseCard/components/CourseCardActions/BeginCourseButton.test.jsx
+++ b/src/containers/CourseCard/components/CourseCardActions/BeginCourseButton.test.jsx
@@ -27,7 +27,7 @@ reduxHooks.useCardCourseRunData.mockReturnValue({ homeUrl });
 const execEdPath = (cardId) => `exec-ed-tracking-path=${cardId}`;
 reduxHooks.useCardExecEdTrackingParam.mockImplementation(execEdPath);
 reduxHooks.useTrackCourseEvent.mockImplementation(
-  (eventName, cardId, url) => ({ trackCourseEvent: { eventName, cardId, url } }),
+  (eventName, cardId, upgradeUrl) => ({ trackCourseEvent: { eventName, cardId, upgradeUrl } }),
 );

 describe('BeginCourseButton', () => {
--- a/src/containers/CourseCard/components/CourseCardActions/ResumeButton.test.jsx
+++ b/src/containers/CourseCard/components/CourseCardActions/ResumeButton.test.jsx
@@ -26,7 +26,7 @@ reduxHooks.useCardCourseRunData.mockReturnValue({ resumeUrl });
 const execEdPath = (cardId) => `exec-ed-tracking-path=${cardId}`;
 reduxHooks.useCardExecEdTrackingParam.mockImplementation(execEdPath);
 reduxHooks.useTrackCourseEvent.mockImplementation(
-  (eventName, cardId, url) => ({ trackCourseEvent: { eventName, cardId, url } }),
+  (eventName, cardId, upgradeUrl) => ({ trackCourseEvent: { eventName, cardId, upgradeUrl } }),
 );

 let wrapper;
--- a/src/containers/CourseCard/components/CourseCardActions/UpgradeButton.jsx
+++ b/src/containers/CourseCard/components/CourseCardActions/UpgradeButton.jsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { Locked } from '@openedx/paragon/icons';
+import { useIntl } from '@edx/frontend-platform/i18n';
+
+import track from 'tracking';
+import { reduxHooks } from 'hooks';
+import useActionDisabledState from '../hooks';
+
+import ActionButton from './ActionButton';
+import messages from './messages';
+
+export const UpgradeButton = ({ cardId }) => {
+  const { formatMessage } = useIntl();
+
+  const { upgradeUrl } = reduxHooks.useCardCourseRunData(cardId);
+  const { disableUpgradeCourse } = useActionDisabledState(cardId);
+
+  const trackUpgradeClick = reduxHooks.useTrackCourseEvent(
+    track.course.upgradeClicked,
+    cardId,
+    upgradeUrl,
+  );
+
+  const enabledProps = {
+    as: 'a',
+    href: upgradeUrl,
+    onClick: trackUpgradeClick,
+  };
+  return (
+    <ActionButton
+      iconBefore={Locked}
+      variant="outline-primary"
+      disabled={disableUpgradeCourse}
+      {...!disableUpgradeCourse && enabledProps}
+    >
+      {formatMessage(messages.upgrade)}
+    </ActionButton>
+  );
+};
+UpgradeButton.propTypes = {
+  cardId: PropTypes.string.isRequired,
+};
+export default UpgradeButton;
--- a/src/containers/CourseCard/components/CourseCardActions/UpgradeButton.test.jsx
+++ b/src/containers/CourseCard/components/CourseCardActions/UpgradeButton.test.jsx
@@ -0,0 +1,49 @@
+import { shallow } from '@edx/react-unit-test-utils';
+
+import track from 'tracking';
+import { reduxHooks } from 'hooks';
+import useActionDisabledState from '../hooks';
+import UpgradeButton from './UpgradeButton';
+
+jest.mock('tracking', () => ({
+  course: {
+    upgradeClicked: jest.fn().mockName('segment.trackUpgradeClicked'),
+  },
+}));
+
+jest.mock('hooks', () => ({
+  reduxHooks: {
+    useCardCourseRunData: jest.fn(),
+    useTrackCourseEvent: jest.fn(
+      (eventName, cardId, upgradeUrl) => ({ trackCourseEvent: { eventName, cardId, upgradeUrl } }),
+    ),
+  },
+}));
+jest.mock('../hooks', () => jest.fn(() => ({ disableUpgradeCourse: false })));
+jest.mock('./ActionButton', () => 'ActionButton');
+
+describe('UpgradeButton', () => {
+  const props = {
+    cardId: 'cardId',
+  };
+  const upgradeUrl = 'upgradeUrl';
+  reduxHooks.useCardCourseRunData.mockReturnValue({ upgradeUrl });
+  describe('snapshot', () => {
+    test('can upgrade', () => {
+      const wrapper = shallow(<UpgradeButton {...props} />);
+      expect(wrapper.snapshot).toMatchSnapshot();
+      expect(wrapper.instance.props.disabled).toEqual(false);
+      expect(wrapper.instance.props.onClick).toEqual(reduxHooks.useTrackCourseEvent(
+        track.course.upgradeClicked,
+        props.cardId,
+        upgradeUrl,
+      ));
+    });
+    test('cannot upgrade', () => {
+      useActionDisabledState.mockReturnValueOnce({ disableUpgradeCourse: true });
+      const wrapper = shallow(<UpgradeButton {...props} />);
+      expect(wrapper.snapshot).toMatchSnapshot();
+      expect(wrapper.instance.props.disabled).toEqual(true);
+    });
+  });
+});
--- a/src/containers/CourseCard/components/CourseCardActions/ViewCourseButton.test.jsx
+++ b/src/containers/CourseCard/components/CourseCardActions/ViewCourseButton.test.jsx
@@ -15,7 +15,7 @@ jest.mock('hooks', () => ({
  reduxHooks: {
    useCardCourseRunData: jest.fn(() => ({ homeUrl: 'homeUrl' })),
    useTrackCourseEvent: jest.fn(
-      (eventName, cardId, url) => ({ trackCourseEvent: { eventName, cardId, url } }),
+      (eventName, cardId, upgradeUrl) => ({ trackCourseEvent: { eventName, cardId, upgradeUrl } }),
    ),
  },
 }));
--- a/src/containers/CourseCard/components/CourseCardActions/snapshots/BeginCourseButton.test.jsx.snap
+++ b/src/containers/CourseCard/components/CourseCardActions/snapshots/BeginCourseButton.test.jsx.snap
@@ -6,11 +6,11 @@ exports[`BeginCourseButton snapshot disabled snapshot 1`] = `
  disabled={true}
  href="#"
  onClick={
-    {
-      "trackCourseEvent": {
+    Object {
+      "trackCourseEvent": Object {
        "cardId": "cardId",
        "eventName": [MockFunction segment.enterCourseClicked],
-        "url": "home-urlexec-ed-tracking-path=cardId",
+        "upgradeUrl": "home-urlexec-ed-tracking-path=cardId",
      },
    }
  }
@@ -25,11 +25,11 @@ exports[`BeginCourseButton snapshot enabled snapshot 1`] = `
  disabled={false}
  href="#"
  onClick={
-    {
-      "trackCourseEvent": {
+    Object {
+      "trackCourseEvent": Object {
        "cardId": "cardId",
        "eventName": [MockFunction segment.enterCourseClicked],
-        "url": "home-urlexec-ed-tracking-path=cardId",
+        "upgradeUrl": "home-urlexec-ed-tracking-path=cardId",
      },
    }
  }
--- a/src/containers/CourseCard/components/CourseCardActions/snapshots/ResumeButton.test.jsx.snap
+++ b/src/containers/CourseCard/components/CourseCardActions/snapshots/ResumeButton.test.jsx.snap
@@ -6,11 +6,11 @@ exports[`ResumeButton snapshot disabled snapshot 1`] = `
  disabled={true}
  href="#"
  onClick={
-    {
-      "trackCourseEvent": {
+    Object {
+      "trackCourseEvent": Object {
        "cardId": "cardId",
        "eventName": [MockFunction segment.enterCourseClicked],
-        "url": "resume-urlexec-ed-tracking-path=cardId",
+        "upgradeUrl": "resume-urlexec-ed-tracking-path=cardId",
      },
    }
  }
@@ -25,11 +25,11 @@ exports[`ResumeButton snapshot enabled snapshot 1`] = `
  disabled={false}
  href="#"
  onClick={
-    {
-      "trackCourseEvent": {
+    Object {
+      "trackCourseEvent": Object {
        "cardId": "cardId",
        "eventName": [MockFunction segment.enterCourseClicked],
-        "url": "resume-urlexec-ed-tracking-path=cardId",
+        "upgradeUrl": "resume-urlexec-ed-tracking-path=cardId",
      },
    }
  }
--- a/src/containers/CourseCard/components/CourseCardActions/snapshots/UpgradeButton.test.jsx.snap
+++ b/src/containers/CourseCard/components/CourseCardActions/snapshots/UpgradeButton.test.jsx.snap
@@ -0,0 +1,32 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`UpgradeButton snapshot can upgrade 1`] = `
+<ActionButton
+  as="a"
+  disabled={false}
+  href="upgradeUrl"
+  iconBefore={[MockFunction icons.Locked]}
+  onClick={
+    Object {
+      "trackCourseEvent": Object {
+        "cardId": "cardId",
+        "eventName": [MockFunction segment.trackUpgradeClicked],
+        "upgradeUrl": "upgradeUrl",
+      },
+    }
+  }
+  variant="outline-primary"
+>
+  Upgrade
+</ActionButton>
+`;
+
+exports[`UpgradeButton snapshot cannot upgrade 1`] = `
+<ActionButton
+  disabled={true}
+  iconBefore={[MockFunction icons.Locked]}
+  variant="outline-primary"
+>
+  Upgrade
+</ActionButton>
+`;
--- a/src/containers/CourseCard/components/CourseCardActions/snapshots/ViewCourseButton.test.jsx.snap
+++ b/src/containers/CourseCard/components/CourseCardActions/snapshots/ViewCourseButton.test.jsx.snap
@@ -6,11 +6,11 @@ exports[`ViewCourseButton learner can view course 1`] = `
  disabled={false}
  href="#"
  onClick={
-    {
-      "trackCourseEvent": {
+    Object {
+      "trackCourseEvent": Object {
        "cardId": "cardId",
        "eventName": [MockFunction segment.enterCourseClicked],
-        "url": "homeUrl",
+        "upgradeUrl": "homeUrl",
      },
    }
  }
@@ -25,11 +25,11 @@ exports[`ViewCourseButton learner cannot view course 1`] = `
  disabled={true}
  href="#"
  onClick={
-    {
-      "trackCourseEvent": {
+    Object {
+      "trackCourseEvent": Object {
        "cardId": "cardId",
        "eventName": [MockFunction segment.enterCourseClicked],
-        "url": "homeUrl",
+        "upgradeUrl": "homeUrl",
      },
    }
  }
--- a/src/containers/CourseCard/components/CourseCardActions/index.jsx
+++ b/src/containers/CourseCard/components/CourseCardActions/index.jsx
@@ -5,7 +5,7 @@ import { ActionRow } from '@openedx/paragon';

 import { reduxHooks } from 'hooks';

-import CourseCardActionSlot from 'plugin-slots/CourseCardActionSlot';
+import UpgradeButton from './UpgradeButton';
 import SelectSessionButton from './SelectSessionButton';
 import BeginCourseButton from './BeginCourseButton';
 import ResumeButton from './ResumeButton';
@@ -14,13 +14,15 @@ import ViewCourseButton from './ViewCourseButton';
 export const CourseCardActions = ({ cardId }) => {
  const { isEntitlement, isFulfilled } = reduxHooks.useCardEntitlementData(cardId);
  const {
+    isVerified,
    hasStarted,
+    isExecEd2UCourse,
  } = reduxHooks.useCardEnrollmentData(cardId);
  const { isArchived } = reduxHooks.useCardCourseRunData(cardId);

  return (
    <ActionRow data-test-id="CourseCardActions">
-      <CourseCardActionSlot cardId={cardId} />
+      {!(isEntitlement || isVerified || isExecEd2UCourse) && <UpgradeButton cardId={cardId} />}
      {isEntitlement && (isFulfilled
        ? <ViewCourseButton cardId={cardId} />
        : <SelectSessionButton cardId={cardId} />
--- a/src/containers/CourseCard/components/CourseCardActions/index.test.jsx
+++ b/src/containers/CourseCard/components/CourseCardActions/index.test.jsx
@@ -2,7 +2,7 @@ import { shallow } from '@edx/react-unit-test-utils';

 import { reduxHooks } from 'hooks';

-import CourseCardActionSlot from 'plugin-slots/CourseCardActionSlot';
+import UpgradeButton from './UpgradeButton';
 import SelectSessionButton from './SelectSessionButton';
 import BeginCourseButton from './BeginCourseButton';
 import ResumeButton from './ResumeButton';
@@ -19,7 +19,7 @@ jest.mock('hooks', () => ({
  },
 }));

-jest.mock('plugin-slots/CourseCardActionSlot', () => 'CustomActionButton');
+jest.mock('./UpgradeButton', () => 'UpgradeButton');
 jest.mock('./SelectSessionButton', () => 'SelectSessionButton');
 jest.mock('./ViewCourseButton', () => 'ViewCourseButton');
 jest.mock('./BeginCourseButton', () => 'BeginCourseButton');
@@ -57,7 +57,19 @@ describe('CourseCardActions', () => {
    });
  });
  describe('output', () => {
+    describe('Exec Ed course', () => {
+      it('does not render upgrade button', () => {
+        mockHooks({ isExecEd2UCourse: true });
+        render();
+        expect(el.instance.findByType(UpgradeButton).length).toEqual(0);
+      });
+    });
    describe('entitlement course', () => {
+      it('does not render upgrade button', () => {
+        mockHooks({ isEntitlement: true });
+        render();
+        expect(el.instance.findByType(UpgradeButton).length).toEqual(0);
+      });
      it('renders ViewCourseButton if fulfilled', () => {
        mockHooks({ isEntitlement: true, isFulfilled: true });
        render();
@@ -69,26 +81,33 @@ describe('CourseCardActions', () => {
        expect(el.instance.findByType(SelectSessionButton)[0].props.cardId).toEqual(cardId);
      });
    });
-    describe('not entitlement, verified, or exec ed', () => {
-      it('renders CourseCardActionSlot and ViewCourseButton for archived courses', () => {
+    describe('verified course', () => {
+      it('does not render upgrade button', () => {
+        mockHooks({ isVerified: true });
+        render();
+        expect(el.instance.findByType(UpgradeButton).length).toEqual(0);
+      });
+    });
+    describe('not entielement, verified, or exec ed', () => {
+      it('renders UpgradeButton and ViewCourseButton for archived courses', () => {
        mockHooks({ isArchived: true });
        render();
-        expect(el.instance.findByType(CourseCardActionSlot)[0].props.cardId).toEqual(cardId);
+        expect(el.instance.findByType(UpgradeButton)[0].props.cardId).toEqual(cardId);
        expect(el.instance.findByType(ViewCourseButton)[0].props.cardId).toEqual(cardId);
      });
      describe('unstarted courses', () => {
-        it('renders CourseCardActionSlot and BeginCourseButton', () => {
+        it('renders UpgradeButton and BeginCourseButton', () => {
          mockHooks();
          render();
-          expect(el.instance.findByType(CourseCardActionSlot)[0].props.cardId).toEqual(cardId);
+          expect(el.instance.findByType(UpgradeButton)[0].props.cardId).toEqual(cardId);
          expect(el.instance.findByType(BeginCourseButton)[0].props.cardId).toEqual(cardId);
        });
      });
      describe('active courses (started, and not archived)', () => {
-        it('renders CourseCardActionSlot and ResumeButton', () => {
+        it('renders UpgradeButton and ResumeButton', () => {
          mockHooks({ hasStarted: true });
          render();
-          expect(el.instance.findByType(CourseCardActionSlot)[0].props.cardId).toEqual(cardId);
+          expect(el.instance.findByType(UpgradeButton)[0].props.cardId).toEqual(cardId);
          expect(el.instance.findByType(ResumeButton)[0].props.cardId).toEqual(cardId);
        });
      });
--- a/src/containers/CourseCard/components/CourseCardActions/messages.js
+++ b/src/containers/CourseCard/components/CourseCardActions/messages.js
@@ -1,6 +1,11 @@
 import { defineMessages } from '@edx/frontend-platform/i18n';

 const messages = defineMessages({
+  upgrade: {
+    id: 'learner-dash.courseCard.actions.upgrade',
+    description: 'Course card upgrade button text',
+    defaultMessage: 'Upgrade',
+  },
  beginCourse: {
    id: 'learner-dash.courseCard.actions.beginCourse',
    description: 'Course card begin-course button text',
--- a/src/containers/CourseCard/components/CourseCardBanners/CourseBanner.jsx
+++ b/src/containers/CourseCard/components/CourseCardBanners/CourseBanner.jsx
@@ -12,6 +12,7 @@ export const CourseBanner = ({ cardId }) => {
  const {
    isVerified,
    isAuditAccessExpired,
+    canUpgrade,
    coursewareAccess = {},
  } = reduxHooks.useCardEnrollmentData(cardId);
  const courseRun = reduxHooks.useCardCourseRunData(cardId);
@@ -25,7 +26,13 @@ export const CourseBanner = ({ cardId }) => {
  return (
    <>
      {isAuditAccessExpired
-        && (
+        && (canUpgrade ? (
+          <Banner>
+            {formatMessage(messages.auditAccessExpired)}
+            {'  '}
+            {formatMessage(messages.upgradeToAccess)}
+          </Banner>
+        ) : (
          <Banner>
            {formatMessage(messages.auditAccessExpired)}
            {'  '}
@@ -33,7 +40,17 @@ export const CourseBanner = ({ cardId }) => {
              {formatMessage(messages.findAnotherCourse)}
            </Hyperlink>
          </Banner>
-        )}
+        ))}
+
+      {courseRun.isActive && !canUpgrade && (
+        <Banner>
+          {formatMessage(messages.upgradeDeadlinePassed)}
+          {'  '}
+          <Hyperlink isInline destination={courseRun.marketingUrl || ''}>
+            {formatMessage(messages.exploreCourseDetails)}
+          </Hyperlink>
+        </Banner>
+      )}

      {(!isStaff && isTooEarly && courseRun.startDate) && (
        <Banner>
@@ -42,7 +59,6 @@ export const CourseBanner = ({ cardId }) => {
          })}
        </Banner>
      )}
-
      {(!isStaff && hasUnmetPrerequisites) && (
        <Banner>{formatMessage(messages.prerequisitesNotMet)}</Banner>
      )}
--- a/src/containers/CourseCard/components/CourseCardBanners/CourseBanner.test.jsx
+++ b/src/containers/CourseCard/components/CourseCardBanners/CourseBanner.test.jsx
@@ -25,6 +25,7 @@ let el;

 const enrollmentData = {
  isVerified: false,
+  canUpgrade: false,
  isAuditAccessExpired: false,
  coursewareAccess: {
    hasUnmetPrerequisites: false,
@@ -64,18 +65,51 @@ describe('CourseBanner', () => {
    render({ enrollment: { isVerified: true } });
    expect(el.isEmptyRender()).toEqual(true);
  });
-  describe('audit access expired', () => {
+  describe('audit access expired, can upgrade', () => {
+    beforeEach(() => {
+      render({ enrollment: { isAuditAccessExpired: true, canUpgrade: true } });
+    });
+    test('snapshot: (auditAccessExpired, upgradeToAccess)', () => {
+      expect(el.snapshot).toMatchSnapshot();
+    });
+    test('messages: (auditAccessExpired, upgradeToAccess)', () => {
+      expect(el.instance.children[0].children[0].el).toContain(messages.auditAccessExpired.defaultMessage);
+      expect(el.instance.children[0].children[2].el).toContain(messages.upgradeToAccess.defaultMessage);
+    });
+  });
+  describe('audit access expired, cannot upgrade', () => {
    beforeEach(() => {
      render({ enrollment: { isAuditAccessExpired: true } });
    });
    test('snapshot: (auditAccessExpired, findAnotherCourse hyperlink)', () => {
      expect(el.snapshot).toMatchSnapshot();
    });
-    test('messages: auditAccessExpired', () => {
+    test('messages: (auditAccessExpired, upgradeToAccess)', () => {
      expect(el.instance.children[0].children[0].el).toContain(messages.auditAccessExpired.defaultMessage);
      expect(el.instance.findByType(Hyperlink)[0].children[0].el).toEqual(messages.findAnotherCourse.defaultMessage);
    });
  });
+  describe('course run active and cannot upgrade', () => {
+    beforeEach(() => {
+      render({ courseRun: { isActive: true } });
+    });
+    test('snapshot: (upgradseDeadlinePassed, exploreCourseDetails hyperlink)', () => {
+      expect(el.snapshot).toMatchSnapshot();
+    });
+    test('messages: (upgradseDeadlinePassed, exploreCourseDetails hyperlink)', () => {
+      expect(el.instance.children[0].children[0].el).toContain(messages.upgradeDeadlinePassed.defaultMessage);
+      const link = el.instance.findByType(Hyperlink);
+      expect(link[0].children[0].el).toEqual(messages.exploreCourseDetails.defaultMessage);
+      expect(link[0].props.destination).toEqual(courseRunData.marketingUrl);
+    });
+  });
+  test('no display if audit access not expired and (course is not active or can upgrade)', () => {
+    render();
+    // isEmptyRender() isn't true because the minimal is <Fragment />
+    expect(el.instance.children).toEqual([]);
+    render({ enrollment: { canUpgrade: true }, courseRun: { isActive: true } });
+    expect(el.instance.children).toEqual([]);
+  });
  describe('unmet prerequisites', () => {
    beforeEach(() => {
      render({ enrollment: { coursewareAccess: { hasUnmetPrerequisites: true } } });
--- a/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/snapshots/index.test.jsx.snap
+++ b/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/snapshots/index.test.jsx.snap
@@ -10,14 +10,14 @@ exports[`CreditBanner component render with error state snapshot 1`] = `
  >
    <format-message-function
      message={
-        {
+        Object {
          "defaultMessage": "An error occurred with this transaction.  For help, contact {supportEmailLink}.",
          "description": "",
          "id": "learner-dash.courseCard.banners.credit.error",
        }
      }
      values={
-        {
+        Object {
          "supportEmailLink": <MailtoLink
            to="test-support-email"
          >
--- a/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/views/components/snapshots/CreditContent.test.jsx.snap
+++ b/src/containers/CourseCard/components/CourseCardBanners/CreditBanner/views/components/snapshots/CreditContent.test.jsx.snap
@@ -27,8 +27,8 @@ exports[`CreditContent component render with action snapshot 1`] = `
  </ActionRow>
  <CreditRequestForm
    requestData={
-      {
-        "parameters": {
+      Object {
+        "parameters": Object {
          "key1": "val1",
        },
        "url": "test-request-data-url",
@@ -48,8 +48,8 @@ exports[`CreditContent component render without action snapshot 1`] = `
  </div>
  <CreditRequestForm
    requestData={
-      {
-        "parameters": {
+      Object {
+        "parameters": Object {
          "key1": "val1",
        },
        "url": "test-request-data-url",
--- a/src/containers/CourseCard/components/CourseCardBanners/RelatedProgramsBanner/snapshots/index.test.jsx.snap
+++ b/src/containers/CourseCard/components/CourseCardBanners/RelatedProgramsBanner/snapshots/index.test.jsx.snap
@@ -13,12 +13,12 @@ exports[`RelatedProgramsBanner render with programs 1`] = `
  </span>
  <ProgramsList
    programs={
-      [
-        {
+      Array [
+        Object {
          "title": "Program 1",
          "url": "http://example.com/program1",
        },
-        {
+        Object {
          "title": "Program 2",
          "url": "http://example.com/program2",
        },
--- a/src/containers/CourseCard/components/CourseCardBanners/snapshots/CertificateBanner.test.jsx.snap
+++ b/src/containers/CourseCard/components/CourseCardBanners/snapshots/CertificateBanner.test.jsx.snap
@@ -43,14 +43,14 @@ exports[`CertificateBanner snapshot is restricted and verified with billing emai
    
  <format-message-function
    message={
-      {
+      Object {
        "defaultMessage": "If you would like a refund on your Certificate of Achievement, please contact our billing address {billingEmail}",
        "description": "Message to learners to contact billing for certificate refunds",
        "id": "learner-dash.courseCard.banners.certificateRefundContactBilling",
      }
    }
    values={
-      {
+      Object {
        "billingEmail": <MailtoLink
          to="billing@email"
        >
@@ -68,14 +68,14 @@ exports[`CertificateBanner snapshot is restricted and verified with support and
 >
  <format-message-function
    message={
-      {
+      Object {
        "defaultMessage": "Your Certificate of Achievement is being held pending confirmation that the issuance of your Certificate is in compliance with strict U.S. embargoes on Iran, Cuba, Syria, and Sudan.  If you think our system has mistakenly identified you as being connected with one of those countries, please let us know by contacting {supportEmail}.",
        "description": "Restricted certificate warning message",
        "id": "learner-dash.courseCard.banners.certificateRestricted",
      }
    }
    values={
-      {
+      Object {
        "supportEmail": <MailtoLink
          to="suport@email"
        >
@@ -87,14 +87,14 @@ exports[`CertificateBanner snapshot is restricted and verified with support and
    
  <format-message-function
    message={
-      {
+      Object {
        "defaultMessage": "If you would like a refund on your Certificate of Achievement, please contact our billing address {billingEmail}",
        "description": "Message to learners to contact billing for certificate refunds",
        "id": "learner-dash.courseCard.banners.certificateRefundContactBilling",
      }
    }
    values={
-      {
+      Object {
        "billingEmail": <MailtoLink
          to="billing@email"
        >
@@ -112,14 +112,14 @@ exports[`CertificateBanner snapshot is restricted and verified with support emai
 >
  <format-message-function
    message={
-      {
+      Object {
        "defaultMessage": "Your Certificate of Achievement is being held pending confirmation that the issuance of your Certificate is in compliance with strict U.S. embargoes on Iran, Cuba, Syria, and Sudan.  If you think our system has mistakenly identified you as being connected with one of those countries, please let us know by contacting {supportEmail}.",
        "description": "Restricted certificate warning message",
        "id": "learner-dash.courseCard.banners.certificateRestricted",
      }
    }
    values={
-      {
+      Object {
        "supportEmail": <MailtoLink
          to="suport@email"
        >
@@ -147,14 +147,14 @@ exports[`CertificateBanner snapshot is restricted with support email 1`] = `
 >
  <format-message-function
    message={
-      {
+      Object {
        "defaultMessage": "Your Certificate of Achievement is being held pending confirmation that the issuance of your Certificate is in compliance with strict U.S. embargoes on Iran, Cuba, Syria, and Sudan.  If you think our system has mistakenly identified you as being connected with one of those countries, please let us know by contacting {supportEmail}.",
        "description": "Restricted certificate warning message",
        "id": "learner-dash.courseCard.banners.certificateRestricted",
      }
    }
    values={
-      {
+      Object {
        "supportEmail": <MailtoLink
          to="suport@email"
        >
--- a/src/containers/CourseCard/components/CourseCardBanners/snapshots/CourseBanner.test.jsx.snap
+++ b/src/containers/CourseCard/components/CourseCardBanners/snapshots/CourseBanner.test.jsx.snap
@@ -1,6 +1,16 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`CourseBanner audit access expired snapshot: (auditAccessExpired, findAnotherCourse hyperlink) 1`] = `
+exports[`CourseBanner audit access expired, can upgrade snapshot: (auditAccessExpired, upgradeToAccess) 1`] = `
+<Fragment>
+  <Banner>
+    Your audit access to this course has expired.
+      
+    Upgrade now to access your course again.
+  </Banner>
+</Fragment>
+`;
+
+exports[`CourseBanner audit access expired, cannot upgrade snapshot: (auditAccessExpired, findAnotherCourse hyperlink) 1`] = `
 <Fragment>
  <Banner>
    Your audit access to this course has expired.
@@ -15,6 +25,21 @@ exports[`CourseBanner audit access expired snapshot: (auditAccessExpired, findAn
 </Fragment>
 `;

+exports[`CourseBanner course run active and cannot upgrade snapshot: (upgradseDeadlinePassed, exploreCourseDetails hyperlink) 1`] = `
+<Fragment>
+  <Banner>
+    Your upgrade deadline for this course has passed.  To upgrade, enroll in a session that is farther in the future.
+      
+    <Hyperlink
+      destination="marketing-url"
+      isInline={true}
+    >
+      Explore course details.
+    </Hyperlink>
+  </Banner>
+</Fragment>
+`;
+
 exports[`CourseBanner snapshot: stacking banners 1`] = `<Fragment />`;

 exports[`CourseBanner staff snapshot: isStaff 1`] = `<Fragment />`;
--- a/src/containers/CourseCard/components/CourseCardBanners/snapshots/EntitlementBanner.test.jsx.snap
+++ b/src/containers/CourseCard/components/CourseCardBanners/snapshots/EntitlementBanner.test.jsx.snap
@@ -4,14 +4,14 @@ exports[`EntitlementBanner snapshot: expiration warning 1`] = `
 <Banner>
  <format-message-function
    message={
-      {
+      Object {
        "defaultMessage": "You must {selectSessionButton} by {changeDeadline} to access the course.",
        "description": "Entitlement course message when the entitlement is expiring soon.",
        "id": "learner-dash.courseCard.banners.entitlementExpiringSoon",
      }
    }
    values={
-      {
+      Object {
        "changeDeadline": "11/11/2022",
        "selectSessionButton": <Button
          className="m-0 p-0"
@@ -33,14 +33,14 @@ exports[`EntitlementBanner snapshot: no sessions available 1`] = `
 >
  <format-message-function
    message={
-      {
+      Object {
        "defaultMessage": "There are no sessions available at the moment.  The course team will create new sessions soon.  If no sessions appear, please contact {emailLink} for information.",
        "description": "Entitlement course message when no sessions are available",
        "id": "learner-dash.courseCard.banners.entitlementUnavailable",
      }
    }
    values={
-      {
+      Object {
        "emailLink": <MailtoLink
          to="test-support-email"
        >
--- a/src/containers/CourseCard/components/CourseCardBanners/snapshots/index.test.jsx.snap
+++ b/src/containers/CourseCard/components/CourseCardBanners/snapshots/index.test.jsx.snap
@@ -8,7 +8,7 @@ exports[`CourseCardBanners render with isEnrolled false 1`] = `
  <RelatedProgramsBanner
    cardId="test-card-id"
  />
-  <CourseBannerSlot
+  <CourseBanner
    cardId="test-card-id"
  />
  <EntitlementBanner
@@ -25,7 +25,7 @@ exports[`CourseCardBanners renders default CourseCardBanners 1`] = `
  <RelatedProgramsBanner
    cardId="test-card-id"
  />
-  <CourseBannerSlot
+  <CourseBanner
    cardId="test-card-id"
  />
  <EntitlementBanner
--- a/src/containers/CourseCard/components/CourseCardBanners/index.jsx
+++ b/src/containers/CourseCard/components/CourseCardBanners/index.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';

 import { reduxHooks } from 'hooks';

-import CourseBannerSlot from 'plugin-slots/CourseBannerSlot';
+import CourseBanner from './CourseBanner';
 import CertificateBanner from './CertificateBanner';
 import CreditBanner from './CreditBanner';
 import EntitlementBanner from './EntitlementBanner';
@@ -14,7 +14,7 @@ export const CourseCardBanners = ({ cardId }) => {
  return (
    <div className="course-card-banners" data-testid="CourseCardBanners">
      <RelatedProgramsBanner cardId={cardId} />
-      <CourseBannerSlot cardId={cardId} />
+      <CourseBanner cardId={cardId} />
      <EntitlementBanner cardId={cardId} />
      {isEnrolled && <CertificateBanner cardId={cardId} />}
      {isEnrolled && <CreditBanner cardId={cardId} />}
--- a/src/containers/CourseCard/components/CourseCardBanners/messages.js
+++ b/src/containers/CourseCard/components/CourseCardBanners/messages.js
@@ -6,11 +6,26 @@ const messages = defineMessages({
    description: 'Audit access expiration banner message',
    defaultMessage: 'Your audit access to this course has expired.',
  },
+  upgradeToAccess: {
+    id: 'learner-dash.courseCard.banners.upgradeToAccess',
+    description: 'Upgrade prompt for audit-expired learners that can still upgrade',
+    defaultMessage: 'Upgrade now to access your course again.',
+  },
  findAnotherCourse: {
    id: 'learner-dash.courseCard.banners.findAnotherCourse',
    description: 'Action prompt taking learners to course exploration',
    defaultMessage: 'Find another course',
  },
+  upgradeDeadlinePassed: {
+    id: 'learner-dash.courseCard.banners.upgradeDeadlinePassed',
+    description: 'Audit upgrade deadline passed banner message',
+    defaultMessage: 'Your upgrade deadline for this course has passed.  To upgrade, enroll in a session that is farther in the future.',
+  },
+  exploreCourseDetails: {
+    id: 'learner-dash.courseCard.banners.exploreCourseDetails',
+    description: 'Action prompt taking learners to course details page',
+    defaultMessage: 'Explore course details.',
+  },
  certRestricted: {
    id: 'learner-dash.courseCard.banners.certificateRestricted',
    description: 'Restricted certificate warning message',
--- a/src/containers/CourseCard/components/CourseCardImage.jsx
+++ b/src/containers/CourseCard/components/CourseCardImage.jsx
@@ -20,13 +20,11 @@ export const CourseCardImage = ({ cardId, orientation }) => {
  const { isVerified } = reduxHooks.useCardEnrollmentData(cardId);
  const { disableCourseTitle } = useActionDisabledState(cardId);
  const handleImageClicked = reduxHooks.useTrackCourseEvent(courseImageClicked, cardId, homeUrl);
-  const wrapperClassName = `pgn__card-wrapper-image-cap d-inline-block overflow-visible ${orientation}`;
+  const wrapperClassName = `pgn__card-wrapper-image-cap overflow-visible ${orientation}`;
  const image = (
    <>
      <img
-        // w-100 is necessary for images on Safari, otherwise stretches full height of the image
-        // https://stackoverflow.com/a/44250830
-        className="pgn__card-image-cap w-100 show"
+        className="pgn__card-image-cap show"
        src={bannerImgSrc}
        alt={formatMessage(messages.bannerAlt)}
      />
--- a/src/containers/CourseCard/components/CourseCardImage.test.jsx
+++ b/src/containers/CourseCard/components/CourseCardImage.test.jsx
@@ -18,8 +18,8 @@ jest.mock('hooks', () => ({
    useCardCourseData: jest.fn(() => ({ bannerImgSrc: 'banner-img-src' })),
    useCardCourseRunData: jest.fn(() => ({ homeUrl })),
    useCardEnrollmentData: jest.fn(() => ({ isVerified: true })),
-    useTrackCourseEvent: jest.fn((eventName, cardId, url) => ({
-      trackCourseEvent: { eventName, cardId, url },
+    useTrackCourseEvent: jest.fn((eventName, cardId, upgradeUrl) => ({
+      trackCourseEvent: { eventName, cardId, upgradeUrl },
    })),
  },
 }));
--- a/src/containers/CourseCard/components/CourseCardMenu/snapshots/index.test.jsx.snap
+++ b/src/containers/CourseCard/components/CourseCardMenu/snapshots/index.test.jsx.snap
@@ -17,7 +17,7 @@ exports[`CourseCardMenu render show dropdown hide unenroll item and disable emai
      <SocialShareMenu
        cardId="test-card-id"
        emailSettings={
-          {
+          Object {
            "hide": [MockFunction emailSettingHide],
            "isVisible": false,
            "show": [MockFunction emailSettingShow],
@@ -58,7 +58,7 @@ exports[`CourseCardMenu render show dropdown show unenroll and enable email snap
      <SocialShareMenu
        cardId="test-card-id"
        emailSettings={
-          {
+          Object {
            "hide": [MockFunction emailSettingHide],
            "isVisible": false,
            "show": [MockFunction emailSettingShow],
--- a/src/containers/CourseCard/components/CourseCardTitle.test.jsx
+++ b/src/containers/CourseCard/components/CourseCardTitle.test.jsx
@@ -17,8 +17,8 @@ jest.mock('hooks', () => ({
  reduxHooks: {
    useCardCourseData: jest.fn(() => ({ courseName: 'course-name' })),
    useCardCourseRunData: jest.fn(() => ({ homeUrl })),
-    useTrackCourseEvent: jest.fn((eventName, cardId, url) => ({
-      trackCourseEvent: { eventName, cardId, url },
+    useTrackCourseEvent: jest.fn((eventName, cardId, upgradeUrl) => ({
+      trackCourseEvent: { eventName, cardId, upgradeUrl },
    })),
  },
 }));
--- a/src/containers/CourseCard/components/snapshots/CourseCardImage.test.jsx.snap
+++ b/src/containers/CourseCard/components/snapshots/CourseCardImage.test.jsx.snap
@@ -2,14 +2,14 @@

 exports[`CourseCardImage snapshot renders clickable link course Image 1`] = `
 <a
-  className="pgn__card-wrapper-image-cap d-inline-block overflow-visible orientation"
+  className="pgn__card-wrapper-image-cap overflow-visible orientation"
  href="home-url"
  onClick={
-    {
-      "trackCourseEvent": {
+    Object {
+      "trackCourseEvent": Object {
        "cardId": "cardId",
        "eventName": [MockFunction segment.courseImageClicked],
-        "url": "home-url",
+        "upgradeUrl": "home-url",
      },
    }
  }
@@ -18,7 +18,7 @@ exports[`CourseCardImage snapshot renders clickable link course Image 1`] = `
  <Fragment>
    <img
      alt="Course thumbnail"
-      className="pgn__card-image-cap w-100 show"
+      className="pgn__card-image-cap show"
      src="banner-img-src"
    />
    <span
@@ -43,12 +43,12 @@ exports[`CourseCardImage snapshot renders clickable link course Image 1`] = `

 exports[`CourseCardImage snapshot renders disabled link 1`] = `
 <div
-  className="pgn__card-wrapper-image-cap d-inline-block overflow-visible orientation"
+  className="pgn__card-wrapper-image-cap overflow-visible orientation"
 >
  <Fragment>
    <img
      alt="Course thumbnail"
-      className="pgn__card-image-cap w-100 show"
+      className="pgn__card-image-cap show"
      src="banner-img-src"
    />
    <span
--- a/src/containers/CourseCard/components/snapshots/CourseCardTitle.test.jsx.snap
+++ b/src/containers/CourseCard/components/snapshots/CourseCardTitle.test.jsx.snap
@@ -7,11 +7,11 @@ exports[`CourseCardTitle snapshot renders clickable link course title 1`] = `
    data-testid="CourseCardTitle"
    href="home-url"
    onClick={
-      {
-        "trackCourseEvent": {
+      Object {
+        "trackCourseEvent": Object {
          "cardId": "cardId",
          "eventName": [MockFunction segment.courseTitleClicked],
-          "url": "home-url",
+          "upgradeUrl": "home-url",
        },
      }
    }
--- a/src/containers/CourseCard/components/hooks.js
+++ b/src/containers/CourseCard/components/hooks.js
@@ -3,18 +3,19 @@ import { reduxHooks } from 'hooks';
 export const useActionDisabledState = (cardId) => {
  const { isMasquerading } = reduxHooks.useMasqueradeData();
  const {
-    hasAccess, isAudit, isAuditAccessExpired,
+    canUpgrade, hasAccess, isAudit, isAuditAccessExpired,
  } = reduxHooks.useCardEnrollmentData(cardId);
  const {
    isEntitlement, isFulfilled, canChange, hasSessions,
  } = reduxHooks.useCardEntitlementData(cardId);

-  const { resumeUrl, homeUrl } = reduxHooks.useCardCourseRunData(cardId);
+  const { resumeUrl, homeUrl, upgradeUrl } = reduxHooks.useCardCourseRunData(cardId);

  const disableBeginCourse = !homeUrl || (isMasquerading || !hasAccess || (isAudit && isAuditAccessExpired));
  const disableResumeCourse = !resumeUrl || (isMasquerading || !hasAccess || (isAudit && isAuditAccessExpired));
  const disableViewCourse = !hasAccess || (isAudit && isAuditAccessExpired);
  const disableSelectSession = !isEntitlement || isMasquerading || !hasAccess || (!canChange || !hasSessions);
+  const disableUpgradeCourse = !upgradeUrl || (isMasquerading && !canUpgrade);

  const disableCourseTitle = (isEntitlement && !isFulfilled) || disableViewCourse;

@@ -22,6 +23,7 @@ export const useActionDisabledState = (cardId) => {
    disableBeginCourse,
    disableResumeCourse,
    disableViewCourse,
+    disableUpgradeCourse,
    disableSelectSession,
    disableCourseTitle,
  };
--- a/src/containers/CourseCard/components/hooks.test.js
+++ b/src/containers/CourseCard/components/hooks.test.js
@@ -16,6 +16,7 @@ const cardId = 'my-test-course-number';
 describe('useActionDisabledState', () => {
  const defaultData = {
    isMasquerading: false,
+    canUpgrade: false,
    isEntitlement: false,
    isFulfilled: false,
    canChange: false,
@@ -25,10 +26,12 @@ describe('useActionDisabledState', () => {
    isAuditAccessExpired: false,
    resumeUrl: 'resume.url',
    homeUrl: 'home.url',
+    upgradeUrl: 'upgrade.url',
  };
  const mockHooksData = (args) => {
    const {
      isMasquerading,
+      canUpgrade,
      isEntitlement,
      isFulfilled,
      canChange,
@@ -38,9 +41,11 @@ describe('useActionDisabledState', () => {
      isAuditAccessExpired,
      resumeUrl,
      homeUrl,
+      upgradeUrl,
    } = { ...defaultData, ...args };
    reduxHooks.useMasqueradeData.mockReturnValueOnce({ isMasquerading });
    reduxHooks.useCardEnrollmentData.mockReturnValueOnce({
+      canUpgrade,
      hasAccess,
      isAudit,
      isAuditAccessExpired,
@@ -54,6 +59,7 @@ describe('useActionDisabledState', () => {
    reduxHooks.useCardCourseRunData.mockReturnValueOnce({
      resumeUrl,
      homeUrl,
+      upgradeUrl,
    });
  };

@@ -115,6 +121,21 @@ describe('useActionDisabledState', () => {
      testDisabled({ hasAccess: true }, false);
    });
  });
+  describe('disableUpgradeCourse', () => {
+    const testDisabled = (data, expected) => {
+      mockHooksData(data);
+      expect(runHook().disableUpgradeCourse).toBe(expected);
+    };
+    it('disable when upgradeUrl is invalid', () => {
+      testDisabled({ upgradeUrl: null }, true);
+    });
+    it('disable when isMasquerading is true and canUpgrade is false', () => {
+      testDisabled({ isMasquerading: true, canUpgrade: false }, true);
+    });
+    it('enable when all conditions are met', () => {
+      testDisabled({ canUpgrade: true }, false);
+    });
+  });
  describe('disableSelectSession', () => {
    const testDisabled = (data, expected) => {
      mockHooksData(data);
--- a/src/containers/CourseFilterControls/snapshots/CourseFilterControls.test.jsx.snap
+++ b/src/containers/CourseFilterControls/snapshots/CourseFilterControls.test.jsx.snap
@@ -28,7 +28,7 @@ exports[`CourseFilterControls is not mobile snapshot 1`] = `
        >
          <FilterForm
            filters={
-              [
+              Array [
                "test-filter",
              ]
            }
@@ -84,7 +84,7 @@ exports[`CourseFilterControls mobile snapshot 1`] = `
      >
        <FilterForm
          filters={
-            [
+            Array [
              "test-filter",
            ]
          }
@@ -144,7 +144,7 @@ exports[`CourseFilterControls no courses snapshot 1`] = `
        >
          <FilterForm
            filters={
-              [
+              Array [
                "test-filter",
              ]
            }
--- a/src/containers/CourseFilterControls/components/snapshots/FilterForm.test.jsx.snap
+++ b/src/containers/CourseFilterControls/components/snapshots/FilterForm.test.jsx.snap
@@ -11,7 +11,7 @@ exports[`FilterForm snapshot renders 1`] = `
    name="course-status-filters"
    onChange={[MockFunction handleFilterChange]}
    value={
-      [
+      Array [
        "test-filter",
      ]
    }
--- a/src/containers/CoursesPanel/CourseList/index.jsx
+++ b/src/containers/CoursesPanel/CourseList/index.jsx
@@ -9,10 +9,9 @@ import CourseCard from 'containers/CourseCard';

 import { useIsCollapsed } from './hooks';

-export const CourseList = ({ courseListData }) => {
-  const {
-    filterOptions, setPageNumber, numPages, showFilters, visibleList,
-  } = courseListData;
+export const CourseList = ({
+  filterOptions, setPageNumber, numPages, showFilters, visibleList,
+}) => {
  const isCollapsed = useIsCollapsed();
  return (
    <>
@@ -39,16 +38,14 @@ export const CourseList = ({ courseListData }) => {
  );
 };

-export const courseListDataShape = PropTypes.shape({
+CourseList.propTypes = {
  showFilters: PropTypes.bool.isRequired,
-  visibleList: PropTypes.arrayOf(PropTypes.shape()).isRequired,
-  filterOptions: PropTypes.shape().isRequired,
+  // eslint-disable-next-line react/forbid-prop-types
+  visibleList: PropTypes.arrayOf(PropTypes.object).isRequired,
+  // eslint-disable-next-line react/forbid-prop-types
+  filterOptions: PropTypes.object.isRequired,
  numPages: PropTypes.number.isRequired,
  setPageNumber: PropTypes.func.isRequired,
-});
-
-CourseList.propTypes = {
-  courseListData: courseListDataShape,
 };

 export default CourseList;
--- a/src/containers/CoursesPanel/CourseList/index.test.jsx
+++ b/src/containers/CoursesPanel/CourseList/index.test.jsx
@@ -23,7 +23,7 @@ describe('CourseList', () => {
  useIsCollapsed.mockReturnValue(false);

  const createWrapper = (courseListData = defaultCourseListData) => (
-    shallow(<CourseList courseListData={courseListData} />)
+    shallow(<CourseList {...courseListData} />)
  );

  describe('no courses or filters', () => {
--- a/src/containers/CoursesPanel/snapshots/index.test.jsx.snap
+++ b/src/containers/CoursesPanel/snapshots/index.test.jsx.snap
@@ -18,7 +18,11 @@ exports[`CoursesPanel no courses snapshot 1`] = `
      <CourseFilterControls />
    </div>
  </div>
-  <NoCoursesViewSlot />
+  <PluginSlot
+    id="no_courses_view"
+  >
+    <NoCoursesView />
+  </PluginSlot>
 </div>
 `;

@@ -40,16 +44,16 @@ exports[`CoursesPanel with courses snapshot 1`] = `
      <CourseFilterControls />
    </div>
  </div>
-  <CourseListSlot
-    courseListData={
-      {
-        "filterOptions": {},
-        "numPages": 1,
-        "setPageNumber": [MockFunction setPageNumber],
-        "showFilters": false,
-        "visibleList": [],
-      }
-    }
-  />
+  <PluginSlot
+    id="course_list"
+  >
+    <CourseList
+      filterOptions={Object {}}
+      numPages={1}
+      setPageNumber={[MockFunction setPageNumber]}
+      showFilters={false}
+      visibleList={Array []}
+    />
+  </PluginSlot>
 </div>
 `;
--- a/src/containers/CoursesPanel/index.jsx
+++ b/src/containers/CoursesPanel/index.jsx
@@ -1,13 +1,15 @@
 import React from 'react';

+import { PluginSlot } from '@openedx/frontend-plugin-framework';
 import { useIntl } from '@edx/frontend-platform/i18n';

 import { reduxHooks } from 'hooks';
 import {
  CourseFilterControls,
 } from 'containers/CourseFilterControls';
-import CourseListSlot from 'plugin-slots/CourseListSlot';
-import NoCoursesViewSlot from 'plugin-slots/NoCoursesViewSlot';
+import NoCoursesView from './NoCoursesView';
+
+import CourseList from './CourseList';

 import { useCourseListData } from './hooks';

@@ -32,7 +34,19 @@ export const CoursesPanel = () => {
          <CourseFilterControls {...courseListData.filterOptions} />
        </div>
      </div>
-      {hasCourses ? <CourseListSlot courseListData={courseListData} /> : <NoCoursesViewSlot />}
+      {hasCourses ? (
+        <PluginSlot
+          id="course_list"
+        >
+          <CourseList {...courseListData} />
+        </PluginSlot>
+      ) : (
+        <PluginSlot
+          id="no_courses_view"
+        >
+          <NoCoursesView />
+        </PluginSlot>
+      )}
    </div>
  );
 };
--- a/src/containers/Dashboard/DashboardLayout.jsx
+++ b/src/containers/Dashboard/DashboardLayout.jsx
@@ -3,8 +3,7 @@ import PropTypes from 'prop-types';

 import { Container, Col, Row } from '@openedx/paragon';

-import WidgetSidebarSlot from 'plugin-slots/WidgetSidebarSlot';
-
+import WidgetFooter from 'containers/WidgetContainers/WidgetFooter';
 import hooks from './hooks';

 export const columnConfig = {
@@ -24,10 +23,11 @@ export const columnConfig = {
  },
 };

-export const DashboardLayout = ({ children }) => {
+export const DashboardLayout = ({ children, sidebar: Sidebar }) => {
  const {
    isCollapsed,
    sidebarShowing,
+    setSidebarShowing,
  } = hooks.useDashboardLayoutData();

  const courseListColumnProps = sidebarShowing
@@ -42,7 +42,12 @@ export const DashboardLayout = ({ children }) => {
        </Col>
        <Col {...columnConfig.sidebar} className="sidebar-column">
          {!isCollapsed && (<h2 className="course-list-title">&nbsp;</h2>)}
-          <WidgetSidebarSlot />
+          <Sidebar setSidebarShowing={setSidebarShowing} />
+        </Col>
+      </Row>
+      <Row>
+        <Col>
+          <WidgetFooter />
        </Col>
      </Row>
    </Container>
@@ -50,6 +55,7 @@ export const DashboardLayout = ({ children }) => {
 };
 DashboardLayout.propTypes = {
  children: PropTypes.node.isRequired,
+  sidebar: PropTypes.func.isRequired,
 };

 export default DashboardLayout;
--- a/src/containers/Dashboard/DashboardLayout.test.jsx
+++ b/src/containers/Dashboard/DashboardLayout.test.jsx
@@ -16,13 +16,17 @@ const hookProps = {
 };
 hooks.useDashboardLayoutData.mockReturnValue(hookProps);

+const props = {
+  sidebar: jest.fn(() => 'test-sidebar-content'),
+};
+
 const children = 'test-children';

 let el;
 describe('DashboardLayout', () => {
  beforeEach(() => {
    jest.clearAllMocks();
-    el = shallow(<DashboardLayout>{children}</DashboardLayout>);
+    el = shallow(<DashboardLayout {...props}>{children}</DashboardLayout>);
  });

  const testColumns = () => {
@@ -36,13 +40,17 @@ describe('DashboardLayout', () => {
      const columns = el.instance.findByType(Row)[0].findByType(Col);
      expect(columns[0].children).not.toHaveLength(0);
    });
-    it('displays WidgetSidebarSlot in second column', () => {
+    it('displays sidebar prop in second column', () => {
      const columns = el.instance.findByType(Row)[0].findByType(Col);
-      expect(columns[1].findByType('WidgetSidebarSlot')).toHaveLength(1);
+      expect(columns[1].findByType(props.sidebar)).toHaveLength(1);
+    });
+    it('displays a footer in the second row', () => {
+      const columns = el.instance.findByType(Row)[1].findByType(Col);
+      expect(columns[0].children[0].type).toEqual('WidgetFooter');
    });
  };
  const testSidebarLayout = () => {
-    it('displays withSidebar width for course list column', () => {
+    it('displays widthSidebar width for course list column', () => {
      const columns = el.instance.findByType(Row)[0].findByType(Col);
      Object.keys(columnConfig.courseList.withSidebar).forEach(size => {
        expect(columns[0].props[size]).toEqual(columnConfig.courseList.withSidebar[size]);
--- a/src/containers/Dashboard/snapshots/DashboardLayout.test.jsx.snap
+++ b/src/containers/Dashboard/snapshots/DashboardLayout.test.jsx.snap
@@ -9,13 +9,13 @@ exports[`DashboardLayout collapsed sidebar not showing snapshot 1`] = `
    <Col
      className="course-list-column"
      lg={
-        {
+        Object {
          "offset": 0,
          "span": 12,
        }
      }
      xl={
-        {
+        Object {
          "offset": 0,
          "span": 12,
        }
@@ -26,19 +26,26 @@ exports[`DashboardLayout collapsed sidebar not showing snapshot 1`] = `
    <Col
      className="sidebar-column"
      lg={
-        {
+        Object {
          "offset": 0,
          "span": 12,
        }
      }
      xl={
-        {
+        Object {
          "offset": 0,
          "span": 4,
        }
      }
    >
-      <WidgetSidebarSlot />
+      <mockConstructor
+        setSidebarShowing={[MockFunction hooks.setSidebarShowing]}
+      />
+    </Col>
+  </Row>
+  <Row>
+    <Col>
+      <WidgetFooter />
    </Col>
  </Row>
 </Container>
@@ -53,13 +60,13 @@ exports[`DashboardLayout collapsed sidebar showing snapshot 1`] = `
    <Col
      className="course-list-column"
      lg={
-        {
+        Object {
          "offset": 0,
          "span": 12,
        }
      }
      xl={
-        {
+        Object {
          "offset": 0,
          "span": 8,
        }
@@ -70,19 +77,26 @@ exports[`DashboardLayout collapsed sidebar showing snapshot 1`] = `
    <Col
      className="sidebar-column"
      lg={
-        {
+        Object {
          "offset": 0,
          "span": 12,
        }
      }
      xl={
-        {
+        Object {
          "offset": 0,
          "span": 4,
        }
      }
    >
-      <WidgetSidebarSlot />
+      <mockConstructor
+        setSidebarShowing={[MockFunction hooks.setSidebarShowing]}
+      />
+    </Col>
+  </Row>
+  <Row>
+    <Col>
+      <WidgetFooter />
    </Col>
  </Row>
 </Container>
@@ -97,13 +111,13 @@ exports[`DashboardLayout not collapsed sidebar not showing snapshot 1`] = `
    <Col
      className="course-list-column"
      lg={
-        {
+        Object {
          "offset": 0,
          "span": 12,
        }
      }
      xl={
-        {
+        Object {
          "offset": 0,
          "span": 12,
        }
@@ -114,13 +128,13 @@ exports[`DashboardLayout not collapsed sidebar not showing snapshot 1`] = `
    <Col
      className="sidebar-column"
      lg={
-        {
+        Object {
          "offset": 0,
          "span": 12,
        }
      }
      xl={
-        {
+        Object {
          "offset": 0,
          "span": 4,
        }
@@ -131,7 +145,14 @@ exports[`DashboardLayout not collapsed sidebar not showing snapshot 1`] = `
      >
         
      </h2>
-      <WidgetSidebarSlot />
+      <mockConstructor
+        setSidebarShowing={[MockFunction hooks.setSidebarShowing]}
+      />
+    </Col>
+  </Row>
+  <Row>
+    <Col>
+      <WidgetFooter />
    </Col>
  </Row>
 </Container>
@@ -146,13 +167,13 @@ exports[`DashboardLayout not collapsed sidebar showing snapshot 1`] = `
    <Col
      className="course-list-column"
      lg={
-        {
+        Object {
          "offset": 0,
          "span": 12,
        }
      }
      xl={
-        {
+        Object {
          "offset": 0,
          "span": 8,
        }
@@ -163,13 +184,13 @@ exports[`DashboardLayout not collapsed sidebar showing snapshot 1`] = `
    <Col
      className="sidebar-column"
      lg={
-        {
+        Object {
          "offset": 0,
          "span": 12,
        }
      }
      xl={
-        {
+        Object {
          "offset": 0,
          "span": 4,
        }
@@ -180,7 +201,14 @@ exports[`DashboardLayout not collapsed sidebar showing snapshot 1`] = `
      >
         
      </h2>
-      <WidgetSidebarSlot />
+      <mockConstructor
+        setSidebarShowing={[MockFunction hooks.setSidebarShowing]}
+      />
+    </Col>
+  </Row>
+  <Row>
+    <Col>
+      <WidgetFooter />
    </Col>
  </Row>
 </Container>
--- a/src/containers/Dashboard/snapshots/index.test.jsx.snap
+++ b/src/containers/Dashboard/snapshots/index.test.jsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`Dashboard snapshots courses loaded, show select session modal snapshot 1`] = `
+exports[`Dashboard snapshots courses loaded, show select session modal, no available dashboards snapshot 1`] = `
 <div
  className="d-flex flex-column p-2 pt-0"
  id="dashboard-container"
@@ -11,14 +11,15 @@ exports[`Dashboard snapshots courses loaded, show select session modal snapshot
    test-page-title
  </h1>
  <Fragment>
-    <DashboardModalSlot />
    <SelectSessionModal />
  </Fragment>
  <div
    data-testid="dashboard-content"
    id="dashboard-content"
  >
-    <DashboardLayout>
+    <DashboardLayout
+      sidebar="LoadedWidgetSidebar"
+    >
      <CoursesPanel />
    </DashboardLayout>
  </div>
@@ -44,7 +45,7 @@ exports[`Dashboard snapshots courses still loading snapshot 1`] = `
 </div>
 `;

-exports[`Dashboard snapshots there are no courses snapshot 1`] = `
+exports[`Dashboard snapshots there are no courses, there ARE available dashboards snapshot 1`] = `
 <div
  className="d-flex flex-column p-2 pt-0"
  id="dashboard-container"
@@ -55,13 +56,15 @@ exports[`Dashboard snapshots there are no courses snapshot 1`] = `
    test-page-title
  </h1>
  <Fragment>
-    <DashboardModalSlot />
+    <EnterpriseDashboardModal />
  </Fragment>
  <div
    data-testid="dashboard-content"
    id="dashboard-content"
  >
-    <DashboardLayout>
+    <DashboardLayout
+      sidebar="NoCoursesWidgetSidebar"
+    >
      <CoursesPanel />
    </DashboardLayout>
  </div>
--- a/src/containers/Dashboard/hooks.js
+++ b/src/containers/Dashboard/hooks.js
@@ -26,8 +26,7 @@ export const useDashboardMessages = () => {

 export const useDashboardLayoutData = () => {
  const { width } = useWindowSize();
-
-  const [sidebarShowing, setSidebarShowing] = module.state.sidebarShowing(true);
+  const [sidebarShowing, setSidebarShowing] = module.state.sidebarShowing(false);
  return {
    isDashboardCollapsed: width < breakpoints.large.maxWidth,
    sidebarShowing,
--- a/src/containers/Dashboard/hooks.test.js
+++ b/src/containers/Dashboard/hooks.test.js
@@ -40,9 +40,9 @@ describe('CourseCard hooks', () => {
  describe('useDashboardLayoutData', () => {
    beforeEach(() => { state.mock(); });
    describe('behavior', () => {
-      it('initializes sidebarShowing to default true value', () => {
+      it('initializes sidebarShowing to default false value', () => {
        hooks.useDashboardLayoutData();
-        state.expectInitializedWith(state.keys.sidebarShowing, true);
+        state.expectInitializedWith(state.keys.sidebarShowing, false);
      });
    });
    describe('output', () => {
--- a/src/containers/Dashboard/index.jsx
+++ b/src/containers/Dashboard/index.jsx
@@ -2,9 +2,12 @@ import React from 'react';

 import { reduxHooks } from 'hooks';
 import { RequestKeys } from 'data/constants/requests';
+import EnterpriseDashboardModal from 'containers/EnterpriseDashboardModal';
 import SelectSessionModal from 'containers/SelectSessionModal';
 import CoursesPanel from 'containers/CoursesPanel';
-import DashboardModalSlot from 'plugin-slots/DashboardModalSlot';
+
+import LoadedSidebar from 'containers/WidgetContainers/LoadedSidebar';
+import NoCoursesSidebar from 'containers/WidgetContainers/NoCoursesSidebar';

 import LoadingView from './LoadingView';
 import DashboardLayout from './DashboardLayout';
@@ -15,6 +18,7 @@ export const Dashboard = () => {
  hooks.useInitializeDashboard();
  const { pageTitle } = hooks.useDashboardMessages();
  const hasCourses = reduxHooks.useHasCourses();
+  const hasAvailableDashboards = reduxHooks.useHasAvailableDashboards();
  const initIsPending = reduxHooks.useRequestIsPending(RequestKeys.initialize);
  const showSelectSessionModal = reduxHooks.useShowSelectSessionModal();

@@ -23,7 +27,7 @@ export const Dashboard = () => {
      <h1 className="sr-only">{pageTitle}</h1>
      {!initIsPending && (
        <>
-          <DashboardModalSlot />
+          {hasAvailableDashboards && <EnterpriseDashboardModal />}
          {(hasCourses && showSelectSessionModal) && <SelectSessionModal />}
        </>
      )}
@@ -31,7 +35,7 @@ export const Dashboard = () => {
        {initIsPending
          ? (<LoadingView />)
          : (
-            <DashboardLayout>
+            <DashboardLayout sidebar={hasCourses ? LoadedSidebar : NoCoursesSidebar}>
              <CoursesPanel />
            </DashboardLayout>
          )}
--- a/src/containers/Dashboard/index.test.jsx
+++ b/src/containers/Dashboard/index.test.jsx
@@ -2,9 +2,13 @@ import { shallow } from '@edx/react-unit-test-utils';

 import { reduxHooks } from 'hooks';

+import EnterpriseDashboardModal from 'containers/EnterpriseDashboardModal';
 import SelectSessionModal from 'containers/SelectSessionModal';
 import CoursesPanel from 'containers/CoursesPanel';

+import LoadedWidgetSidebar from 'containers/WidgetContainers/LoadedSidebar';
+import NoCoursesWidgetSidebar from 'containers/WidgetContainers/NoCoursesSidebar';
+
 import DashboardLayout from './DashboardLayout';
 import LoadingView from './LoadingView';
 import hooks from './hooks';
@@ -13,13 +17,16 @@ import Dashboard from '.';
 jest.mock('hooks', () => ({
  reduxHooks: {
    useHasCourses: jest.fn(),
+    useHasAvailableDashboards: jest.fn(),
    useShowSelectSessionModal: jest.fn(),
    useRequestIsPending: jest.fn(),
  },
 }));

-jest.mock('plugin-slots/DashboardModalSlot', () => 'DashboardModalSlot');
+jest.mock('containers/EnterpriseDashboardModal', () => 'EnterpriseDashboardModal');
 jest.mock('containers/CoursesPanel', () => 'CoursesPanel');
+jest.mock('containers/WidgetContainers/LoadedSidebar', () => 'LoadedWidgetSidebar');
+jest.mock('containers/WidgetContainers/NoCoursesSidebar', () => 'NoCoursesWidgetSidebar');
 jest.mock('./LoadingView', () => 'LoadingView');
 jest.mock('./DashboardLayout', () => 'DashboardLayout');

@@ -36,10 +43,12 @@ describe('Dashboard', () => {
  });
  const createWrapper = ({
    hasCourses,
+    hasAvailableDashboards,
    initIsPending,
    showSelectSessionModal,
  }) => {
    reduxHooks.useHasCourses.mockReturnValueOnce(hasCourses);
+    reduxHooks.useHasAvailableDashboards.mockReturnValueOnce(hasAvailableDashboards);
    reduxHooks.useRequestIsPending.mockReturnValueOnce(initIsPending);
    reduxHooks.useShowSelectSessionModal.mockReturnValueOnce(showSelectSessionModal);
    return shallow(<Dashboard />);
@@ -67,6 +76,7 @@ describe('Dashboard', () => {
    const testView = ({
      props,
      content: [contentName, contentEl],
+      showEnterpriseModal,
      showSelectSessionModal,
    }) => {
      beforeEach(() => { wrapper = createWrapper(props); });
@@ -75,6 +85,10 @@ describe('Dashboard', () => {
      it(`renders ${contentName}`, () => {
        testContent(contentEl);
      });
+      it(`${renderString(showEnterpriseModal)} dashbaord modal`, () => {
+        expect(wrapper.instance.findByType(EnterpriseDashboardModal).length)
+          .toEqual(showEnterpriseModal ? 1 : 0);
+      });
      it(`${renderString(showSelectSessionModal)} select session modal`, () => {
        expect(wrapper.instance.findByType(SelectSessionModal).length).toEqual(showSelectSessionModal ? 1 : 0);
      });
@@ -83,38 +97,44 @@ describe('Dashboard', () => {
      testView({
        props: {
          hasCourses: false,
+          hasAvailableDashboards: false,
          initIsPending: true,
          showSelectSessionModal: false,
        },
        content: ['LoadingView', <LoadingView />],
+        showEnterpriseModal: false,
        showSelectSessionModal: false,
      });
    });

-    describe('courses loaded, show select session modal', () => {
+    describe('courses loaded, show select session modal, no available dashboards', () => {
      testView({
        props: {
          hasCourses: true,
+          hasAvailableDashboards: false,
          initIsPending: false,
          showSelectSessionModal: true,
        },
        content: ['LoadedView', (
-          <DashboardLayout><CoursesPanel /></DashboardLayout>
+          <DashboardLayout sidebar={LoadedWidgetSidebar}><CoursesPanel /></DashboardLayout>
        )],
+        showEnterpriseModal: false,
        showSelectSessionModal: true,
      });
    });

-    describe('there are no courses', () => {
+    describe('there are no courses, there ARE available dashboards', () => {
      testView({
        props: {
          hasCourses: false,
+          hasAvailableDashboards: true,
          initIsPending: false,
          showSelectSessionModal: false,
        },
        content: ['Dashboard layout with no courses sidebar and content', (
-          <DashboardLayout><CoursesPanel /></DashboardLayout>
+          <DashboardLayout sidebar={NoCoursesWidgetSidebar}><CoursesPanel /></DashboardLayout>
        )],
+        showEnterpriseModal: true,
        showSelectSessionModal: false,
      });
    });
--- a/src/containers/EmailSettingsModal/snapshots/index.test.jsx.snap
+++ b/src/containers/EmailSettingsModal/snapshots/index.test.jsx.snap
@@ -10,7 +10,7 @@ exports[`EmailSettingsModal render snapshot: emails disabled, show: false 1`] =
  <div
    className="bg-white p-3 rounded shadow"
    style={
-      {
+      Object {
        "textAlign": "start",
      }
    }
@@ -54,7 +54,7 @@ exports[`EmailSettingsModal render snapshot: emails disabled, show: true 1`] = `
  <div
    className="bg-white p-3 rounded shadow"
    style={
-      {
+      Object {
        "textAlign": "start",
      }
    }
@@ -98,7 +98,7 @@ exports[`EmailSettingsModal render snapshot: emails enabled, show: true 1`] = `
  <div
    className="bg-white p-3 rounded shadow"
    style={
-      {
+      Object {
        "textAlign": "start",
      }
    }
--- a/src/containers/EnterpriseDashboardModal/snapshots/index.test.jsx.snap
+++ b/src/containers/EnterpriseDashboardModal/snapshots/index.test.jsx.snap
@@ -0,0 +1,42 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EnterpriseDashboard empty snapshot 1`] = `null`;
+
+exports[`EnterpriseDashboard snapshot 1`] = `
+<ModalDialog
+  hasCloseButton={false}
+  onClose={[MockFunction useEnterpriseDashboardHook.handleEscape]}
+  title=""
+>
+  <div
+    className="bg-white p-3 rounded shadow"
+    style={
+      Object {
+        "textAlign": "start",
+      }
+    }
+  >
+    <h4>
+      You have access to the edX, Inc. dashboard
+    </h4>
+    <p>
+      To access the courses available to you through edX, Inc., visit the edX, Inc. dashboard now.
+    </p>
+    <ActionRow>
+      <Button
+        onClick={[MockFunction useEnterpriseDashboardHook.handleClose]}
+        variant="tertiary"
+      >
+        Dismiss
+      </Button>
+      <Button
+        href="/edx-dashboard"
+        onClick={[MockFunction useEnterpriseDashboardHook.handleCTAClick]}
+        type="a"
+      >
+        Go to dashboard
+      </Button>
+    </ActionRow>
+  </div>
+</ModalDialog>
+`;
--- a/src/containers/EnterpriseDashboardModal/hooks.js
+++ b/src/containers/EnterpriseDashboardModal/hooks.js
@@ -0,0 +1,48 @@
+import React from 'react';
+
+import { StrictDict } from 'utils';
+import track from 'tracking';
+import { reduxHooks } from 'hooks';
+
+import * as module from './hooks';
+
+export const state = StrictDict({
+  showModal: (val) => React.useState(val), // eslint-disable-line
+});
+
+const { modalOpened, modalClosed, modalCTAClicked } = track.enterpriseDashboard;
+
+export const useEnterpriseDashboardHook = () => {
+  const [showModal, setShowModal] = module.state.showModal(true);
+  const dashboard = reduxHooks.useEnterpriseDashboardData();
+
+  const trackOpened = modalOpened(dashboard.enterpriseUUID);
+  const trackClose = modalClosed(dashboard.enterpriseUUID, 'Cancel button');
+  const trackEscape = modalClosed(dashboard.enterpriseUUID, 'Escape');
+
+  const handleCTAClick = modalCTAClicked(dashboard.enterpriseUUID, dashboard.url);
+  const handleClose = () => {
+    trackClose();
+    setShowModal(false);
+  };
+  const handleEscape = () => {
+    trackEscape();
+    setShowModal(false);
+  };
+
+  React.useEffect(() => {
+    if (dashboard && dashboard.label) {
+      trackOpened();
+    }
+  }, []); // eslint-disable-line
+
+  return {
+    showModal,
+    handleCTAClick,
+    handleClose,
+    handleEscape,
+    dashboard,
+  };
+};
+
+export default useEnterpriseDashboardHook;
--- a/src/containers/EnterpriseDashboardModal/hooks.test.js
+++ b/src/containers/EnterpriseDashboardModal/hooks.test.js
@@ -0,0 +1,75 @@
+import { MockUseState } from 'testUtils';
+import { reduxHooks } from 'hooks';
+import track from 'tracking';
+
+import * as hooks from './hooks';
+
+jest.mock('hooks', () => ({
+  reduxHooks: {
+    useEnterpriseDashboardData: jest.fn(),
+  },
+}));
+jest.mock('tracking', () => {
+  const modalOpenedEvent = jest.fn();
+  const modalClosedEvent = jest.fn();
+  const modalCTAClickedEvent = jest.fn();
+  return {
+    __esModule: true,
+    default: {
+      enterpriseDashboard: {
+        modalOpenedEvent,
+        modalClosedEvent,
+        modalCTAClickedEvent,
+        modalOpened: jest.fn(() => modalOpenedEvent),
+        modalClosed: jest.fn(() => modalClosedEvent),
+        modalCTAClicked: jest.fn(() => modalCTAClickedEvent),
+      },
+    },
+  };
+});
+
+const state = new MockUseState(hooks);
+
+const enterpriseDashboardData = { label: 'edX, Inc.', url: '/edx-dashboard' };
+
+describe('EnterpriseDashboard hooks', () => {
+  reduxHooks.useEnterpriseDashboardData.mockReturnValue({ ...enterpriseDashboardData });
+
+  describe('state values', () => {
+    state.testGetter(state.keys.showModal);
+  });
+
+  describe('behavior', () => {
+    let out;
+
+    beforeEach(() => {
+      state.mock();
+      out = hooks.useEnterpriseDashboardHook();
+    });
+    afterEach(state.restore);
+
+    test('useEnterpriseDashboardHook to return dashboard data from redux hooks', () => {
+      expect(out.dashboard).toMatchObject(enterpriseDashboardData);
+    });
+
+    test('modal initializes to shown when rendered and closes on click', () => {
+      state.expectInitializedWith(state.keys.showModal, true);
+      out.handleClose();
+      expect(state.values.showModal).toEqual(false);
+    });
+
+    test('modal initializes to shown when rendered and closes on escape', () => {
+      state.expectInitializedWith(state.keys.showModal, true);
+      out.handleEscape();
+      expect(state.values.showModal).toEqual(false);
+    });
+
+    test('CTA click tracks modalCTAClicked', () => {
+      out.handleCTAClick();
+      expect(track.enterpriseDashboard.modalCTAClicked).toHaveBeenCalledWith(
+        enterpriseDashboardData.enterpriseUUID,
+        enterpriseDashboardData.url,
+      );
+    });
+  });
+});
--- a/src/containers/EnterpriseDashboardModal/index.jsx
+++ b/src/containers/EnterpriseDashboardModal/index.jsx
@@ -0,0 +1,60 @@
+import React from 'react';
+// import PropTypes from 'prop-types';
+
+import { useIntl } from '@edx/frontend-platform/i18n';
+import {
+  ModalDialog, ActionRow, Button,
+} from '@openedx/paragon';
+
+import messages from './messages';
+import useEnterpriseDashboardHook from './hooks';
+
+export const EnterpriseDashboardModal = () => {
+  const { formatMessage } = useIntl();
+  const {
+    showModal,
+    handleClose,
+    handleCTAClick,
+    handleEscape,
+    dashboard,
+  } = useEnterpriseDashboardHook();
+  if (!dashboard || !dashboard.label) {
+    return null;
+  }
+  return (
+    <ModalDialog
+      isOpen={showModal}
+      onClose={handleEscape}
+      hasCloseButton={false}
+      title=""
+    >
+      <div
+        className="bg-white p-3 rounded shadow"
+        style={{ textAlign: 'start' }}
+      >
+        <h4>
+          {formatMessage(messages.enterpriseDialogHeader, {
+            label: dashboard.label,
+          })}
+        </h4>
+        <p>
+          {formatMessage(messages.enterpriseDialogBody, {
+            label: dashboard.label,
+          })}
+        </p>
+        <ActionRow>
+          <Button variant="tertiary" onClick={handleClose}>
+            {formatMessage(messages.enterpriseDialogDismissButton)}
+          </Button>
+          <Button type="a" href={dashboard.url} onClick={handleCTAClick}>
+            {formatMessage(messages.enterpriseDialogConfirmButton)}
+          </Button>
+        </ActionRow>
+      </div>
+    </ModalDialog>
+  );
+};
+
+EnterpriseDashboardModal.propTypes = {};
+
+export default EnterpriseDashboardModal;
--- a/src/containers/EnterpriseDashboardModal/index.test.jsx
+++ b/src/containers/EnterpriseDashboardModal/index.test.jsx
@@ -0,0 +1,29 @@
+import { shallow } from '@edx/react-unit-test-utils';
+import EnterpriseDashboard from '.';
+
+import useEnterpriseDashboardHook from './hooks';
+
+jest.mock('./hooks', () => ({
+  __esModule: true,
+  default: jest.fn(),
+}));
+
+describe('EnterpriseDashboard', () => {
+  test('snapshot', () => {
+    const hookData = {
+      dashboard: { label: 'edX, Inc.', url: '/edx-dashboard' },
+      showDialog: false,
+      handleClose: jest.fn().mockName('useEnterpriseDashboardHook.handleClose'),
+      handleCTAClick: jest.fn().mockName('useEnterpriseDashboardHook.handleCTAClick'),
+      handleEscape: jest.fn().mockName('useEnterpriseDashboardHook.handleEscape'),
+    };
+    useEnterpriseDashboardHook.mockReturnValueOnce({ ...hookData });
+    const el = shallow(<EnterpriseDashboard />);
+    expect(el.snapshot).toMatchSnapshot();
+  });
+  test('empty snapshot', () => {
+    useEnterpriseDashboardHook.mockReturnValueOnce({});
+    const el = shallow(<EnterpriseDashboard />);
+    expect(el.snapshot).toMatchSnapshot();
+  });
+});
--- a/src/containers/EnterpriseDashboardModal/messages.js
+++ b/src/containers/EnterpriseDashboardModal/messages.js
@@ -0,0 +1,26 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  enterpriseDialogHeader: {
+    id: 'leanerDashboard.enterpriseDialogHeader',
+    defaultMessage: 'You have access to the {label} dashboard',
+    description: 'title for enterpise dashboard dialog',
+  },
+  enterpriseDialogBody: {
+    id: 'leanerDashboard.enterpriseDialogBody',
+    defaultMessage: 'To access the courses available to you through {label}, visit the {label} dashboard now.',
+    description: 'Body text for enterpise dashboard dialog',
+  },
+  enterpriseDialogDismissButton: {
+    id: 'leanerDashboard.enterpriseDialogDismissButton',
+    defaultMessage: 'Dismiss',
+    description: 'Dismiss button to cancel visiting dashboard',
+  },
+  enterpriseDialogConfirmButton: {
+    id: 'leanerDashboard.enterpriseDialogConfirmButton',
+    defaultMessage: 'Go to dashboard',
+    description: 'Confirm button to go to the dashboard url',
+  },
+});
+
+export default messages;
--- a/src/containers/LearnerDashboardHeader/BrandLogo.jsx
+++ b/src/containers/LearnerDashboardHeader/BrandLogo.jsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { useIntl } from '@edx/frontend-platform/i18n';

 import { reduxHooks } from 'hooks';
@@ -12,7 +10,7 @@ export const BrandLogo = () => {
  const dashboard = reduxHooks.useEnterpriseDashboardData();

  return (
-    <a href={dashboard?.url || '/'} className="mx-auto">
+    <a href={dashboard?.url || getConfig().LMS_BASE_URL} className="mx-auto">
      <img
        className="logo py-3"
        src={getConfig().LOGO_URL}
--- a/src/containers/LearnerDashboardHeader/BrandLogo.test.jsx
+++ b/src/containers/LearnerDashboardHeader/BrandLogo.test.jsx
@@ -1,6 +1,7 @@
 import { shallow } from '@edx/react-unit-test-utils';
-
+import { getConfig } from '@edx/frontend-platform';
 import { reduxHooks } from 'hooks';
+
 import BrandLogo from './BrandLogo';

 jest.mock('hooks', () => ({
@@ -23,6 +24,6 @@ describe('BrandLogo', () => {
    reduxHooks.useEnterpriseDashboardData.mockReturnValueOnce(null);
    const wrapper = shallow(<BrandLogo />);
    expect(wrapper.snapshot).toMatchSnapshot();
-    expect(wrapper.instance.findByType('a')[0].props.href).toEqual('/');
+    expect(wrapper.instance.findByType('a')[0].props.href).toEqual(getConfig().LMS_BASE_URL);
  });
 });
--- a/src/containers/LearnerDashboardHeader/CollapsedHeader/CollapseMenuBody.jsx
+++ b/src/containers/LearnerDashboardHeader/CollapsedHeader/CollapseMenuBody.jsx
@@ -0,0 +1,108 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { getConfig } from '@edx/frontend-platform';
+import { useIntl } from '@edx/frontend-platform/i18n';
+import { AppContext } from '@edx/frontend-platform/react';
+import { Button, Badge } from '@openedx/paragon';
+
+import urls from 'data/services/lms/urls';
+import { reduxHooks, apiHooks } from 'hooks';
+
+import { findCoursesNavDropdownClicked } from '../hooks';
+import messages from '../messages';
+
+export const CollapseMenuBody = ({ isOpen }) => {
+  const { formatMessage } = useIntl();
+  const { authenticatedUser } = React.useContext(AppContext);
+
+  const { enabled: programsEnabled } = apiHooks.useProgramsConfig();
+
+  const dashboard = reduxHooks.useEnterpriseDashboardData();
+  const { courseSearchUrl } = reduxHooks.usePlatformSettingsData();
+
+  const exploreCoursesClick = findCoursesNavDropdownClicked(
+    urls.baseAppUrl(courseSearchUrl),
+  );
+
+  if (!isOpen) {
+    return null;
+  }
+
+  return (
+    <div className="d-flex flex-column shadow-sm nav-small-menu">
+      <Button as="a" href={`${getConfig().LMS_BASE_URL}/dashboard/`} variant="inverse-primary">
+        {formatMessage(messages.course)}
+      </Button>
+      {programsEnabled && (
+        <Button as="a" href={urls.programsUrl()} variant="inverse-primary">
+          {formatMessage(messages.program)}
+        </Button>
+      )}
+      <Button
+        as="a"
+        href={urls.baseAppUrl(courseSearchUrl)}
+        variant="inverse-primary"
+        onClick={exploreCoursesClick}
+      >
+        {formatMessage(messages.discoverNew)}
+      </Button>
+      <Button as="a" href={getConfig().SUPPORT_URL} variant="inverse-primary">
+        {formatMessage(messages.help)}
+      </Button>
+      {authenticatedUser && (
+        <>
+          {!!dashboard && (
+            <Button as="a" href={dashboard.url} variant="inverse-primary">
+              {formatMessage(messages.dashboard)}
+            </Button>
+          )}
+          {!dashboard && getConfig().CAREER_LINK_URL && (
+            <Button href={`${getConfig().CAREER_LINK_URL}`}>
+              {formatMessage(messages.career)}
+              <Badge className="px-2 mx-2" variant="warning">
+                {formatMessage(messages.newAlert)}
+              </Badge>
+            </Button>
+          )}
+          <Button
+            as="a"
+            href={`${getConfig().LMS_BASE_URL}/u/${authenticatedUser.username}`}
+            variant="inverse-primary"
+          >
+            {formatMessage(messages.profile)}
+          </Button>
+          <Button
+            as="a"
+            href={`${getConfig().LMS_BASE_URL}/account/settings`}
+            variant="inverse-primary"
+          >
+            {formatMessage(messages.account)}
+          </Button>
+          {getConfig().ORDER_HISTORY_URL && (
+            <Button
+              as="a"
+              variant="inverse-primary"
+              href={getConfig().ORDER_HISTORY_URL}
+            >
+              {formatMessage(messages.orderHistory)}
+            </Button>
+          )}
+          <Button
+            as="a"
+            href={getConfig().LOGOUT_URL}
+            variant="inverse-primary"
+          >
+            {formatMessage(messages.signOut)}
+          </Button>
+        </>
+      )}
+    </div>
+  );
+};
+
+CollapseMenuBody.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+};
+
+export default CollapseMenuBody;
--- a/src/containers/LearnerDashboardHeader/CollapsedHeader/CollapseMenuBody.test.jsx
+++ b/src/containers/LearnerDashboardHeader/CollapsedHeader/CollapseMenuBody.test.jsx
@@ -0,0 +1,60 @@
+import { shallow } from '@edx/react-unit-test-utils';
+import { AppContext } from '@edx/frontend-platform/react';
+
+import { apiHooks } from 'hooks';
+import CollapseMenuBody from './CollapseMenuBody';
+
+jest.mock('@edx/frontend-platform/react', () => ({
+  AppContext: {
+    authenticatedUser: {
+      username: 'username',
+    },
+  },
+}));
+
+jest.mock('hooks', () => ({
+  reduxHooks: {
+    useEnterpriseDashboardData: () => ({
+      url: 'url',
+    }),
+    usePlatformSettingsData: () => ({
+      courseSearchUrl: '/courseSearchUrl',
+    }),
+  },
+  apiHooks: {
+    useProgramsConfig: () => ({
+      enabled: true,
+    }),
+  },
+}));
+
+jest.mock('../hooks', () => ({
+  findCoursesNavDropdownClicked: (url) => jest.fn().mockName(`findCoursesNavDropdownClicked("${url}")`),
+}));
+
+describe('CollapseMenuBody', () => {
+  test('render', () => {
+    const wrapper = shallow(<CollapseMenuBody isOpen />);
+    expect(wrapper.snapshot).toMatchSnapshot();
+  });
+
+  test('render empty if not open', () => {
+    const wrapper = shallow(<CollapseMenuBody isOpen={false} />);
+    expect(wrapper.snapshot).toMatchSnapshot();
+    expect(wrapper.isEmptyRender()).toBe(true);
+  });
+
+  test('render unauthenticated', () => {
+    const { authenticatedUser } = AppContext;
+    AppContext.authenticatedUser = null;
+    const wrapper = shallow(<CollapseMenuBody isOpen />);
+    expect(wrapper.snapshot).toMatchSnapshot();
+    AppContext.authenticatedUser = authenticatedUser;
+  });
+
+  test('render with disabled programs', () => {
+    apiHooks.useProgramsConfig = () => ({ enabled: false });
+    const wrapper = shallow(<CollapseMenuBody isOpen />);
+    expect(wrapper.snapshot).toMatchSnapshot();
+  });
+});
--- a/src/containers/LearnerDashboardHeader/CollapsedHeader/snapshots/CollapseMenuBody.test.jsx.snap
+++ b/src/containers/LearnerDashboardHeader/CollapsedHeader/snapshots/CollapseMenuBody.test.jsx.snap
@@ -0,0 +1,164 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CollapseMenuBody render 1`] = `
+<div
+  className="d-flex flex-column shadow-sm nav-small-menu"
+>
+  <Button
+    as="a"
+    href="http://localhost:18000/dashboard/"
+    variant="inverse-primary"
+  >
+    Courses
+  </Button>
+  <Button
+    as="a"
+    href="http://localhost:18000/dashboard/programs"
+    variant="inverse-primary"
+  >
+    Programs
+  </Button>
+  <Button
+    as="a"
+    href="http://localhost:18000/courseSearchUrl"
+    onClick={[MockFunction findCoursesNavDropdownClicked("http://localhost:18000/courseSearchUrl")]}
+    variant="inverse-primary"
+  >
+    Discover New
+  </Button>
+  <Button
+    as="a"
+    href="http://localhost:18000/support"
+    variant="inverse-primary"
+  >
+    Help
+  </Button>
+  <Fragment>
+    <Button
+      as="a"
+      href="url"
+      variant="inverse-primary"
+    >
+      Dashboard
+    </Button>
+    <Button
+      as="a"
+      href="http://localhost:18000/u/username"
+      variant="inverse-primary"
+    >
+      Profile
+    </Button>
+    <Button
+      as="a"
+      href="http://localhost:18000/account/settings"
+      variant="inverse-primary"
+    >
+      Account
+    </Button>
+    <Button
+      as="a"
+      href="http://localhost:18000/logout"
+      variant="inverse-primary"
+    >
+      Sign Out
+    </Button>
+  </Fragment>
+</div>
+`;
+
+exports[`CollapseMenuBody render empty if not open 1`] = `null`;
+
+exports[`CollapseMenuBody render unauthenticated 1`] = `
+<div
+  className="d-flex flex-column shadow-sm nav-small-menu"
+>
+  <Button
+    as="a"
+    href="http://localhost:18000/dashboard/"
+    variant="inverse-primary"
+  >
+    Courses
+  </Button>
+  <Button
+    as="a"
+    href="http://localhost:18000/dashboard/programs"
+    variant="inverse-primary"
+  >
+    Programs
+  </Button>
+  <Button
+    as="a"
+    href="http://localhost:18000/courseSearchUrl"
+    onClick={[MockFunction findCoursesNavDropdownClicked("http://localhost:18000/courseSearchUrl")]}
+    variant="inverse-primary"
+  >
+    Discover New
+  </Button>
+  <Button
+    as="a"
+    href="http://localhost:18000/support"
+    variant="inverse-primary"
+  >
+    Help
+  </Button>
+</div>
+`;
+
+exports[`CollapseMenuBody render with disabled programs 1`] = `
+<div
+  className="d-flex flex-column shadow-sm nav-small-menu"
+>
+  <Button
+    as="a"
+    href="http://localhost:18000/dashboard/"
+    variant="inverse-primary"
+  >
+    Courses
+  </Button>
+  <Button
+    as="a"
+    href="http://localhost:18000/courseSearchUrl"
+    onClick={[MockFunction findCoursesNavDropdownClicked("http://localhost:18000/courseSearchUrl")]}
+    variant="inverse-primary"
+  >
+    Discover New
+  </Button>
+  <Button
+    as="a"
+    href="http://localhost:18000/support"
+    variant="inverse-primary"
+  >
+    Help
+  </Button>
+  <Fragment>
+    <Button
+      as="a"
+      href="url"
+      variant="inverse-primary"
+    >
+      Dashboard
+    </Button>
+    <Button
+      as="a"
+      href="http://localhost:18000/u/username"
+      variant="inverse-primary"
+    >
+      Profile
+    </Button>
+    <Button
+      as="a"
+      href="http://localhost:18000/account/settings"
+      variant="inverse-primary"
+    >
+      Account
+    </Button>
+    <Button
+      as="a"
+      href="http://localhost:18000/logout"
+      variant="inverse-primary"
+    >
+      Sign Out
+    </Button>
+  </Fragment>
+</div>
+`;
--- a/src/containers/LearnerDashboardHeader/CollapsedHeader/snapshots/index.test.jsx.snap
+++ b/src/containers/LearnerDashboardHeader/CollapsedHeader/snapshots/index.test.jsx.snap
@@ -0,0 +1,48 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CollapsedHeader render nothing if not collapsed 1`] = `false`;
+
+exports[`CollapsedHeader renders 1`] = `
+<Fragment>
+  <header
+    className="d-flex shadow-sm align-items-center learner-variant-header"
+  >
+    <IconButton
+      alt="Close"
+      className="p-4"
+      iconAs="Icon"
+      invertColors={true}
+      isActive={true}
+      onClick={[MockFunction toggleIsOpen]}
+      variant="primary"
+    />
+    <mockConstructor />
+  </header>
+  <mockConstructor
+    isOpen={false}
+  />
+</Fragment>
+`;
+
+exports[`CollapsedHeader renders with isOpen true 1`] = `
+<Fragment>
+  <header
+    className="d-flex shadow-sm align-items-center learner-variant-header"
+  >
+    <IconButton
+      alt="Menu"
+      className="p-4"
+      iconAs="Icon"
+      invertColors={true}
+      isActive={true}
+      onClick={[MockFunction toggleIsOpen]}
+      src={[MockFunction icons.Close]}
+      variant="primary"
+    />
+    <mockConstructor />
+  </header>
+  <mockConstructor
+    isOpen={true}
+  />
+</Fragment>
+`;
--- a/src/containers/LearnerDashboardHeader/CollapsedHeader/index.jsx
+++ b/src/containers/LearnerDashboardHeader/CollapsedHeader/index.jsx
@@ -0,0 +1,47 @@
+import React from 'react';
+
+import { useIntl } from '@edx/frontend-platform/i18n';
+import { MenuIcon, Close } from '@openedx/paragon/icons';
+import { IconButton, Icon } from '@openedx/paragon';
+
+import { useLearnerDashboardHeaderData, useIsCollapsed } from '../hooks';
+
+import CollapseMenuBody from './CollapseMenuBody';
+import BrandLogo from '../BrandLogo';
+
+import messages from '../messages';
+
+export const CollapsedHeader = () => {
+  const { formatMessage } = useIntl();
+  const isCollapsed = useIsCollapsed();
+  const { isOpen, toggleIsOpen } = useLearnerDashboardHeaderData();
+
+  return (
+    isCollapsed && (
+      <>
+        <header className="d-flex shadow-sm align-items-center learner-variant-header">
+          <IconButton
+            invertColors
+            isActive
+            src={isOpen ? Close : MenuIcon}
+            iconAs={Icon}
+            alt={
+              isOpen
+                ? formatMessage(messages.collapseMenuOpenAltText)
+                : formatMessage(messages.collapseMenuClosedAltText)
+            }
+            onClick={toggleIsOpen}
+            variant="primary"
+            className="p-4"
+          />
+          <BrandLogo />
+        </header>
+        <CollapseMenuBody isOpen={isOpen} />
+      </>
+    )
+  );
+};
+
+CollapsedHeader.propTypes = {};
+
+export default CollapsedHeader;
--- a/src/containers/LearnerDashboardHeader/CollapsedHeader/index.test.jsx
+++ b/src/containers/LearnerDashboardHeader/CollapsedHeader/index.test.jsx
@@ -0,0 +1,38 @@
+import { shallow } from '@edx/react-unit-test-utils';
+
+import CollapsedHeader from '.';
+
+import { useLearnerDashboardHeaderData, useIsCollapsed } from '../hooks';
+
+jest.mock('../BrandLogo', () => jest.fn(() => 'BrandLogo'));
+jest.mock('./CollapseMenuBody', () => jest.fn(() => 'CollapseMenuBody'));
+
+jest.mock('../hooks', () => ({
+  useIsCollapsed: jest.fn(() => true),
+  useLearnerDashboardHeaderData: jest.fn(() => ({
+    isOpen: false,
+    toggleIsOpen: jest.fn().mockName('toggleIsOpen'),
+  })),
+}));
+
+describe('CollapsedHeader', () => {
+  it('renders', () => {
+    const wrapper = shallow(<CollapsedHeader />);
+    expect(wrapper.snapshot).toMatchSnapshot();
+  });
+
+  it('render nothing if not collapsed', () => {
+    useIsCollapsed.mockReturnValueOnce(false);
+    const wrapper = shallow(<CollapsedHeader />);
+    expect(wrapper.snapshot).toMatchSnapshot();
+  });
+
+  it('renders with isOpen true', () => {
+    useLearnerDashboardHeaderData.mockReturnValueOnce({
+      isOpen: true,
+      toggleIsOpen: jest.fn().mockName('toggleIsOpen'),
+    });
+    const wrapper = shallow(<CollapsedHeader />);
+    expect(wrapper.snapshot).toMatchSnapshot();
+  });
+});
--- a/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/snapshots/index.test.jsx.snap
+++ b/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/snapshots/index.test.jsx.snap
@@ -9,14 +9,14 @@ exports[`ConfirmEmailBanner snapshot Show on unverified 1`] = `
  >
    <format-message-function
      message={
-        {
+        Object {
          "defaultMessage": "Remember to confirm your email so that you can keep learning! {confirmNowButton}.",
          "description": "Text for reminding user to confirm email",
          "id": "leanerDashboard.confirmEmailTextReminderBanner",
        }
      }
      values={
-        {
+        Object {
          "confirmNowButton": <Button
            className="confirm-email-now-button"
            onClick={[MockFunction openConfirmModalButtonClick]}
--- a/src/containers/LearnerDashboardHeader/ExpandedHeader/AuthenticatedUserDropdown.jsx
+++ b/src/containers/LearnerDashboardHeader/ExpandedHeader/AuthenticatedUserDropdown.jsx
@@ -0,0 +1,78 @@
+import React from 'react';
+
+import { getConfig } from '@edx/frontend-platform';
+import { useIntl } from '@edx/frontend-platform/i18n';
+import { AppContext } from '@edx/frontend-platform/react';
+import { AvatarButton, Dropdown, Badge } from '@openedx/paragon';
+
+import { reduxHooks } from 'hooks';
+
+import messages from '../messages';
+
+export const AuthenticatedUserDropdown = () => {
+  const { formatMessage } = useIntl();
+  const { authenticatedUser } = React.useContext(AppContext);
+  const dashboard = reduxHooks.useEnterpriseDashboardData();
+
+  return (
+    authenticatedUser && (
+      <Dropdown className="user-dropdown pr4">
+        <Dropdown.Toggle
+          as={AvatarButton}
+          src={authenticatedUser.profileImage}
+          id="user"
+          variant="light"
+          className="p-4"
+        >
+          <span data-hj-suppress className="d-md-inline">
+            {authenticatedUser.username}
+          </span>
+        </Dropdown.Toggle>
+        <Dropdown.Menu className="dropdown-menu-right">
+          { getConfig().ENABLE_EDX_PERSONAL_DASHBOARD && (
+            <>
+              <Dropdown.Header>{formatMessage(messages.dashboardSwitch)}</Dropdown.Header>
+              <Dropdown.Item as="a" href="/edx-dashboard" className="active">
+                {formatMessage(messages.dashboardPersonal)}
+              </Dropdown.Item>
+              {!!dashboard && (
+                <Dropdown.Item as="a" href={dashboard.url} key={dashboard.label}>
+                  {dashboard.label} {formatMessage(messages.dashboard)}
+                </Dropdown.Item>
+              )}
+              <Dropdown.Divider />
+            </>
+          )}
+
+          {!dashboard && getConfig().CAREER_LINK_URL && (
+            <Dropdown.Item href={`${getConfig().CAREER_LINK_URL}`}>
+              {formatMessage(messages.career)}
+              <Badge className="px-2 mx-2" variant="warning">
+                {formatMessage(messages.newAlert)}
+              </Badge>
+            </Dropdown.Item>
+          )}
+          <Dropdown.Item href={`${getConfig().ACCOUNT_PROFILE_URL}/u/${authenticatedUser.username}`}>
+            {formatMessage(messages.profile)}
+          </Dropdown.Item>
+          <Dropdown.Item href={getConfig().ACCOUNT_SETTINGS_URL}>
+            {formatMessage(messages.account)}
+          </Dropdown.Item>
+          {getConfig().ORDER_HISTORY_URL && (
+            <Dropdown.Item href={getConfig().ORDER_HISTORY_URL}>
+              {formatMessage(messages.orderHistory)}
+            </Dropdown.Item>
+          )}
+          <Dropdown.Divider />
+          <Dropdown.Item href={getConfig().LOGOUT_URL}>
+            {formatMessage(messages.signOut)}
+          </Dropdown.Item>
+        </Dropdown.Menu>
+      </Dropdown>
+    )
+  );
+};
+
+AuthenticatedUserDropdown.propTypes = {};
+
+export default AuthenticatedUserDropdown;
--- a/src/containers/LearnerDashboardHeader/ExpandedHeader/AuthenticatedUserDropdown.test.jsx
+++ b/src/containers/LearnerDashboardHeader/ExpandedHeader/AuthenticatedUserDropdown.test.jsx
@@ -0,0 +1,81 @@
+import { shallow } from '@edx/react-unit-test-utils';
+
+import { reduxHooks } from 'hooks';
+import { getConfig } from '@edx/frontend-platform';
+import { AppContext } from '@edx/frontend-platform/react';
+import { AuthenticatedUserDropdown } from './AuthenticatedUserDropdown';
+import { useIsCollapsed } from '../hooks';
+
+jest.mock('@edx/frontend-platform', () => ({
+  getConfig: jest.fn(),
+}));
+
+jest.mock('@edx/frontend-platform/react', () => ({
+  AppContext: {
+    authenticatedUser: {
+      profileImage: 'profileImage',
+      username: 'username',
+    },
+  },
+}));
+const COURSE_SEARCH_URL = 'test-course-search-url';
+
+jest.mock('hooks', () => ({
+  reduxHooks: {
+    useEnterpriseDashboardData: jest.fn(),
+    usePlatformSettingsData: jest.fn(() => ({
+      courseSearchUrl: COURSE_SEARCH_URL,
+    })),
+  },
+}));
+jest.mock('../hooks', () => ({
+  useIsCollapsed: jest.fn(),
+  findCoursesNavDropdownClicked: (href) => jest.fn().mockName(`findCoursesNavDropdownClicked('${href}')`),
+}));
+
+jest.mock('data/services/lms/urls', () => ({
+  baseAppUrl: (url) => (url),
+  programsUrl: 'http://localhost:18000/dashboard/programs',
+}));
+
+const config = {
+  ACCOUNT_PROFILE_URL: 'http://account-profile-url.test',
+  ACCOUNT_SETTINGS_URL: 'http://account-settings-url.test',
+  LOGOUT_URL: 'http://logout-url.test',
+  ORDER_HISTORY_URL: 'http://order-history-url.test',
+  SUPPORT_URL: 'http://localhost:18000/support',
+  CAREER_LINK_URL: 'http://localhost:18000/career',
+  LMS_BASE_URL: 'http:/localhost:18000',
+  ENABLE_EDX_PERSONAL_DASHBOARD: true,
+};
+getConfig.mockReturnValue(config);
+
+describe('AuthenticatedUserDropdown', () => {
+  const defaultDashboardData = {
+    label: 'label',
+    url: 'url',
+  };
+
+  describe('snapshots', () => {
+    test('no auth render empty', () => {
+      const { authenticatedUser } = AppContext;
+      AppContext.authenticatedUser = null;
+      const wrapper = shallow(<AuthenticatedUserDropdown />);
+      expect(wrapper.snapshot).toMatchSnapshot();
+      expect(wrapper.isEmptyRender()).toBe(true);
+      AppContext.authenticatedUser = authenticatedUser;
+    });
+    test('with enterprise dashboard', () => {
+      reduxHooks.useEnterpriseDashboardData.mockReturnValueOnce(defaultDashboardData);
+      useIsCollapsed.mockReturnValueOnce(true);
+      const wrapper = shallow(<AuthenticatedUserDropdown />);
+      expect(wrapper.snapshot).toMatchSnapshot();
+    });
+    test('without enterprise dashboard and expanded', () => {
+      reduxHooks.useEnterpriseDashboardData.mockReturnValueOnce(null);
+      useIsCollapsed.mockReturnValueOnce(false);
+      const wrapper = shallow(<AuthenticatedUserDropdown />);
+      expect(wrapper.snapshot).toMatchSnapshot();
+    });
+  });
+});
--- a/src/containers/LearnerDashboardHeader/ExpandedHeader/snapshots/AuthenticatedUserDropdown.test.jsx.snap
+++ b/src/containers/LearnerDashboardHeader/ExpandedHeader/snapshots/AuthenticatedUserDropdown.test.jsx.snap
@@ -0,0 +1,139 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AuthenticatedUserDropdown snapshots no auth render empty 1`] = `null`;
+
+exports[`AuthenticatedUserDropdown snapshots with enterprise dashboard 1`] = `
+<Dropdown
+  className="user-dropdown pr4"
+>
+  <Dropdown.Toggle
+    className="p-4"
+    id="user"
+    src="profileImage"
+    variant="light"
+  >
+    <span
+      className="d-md-inline"
+      data-hj-suppress={true}
+    >
+      username
+    </span>
+  </Dropdown.Toggle>
+  <Dropdown.Menu
+    className="dropdown-menu-right"
+  >
+    <Fragment>
+      <Dropdown.Header>
+        SWITCH DASHBOARD
+      </Dropdown.Header>
+      <Dropdown.Item
+        as="a"
+        className="active"
+        href="/edx-dashboard"
+      >
+        Personal
+      </Dropdown.Item>
+      <Dropdown.Item
+        as="a"
+        href="url"
+        key="label"
+      >
+        label
+         
+        Dashboard
+      </Dropdown.Item>
+      <Dropdown.Divider />
+    </Fragment>
+    <Dropdown.Item
+      href="http://account-profile-url.test/u/username"
+    >
+      Profile
+    </Dropdown.Item>
+    <Dropdown.Item
+      href="http://account-settings-url.test"
+    >
+      Account
+    </Dropdown.Item>
+    <Dropdown.Item
+      href="http://order-history-url.test"
+    >
+      Order History
+    </Dropdown.Item>
+    <Dropdown.Divider />
+    <Dropdown.Item
+      href="http://logout-url.test"
+    >
+      Sign Out
+    </Dropdown.Item>
+  </Dropdown.Menu>
+</Dropdown>
+`;
+
+exports[`AuthenticatedUserDropdown snapshots without enterprise dashboard and expanded 1`] = `
+<Dropdown
+  className="user-dropdown pr4"
+>
+  <Dropdown.Toggle
+    className="p-4"
+    id="user"
+    src="profileImage"
+    variant="light"
+  >
+    <span
+      className="d-md-inline"
+      data-hj-suppress={true}
+    >
+      username
+    </span>
+  </Dropdown.Toggle>
+  <Dropdown.Menu
+    className="dropdown-menu-right"
+  >
+    <Fragment>
+      <Dropdown.Header>
+        SWITCH DASHBOARD
+      </Dropdown.Header>
+      <Dropdown.Item
+        as="a"
+        className="active"
+        href="/edx-dashboard"
+      >
+        Personal
+      </Dropdown.Item>
+      <Dropdown.Divider />
+    </Fragment>
+    <Dropdown.Item
+      href="http://localhost:18000/career"
+    >
+      Career
+      <Badge
+        className="px-2 mx-2"
+        variant="warning"
+      >
+        New
+      </Badge>
+    </Dropdown.Item>
+    <Dropdown.Item
+      href="http://account-profile-url.test/u/username"
+    >
+      Profile
+    </Dropdown.Item>
+    <Dropdown.Item
+      href="http://account-settings-url.test"
+    >
+      Account
+    </Dropdown.Item>
+    <Dropdown.Item
+      href="http://order-history-url.test"
+    >
+      Order History
+    </Dropdown.Item>
+    <Dropdown.Divider />
+    <Dropdown.Item
+      href="http://logout-url.test"
+    >
+      Sign Out
+    </Dropdown.Item>
+  </Dropdown.Menu>
+</Dropdown>
+`;
--- a/src/containers/LearnerDashboardHeader/ExpandedHeader/snapshots/index.test.jsx.snap
+++ b/src/containers/LearnerDashboardHeader/ExpandedHeader/snapshots/index.test.jsx.snap
@@ -0,0 +1,93 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ExpandedHeader render 1`] = `
+<header
+  className="d-flex shadow-sm align-items-center learner-variant-header pl-4"
+>
+  <div
+    className="flex-grow-1 d-flex align-items-center"
+  >
+    <BrandLogo />
+    <Button
+      as="a"
+      className="p-4 course-link"
+      href="http://localhost:18000/dashboard/"
+      variant="inverse-primary"
+    >
+      Courses
+    </Button>
+    <Button
+      as="a"
+      className="p-4"
+      href="programsUrl"
+      variant="inverse-primary"
+    >
+      Programs
+    </Button>
+    <Button
+      as="a"
+      className="p-4"
+      href="http://localhost:18000/courseSearchUrl"
+      onClick={[MockFunction findCoursesNavClicked("http://localhost:18000/courseSearchUrl")]}
+      variant="inverse-primary"
+    >
+      Discover New
+    </Button>
+    <span
+      className="flex-grow-1"
+    />
+    <Button
+      as="a"
+      className="p-4"
+      href="http://localhost:18000/support"
+      variant="inverse-primary"
+    >
+      Help
+    </Button>
+  </div>
+  <AuthenticatedUserDropdown />
+</header>
+`;
+
+exports[`ExpandedHeader render empty if collapsed 1`] = `null`;
+
+exports[`ExpandedHeader render with disabled programs 1`] = `
+<header
+  className="d-flex shadow-sm align-items-center learner-variant-header pl-4"
+>
+  <div
+    className="flex-grow-1 d-flex align-items-center"
+  >
+    <BrandLogo />
+    <Button
+      as="a"
+      className="p-4 course-link"
+      href="http://localhost:18000/dashboard/"
+      variant="inverse-primary"
+    >
+      Courses
+    </Button>
+    <Button
+      as="a"
+      className="p-4"
+      href="http://localhost:18000/courseSearchUrl"
+      onClick={[MockFunction findCoursesNavClicked("http://localhost:18000/courseSearchUrl")]}
+      variant="inverse-primary"
+    >
+      Discover New
+    </Button>
+    <span
+      className="flex-grow-1"
+    />
+    <Button
+      as="a"
+      className="p-4"
+      href="http://localhost:18000/support"
+      variant="inverse-primary"
+    >
+      Help
+    </Button>
+  </div>
+  <AuthenticatedUserDropdown />
+</header>
+`;
--- a/src/containers/LearnerDashboardHeader/ExpandedHeader/index.jsx
+++ b/src/containers/LearnerDashboardHeader/ExpandedHeader/index.jsx
@@ -0,0 +1,80 @@
+import React from 'react';
+
+import { getConfig } from '@edx/frontend-platform';
+import { useIntl } from '@edx/frontend-platform/i18n';
+import { Button } from '@openedx/paragon';
+
+import urls from 'data/services/lms/urls';
+import { reduxHooks, apiHooks } from 'hooks';
+
+import AuthenticatedUserDropdown from './AuthenticatedUserDropdown';
+import { useIsCollapsed, findCoursesNavClicked } from '../hooks';
+import messages from '../messages';
+import BrandLogo from '../BrandLogo';
+
+export const ExpandedHeader = () => {
+  const { formatMessage } = useIntl();
+  const { courseSearchUrl } = reduxHooks.usePlatformSettingsData();
+  const isCollapsed = useIsCollapsed();
+
+  const { enabled: programsEnabled } = apiHooks.useProgramsConfig();
+
+  const exploreCoursesClick = findCoursesNavClicked(
+    urls.baseAppUrl(courseSearchUrl),
+  );
+
+  if (isCollapsed) {
+    return null;
+  }
+
+  return (
+    <header className="d-flex shadow-sm align-items-center learner-variant-header pl-4">
+      <div className="flex-grow-1 d-flex align-items-center">
+        <BrandLogo />
+
+        <Button
+          as="a"
+          href={`${getConfig().LMS_BASE_URL}/dashboard/`}
+          variant="inverse-primary"
+          className="p-4 course-link"
+        >
+          {formatMessage(messages.course)}
+        </Button>
+        {programsEnabled && (
+          <Button
+            as="a"
+            href={urls.programsUrl()}
+            variant="inverse-primary"
+            className="p-4"
+          >
+            {formatMessage(messages.program)}
+          </Button>
+        )}
+        <Button
+          as="a"
+          href={urls.baseAppUrl(courseSearchUrl)}
+          variant="inverse-primary"
+          className="p-4"
+          onClick={exploreCoursesClick}
+        >
+          {formatMessage(messages.discoverNew)}
+        </Button>
+        <span className="flex-grow-1" />
+        <Button
+          as="a"
+          href={getConfig().SUPPORT_URL}
+          variant="inverse-primary"
+          className="p-4"
+        >
+          {formatMessage(messages.help)}
+        </Button>
+      </div>
+
+      <AuthenticatedUserDropdown />
+    </header>
+  );
+};
+
+ExpandedHeader.propTypes = {};
+
+export default ExpandedHeader;
--- a/src/containers/LearnerDashboardHeader/ExpandedHeader/index.test.jsx
+++ b/src/containers/LearnerDashboardHeader/ExpandedHeader/index.test.jsx
@@ -0,0 +1,53 @@
+import { shallow } from '@edx/react-unit-test-utils';
+
+import { apiHooks } from 'hooks';
+import ExpandedHeader from '.';
+
+import { useIsCollapsed } from '../hooks';
+
+jest.mock('data/services/lms/urls', () => ({
+  programsUrl: () => 'programsUrl',
+  baseAppUrl: url => (`http://localhost:18000${url}`),
+}));
+
+jest.mock('hooks', () => ({
+  reduxHooks: {
+    usePlatformSettingsData: () => ({
+      courseSearchUrl: '/courseSearchUrl',
+    }),
+  },
+  apiHooks: {
+    useProgramsConfig: () => ({
+      enabled: true,
+    }),
+  },
+}));
+
+jest.mock('../hooks', () => ({
+  useIsCollapsed: jest.fn(),
+  findCoursesNavClicked: (url) => jest.fn().mockName(`findCoursesNavClicked("${url}")`),
+}));
+
+jest.mock('./AuthenticatedUserDropdown', () => 'AuthenticatedUserDropdown');
+jest.mock('../BrandLogo', () => 'BrandLogo');
+
+describe('ExpandedHeader', () => {
+  test('render', () => {
+    useIsCollapsed.mockReturnValueOnce(false);
+    const wrapper = shallow(<ExpandedHeader />);
+    expect(wrapper.snapshot).toMatchSnapshot();
+  });
+
+  test('render empty if collapsed', () => {
+    useIsCollapsed.mockReturnValueOnce(true);
+    const wrapper = shallow(<ExpandedHeader />);
+    expect(wrapper.snapshot).toMatchSnapshot();
+    expect(wrapper.isEmptyRender()).toBe(true);
+  });
+
+  test('render with disabled programs', () => {
+    apiHooks.useProgramsConfig = () => ({ enabled: false });
+    const wrapper = shallow(<ExpandedHeader />);
+    expect(wrapper.snapshot).toMatchSnapshot();
+  });
+});
--- a/src/containers/LearnerDashboardHeader/LearnerDashboardMenu.jsx
+++ b/src/containers/LearnerDashboardHeader/LearnerDashboardMenu.jsx
@@ -1,76 +0,0 @@
-import { getConfig } from '@edx/frontend-platform';
-
-import urls from 'data/services/lms/urls';
-
-import messages from './messages';
-
-const getLearnerHeaderMenu = (
-  formatMessage,
-  courseSearchUrl,
-  authenticatedUser,
-  exploreCoursesClick,
-) => ({
-  mainMenu: [
-    {
-      type: 'item',
-      href: '/',
-      content: formatMessage(messages.course),
-      isActive: true,
-    },
-    ...(getConfig().ENABLE_PROGRAMS ? [{
-      type: 'item',
-      href: `${urls.programsUrl()}`,
-      content: formatMessage(messages.program),
-    }] : []),
-    {
-      type: 'item',
-      href: `${urls.baseAppUrl(courseSearchUrl)}`,
-      content: formatMessage(messages.discoverNew),
-      onClick: (e) => {
-        exploreCoursesClick(e);
-      },
-    },
-  ],
-  secondaryMenu: [
-    ...(getConfig().SUPPORT_URL ? [{
-      type: 'item',
-      href: `${getConfig().SUPPORT_URL}`,
-      content: formatMessage(messages.help),
-    }] : []),
-  ],
-  userMenu: [
-    {
-      heading: '',
-      items: [
-        {
-          type: 'item',
-          href: `${getConfig().ACCOUNT_PROFILE_URL}/u/${authenticatedUser?.username}`,
-          content: formatMessage(messages.profile),
-        },
-        {
-          type: 'item',
-          href: `${getConfig().ACCOUNT_SETTINGS_URL}`,
-          content: formatMessage(messages.account),
-        },
-        ...(getConfig().ORDER_HISTORY_URL ? [{
-          type: 'item',
-          href: getConfig().ORDER_HISTORY_URL,
-          content: formatMessage(messages.orderHistory),
-        }] : []),
-      ],
-    },
-    {
-      heading: '',
-      items: [
-        {
-          type: 'item',
-          href: `${getConfig().LOGOUT_URL}`,
-          content: formatMessage(messages.signOut),
-        },
-      ],
-    },
-  ],
-}
-);
-
-export default getLearnerHeaderMenu;
--- a/src/containers/LearnerDashboardHeader/snapshots/BrandLogo.test.jsx.snap
+++ b/src/containers/LearnerDashboardHeader/snapshots/BrandLogo.test.jsx.snap
@@ -16,7 +16,7 @@ exports[`BrandLogo dashboard defined 1`] = `
 exports[`BrandLogo dashboard undefined 1`] = `
 <a
  className="mx-auto"
-  href="/"
+  href="http://localhost:18000"
 >
  <img
    alt="edX, Inc. Dashboard"
--- a/src/containers/LearnerDashboardHeader/snapshots/index.test.jsx.snap
+++ b/src/containers/LearnerDashboardHeader/snapshots/index.test.jsx.snap
@@ -3,59 +3,8 @@
 exports[`LearnerDashboardHeader render 1`] = `
 <Fragment>
  <ConfirmEmailBanner />
-  <Header
-    mainMenuItems={
-      [
-        {
-          "content": "Courses",
-          "href": "/",
-          "isActive": true,
-          "type": "item",
-        },
-        {
-          "content": "Discover New",
-          "href": "http://localhost:18000/course-search-url",
-          "onClick": [Function],
-          "type": "item",
-        },
-      ]
-    }
-    secondaryMenuItems={[]}
-    userMenuItems={
-      [
-        {
-          "heading": "",
-          "items": [
-            {
-              "content": "Profile",
-              "href": "http://account-profile-url.test/u/undefined",
-              "type": "item",
-            },
-            {
-              "content": "Account",
-              "href": "http://account-settings-url.test",
-              "type": "item",
-            },
-            {
-              "content": "Order History",
-              "href": "test-url",
-              "type": "item",
-            },
-          ],
-        },
-        {
-          "heading": "",
-          "items": [
-            {
-              "content": "Sign Out",
-              "href": "http://localhost:18000/logout",
-              "type": "item",
-            },
-          ],
-        },
-      ]
-    }
-  />
+  <CollapsedHeader />
+  <ExpandedHeader />
  <MasqueradeBar />
 </Fragment>
 `;
--- a/src/containers/LearnerDashboardHeader/hooks.js
+++ b/src/containers/LearnerDashboardHeader/hooks.js
@@ -1,12 +1,9 @@
 import React from 'react';
 import { useWindowSize, breakpoints } from '@openedx/paragon';
-import { useIntl } from '@edx/frontend-platform/i18n';
 import track from 'tracking';
 import { StrictDict } from 'utils';
 import { linkNames } from 'tracking/constants';

-import getLearnerHeaderMenu from './LearnerDashboardMenu';
-
 import * as module from './hooks';

 export const state = StrictDict({
@@ -27,13 +24,6 @@ export const findCoursesNavDropdownClicked = (href) => track.findCourses.findCou
  linkName: linkNames.learnerHomeNavDropdownExplore,
 });

-export const useLearnerDashboardHeaderMenu = ({
-  courseSearchUrl, authenticatedUser, exploreCoursesClick,
-}) => {
-  const { formatMessage } = useIntl();
-  return getLearnerHeaderMenu(formatMessage, courseSearchUrl, authenticatedUser, exploreCoursesClick);
-};
-
 export const useLearnerDashboardHeaderData = () => {
  const [isOpen, setIsOpen] = module.state.isOpen(false);
  const toggleIsOpen = () => setIsOpen(!isOpen);
@@ -49,5 +39,4 @@ export default {
  findCoursesNavClicked,
  findCoursesNavDropdownClicked,
  useLearnerDashboardHeaderData,
-  useLearnerDashboardHeaderMenu,
 };
--- a/src/containers/LearnerDashboardHeader/hooks.test.js
+++ b/src/containers/LearnerDashboardHeader/hooks.test.js
@@ -13,7 +13,6 @@ const {
  findCoursesNavClicked,
  findCoursesNavDropdownClicked,
  useLearnerDashboardHeaderData,
-  useLearnerDashboardHeaderMenu,
 } = hooks;

 jest.mock('tracking', () => ({
@@ -49,17 +48,6 @@ describe('LearnerDashboardHeader hooks', () => {
    });
  });

-  describe('getLearnerDashboardHeaderMenu', () => {
-    test('calls header menu data hook', () => {
-      const courseSearchUrl = '/courses';
-      const authenticatedUser = {
-        username: 'test',
-      };
-      const learnerHomeHeaderMenu = useLearnerDashboardHeaderMenu({ courseSearchUrl, authenticatedUser });
-      expect(learnerHomeHeaderMenu.mainMenu.length).toBe(2);
-    });
-  });
-
  describe('findCoursesNavDropdownClicked', () => {
    test('calls tracking with dropdown link name', () => {
      findCoursesNavDropdownClicked(url);
--- a/src/containers/LearnerDashboardHeader/index.jsx
+++ b/src/containers/LearnerDashboardHeader/index.jsx
@@ -1,43 +1,21 @@
 import React from 'react';

 import MasqueradeBar from 'containers/MasqueradeBar';
-import { AppContext } from '@edx/frontend-platform/react';
-import Header from '@edx/frontend-component-header';
-import { reduxHooks } from 'hooks';
-import urls from 'data/services/lms/urls';
-
 import ConfirmEmailBanner from './ConfirmEmailBanner';

-import { useLearnerDashboardHeaderMenu, findCoursesNavClicked } from './hooks';
+import CollapsedHeader from './CollapsedHeader';
+import ExpandedHeader from './ExpandedHeader';

 import './index.scss';

-export const LearnerDashboardHeader = () => {
-  const { authenticatedUser } = React.useContext(AppContext);
-  const { courseSearchUrl } = reduxHooks.usePlatformSettingsData();
-
-  const exploreCoursesClick = () => {
-    findCoursesNavClicked(urls.baseAppUrl(courseSearchUrl));
-  };
-
-  const learnerHomeHeaderMenu = useLearnerDashboardHeaderMenu({
-    courseSearchUrl,
-    authenticatedUser,
-    exploreCoursesClick,
-  });
-
-  return (
-    <>
-      <ConfirmEmailBanner />
-      <Header
-        mainMenuItems={learnerHomeHeaderMenu.mainMenu}
-        secondaryMenuItems={learnerHomeHeaderMenu.secondaryMenu}
-        userMenuItems={learnerHomeHeaderMenu.userMenu}
-      />
-      <MasqueradeBar />
-    </>
-  );
-};
+export const LearnerDashboardHeader = () => (
+  <>
+    <ConfirmEmailBanner />
+    <CollapsedHeader />
+    <ExpandedHeader />
+    <MasqueradeBar />
+  </>
+);

 LearnerDashboardHeader.propTypes = {};

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Peter Kulko	49d64ff5c6	fix: fixed module button href (#508 )	2024-12-12 10:30:30 +02:00
Peter Kulko	fe658c1796	fix: added LMS_BASE_URL for brand logo (#498 )	2024-11-20 13:19:08 +02:00
Max Sokolski	82dbc27aba	fix: removed Program link from the header (#497 )	2024-11-18 16:59:27 +02:00
Peter Kulko	25d3f831a2	fix: removed program tab in the header	2024-11-14 23:35:40 +02:00
Adolfo R. Brandes	bc68a8c674	fix: Remove edX-specific reference Remove edx-Specific reference from email confirmation banner.	2024-06-10 11:35:01 -03:00
Adolfo R. Brandes	15f9969993	feat: use frontend-plugin-framework to provide a FooterSlot (#356 ) Co-authored-by: Brian Smith <bsmith@axim.org>	2024-06-06 15:05:35 -03:00
@@ -1 +1 @@
 
 .20