feat: update to header with new FPF pluginProps (#1525 )

2024-11-22 15:21:03 -05:00
209 changed files with 3989 additions and 7654 deletions
--- a/.env
+++ b/.env
@@ -48,4 +48,3 @@ TWITTER_HASHTAG=''
 TWITTER_URL=''
 USER_INFO_COOKIE_NAME=''
 OPTIMIZELY_FULL_STACK_SDK_KEY=''
-SHOW_UNGRADED_ASSIGNMENT_PROGRESS=''
--- a/.env.development
+++ b/.env.development
@@ -50,4 +50,3 @@ SESSION_COOKIE_DOMAIN='localhost'
 CHAT_RESPONSE_URL='http://localhost:18000/api/learning_assistant/v1/course_id'
 PRIVACY_POLICY_URL='http://localhost:18000/privacy'
 OPTIMIZELY_FULL_STACK_SDK_KEY=''
-SHOW_UNGRADED_ASSIGNMENT_PROGRESS=''
--- a/.env.test
+++ b/.env.test
@@ -47,4 +47,3 @@ TWITTER_HASHTAG='myedxjourney'
 TWITTER_URL='https://twitter.com/edXOnline'
 USER_INFO_COOKIE_NAME='edx-user-info'
 PRIVACY_POLICY_URL='http://localhost:18000/privacy'
-SHOW_UNGRADED_ASSIGNMENT_PROGRESS=''
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -9,28 +9,35 @@ on:
 jobs:
  tests:
    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [18, 20]
    steps:
    - uses: actions/checkout@v4
    - uses: actions/setup-node@v4
      with:
-        node-version-file: '.nvmrc'
+        node-version: ${{ matrix.node }}
    - run: make validate.ci
    - name: Archive code coverage results
      uses: actions/upload-artifact@v4
      with:
-        name: code-coverage-report
+        name: code-coverage-report-${{ matrix.node }}
+        # When we're only using Node 20, replace the line above with the following:
+        # name: code-coverage-report
        path: coverage/*.*
  coverage:
    runs-on: ubuntu-latest
    needs: tests
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
    - name: Download code coverage results
      uses: actions/download-artifact@v4
      with:
-        name: code-coverage-report
+        name: code-coverage-report-20
+        # When we're only using Node 20, replace the line above with the following:
+        # name: code-coverage-report
    - name: Upload coverage
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@v4
      with:
        fail_ci_if_error: true
        token: ${{ secrets.CODECOV_TOKEN }}
--- a/.husky/_/.gitignore
+++ b/.husky/_/.gitignore
@@ -0,0 +1 @@
+*
--- a/.husky/_/husky.sh
+++ b/.husky/_/husky.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+if [ -z "$husky_skip_init" ]; then
+  debug () {
+    if [ "$HUSKY_DEBUG" = "1" ]; then
+      echo "husky (debug) - $1"
+    fi
+  }
+
+  readonly hook_name="$(basename "$0")"
+  debug "starting $hook_name..."
+
+  if [ "$HUSKY" = "0" ]; then
+    debug "HUSKY env variable is set to 0, skipping hook"
+    exit 0
+  fi
+
+  if [ -f ~/.huskyrc ]; then
+    debug "sourcing ~/.huskyrc"
+    . ~/.huskyrc
+  fi
+
+  export readonly husky_skip_init=1
+  sh -e "$0" "$@"
+  exitCode="$?"
+
+  if [ $exitCode != 0 ]; then
+    echo "husky - $hook_name hook exited with code $exitCode (error)"
+  fi
+
+  exit $exitCode
+fi
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run lint
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -12,7 +12,6 @@ metadata:
      icon: "Web"
  annotations:
    openedx.org/arch-interest-groups: ""
-    openedx.org/release: "master"
 spec:
  owner: group:committers-frontend-app-learning
  type: 'website'
--- a/openedx.yaml
+++ b/openedx.yaml
@@ -0,0 +1,10 @@
+# This file describes this Open edX repo, as described in OEP-2:
+# https://open-edx-proposals.readthedocs.io/en/latest/oep-0002-bp-repo-metadata.html#specification
+
+oeps: {}
+owner: edx/platform-core-tnl
+openedx-release:
+  # The openedx-release key is described in OEP-10:
+  #   https://open-edx-proposals.readthedocs.io/en/latest/oep-0010-proc-openedx-releases.html
+  # The FAQ might also be helpful: https://openedx.atlassian.net/wiki/spaces/COMM/pages/1331268879/Open+edX+Release+FAQ
+  ref: master
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,9 +11,9 @@
      "license": "AGPL-3.0",
      "dependencies": {
        "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
-        "@edx/browserslist-config": "1.5.0",
+        "@edx/browserslist-config": "1.2.0",
        "@edx/frontend-component-header": "^5.8.0",
-        "@edx/frontend-lib-learning-assistant": "^2.19.2",
+        "@edx/frontend-lib-learning-assistant": "^2.2.4",
        "@edx/frontend-lib-special-exams": "^3.1.3",
        "@edx/frontend-platform": "^8.0.0",
        "@edx/openedx-atlas": "^0.6.0",
@@ -22,15 +22,16 @@
        "@fortawesome/free-regular-svg-icons": "5.15.4",
        "@fortawesome/free-solid-svg-icons": "5.15.4",
        "@fortawesome/react-fontawesome": "^0.1.4",
-        "@openedx/frontend-build": "^14.2.0",
+        "@openedx/frontend-build": "14.1.2",
        "@openedx/frontend-plugin-framework": "^1.2.1",
        "@openedx/frontend-slot-footer": "^1.0.2",
        "@openedx/paragon": "^22.3.0",
        "@popperjs/core": "2.11.8",
-        "@reduxjs/toolkit": "1.9.7",
+        "@reduxjs/toolkit": "1.8.1",
        "buffer": "^6.0.3",
        "classnames": "2.5.1",
-        "copy-webpack-plugin": "^12.0.0",
+        "copy-webpack-plugin": "^11.0.0",
+        "husky": "7.0.4",
        "joi": "^17.11.0",
        "js-cookie": "3.0.5",
        "lodash": "^4.17.21",
@@ -46,7 +47,7 @@
        "react-router": "6.15.0",
        "react-router-dom": "6.15.0",
        "react-share": "4.4.1",
-        "redux": "4.2.1",
+        "redux": "4.1.2",
        "reselect": "4.1.8",
        "sass": "^1.79.3",
        "sass-loader": "^16.0.2",
@@ -59,8 +60,8 @@
        "@testing-library/jest-dom": "5.17.0",
        "@testing-library/react": "12.1.5",
        "@testing-library/react-hooks": "^8.0.1",
-        "@testing-library/user-event": "14.6.1",
-        "axios-mock-adapter": "2.1.0",
+        "@testing-library/user-event": "13.5.0",
+        "axios-mock-adapter": "2.0.0",
        "bundlewatch": "^0.4.0",
        "eslint-import-resolver-webpack": "^0.13.9",
        "jest": "^29.7.0",
@@ -130,13 +131,12 @@
      "license": "MIT"
    },
    "node_modules/@babel/code-frame": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
-      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
      "license": "MIT",
      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.25.9",
-        "js-tokens": "^4.0.0",
+        "@babel/highlight": "^7.24.7",
        "picocolors": "^1.0.0"
      },
      "engines": {
@@ -206,28 +206,27 @@
      }
    },
    "node_modules/@babel/generator": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz",
-      "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz",
+      "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==",
      "license": "MIT",
      "dependencies": {
-        "@babel/parser": "^7.26.9",
-        "@babel/types": "^7.26.9",
+        "@babel/types": "^7.25.0",
        "@jridgewell/gen-mapping": "^0.3.5",
        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^3.0.2"
+        "jsesc": "^2.5.1"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
-      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
      "license": "MIT",
      "dependencies": {
-        "@babel/types": "^7.25.9"
+        "@babel/types": "^7.24.7"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -329,13 +328,13 @@
      }
    },
    "node_modules/@babel/helper-module-imports": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
-      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
      "license": "MIT",
      "dependencies": {
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.25.9"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -372,9 +371,9 @@
      }
    },
    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
-      "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
+      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
@@ -441,27 +440,27 @@
      }
    },
    "node_modules/@babel/helper-string-parser": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-validator-option": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
-      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
@@ -494,13 +493,99 @@
        "node": ">=6.9.0"
      }
    },
-    "node_modules/@babel/parser": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz",
-      "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==",
+    "node_modules/@babel/highlight": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
      "license": "MIT",
      "dependencies": {
-        "@babel/types": "^7.26.9"
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "license": "MIT"
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.25.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.3.tgz",
+      "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.25.2"
      },
      "bin": {
        "parser": "bin/babel-parser.js"
@@ -743,12 +828,12 @@
      }
    },
    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
-      "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
+      "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
      "license": "MIT",
      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -1495,12 +1580,12 @@
      }
    },
    "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.9.tgz",
-      "integrity": "sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.7.tgz",
+      "integrity": "sha512-H/Snz9PFxKsS1JLI4dJLtnJgCJRoo0AUm3chP6NYr+9En1JMKloheEiLIhlp5MDVznWo+H3AAC1Mc8lmUEpsgg==",
      "license": "MIT",
      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.24.7"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -1510,16 +1595,16 @@
      }
    },
    "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz",
-      "integrity": "sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.2.tgz",
+      "integrity": "sha512-KQsqEAVBpU82NM/B/N9j9WOdphom1SZH3R+2V7INrQUH+V9EBFwZsEJl8eBIVeQE62FxJCc70jzEZwqU7RcVqA==",
      "license": "MIT",
      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.9",
-        "@babel/helper-module-imports": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/plugin-syntax-jsx": "^7.25.9",
-        "@babel/types": "^7.25.9"
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.8",
+        "@babel/plugin-syntax-jsx": "^7.24.7",
+        "@babel/types": "^7.25.2"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -1529,12 +1614,12 @@
      }
    },
    "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.25.9.tgz",
-      "integrity": "sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.24.7.tgz",
+      "integrity": "sha512-QG9EnzoGn+Qar7rxuW+ZOsbWOt56FvvI93xInqsZDC5fsekx1AlIO4KIJ5M+D0p0SqSH156EpmZyXq630B8OlQ==",
      "license": "MIT",
      "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.25.9"
+        "@babel/plugin-transform-react-jsx": "^7.24.7"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -1544,13 +1629,13 @@
      }
    },
    "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.25.9.tgz",
-      "integrity": "sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.7.tgz",
+      "integrity": "sha512-PLgBVk3fzbmEjBJ/u8kFzOqS9tUeDjiaWud/rRym/yjCo/M9cASPlnrd2ZmmZpQT40fOOrvR8jh+n8jikrOhNA==",
      "license": "MIT",
      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -1856,17 +1941,17 @@
      }
    },
    "node_modules/@babel/preset-react": {
-      "version": "7.26.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
-      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.24.7.tgz",
+      "integrity": "sha512-AAH4lEkpmzFWrGVlHaxJB7RLH21uPQ9+He+eFLWHmF9IuFQVugz8eAsamaW0DXRrTfco5zj1wWtpdcXJUOfsag==",
      "license": "MIT",
      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-validator-option": "^7.25.9",
-        "@babel/plugin-transform-react-display-name": "^7.25.9",
-        "@babel/plugin-transform-react-jsx": "^7.25.9",
-        "@babel/plugin-transform-react-jsx-development": "^7.25.9",
-        "@babel/plugin-transform-react-pure-annotations": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-validator-option": "^7.24.7",
+        "@babel/plugin-transform-react-display-name": "^7.24.7",
+        "@babel/plugin-transform-react-jsx": "^7.24.7",
+        "@babel/plugin-transform-react-jsx-development": "^7.24.7",
+        "@babel/plugin-transform-react-pure-annotations": "^7.24.7"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -1921,31 +2006,41 @@
        "node": ">=6.9.0"
      }
    },
+    "node_modules/@babel/runtime-corejs3/node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+    },
+    "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
+    },
    "node_modules/@babel/template": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
-      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
+      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
      "license": "MIT",
      "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "@babel/parser": "^7.26.9",
-        "@babel/types": "^7.26.9"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.25.0",
+        "@babel/types": "^7.25.0"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/traverse": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz",
-      "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==",
+      "version": "7.25.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.3.tgz",
+      "integrity": "sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==",
      "license": "MIT",
      "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "@babel/generator": "^7.26.9",
-        "@babel/parser": "^7.26.9",
-        "@babel/template": "^7.26.9",
-        "@babel/types": "^7.26.9",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/parser": "^7.25.3",
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.2",
        "debug": "^4.3.1",
        "globals": "^11.1.0"
      },
@@ -1954,13 +2049,14 @@
      }
    },
    "node_modules/@babel/types": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",
-      "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.2.tgz",
+      "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==",
      "license": "MIT",
      "dependencies": {
-        "@babel/helper-string-parser": "^7.25.9",
-        "@babel/helper-validator-identifier": "^7.25.9"
+        "@babel/helper-string-parser": "^7.24.8",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "to-fast-properties": "^2.0.0"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -2081,16 +2177,14 @@
      "integrity": "sha512-Dn9CtpC8fovh++Xi4NF5NJoeR9yU2yXZnV9IujxIyGd/dn0Phq5t6dzJVfupwq09mpDnzJv7egA8Znz/3ljO+w=="
    },
    "node_modules/@edx/browserslist-config": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@edx/browserslist-config/-/browserslist-config-1.5.0.tgz",
-      "integrity": "sha512-d2ggwi5j4DOBJOwhWZxBWQSDR0DhT4ke/1PbzRauICdFkuOyax+PsFjK8GUh443K2OaQpy9PGfiCzZ1Yg37AUA==",
-      "license": "AGPL-3.0"
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@edx/browserslist-config/-/browserslist-config-1.2.0.tgz",
+      "integrity": "sha512-T1+6P52Yx7SMkmoIr4O0Q3m/DyRdrLTJbv1xVijdRLFEq1hqdafEs+Ln1423U5LSkTePb9AOkEtL1G0RZLFl1w=="
    },
    "node_modules/@edx/eslint-config": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@edx/eslint-config/-/eslint-config-4.3.0.tgz",
-      "integrity": "sha512-4W9wFG4ALr3xocakCsncgJbK67RHfSmDwHDXKHReFtjxl/FRkxhS6qayz189oChqfANieeV3zRCLaq44bLf+/A==",
-      "license": "MIT",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@edx/eslint-config/-/eslint-config-4.2.0.tgz",
+      "integrity": "sha512-2wuIw49uyj6gRwS74qJ8WhBU+X2FOP4uot40sthIC4YU9qCM7WJOcOuAhkRPP1FvZKd3UQH3gZM7eJ85xzDBqA==",
      "peerDependencies": {
        "@typescript-eslint/eslint-plugin": "^5.62.0",
        "@typescript-eslint/parser": "^5.62.0",
@@ -2201,11 +2295,37 @@
        "react": ">=16.3"
      }
    },
+    "node_modules/@edx/frontend-component-footer/node_modules/jest-environment-jsdom": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
+      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
+      "peer": true,
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/jsdom": "^20.0.0",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jsdom": "^20.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/@edx/frontend-component-header": {
-      "version": "5.8.3",
-      "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-5.8.3.tgz",
-      "integrity": "sha512-cPenGEirOE7sQwyjakK9Vy/oyvBy4gzhCkf5pxiYYuOhTe0uK/iLnnThJh7R0XdkGdxMMOvUBJVmV4TGC1BHJQ==",
-      "license": "AGPL-3.0",
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-5.8.0.tgz",
+      "integrity": "sha512-AgLgt1y5vrqx6cU3IDr7HKngJImTN48gCIaXdCQ4YhR4PpX3p+ZS9R5Ih0dapWtvnX0Oo2hT2ggUKORV0h90rw==",
      "dependencies": {
        "@fortawesome/fontawesome-svg-core": "6.6.0",
        "@fortawesome/free-brands-svg-icons": "6.6.0",
@@ -2291,37 +2411,106 @@
        "axios": ">= 0.17.0"
      }
    },
-    "node_modules/@edx/frontend-lib-learning-assistant": {
-      "version": "2.19.2",
-      "resolved": "https://registry.npmjs.org/@edx/frontend-lib-learning-assistant/-/frontend-lib-learning-assistant-2.19.2.tgz",
-      "integrity": "sha512-EF2JPEe0llJfw8GwDgFsBr+5VKuqwVGqCBAP0jhWuWnLnJ2KUJJ+oxm8t0Dlni8M59LiO8QlO52OilJ6+/5IJw==",
-      "license": "AGPL-3.0",
+    "node_modules/@edx/frontend-component-header/node_modules/jest-environment-jsdom": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
+      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
+      "license": "MIT",
      "dependencies": {
-        "@edx/brand": "npm:@openedx/brand-openedx@^1.2.3",
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/jsdom": "^20.0.0",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jsdom": "^20.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@edx/frontend-lib-learning-assistant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-lib-learning-assistant/-/frontend-lib-learning-assistant-2.2.4.tgz",
+      "integrity": "sha512-EvN22XhDzzdIYrJY1TKEF/5zXuozC4tlKRo96+dSe9I7UAMg4zsLKC1zqY15oUuyB8rHo1ERYhQBG18uMepXrw==",
+      "dependencies": {
+        "@edx/brand": "npm:@edx/brand-openedx@1.2.0",
+        "@fortawesome/fontawesome-svg-core": "1.2.36",
+        "@fortawesome/free-brands-svg-icons": "5.15.4",
+        "@fortawesome/free-regular-svg-icons": "5.15.4",
+        "@fortawesome/free-solid-svg-icons": "5.15.4",
+        "@fortawesome/react-fontawesome": "0.2.0",
        "@optimizely/react-sdk": "^2.9.2",
+        "core-js": "^3.36.1",
+        "prop-types": "15.8.1",
        "react-markdown": "^8.0.5",
        "uuid": "9.0.0"
      },
      "peerDependencies": {
-        "@edx/browserslist-config": "*",
-        "@edx/frontend-platform": "^8",
-        "@openedx/frontend-build": "^14",
-        "@openedx/paragon": "^22",
-        "@reduxjs/toolkit": "^1.8",
-        "prop-types": "^15",
-        "react": "^17",
-        "react-dom": "^17",
-        "react-redux": "^7",
-        "react-router": "^6",
-        "react-router-dom": "^6",
-        "redux": "^4"
+        "@edx/frontend-platform": "^7.0.0 || ^8.0.0",
+        "@openedx/paragon": "^22.0.0",
+        "@reduxjs/toolkit": "1.8.1",
+        "react": "16.14.0 || ^17.0.0",
+        "react-dom": "16.14.0 || ^17.0.0",
+        "react-redux": "7.2.9",
+        "react-router": "5.2.1 || ^6.0.0",
+        "react-router-dom": "5.3.0 || ^6.0.0",
+        "redux": "4.1.2",
+        "regenerator-runtime": "0.13.11"
+      }
+    },
+    "node_modules/@edx/frontend-lib-learning-assistant/node_modules/@edx/brand": {
+      "name": "@edx/brand-openedx",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@edx/brand-openedx/-/brand-openedx-1.2.0.tgz",
+      "integrity": "sha512-r4PDN3rCgDsLovW44ayxoNNHgG5I4Rvss6MG5CrQEX4oW8YhQVEod+jJtwR5vi0mFLN2GIaMlDpd7iIy03VqXg=="
+    },
+    "node_modules/@edx/frontend-lib-learning-assistant/node_modules/@fortawesome/fontawesome-common-types": {
+      "version": "0.2.36",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz",
+      "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==",
+      "hasInstallScript": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@edx/frontend-lib-learning-assistant/node_modules/@fortawesome/fontawesome-svg-core": {
+      "version": "1.2.36",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.36.tgz",
+      "integrity": "sha512-YUcsLQKYb6DmaJjIHdDWpBIGCcyE/W+p/LMGvjQem55Mm2XWVAP5kWTMKWLv9lwpCVjpLxPyOMOyUocP1GxrtA==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "@fortawesome/fontawesome-common-types": "^0.2.36"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@edx/frontend-lib-learning-assistant/node_modules/@fortawesome/react-fontawesome": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz",
+      "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==",
+      "dependencies": {
+        "prop-types": "^15.8.1"
+      },
+      "peerDependencies": {
+        "@fortawesome/fontawesome-svg-core": "~1 || ~6",
+        "react": ">=16.3"
      }
    },
    "node_modules/@edx/frontend-lib-special-exams": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@edx/frontend-lib-special-exams/-/frontend-lib-special-exams-3.3.0.tgz",
-      "integrity": "sha512-znlwIDqODP34C1QV+qLh8v9uRubGhOYrOf84lxulfiSGIVcxWtzQkjM8NHL2BE8OPefsyDbdy7QjC6GQ/Qo2hA==",
-      "license": "AGPL-3.0",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-lib-special-exams/-/frontend-lib-special-exams-3.1.3.tgz",
+      "integrity": "sha512-qkcnjPybt/eEE5txl8srUGTAVRiT92SFkjvPJEx9xuoUWuKTt0AmE0z3CVM2KypmcklBLlUZHVqZQVmgHlbtdA==",
      "dependencies": {
        "@fortawesome/fontawesome-svg-core": "1.2.34",
        "@fortawesome/free-brands-svg-icons": "5.11.2",
@@ -2349,7 +2538,6 @@
      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz",
      "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==",
      "hasInstallScript": true,
-      "license": "MIT",
      "engines": {
        "node": ">=6"
      }
@@ -2359,7 +2547,6 @@
      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.34.tgz",
      "integrity": "sha512-0KNN0nc5eIzaJxlv43QcDmTkDY1CqeN6J7OCGSs+fwGPdtv0yOQqRjieopBCmw+yd7uD3N2HeNL3Zm5isDleLg==",
      "hasInstallScript": true,
-      "license": "MIT",
      "dependencies": {
        "@fortawesome/fontawesome-common-types": "^0.2.34"
      },
@@ -2371,7 +2558,6 @@
      "version": "5.11.2",
      "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.11.2.tgz",
      "integrity": "sha512-wKK5znpHiZ2S0VgOvbeAnYuzkk3H86rxWajD9PVpfBj3s/kySEWTFKh/uLPyxiTOx8Tsd0OGN4En/s9XudVHLQ==",
-      "license": "(CC-BY-4.0 AND MIT)",
      "dependencies": {
        "@fortawesome/fontawesome-common-types": "^0.2.25"
      },
@@ -2383,7 +2569,6 @@
      "version": "5.11.2",
      "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.11.2.tgz",
      "integrity": "sha512-k0vbThRv9AvnXYBWi1gn1rFW4X7co/aFkbm0ZNmAR5PoWb9vY9EDDDobg8Ay4ISaXtCPypvJ0W1FWkSpLQwZ6w==",
-      "license": "(CC-BY-4.0 AND MIT)",
      "dependencies": {
        "@fortawesome/fontawesome-common-types": "^0.2.25"
      },
@@ -2395,7 +2580,6 @@
      "version": "5.11.2",
      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.11.2.tgz",
      "integrity": "sha512-zBue4i0PAZJUXOmLBBvM7L0O7wmsDC8dFv9IhpW5QL4kT9xhhVUsYg/LX1+5KaukWq4/cbDcKT+RT1aRe543sg==",
-      "license": "(CC-BY-4.0 AND MIT)",
      "dependencies": {
        "@fortawesome/fontawesome-common-types": "^0.2.25"
      },
@@ -2407,7 +2591,6 @@
      "version": "0.1.14",
      "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.14.tgz",
      "integrity": "sha512-4wqNb0gRLVaBm/h+lGe8UfPPivcbuJ6ecI4hIgW0LjI7kzpYB9FkN0L9apbVzg+lsBdcTf0AlBtODjcSX5mmKA==",
-      "license": "MIT",
      "dependencies": {
        "prop-types": "^15.7.2"
      },
@@ -2417,16 +2600,16 @@
      }
    },
    "node_modules/@edx/frontend-platform": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-8.2.1.tgz",
-      "integrity": "sha512-Pid7feVSr81Kl+Oeuh5sZR2caDyCvOz191dmtSYFKKR5lAyOBetc14GMZ9s/TYneeiR0bCbzUIWSl17eRuZrJw==",
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-8.1.1.tgz",
+      "integrity": "sha512-fJunRCg1P+mK7DhIIk+GsLNHjmqaZEnAD8W5eJ7Kb69/62oQg3/xJlx3twfYlLmdXtIOeyuZVtGs/X9AfQUeFg==",
      "license": "AGPL-3.0",
      "dependencies": {
        "@cospired/i18n-iso-languages": "4.2.0",
        "@formatjs/intl-pluralrules": "4.3.3",
        "@formatjs/intl-relativetimeformat": "10.0.1",
-        "axios": "1.7.9",
-        "axios-cache-interceptor": "1.6.2",
+        "axios": "1.6.7",
+        "axios-cache-interceptor": "1.3.2",
        "form-urlencoded": "4.1.4",
        "glob": "7.2.3",
        "history": "4.10.1",
@@ -2438,8 +2621,8 @@
        "lodash.memoize": "4.1.2",
        "lodash.merge": "4.6.2",
        "lodash.snakecase": "4.1.1",
-        "pubsub-js": "1.9.5",
-        "react-intl": "6.8.9",
+        "pubsub-js": "1.9.4",
+        "react-intl": "6.6.8",
        "universal-cookie": "4.0.4"
      },
      "bin": {
@@ -2450,13 +2633,24 @@
        "@openedx/frontend-build": ">= 14.0.0",
        "@openedx/paragon": ">= 21.5.7 < 23.0.0",
        "prop-types": ">=15.7.2 <16.0.0",
-        "react": "^16.9.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0",
+        "react": "^16.9.0 || ^17.0.0",
+        "react-dom": "^16.9.0 || ^17.0.0",
        "react-redux": "^7.1.1 || ^8.1.1",
        "react-router-dom": "^6.0.0",
        "redux": "^4.0.4"
      }
    },
+    "node_modules/@edx/frontend-platform/node_modules/axios": {
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
+      "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.15.4",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
    "node_modules/@edx/new-relic-source-map-webpack-plugin": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/@edx/new-relic-source-map-webpack-plugin/-/new-relic-source-map-webpack-plugin-2.1.0.tgz",
@@ -2719,12 +2913,12 @@
      }
    },
    "node_modules/@formatjs/fast-memoize": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.3.tgz",
-      "integrity": "sha512-3jeJ+HyOfu8osl3GNSL4vVHUuWFXR03Iz9jjgI7RwjG6ysu/Ymdr0JRCPHfF5yGbTE6JCrd63EpvX1/WybYRbA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz",
+      "integrity": "sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==",
      "license": "MIT",
      "dependencies": {
-        "tslib": "2"
+        "tslib": "^2.4.0"
      }
    },
    "node_modules/@formatjs/icu-messageformat-parser": {
@@ -2787,18 +2981,18 @@
      }
    },
    "node_modules/@formatjs/intl": {
-      "version": "2.10.15",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.10.15.tgz",
-      "integrity": "sha512-i6+xVqT+6KCz7nBfk4ybMXmbKO36tKvbMKtgFz9KV+8idYFyFbfwKooYk8kGjyA5+T5f1kEPQM5IDLXucTAQ9g==",
+      "version": "2.10.4",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.10.4.tgz",
+      "integrity": "sha512-56483O+HVcL0c7VucAS2tyH020mt9XTozZO67cwtGg0a7KWDukS/FzW3OnvaHmTHDuYsoPIzO+ZHVfU6fT/bJw==",
      "license": "MIT",
      "dependencies": {
-        "@formatjs/ecma402-abstract": "2.2.4",
-        "@formatjs/fast-memoize": "2.2.3",
-        "@formatjs/icu-messageformat-parser": "2.9.4",
-        "@formatjs/intl-displaynames": "6.8.5",
-        "@formatjs/intl-listformat": "7.7.5",
-        "intl-messageformat": "10.7.7",
-        "tslib": "2"
+        "@formatjs/ecma402-abstract": "2.0.0",
+        "@formatjs/fast-memoize": "2.2.0",
+        "@formatjs/icu-messageformat-parser": "2.7.8",
+        "@formatjs/intl-displaynames": "6.6.8",
+        "@formatjs/intl-listformat": "7.5.7",
+        "intl-messageformat": "10.5.14",
+        "tslib": "^2.4.0"
      },
      "peerDependencies": {
        "typescript": "^4.7 || 5"
@@ -2810,65 +3004,63 @@
      }
    },
    "node_modules/@formatjs/intl-displaynames": {
-      "version": "6.8.5",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-6.8.5.tgz",
-      "integrity": "sha512-85b+GdAKCsleS6cqVxf/Aw/uBd+20EM0wDpgaxzHo3RIR3bxF4xCJqH/Grbzx8CXurTgDDZHPdPdwJC+May41w==",
+      "version": "6.6.8",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-6.6.8.tgz",
+      "integrity": "sha512-Lgx6n5KxN16B3Pb05z3NLEBQkGoXnGjkTBNCZI+Cn17YjHJ3fhCeEJJUqRlIZmJdmaXQhjcQVDp6WIiNeRYT5g==",
      "license": "MIT",
      "dependencies": {
-        "@formatjs/ecma402-abstract": "2.2.4",
-        "@formatjs/intl-localematcher": "0.5.8",
-        "tslib": "2"
+        "@formatjs/ecma402-abstract": "2.0.0",
+        "@formatjs/intl-localematcher": "0.5.4",
+        "tslib": "^2.4.0"
      }
    },
    "node_modules/@formatjs/intl-displaynames/node_modules/@formatjs/ecma402-abstract": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.2.4.tgz",
-      "integrity": "sha512-lFyiQDVvSbQOpU+WFd//ILolGj4UgA/qXrKeZxdV14uKiAUiPAtX6XAn7WBCRi7Mx6I7EybM9E5yYn4BIpZWYg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+      "integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
      "license": "MIT",
      "dependencies": {
-        "@formatjs/fast-memoize": "2.2.3",
-        "@formatjs/intl-localematcher": "0.5.8",
-        "tslib": "2"
+        "@formatjs/intl-localematcher": "0.5.4",
+        "tslib": "^2.4.0"
      }
    },
    "node_modules/@formatjs/intl-displaynames/node_modules/@formatjs/intl-localematcher": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.8.tgz",
-      "integrity": "sha512-I+WDNWWJFZie+jkfkiK5Mp4hEDyRSEvmyfYadflOno/mmKJKcB17fEpEH0oJu/OWhhCJ8kJBDz2YMd/6cDl7Mg==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+      "integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
      "license": "MIT",
      "dependencies": {
-        "tslib": "2"
+        "tslib": "^2.4.0"
      }
    },
    "node_modules/@formatjs/intl-listformat": {
-      "version": "7.7.5",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-7.7.5.tgz",
-      "integrity": "sha512-Wzes10SMNeYgnxYiKsda4rnHP3Q3II4XT2tZyOgnH5fWuHDtIkceuWlRQNsvrI3uiwP4hLqp2XdQTCsfkhXulg==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-7.5.7.tgz",
+      "integrity": "sha512-MG2TSChQJQT9f7Rlv+eXwUFiG24mKSzmF144PLb8m8OixyXqn4+YWU+5wZracZGCgVTVmx8viCf7IH3QXoiB2g==",
      "license": "MIT",
      "dependencies": {
-        "@formatjs/ecma402-abstract": "2.2.4",
-        "@formatjs/intl-localematcher": "0.5.8",
-        "tslib": "2"
+        "@formatjs/ecma402-abstract": "2.0.0",
+        "@formatjs/intl-localematcher": "0.5.4",
+        "tslib": "^2.4.0"
      }
    },
    "node_modules/@formatjs/intl-listformat/node_modules/@formatjs/ecma402-abstract": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.2.4.tgz",
-      "integrity": "sha512-lFyiQDVvSbQOpU+WFd//ILolGj4UgA/qXrKeZxdV14uKiAUiPAtX6XAn7WBCRi7Mx6I7EybM9E5yYn4BIpZWYg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+      "integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
      "license": "MIT",
      "dependencies": {
-        "@formatjs/fast-memoize": "2.2.3",
-        "@formatjs/intl-localematcher": "0.5.8",
-        "tslib": "2"
+        "@formatjs/intl-localematcher": "0.5.4",
+        "tslib": "^2.4.0"
      }
    },
    "node_modules/@formatjs/intl-listformat/node_modules/@formatjs/intl-localematcher": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.8.tgz",
-      "integrity": "sha512-I+WDNWWJFZie+jkfkiK5Mp4hEDyRSEvmyfYadflOno/mmKJKcB17fEpEH0oJu/OWhhCJ8kJBDz2YMd/6cDl7Mg==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+      "integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
      "license": "MIT",
      "dependencies": {
-        "tslib": "2"
+        "tslib": "^2.4.0"
      }
    },
    "node_modules/@formatjs/intl-localematcher": {
@@ -2900,44 +3092,22 @@
      }
    },
    "node_modules/@formatjs/intl/node_modules/@formatjs/ecma402-abstract": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.2.4.tgz",
-      "integrity": "sha512-lFyiQDVvSbQOpU+WFd//ILolGj4UgA/qXrKeZxdV14uKiAUiPAtX6XAn7WBCRi7Mx6I7EybM9E5yYn4BIpZWYg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+      "integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
      "license": "MIT",
      "dependencies": {
-        "@formatjs/fast-memoize": "2.2.3",
-        "@formatjs/intl-localematcher": "0.5.8",
-        "tslib": "2"
-      }
-    },
-    "node_modules/@formatjs/intl/node_modules/@formatjs/icu-messageformat-parser": {
-      "version": "2.9.4",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.9.4.tgz",
-      "integrity": "sha512-Tbvp5a9IWuxUcpWNIW6GlMQYEc4rwNHR259uUFoKWNN1jM9obf9Ul0e+7r7MvFOBNcN+13K7NuKCKqQiAn1QEg==",
-      "license": "MIT",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "2.2.4",
-        "@formatjs/icu-skeleton-parser": "1.8.8",
-        "tslib": "2"
-      }
-    },
-    "node_modules/@formatjs/intl/node_modules/@formatjs/icu-skeleton-parser": {
-      "version": "1.8.8",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.8.tgz",
-      "integrity": "sha512-vHwK3piXwamFcx5YQdCdJxUQ1WdTl6ANclt5xba5zLGDv5Bsur7qz8AD7BevaKxITwpgDeU0u8My3AIibW9ywA==",
-      "license": "MIT",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "2.2.4",
-        "tslib": "2"
+        "@formatjs/intl-localematcher": "0.5.4",
+        "tslib": "^2.4.0"
      }
    },
    "node_modules/@formatjs/intl/node_modules/@formatjs/intl-localematcher": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.8.tgz",
-      "integrity": "sha512-I+WDNWWJFZie+jkfkiK5Mp4hEDyRSEvmyfYadflOno/mmKJKcB17fEpEH0oJu/OWhhCJ8kJBDz2YMd/6cDl7Mg==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+      "integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
      "license": "MIT",
      "dependencies": {
-        "tslib": "2"
+        "tslib": "^2.4.0"
      }
    },
    "node_modules/@formatjs/ts-transformer": {
@@ -3760,10 +3930,9 @@
      }
    },
    "node_modules/@openedx/frontend-build": {
-      "version": "14.3.3",
-      "resolved": "https://registry.npmjs.org/@openedx/frontend-build/-/frontend-build-14.3.3.tgz",
-      "integrity": "sha512-I1xjpNV8m0ztbTFsh3YTeqcgc+9GqOtywdFnoXKzeCvjuQF/LVTmGg59/Cv0l9VisT82bI0cpi5DM4SwgHyQRA==",
-      "license": "AGPL-3.0",
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@openedx/frontend-build/-/frontend-build-14.1.2.tgz",
+      "integrity": "sha512-pLTcY/BLjCFn2qsBmUY0on2qB4PNShlg8scTYjrsz5fCASuSAJk000jOF5ys6bg6i8krSOIJlcZXPgrq0ywsUg==",
      "dependencies": {
        "@babel/cli": "7.24.8",
        "@babel/core": "7.24.9",
@@ -3772,8 +3941,8 @@
        "@babel/plugin-proposal-object-rest-spread": "7.20.7",
        "@babel/plugin-syntax-dynamic-import": "7.8.3",
        "@babel/preset-env": "7.24.8",
-        "@babel/preset-react": "7.26.3",
-        "@edx/eslint-config": "^4.3.0",
+        "@babel/preset-react": "7.24.7",
+        "@edx/eslint-config": "4.2.0",
        "@edx/new-relic-source-map-webpack-plugin": "2.1.0",
        "@edx/typescript-config": "1.1.0",
        "@formatjs/cli": "^6.0.3",
@@ -3783,9 +3952,9 @@
        "@types/jest": "29.5.12",
        "@typescript-eslint/eslint-plugin": "^5.58.0",
        "@typescript-eslint/parser": "^5.58.0",
-        "autoprefixer": "10.4.20",
-        "babel-jest": "29.7.0",
-        "babel-loader": "9.2.1",
+        "autoprefixer": "10.4.19",
+        "babel-jest": "29.6.1",
+        "babel-loader": "9.1.3",
        "babel-plugin-formatjs": "^10.4.0",
        "babel-plugin-transform-imports": "2.0.0",
        "babel-polyfill": "6.26.0",
@@ -3799,27 +3968,27 @@
        "eslint-config-airbnb": "19.0.4",
        "eslint-config-airbnb-typescript": "^17.0.0",
        "eslint-plugin-formatjs": "^4.12.2",
-        "eslint-plugin-import": "2.31.0",
+        "eslint-plugin-import": "2.27.5",
        "eslint-plugin-jsx-a11y": "6.7.1",
-        "eslint-plugin-react": "7.33.2",
-        "eslint-plugin-react-hooks": "4.6.1",
+        "eslint-plugin-react": "7.32.2",
+        "eslint-plugin-react-hooks": "4.6.0",
        "express": "^4.18.2",
        "file-loader": "6.2.0",
-        "html-webpack-plugin": "5.6.3",
+        "html-webpack-plugin": "5.6.0",
        "identity-obj-proxy": "3.0.0",
        "image-minimizer-webpack-plugin": "3.8.3",
-        "jest": "29.7.0",
-        "jest-environment-jsdom": "29.7.0",
+        "jest": "29.6.1",
+        "jest-environment-jsdom": "29.6.1",
        "mini-css-extract-plugin": "1.6.2",
        "parse5": "7.1.2",
-        "postcss": "8.4.49",
+        "postcss": "8.4.39",
        "postcss-custom-media": "10.0.8",
        "postcss-loader": "7.3.4",
        "postcss-rtlcss": "5.1.2",
        "react-dev-utils": "12.0.1",
-        "react-refresh": "0.16.0",
+        "react-refresh": "0.14.2",
        "resolve-url-loader": "5.0.0",
-        "sass": "1.85.1",
+        "sass": "1.69.7",
        "sass-loader": "13.3.3",
        "sharp": "0.32.6",
        "source-map-loader": "4.0.2",
@@ -3827,7 +3996,7 @@
        "ts-jest": "29.1.4",
        "typescript": "4.9.5",
        "url-loader": "4.1.1",
-        "webpack": "^5.97.1",
+        "webpack": "^5.89.0",
        "webpack-bundle-analyzer": "^4.10.1",
        "webpack-cli": "^5.1.4",
        "webpack-dev-server": "^4.15.1",
@@ -3838,7 +4007,7 @@
        "fedx-scripts": "bin/fedx-scripts.js"
      },
      "peerDependencies": {
-        "react": "^16.9.0 || ^17.0.0 || ^18.0.0"
+        "react": "^16.9.0 || ^17.0.0"
      }
    },
    "node_modules/@openedx/frontend-build/node_modules/iconv-lite": {
@@ -3853,6 +4022,32 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/@openedx/frontend-build/node_modules/jest": {
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.6.1.tgz",
+      "integrity": "sha512-Nirw5B4nn69rVUZtemCQhwxOBhm0nsp3hmtF4rzCeWD7BkjAXRIji7xWQfnTNbz9g0aVsBX6aZK3n+23LM6uDw==",
+      "license": "MIT",
+      "dependencies": {
+        "@jest/core": "^29.6.1",
+        "@jest/types": "^29.6.1",
+        "import-local": "^3.0.2",
+        "jest-cli": "^29.6.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/@openedx/frontend-build/node_modules/postcss-loader": {
      "version": "7.3.4",
      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.4.tgz",
@@ -3875,6 +4070,23 @@
        "webpack": "^5.0.0"
      }
    },
+    "node_modules/@openedx/frontend-build/node_modules/sass": {
+      "version": "1.69.7",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.7.tgz",
+      "integrity": "sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ==",
+      "license": "MIT",
+      "dependencies": {
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
    "node_modules/@openedx/frontend-build/node_modules/sass-loader": {
      "version": "13.3.3",
      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.3.tgz",
@@ -3913,9 +4125,9 @@
      }
    },
    "node_modules/@openedx/frontend-build/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
      "license": "ISC",
      "bin": {
        "semver": "bin/semver.js"
@@ -3945,89 +4157,59 @@
      }
    },
    "node_modules/@openedx/frontend-plugin-framework": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@openedx/frontend-plugin-framework/-/frontend-plugin-framework-1.5.0.tgz",
-      "integrity": "sha512-+sZeyEA/AwoiRGQFvMUuUMD8i63p1LMgUo93sUg7OylMyMaaAnqLGR8QwsJ3CNRfPDBobPBcWPBY1C81VfDlXQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@openedx/frontend-plugin-framework/-/frontend-plugin-framework-1.3.0.tgz",
+      "integrity": "sha512-qLtX/4HIuWXiIhBdtBuL6mPVbV2un0rsFYx3I5+3tIUf7+T7WRq81a6JHU5QGyAmZy9dfiv7QwbqwiEQOVXVuQ==",
      "license": "AGPL-3.0",
      "dependencies": {
        "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
        "classnames": "^2.3.2",
        "core-js": "3.37.1",
-        "react-redux": "8.1.1",
-        "redux": "4.2.1"
+        "react-redux": "7.2.9",
+        "redux": "4.2.1",
+        "regenerator-runtime": "0.14.1"
      },
      "peerDependencies": {
        "@edx/frontend-platform": "^7.0.0 || ^8.0.0",
        "@openedx/paragon": "^21.0.0 || ^22.0.0",
        "prop-types": "^15.8.0",
-        "react": "^17.0.0 || ^18.0.0",
-        "react-dom": "^17.0.0 || ^18.0.0",
+        "react": "^17.0.0",
+        "react-dom": "^17.0.0",
        "react-error-boundary": "^4.0.11"
      }
    },
-    "node_modules/@openedx/frontend-plugin-framework/node_modules/react-is": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "license": "MIT"
-    },
-    "node_modules/@openedx/frontend-plugin-framework/node_modules/react-redux": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.1.1.tgz",
-      "integrity": "sha512-5W0QaKtEhj+3bC0Nj0NkqkhIv8gLADH/2kYFMTHxCVqQILiWzLv6MaLuV5wJU3BQEdHKzTfcvPN0WMS6SC1oyA==",
+    "node_modules/@openedx/frontend-plugin-framework/node_modules/redux": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
      "license": "MIT",
      "dependencies": {
-        "@babel/runtime": "^7.12.1",
-        "@types/hoist-non-react-statics": "^3.3.1",
-        "@types/use-sync-external-store": "^0.0.3",
-        "hoist-non-react-statics": "^3.3.2",
-        "react-is": "^18.0.0",
-        "use-sync-external-store": "^1.0.0"
-      },
-      "peerDependencies": {
-        "@types/react": "^16.8 || ^17.0 || ^18.0",
-        "@types/react-dom": "^16.8 || ^17.0 || ^18.0",
-        "react": "^16.8 || ^17.0 || ^18.0",
-        "react-dom": "^16.8 || ^17.0 || ^18.0",
-        "react-native": ">=0.59",
-        "redux": "^4 || ^5.0.0-beta.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        },
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        },
-        "redux": {
-          "optional": true
-        }
+        "@babel/runtime": "^7.9.2"
      }
    },
+    "node_modules/@openedx/frontend-plugin-framework/node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+      "license": "MIT"
+    },
    "node_modules/@openedx/frontend-slot-footer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@openedx/frontend-slot-footer/-/frontend-slot-footer-1.1.0.tgz",
-      "integrity": "sha512-EpWWRctxjucF7/5RMTWzdwiYHJDNgQ+b6a4PJvZX04u4u9ydURTSDeOlbmsu6ps/DsLU3NnQhG5VyRRwXGEhcg==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@openedx/frontend-slot-footer/-/frontend-slot-footer-1.0.5.tgz",
+      "integrity": "sha512-hlKj2p7zgAHfPTbmW4rAMUCCj35uCbm9VfRkZYPEIX2bdhkPjc4OIGTE5CKGkyWG5+zL+aap1ywwcKEjEgOMOQ==",
      "license": "AGPL-3.0",
      "dependencies": {
-        "@openedx/frontend-plugin-framework": "^1.5.0"
+        "@openedx/frontend-plugin-framework": "^1.1.2"
      },
      "peerDependencies": {
        "@edx/frontend-component-footer": "*",
-        "react": "^17.0.0 || ^18.0.0",
-        "react-dom": "^17.0.0 || ^18.0.0"
+        "react": "^17.0.0"
      }
    },
    "node_modules/@openedx/paragon": {
-      "version": "22.16.0",
-      "resolved": "https://registry.npmjs.org/@openedx/paragon/-/paragon-22.16.0.tgz",
-      "integrity": "sha512-6dhspna6rMJexeasq5acrkD+NMHOlVOt/RdraXg87Rqw8iR4XWxD8T0wY21DlYysPRCOZJVMXdc1jsjdI4MjXg==",
+      "version": "22.8.1",
+      "resolved": "https://registry.npmjs.org/@openedx/paragon/-/paragon-22.8.1.tgz",
+      "integrity": "sha512-lm2x0tvNZrtJvp0L+cjvLLmkE9NoUbNIzt9L1FaOx9g92gf8rFVgq4aadq7IVAjN12HW19/QJMEJaQ0SVsvY2A==",
      "license": "Apache-2.0",
      "workspaces": [
        "example",
@@ -4071,8 +4253,8 @@
        "paragon": "bin/paragon-scripts.js"
      },
      "peerDependencies": {
-        "react": "^16.8.6 || ^17 || ^18",
-        "react-dom": "^16.8.6 || ^17 || ^18",
+        "react": "^16.8.6 || ^17.0.0",
+        "react-dom": "^16.8.6 || ^17.0.0",
        "react-intl": "^5.25.1 || ^6.4.0"
      }
    },
@@ -4247,9 +4429,9 @@
      }
    },
    "node_modules/@pact-foundation/pact": {
-      "version": "13.2.0",
-      "resolved": "https://registry.npmjs.org/@pact-foundation/pact/-/pact-13.2.0.tgz",
-      "integrity": "sha512-WT9EGwFygbiMZXF5RyTNJgH2ZsHwOVL9guvvY4wpoyjejaXtA5QrnKuOzl8QRoBom+vVTenUJSyI0cMdwZg71w==",
+      "version": "13.1.3",
+      "resolved": "https://registry.npmjs.org/@pact-foundation/pact/-/pact-13.1.3.tgz",
+      "integrity": "sha512-AYSGAfA6b29wQR9RJqoVxasdAV9bx5+wpXvGc654O4+WmpxHs4BF6e8JVAuYVtfb3ego/HyPp+qQ08qKW1Tnxg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -4257,8 +4439,8 @@
        "@types/express": "^4.17.11",
        "axios": "^1.7.4",
        "body-parser": "^1.20.3",
-        "chalk": "4.1.2",
-        "express": "^4.21.1",
+        "cli-color": "^2.0.1",
+        "express": "^4.21.0",
        "graphql": "^14.0.0",
        "graphql-tag": "^2.9.1",
        "http-proxy": "^1.18.1",
@@ -4331,315 +4513,6 @@
        "node": ">= 14"
      }
    },
-    "node_modules/@parcel/watcher": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "detect-libc": "^1.0.3",
-        "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      },
-      "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.1",
-        "@parcel/watcher-darwin-arm64": "2.5.1",
-        "@parcel/watcher-darwin-x64": "2.5.1",
-        "@parcel/watcher-freebsd-x64": "2.5.1",
-        "@parcel/watcher-linux-arm-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm-musl": "2.5.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm64-musl": "2.5.1",
-        "@parcel/watcher-linux-x64-glibc": "2.5.1",
-        "@parcel/watcher-linux-x64-musl": "2.5.1",
-        "@parcel/watcher-win32-arm64": "2.5.1",
-        "@parcel/watcher-win32-ia32": "2.5.1",
-        "@parcel/watcher-win32-x64": "2.5.1"
-      }
-    },
-    "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
-      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher/node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "license": "Apache-2.0",
-      "optional": true,
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
    "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
      "version": "0.5.15",
      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.15.tgz",
@@ -4755,19 +4628,18 @@
      }
    },
    "node_modules/@reduxjs/toolkit": {
-      "version": "1.9.7",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.7.tgz",
-      "integrity": "sha512-t7v8ZPxhhKgOKtU+uyJT13lu4vL7az5aFi4IdoDs/eS548edn2M8Ik9h8fxgvMjGoAUVFSt6ZC1P5cWmQ014QQ==",
-      "license": "MIT",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.8.1.tgz",
+      "integrity": "sha512-Q6mzbTpO9nOYRnkwpDlFOAbQnd3g7zj7CtHAZWz5SzE5lcV97Tf8f3SzOO8BoPOMYBFgfZaqTUZqgGu+a0+Fng==",
      "dependencies": {
-        "immer": "^9.0.21",
-        "redux": "^4.2.1",
-        "redux-thunk": "^2.4.2",
-        "reselect": "^4.1.8"
+        "immer": "^9.0.7",
+        "redux": "^4.1.2",
+        "redux-thunk": "^2.4.1",
+        "reselect": "^4.1.5"
      },
      "peerDependencies": {
        "react": "^16.9.0 || ^17.0.0 || ^18",
-        "react-redux": "^7.2.1 || ^8.0.2"
+        "react-redux": "^7.2.1 || ^8.0.0-beta"
      },
      "peerDependenciesMeta": {
        "react": {
@@ -4805,12 +4677,6 @@
        "react": ">=16.8.0"
      }
    },
-    "node_modules/@rtsao/scc": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
-      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
-      "license": "MIT"
-    },
    "node_modules/@sideway/address": {
      "version": "4.1.5",
      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
@@ -4835,18 +4701,6 @@
      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
    },
-    "node_modules/@sindresorhus/merge-streams": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
-      "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
    "node_modules/@sinonjs/commons": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
@@ -5221,13 +5075,15 @@
      }
    },
    "node_modules/@testing-library/user-event": {
-      "version": "14.6.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.1.tgz",
-      "integrity": "sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==",
+      "version": "13.5.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz",
+      "integrity": "sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==",
      "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5"
+      },
      "engines": {
-        "node": ">=12",
+        "node": ">=10",
        "npm": ">=6"
      },
      "peerDependencies": {
@@ -5364,16 +5220,6 @@
        "@types/json-schema": "*"
      }
    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
    "node_modules/@types/estree": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -5719,12 +5565,6 @@
      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz",
      "integrity": "sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA=="
    },
-    "node_modules/@types/use-sync-external-store": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz",
-      "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==",
-      "license": "MIT"
-    },
    "node_modules/@types/warning": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz",
@@ -5755,7 +5595,6 @@
      "version": "5.62.0",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
-      "license": "MIT",
      "dependencies": {
        "@eslint-community/regexpp": "^4.4.0",
        "@typescript-eslint/scope-manager": "5.62.0",
@@ -5789,7 +5628,6 @@
      "version": "7.6.3",
      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "license": "ISC",
      "bin": {
        "semver": "bin/semver.js"
      },
@@ -5801,7 +5639,6 @@
      "version": "5.62.0",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
-      "license": "BSD-2-Clause",
      "dependencies": {
        "@typescript-eslint/scope-manager": "5.62.0",
        "@typescript-eslint/types": "5.62.0",
@@ -5828,7 +5665,6 @@
      "version": "5.62.0",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
-      "license": "MIT",
      "dependencies": {
        "@typescript-eslint/types": "5.62.0",
        "@typescript-eslint/visitor-keys": "5.62.0"
@@ -5845,7 +5681,6 @@
      "version": "5.62.0",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
-      "license": "MIT",
      "dependencies": {
        "@typescript-eslint/typescript-estree": "5.62.0",
        "@typescript-eslint/utils": "5.62.0",
@@ -5872,7 +5707,6 @@
      "version": "5.62.0",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
-      "license": "MIT",
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
      },
@@ -5885,7 +5719,6 @@
      "version": "5.62.0",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
-      "license": "BSD-2-Clause",
      "dependencies": {
        "@typescript-eslint/types": "5.62.0",
        "@typescript-eslint/visitor-keys": "5.62.0",
@@ -5912,7 +5745,6 @@
      "version": "11.1.0",
      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "license": "MIT",
      "dependencies": {
        "array-union": "^2.1.0",
        "dir-glob": "^3.0.1",
@@ -5932,7 +5764,6 @@
      "version": "7.6.3",
      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "license": "ISC",
      "bin": {
        "semver": "bin/semver.js"
      },
@@ -5944,7 +5775,6 @@
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "license": "MIT",
      "engines": {
        "node": ">=8"
      }
@@ -5953,7 +5783,6 @@
      "version": "5.62.0",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
-      "license": "MIT",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@types/json-schema": "^7.0.9",
@@ -5979,7 +5808,6 @@
      "version": "7.6.3",
      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "license": "ISC",
      "bin": {
        "semver": "bin/semver.js"
      },
@@ -5991,7 +5819,6 @@
      "version": "5.62.0",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
-      "license": "MIT",
      "dependencies": {
        "@typescript-eslint/types": "5.62.0",
        "eslint-visitor-keys": "^3.3.0"
@@ -6008,7 +5835,6 @@
      "version": "3.4.3",
      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "license": "Apache-2.0",
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
      },
@@ -6017,148 +5843,133 @@
      }
    },
    "node_modules/@webassemblyjs/ast": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
-      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
-      "license": "MIT",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
      }
    },
    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
-      "license": "MIT"
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
    },
    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
-      "license": "MIT"
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
    },
    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
-      "license": "MIT"
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw=="
    },
    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
-      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
-      "license": "MIT",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
-        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
        "@xtuc/long": "4.2.2"
      }
    },
    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
-      "license": "MIT"
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
    },
    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
-      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
-      "license": "MIT",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/wasm-gen": "1.14.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.12.1"
      }
    },
    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
-      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
-      "license": "MIT",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
      "dependencies": {
        "@xtuc/ieee754": "^1.2.0"
      }
    },
    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
-      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
-      "license": "Apache-2.0",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
      "dependencies": {
        "@xtuc/long": "4.2.2"
      }
    },
    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
-      "license": "MIT"
+      "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
    },
    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
-      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
-      "license": "MIT",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/helper-wasm-section": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-opt": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1",
-        "@webassemblyjs/wast-printer": "1.14.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-opt": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1",
+        "@webassemblyjs/wast-printer": "1.12.1"
      }
    },
    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
-      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
-      "license": "MIT",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
      }
    },
    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
-      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
-      "license": "MIT",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1"
      }
    },
    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
-      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
-      "license": "MIT",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-api-error": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
      }
    },
    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
-      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
-      "license": "MIT",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/ast": "1.12.1",
        "@xtuc/long": "4.2.2"
      }
    },
@@ -6206,14 +6017,12 @@
    "node_modules/@xtuc/ieee754": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "license": "BSD-3-Clause"
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
    },
    "node_modules/@xtuc/long": {
      "version": "4.2.2",
      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "license": "Apache-2.0"
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
    },
    "node_modules/@yarnpkg/lockfile": {
      "version": "1.1.0",
@@ -6250,10 +6059,9 @@
      }
    },
    "node_modules/acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
-      "license": "MIT",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -6270,6 +6078,14 @@
        "acorn-walk": "^8.0.2"
      }
    },
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
    "node_modules/acorn-jsx": {
      "version": "5.3.2",
      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -6488,13 +6304,12 @@
      }
    },
    "node_modules/array-buffer-byte-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
-      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
-      "license": "MIT",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
      "dependencies": {
-        "call-bound": "^1.0.3",
-        "is-array-buffer": "^3.0.5"
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
      },
      "engines": {
        "node": ">= 0.4"
@@ -6543,26 +6358,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
-      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-shim-unscopables": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/array.prototype.flat": {
      "version": "1.3.2",
      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
@@ -6601,7 +6396,6 @@
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
      "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
-      "license": "MIT",
      "dependencies": {
        "call-bind": "^1.0.7",
        "define-properties": "^1.2.1",
@@ -6614,18 +6408,18 @@
      }
    },
    "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
-      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
-      "license": "MIT",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
      "dependencies": {
        "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.8",
+        "call-bind": "^1.0.5",
        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
-        "is-array-buffer": "^3.0.4"
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
      },
      "engines": {
        "node": ">= 0.4"
@@ -6642,17 +6436,7 @@
    "node_modules/ast-types-flow": {
      "version": "0.0.7",
      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
-      "license": "ISC"
-    },
-    "node_modules/async-function": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
-      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
+      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="
    },
    "node_modules/asynckit": {
      "version": "0.4.0",
@@ -6685,9 +6469,9 @@
      }
    },
    "node_modules/autoprefixer": {
-      "version": "10.4.20",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
-      "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
+      "version": "10.4.19",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz",
+      "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
      "funding": [
        {
          "type": "opencollective",
@@ -6702,13 +6486,12 @@
          "url": "https://github.com/sponsors/ai"
        }
      ],
-      "license": "MIT",
      "dependencies": {
-        "browserslist": "^4.23.3",
-        "caniuse-lite": "^1.0.30001646",
+        "browserslist": "^4.23.0",
+        "caniuse-lite": "^1.0.30001599",
        "fraction.js": "^4.3.7",
        "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.1",
+        "picocolors": "^1.0.0",
        "postcss-value-parser": "^4.2.0"
      },
      "bin": {
@@ -6736,18 +6519,17 @@
      }
    },
    "node_modules/axe-core": {
-      "version": "4.10.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.2.tgz",
-      "integrity": "sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==",
-      "license": "MPL-2.0",
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.0.tgz",
+      "integrity": "sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==",
      "engines": {
        "node": ">=4"
      }
    },
    "node_modules/axios": {
-      "version": "1.7.9",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
-      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
+      "version": "1.7.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
      "license": "MIT",
      "dependencies": {
        "follow-redirects": "^1.15.6",
@@ -6756,14 +6538,14 @@
      }
    },
    "node_modules/axios-cache-interceptor": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/axios-cache-interceptor/-/axios-cache-interceptor-1.6.2.tgz",
-      "integrity": "sha512-YLbAODIHZZIcD4b3WYFVQOa5W2TY/WnJ6sBHqAg6Z+hx+RVj8/OcjQyRopO6awn7/kOkGL5X9TP16AucnlJ/lw==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/axios-cache-interceptor/-/axios-cache-interceptor-1.3.2.tgz",
+      "integrity": "sha512-FNy4/IKvFYVswpPS09j3H9OUzcXSuxQ93wYxCKnogHbjCRE9nDQ/lukgjyuJqMIk3Yao51qQI/zPbMRNQu4JJw==",
      "license": "MIT",
      "dependencies": {
-        "cache-parser": "1.2.5",
-        "fast-defer": "1.1.8",
-        "object-code": "1.3.3"
+        "cache-parser": "^1.2.4",
+        "fast-defer": "^1.1.7",
+        "object-code": "^1.3.0"
      },
      "engines": {
        "node": ">=12"
@@ -6776,9 +6558,9 @@
      }
    },
    "node_modules/axios-mock-adapter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-2.1.0.tgz",
-      "integrity": "sha512-AZUe4OjECGCNNssH8SOdtneiQELsqTsat3SQQCWLPjN436/H+L9AjWfV7bF+Zg/YL9cgbhrz5671hoh+Tbn98w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-2.0.0.tgz",
+      "integrity": "sha512-D/K0J5Zm6KvaMTnsWrBQZWLzKN9GxUFZEa0mx2qeEHXDeTugCoplWehy8y36dj5vuSjhe1u/Dol8cZ8lzzmDew==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -6793,7 +6575,6 @@
      "version": "3.2.4",
      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.4.tgz",
      "integrity": "sha512-aPTElBrbifBU1krmZxGZOlBkslORe7Ll7+BDnI50Wy4LgOt69luMgevkDfTq1O/ZgprooPCtWpjCwKSZw/iZ4A==",
-      "license": "Apache-2.0",
      "engines": {
        "node": ">= 0.4"
      }
@@ -6804,15 +6585,14 @@
      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg=="
    },
    "node_modules/babel-jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
-      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
-      "license": "MIT",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.1.tgz",
+      "integrity": "sha512-qu+3bdPEQC6KZSPz+4Fyjbga5OODNcp49j6GKzG1EKbkfyJBxEYGVUmVGpwCSeGouG52R4EgYMLb6p9YeEEQ4A==",
      "dependencies": {
-        "@jest/transform": "^29.7.0",
+        "@jest/transform": "^29.6.1",
        "@types/babel__core": "^7.1.14",
        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^29.6.3",
+        "babel-preset-jest": "^29.5.0",
        "chalk": "^4.0.0",
        "graceful-fs": "^4.2.9",
        "slash": "^3.0.0"
@@ -6833,10 +6613,9 @@
      }
    },
    "node_modules/babel-loader": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.2.1.tgz",
-      "integrity": "sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA==",
-      "license": "MIT",
+      "version": "9.1.3",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz",
+      "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==",
      "dependencies": {
        "find-cache-dir": "^4.0.0",
        "schema-utils": "^4.0.0"
@@ -7304,9 +7083,9 @@
      }
    },
    "node_modules/browserslist": {
-      "version": "4.24.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+      "version": "4.23.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
+      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
      "funding": [
        {
          "type": "opencollective",
@@ -7323,10 +7102,10 @@
      ],
      "license": "MIT",
      "dependencies": {
-        "caniuse-lite": "^1.0.30001688",
-        "electron-to-chromium": "^1.5.73",
-        "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.1"
+        "caniuse-lite": "^1.0.30001646",
+        "electron-to-chromium": "^1.5.4",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.0"
      },
      "bin": {
        "browserslist": "cli.js"
@@ -7435,50 +7214,20 @@
      }
    },
    "node_modules/cache-parser": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/cache-parser/-/cache-parser-1.2.5.tgz",
-      "integrity": "sha512-Md/4VhAHByQ9frQ15WD6LrMNiVw9AEl/J7vWIXw+sxT6fSOpbtt6LHTp76vy8+bOESPBO94117Hm2bIjlI7XjA==",
-      "license": "MIT"
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/cache-parser/-/cache-parser-1.2.4.tgz",
+      "integrity": "sha512-O0KwuHuJnbHUrghHi2kGp0SxnWSIBXTYt7M8WVhW0kbPRUNUKoE/Of6e1rRD6AAxmfxFunKnt90yEK09D+sc5g=="
    },
    "node_modules/call-bind": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
-      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
-      "license": "MIT",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.0",
        "es-define-property": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/call-bind-apply-helpers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
-      "license": "MIT",
-      "dependencies": {
        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/call-bound": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
-      "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "get-intrinsic": "^1.2.6"
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
      },
      "engines": {
        "node": ">= 0.4"
@@ -7527,9 +7276,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001707",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz",
-      "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==",
+      "version": "1.0.30001669",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
+      "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==",
      "funding": [
        {
          "type": "opencollective",
@@ -7543,8 +7292,7 @@
          "type": "github",
          "url": "https://github.com/sponsors/ai"
        }
-      ],
-      "license": "CC-BY-4.0"
+      ]
    },
    "node_modules/cast-array": {
      "version": "1.0.1",
@@ -7825,6 +7573,22 @@
        "webpack": ">=4.0.0 <6.0.0"
      }
    },
+    "node_modules/cli-color": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.3.tgz",
+      "integrity": "sha512-OkoZnxyC4ERN3zLzZaY9Emb7f/MhBOIpePv0Ycok0fJYT+Ouo00UBEIwsVsr0yoow++n5YWlSUgST9GKhNHiRQ==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.61",
+        "es6-iterator": "^2.0.3",
+        "memoizee": "^0.4.15",
+        "timers-ext": "^0.1.7"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
    "node_modules/cli-cursor": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
@@ -8072,8 +7836,7 @@
    "node_modules/confusing-browser-globals": {
      "version": "1.0.11",
      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "license": "MIT"
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="
    },
    "node_modules/connect-history-api-fallback": {
      "version": "2.0.0",
@@ -8108,9 +7871,9 @@
      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
    },
    "node_modules/cookie": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
-      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
      "license": "MIT",
      "engines": {
        "node": ">= 0.6"
@@ -8127,20 +7890,19 @@
      "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw=="
    },
    "node_modules/copy-webpack-plugin": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-12.0.2.tgz",
-      "integrity": "sha512-SNwdBeHyII+rWvee/bTnAYyO8vfVdcSTud4EIb6jcZ8inLeWucJE0DnxXQBjlQ5zlteuuvooGQy3LIyGxhvlOA==",
-      "license": "MIT",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
+      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
      "dependencies": {
-        "fast-glob": "^3.3.2",
+        "fast-glob": "^3.2.11",
        "glob-parent": "^6.0.1",
-        "globby": "^14.0.0",
+        "globby": "^13.1.1",
        "normalize-path": "^3.0.0",
-        "schema-utils": "^4.2.0",
-        "serialize-javascript": "^6.0.2"
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
      },
      "engines": {
-        "node": ">= 18.12.0"
+        "node": ">= 14.15.0"
      },
      "funding": {
        "type": "opencollective",
@@ -8151,15 +7913,14 @@
      }
    },
    "node_modules/copy-webpack-plugin/node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "license": "MIT",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
+        "fast-deep-equal": "^3.1.1",
        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
      },
      "funding": {
        "type": "github",
@@ -8170,7 +7931,6 @@
      "version": "5.1.0",
      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "license": "MIT",
      "dependencies": {
        "fast-deep-equal": "^3.1.3"
      },
@@ -8182,7 +7942,6 @@
      "version": "6.0.2",
      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "license": "ISC",
      "dependencies": {
        "is-glob": "^4.0.3"
      },
@@ -8193,14 +7952,12 @@
    "node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "license": "MIT"
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
    },
    "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-      "license": "MIT",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.1.0.tgz",
+      "integrity": "sha512-Jw+GZVbP5IggB2WAn6UHI02LBwGmsIeYN/lNbSMZyDziQ7jmtAUrqKqDja+W89YHVs+KL/3IkIMltAklqB1vAw==",
      "dependencies": {
        "@types/json-schema": "^7.0.9",
        "ajv": "^8.9.0",
@@ -8316,9 +8073,9 @@
      }
    },
    "node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
      "dependencies": {
        "path-key": "^3.1.0",
        "shebang-command": "^2.0.0",
@@ -8565,11 +8322,20 @@
      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
    },
+    "node_modules/d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "dev": true,
+      "dependencies": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
    "node_modules/damerau-levenshtein": {
      "version": "1.0.8",
      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
-      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
-      "license": "BSD-2-Clause"
+      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA=="
    },
    "node_modules/data-urls": {
      "version": "3.0.2",
@@ -8585,14 +8351,13 @@
      }
    },
    "node_modules/data-view-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
-      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
-      "license": "MIT",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
      "dependencies": {
-        "call-bound": "^1.0.3",
+        "call-bind": "^1.0.6",
        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.2"
+        "is-data-view": "^1.0.1"
      },
      "engines": {
        "node": ">= 0.4"
@@ -8602,29 +8367,27 @@
      }
    },
    "node_modules/data-view-byte-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
-      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
-      "license": "MIT",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
      "dependencies": {
-        "call-bound": "^1.0.3",
+        "call-bind": "^1.0.7",
        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.2"
+        "is-data-view": "^1.0.1"
      },
      "engines": {
        "node": ">= 0.4"
      },
      "funding": {
-        "url": "https://github.com/sponsors/inspect-js"
+        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/data-view-byte-offset": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
-      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
-      "license": "MIT",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
      "dependencies": {
-        "call-bound": "^1.0.2",
+        "call-bind": "^1.0.6",
        "es-errors": "^1.3.0",
        "is-data-view": "^1.0.1"
      },
@@ -9174,20 +8937,6 @@
        "node": ">=4"
      }
    },
-    "node_modules/dunder-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.2.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/duplexer": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -9199,9 +8948,9 @@
      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
    },
    "node_modules/electron-to-chromium": {
-      "version": "1.5.112",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.112.tgz",
-      "integrity": "sha512-oen93kVyqSb3l+ziUgzIOlWt/oOuy4zRmpwestMn4rhFWAoFJeFuCVte9F2fASjeZZo7l/Cif9TiyrdW4CwEMA==",
+      "version": "1.5.7",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.7.tgz",
+      "integrity": "sha512-6FTNWIWMxMy/ZY6799nBlPtF1DFDQ6VQJ7yyDP27SJNt5lwtQ5ufqVvHylb3fdQefvRcgA3fKcFMJi9OLwBRNw==",
      "license": "ISC"
    },
    "node_modules/email-prop-type": {
@@ -9320,62 +9069,56 @@
      }
    },
    "node_modules/es-abstract": {
-      "version": "1.23.9",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
-      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
-      "license": "MIT",
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
      "dependencies": {
-        "array-buffer-byte-length": "^1.0.2",
-        "arraybuffer.prototype.slice": "^1.0.4",
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "data-view-buffer": "^1.0.2",
-        "data-view-byte-length": "^1.0.2",
-        "data-view-byte-offset": "^1.0.1",
-        "es-define-property": "^1.0.1",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
        "es-errors": "^1.3.0",
        "es-object-atoms": "^1.0.0",
-        "es-set-tostringtag": "^2.1.0",
-        "es-to-primitive": "^1.3.0",
-        "function.prototype.name": "^1.1.8",
-        "get-intrinsic": "^1.2.7",
-        "get-proto": "^1.0.0",
-        "get-symbol-description": "^1.1.0",
-        "globalthis": "^1.0.4",
-        "gopd": "^1.2.0",
+        "es-set-tostringtag": "^2.0.3",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.2.0",
-        "has-symbols": "^1.1.0",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
        "hasown": "^2.0.2",
-        "internal-slot": "^1.1.0",
-        "is-array-buffer": "^3.0.5",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
        "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.2",
-        "is-regex": "^1.2.1",
-        "is-shared-array-buffer": "^1.0.4",
-        "is-string": "^1.1.1",
-        "is-typed-array": "^1.1.15",
-        "is-weakref": "^1.1.0",
-        "math-intrinsics": "^1.1.0",
-        "object-inspect": "^1.13.3",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.3",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.13",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.7",
-        "own-keys": "^1.0.1",
-        "regexp.prototype.flags": "^1.5.3",
-        "safe-array-concat": "^1.1.3",
-        "safe-push-apply": "^1.0.0",
-        "safe-regex-test": "^1.1.0",
-        "set-proto": "^1.0.0",
-        "string.prototype.trim": "^1.2.10",
-        "string.prototype.trimend": "^1.0.9",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
        "string.prototype.trimstart": "^1.0.8",
-        "typed-array-buffer": "^1.0.3",
-        "typed-array-byte-length": "^1.0.3",
-        "typed-array-byte-offset": "^1.0.4",
-        "typed-array-length": "^1.0.7",
-        "unbox-primitive": "^1.1.0",
-        "which-typed-array": "^1.1.18"
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
      },
      "engines": {
        "node": ">= 0.4"
@@ -9385,10 +9128,12 @@
      }
    },
    "node_modules/es-define-property": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-      "license": "MIT",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
      "engines": {
        "node": ">= 0.4"
      }
@@ -9420,43 +9165,15 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/es-iterator-helpers": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz",
-      "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.6",
-        "es-errors": "^1.3.0",
-        "es-set-tostringtag": "^2.0.3",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.6",
-        "globalthis": "^1.0.4",
-        "gopd": "^1.2.0",
-        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "internal-slot": "^1.1.0",
-        "iterator.prototype": "^1.1.4",
-        "safe-array-concat": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/es-module-lexer": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA=="
    },
    "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
-      "license": "MIT",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
      "dependencies": {
        "es-errors": "^1.3.0"
      },
@@ -9465,15 +9182,13 @@
      }
    },
    "node_modules/es-set-tostringtag": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-      "license": "MIT",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
      "dependencies": {
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
+        "get-intrinsic": "^1.2.4",
        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
+        "hasown": "^2.0.1"
      },
      "engines": {
        "node": ">= 0.4"
@@ -9488,14 +9203,13 @@
      }
    },
    "node_modules/es-to-primitive": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
-      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
-      "license": "MIT",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
      "dependencies": {
-        "is-callable": "^1.2.7",
-        "is-date-object": "^1.0.5",
-        "is-symbol": "^1.0.4"
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
      },
      "engines": {
        "node": ">= 0.4"
@@ -9504,10 +9218,58 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/es5-ext": {
+      "version": "0.10.62",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
+      "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.3",
+        "next-tick": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
+    },
+    "node_modules/es6-weak-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.1"
+      }
+    },
    "node_modules/escalade": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
      "license": "MIT",
      "engines": {
        "node": ">=6"
@@ -9617,7 +9379,6 @@
      "version": "19.0.4",
      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
-      "license": "MIT",
      "dependencies": {
        "eslint-config-airbnb-base": "^15.0.0",
        "object.assign": "^4.1.2",
@@ -9638,7 +9399,6 @@
      "version": "15.0.0",
      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
-      "license": "MIT",
      "dependencies": {
        "confusing-browser-globals": "^1.0.10",
        "object.assign": "^4.1.2",
@@ -9657,7 +9417,6 @@
      "version": "17.1.0",
      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.1.0.tgz",
      "integrity": "sha512-GPxI5URre6dDpJ0CtcthSZVBAfI+Uw7un5OYNVxP2EYi3H81Jw701yFP7AU+/vCE7xBtFmjge7kfhhk4+RAiig==",
-      "license": "MIT",
      "dependencies": {
        "eslint-config-airbnb-base": "^15.0.0"
      },
@@ -9687,19 +9446,18 @@
      }
    },
    "node_modules/eslint-import-resolver-webpack": {
-      "version": "0.13.10",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.10.tgz",
-      "integrity": "sha512-ciVTEg7sA56wRMR772PyjcBRmyBMLS46xgzQZqt6cWBEKc7cK65ZSSLCTLVRu2gGtKyXUb5stwf4xxLBfERLFA==",
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.9.tgz",
+      "integrity": "sha512-yGngeefNiHXau2yzKKs2BNON4HLpxBabY40BGL/vUSKZtqzjlVsTTZm57jhHULhm+mJEwKsEIIN3NXup5AiiBQ==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "debug": "^3.2.7",
        "enhanced-resolve": "^0.9.1",
        "find-root": "^1.1.0",
-        "hasown": "^2.0.2",
+        "hasown": "^2.0.0",
        "interpret": "^1.4.0",
-        "is-core-module": "^2.15.1",
-        "is-regex": "^1.2.0",
+        "is-core-module": "^2.13.1",
+        "is-regex": "^1.1.4",
        "lodash": "^4.17.21",
        "resolve": "^2.0.0-next.5",
        "semver": "^5.7.2"
@@ -9717,7 +9475,6 @@
      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "ms": "^2.1.1"
      }
@@ -9741,7 +9498,6 @@
      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
      "dev": true,
-      "license": "MIT",
      "engines": {
        "node": ">= 0.10"
      }
@@ -9751,7 +9507,6 @@
      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "is-core-module": "^2.13.0",
        "path-parse": "^1.0.7",
@@ -9769,7 +9524,6 @@
      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
      "dev": true,
-      "license": "ISC",
      "bin": {
        "semver": "bin/semver"
      }
@@ -9779,16 +9533,14 @@
      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
      "integrity": "sha512-jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ==",
      "dev": true,
-      "license": "MIT",
      "engines": {
        "node": ">=0.6"
      }
    },
    "node_modules/eslint-module-utils": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
-      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
-      "license": "MIT",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz",
+      "integrity": "sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==",
      "dependencies": {
        "debug": "^3.2.7"
      },
@@ -9805,7 +9557,6 @@
      "version": "3.2.7",
      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "license": "MIT",
      "dependencies": {
        "ms": "^2.1.1"
      }
@@ -10010,36 +9761,31 @@
      }
    },
    "node_modules/eslint-plugin-import": {
-      "version": "2.31.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
-      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
-      "license": "MIT",
+      "version": "2.27.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
+      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
      "dependencies": {
-        "@rtsao/scc": "^1.1.0",
-        "array-includes": "^3.1.8",
-        "array.prototype.findlastindex": "^1.2.5",
-        "array.prototype.flat": "^1.3.2",
-        "array.prototype.flatmap": "^1.3.2",
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "array.prototype.flatmap": "^1.3.1",
        "debug": "^3.2.7",
        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.12.0",
-        "hasown": "^2.0.2",
-        "is-core-module": "^2.15.1",
+        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-module-utils": "^2.7.4",
+        "has": "^1.0.3",
+        "is-core-module": "^2.11.0",
        "is-glob": "^4.0.3",
        "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.8",
-        "object.groupby": "^1.0.3",
-        "object.values": "^1.2.0",
-        "semver": "^6.3.1",
-        "string.prototype.trimend": "^1.0.8",
-        "tsconfig-paths": "^3.15.0"
+        "object.values": "^1.1.6",
+        "resolve": "^1.22.1",
+        "semver": "^6.3.0",
+        "tsconfig-paths": "^3.14.1"
      },
      "engines": {
        "node": ">=4"
      },
      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
      }
    },
    "node_modules/eslint-plugin-import/node_modules/debug": {
@@ -10065,7 +9811,6 @@
      "version": "6.7.1",
      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz",
      "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
-      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.20.7",
        "aria-query": "^5.1.3",
@@ -10094,20 +9839,17 @@
    "node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": {
      "version": "9.2.2",
      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "license": "MIT"
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
    },
    "node_modules/eslint-plugin-react": {
-      "version": "7.33.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz",
-      "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==",
-      "license": "MIT",
+      "version": "7.32.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz",
+      "integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==",
      "dependencies": {
        "array-includes": "^3.1.6",
        "array.prototype.flatmap": "^1.3.1",
        "array.prototype.tosorted": "^1.1.1",
        "doctrine": "^2.1.0",
-        "es-iterator-helpers": "^1.0.12",
        "estraverse": "^5.3.0",
        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
        "minimatch": "^3.1.2",
@@ -10117,7 +9859,7 @@
        "object.values": "^1.1.6",
        "prop-types": "^15.8.1",
        "resolve": "^2.0.0-next.4",
-        "semver": "^6.3.1",
+        "semver": "^6.3.0",
        "string.prototype.matchall": "^4.0.8"
      },
      "engines": {
@@ -10128,10 +9870,9 @@
      }
    },
    "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.1.tgz",
-      "integrity": "sha512-Ck77j8hF7l9N4S/rzSLOWEKpn994YH6iwUK8fr9mXIaQvGpQYmOnQLbiue1u5kI5T1y+gdgqosnEAO9NCz0DBg==",
-      "license": "MIT",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
+      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
      "engines": {
        "node": ">=10"
      },
@@ -10143,7 +9884,6 @@
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "license": "Apache-2.0",
      "dependencies": {
        "esutils": "^2.0.2"
      },
@@ -10155,7 +9895,6 @@
      "version": "2.0.0-next.5",
      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
-      "license": "MIT",
      "dependencies": {
        "is-core-module": "^2.13.0",
        "path-parse": "^1.0.7",
@@ -10360,6 +10099,16 @@
        "node": ">= 0.6"
      }
    },
+    "node_modules/event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
    "node_modules/event-target-shim": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
@@ -10436,16 +10185,17 @@
      }
    },
    "node_modules/express": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
-      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
+      "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
+      "license": "MIT",
      "dependencies": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
        "body-parser": "1.20.3",
        "content-disposition": "0.5.4",
        "content-type": "~1.0.4",
-        "cookie": "0.7.1",
+        "cookie": "0.6.0",
        "cookie-signature": "1.0.6",
        "debug": "2.6.9",
        "depd": "2.0.0",
@@ -10459,7 +10209,7 @@
        "methods": "~1.1.2",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.12",
+        "path-to-regexp": "0.1.10",
        "proxy-addr": "~2.0.7",
        "qs": "6.13.0",
        "range-parser": "~1.2.1",
@@ -10474,10 +10224,6 @@
      },
      "engines": {
        "node": ">= 0.10.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
      }
    },
    "node_modules/express/node_modules/debug": {
@@ -10495,6 +10241,21 @@
      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
      "license": "MIT"
    },
+    "node_modules/ext": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
+      "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
+      "dev": true,
+      "dependencies": {
+        "type": "^2.7.2"
+      }
+    },
+    "node_modules/ext/node_modules/type": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+      "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
+      "dev": true
+    },
    "node_modules/extend": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -10525,10 +10286,9 @@
      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
    },
    "node_modules/fast-defer": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/fast-defer/-/fast-defer-1.1.8.tgz",
-      "integrity": "sha512-lEJeOH5VL5R09j6AA0D4Uvq7AgsHw0dAImQQ+F3iSyHZuAxyQfWobsagGpTcOPvJr3urmKRHrs+Gs9hV+/Qm/Q==",
-      "license": "MIT"
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/fast-defer/-/fast-defer-1.1.7.tgz",
+      "integrity": "sha512-tJ01ulDWT2WhqxMKS20nXX6wyX2iInBYpbN3GO7yjKwXMY4qvkdBRxak9IFwBLlFDESox+SwSvqMCZDfe1tqeg=="
    },
    "node_modules/fast-fifo": {
      "version": "1.3.2",
@@ -10536,10 +10296,9 @@
      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
    },
    "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
-      "license": "MIT",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
      "dependencies": {
        "@nodelib/fs.stat": "^2.0.2",
        "@nodelib/fs.walk": "^1.2.3",
@@ -11019,7 +10778,6 @@
      "version": "4.3.7",
      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
-      "license": "MIT",
      "engines": {
        "node": "*"
      },
@@ -11093,17 +10851,14 @@
      }
    },
    "node_modules/function.prototype.name": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
-      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
-      "license": "MIT",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "functions-have-names": "^1.2.3",
-        "hasown": "^2.0.2",
-        "is-callable": "^1.2.7"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
      },
      "engines": {
        "node": ">= 0.4"
@@ -11137,21 +10892,15 @@
      }
    },
    "node_modules/get-intrinsic": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
-      "license": "MIT",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "es-define-property": "^1.0.1",
        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
        "function-bind": "^1.1.2",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "math-intrinsics": "^1.1.0"
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
      },
      "engines": {
        "node": ">= 0.4"
@@ -11176,19 +10925,6 @@
        "node": ">=8.0.0"
      }
    },
-    "node_modules/get-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-      "license": "MIT",
-      "dependencies": {
-        "dunder-proto": "^1.0.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/get-stream": {
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -11201,14 +10937,13 @@
      }
    },
    "node_modules/get-symbol-description": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
-      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
-      "license": "MIT",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
      "dependencies": {
-        "call-bound": "^1.0.3",
+        "call-bind": "^1.0.5",
        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6"
+        "get-intrinsic": "^1.2.4"
      },
      "engines": {
        "node": ">= 0.4"
@@ -11316,30 +11051,27 @@
      }
    },
    "node_modules/globby": {
-      "version": "14.0.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
-      "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
-      "license": "MIT",
+      "version": "13.2.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
+      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
      "dependencies": {
-        "@sindresorhus/merge-streams": "^2.1.0",
-        "fast-glob": "^3.3.2",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.3.0",
        "ignore": "^5.2.4",
-        "path-type": "^5.0.0",
-        "slash": "^5.1.0",
-        "unicorn-magic": "^0.1.0"
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
      },
      "engines": {
-        "node": ">=18"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
      },
      "funding": {
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/globby/node_modules/path-type": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
-      "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
-      "license": "MIT",
+    "node_modules/globby/node_modules/slash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
      "engines": {
        "node": ">=12"
      },
@@ -11347,25 +11079,12 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/globby/node_modules/slash": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
-      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
    "node_modules/gopd": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
@@ -11475,13 +11194,9 @@
      }
    },
    "node_modules/has-proto": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
-      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
-      "license": "MIT",
-      "dependencies": {
-        "dunder-proto": "^1.0.0"
-      },
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
      "engines": {
        "node": ">= 0.4"
      },
@@ -11490,10 +11205,9 @@
      }
    },
    "node_modules/has-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
-      "license": "MIT",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
      "engines": {
        "node": ">= 0.4"
      },
@@ -11743,10 +11457,9 @@
      }
    },
    "node_modules/html-webpack-plugin": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.3.tgz",
-      "integrity": "sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==",
-      "license": "MIT",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz",
+      "integrity": "sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==",
      "dependencies": {
        "@types/html-minifier-terser": "^6.0.0",
        "html-minifier-terser": "^6.0.2",
@@ -11852,10 +11565,9 @@
      }
    },
    "node_modules/http-proxy-middleware": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
-      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
-      "license": "MIT",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
      "dependencies": {
        "@types/http-proxy": "^1.17.8",
        "http-proxy": "^1.18.1",
@@ -11906,6 +11618,20 @@
        "node": ">=10.17.0"
      }
    },
+    "node_modules/husky": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
+      "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==",
+      "bin": {
+        "husky": "lib/bin.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/typicode"
+      }
+    },
    "node_modules/hyphenate-style-name": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz",
@@ -12089,6 +11815,11 @@
        "url": "https://opencollective.com/immer"
      }
    },
+    "node_modules/immutable": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz",
+      "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA=="
+    },
    "node_modules/import-fresh": {
      "version": "3.3.0",
      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -12256,14 +11987,13 @@
      }
    },
    "node_modules/internal-slot": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
-      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
-      "license": "MIT",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
      "dependencies": {
        "es-errors": "^1.3.0",
-        "hasown": "^2.0.2",
-        "side-channel": "^1.1.0"
+        "hasown": "^2.0.0",
+        "side-channel": "^1.0.4"
      },
      "engines": {
        "node": ">= 0.4"
@@ -12278,56 +12008,34 @@
      }
    },
    "node_modules/intl-messageformat": {
-      "version": "10.7.7",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.7.tgz",
-      "integrity": "sha512-F134jIoeYMro/3I0h08D0Yt4N9o9pjddU/4IIxMMURqbAtI2wu70X8hvG1V48W49zXHXv3RKSF/po+0fDfsGjA==",
+      "version": "10.5.14",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.5.14.tgz",
+      "integrity": "sha512-IjC6sI0X7YRjjyVH9aUgdftcmZK7WXdHeil4KwbjDnRWjnVitKpAx3rr6t6di1joFp5188VqKcobOPA6mCLG/w==",
      "license": "BSD-3-Clause",
      "dependencies": {
-        "@formatjs/ecma402-abstract": "2.2.4",
-        "@formatjs/fast-memoize": "2.2.3",
-        "@formatjs/icu-messageformat-parser": "2.9.4",
-        "tslib": "2"
+        "@formatjs/ecma402-abstract": "2.0.0",
+        "@formatjs/fast-memoize": "2.2.0",
+        "@formatjs/icu-messageformat-parser": "2.7.8",
+        "tslib": "^2.4.0"
      }
    },
    "node_modules/intl-messageformat/node_modules/@formatjs/ecma402-abstract": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.2.4.tgz",
-      "integrity": "sha512-lFyiQDVvSbQOpU+WFd//ILolGj4UgA/qXrKeZxdV14uKiAUiPAtX6XAn7WBCRi7Mx6I7EybM9E5yYn4BIpZWYg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+      "integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
      "license": "MIT",
      "dependencies": {
-        "@formatjs/fast-memoize": "2.2.3",
-        "@formatjs/intl-localematcher": "0.5.8",
-        "tslib": "2"
-      }
-    },
-    "node_modules/intl-messageformat/node_modules/@formatjs/icu-messageformat-parser": {
-      "version": "2.9.4",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.9.4.tgz",
-      "integrity": "sha512-Tbvp5a9IWuxUcpWNIW6GlMQYEc4rwNHR259uUFoKWNN1jM9obf9Ul0e+7r7MvFOBNcN+13K7NuKCKqQiAn1QEg==",
-      "license": "MIT",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "2.2.4",
-        "@formatjs/icu-skeleton-parser": "1.8.8",
-        "tslib": "2"
-      }
-    },
-    "node_modules/intl-messageformat/node_modules/@formatjs/icu-skeleton-parser": {
-      "version": "1.8.8",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.8.tgz",
-      "integrity": "sha512-vHwK3piXwamFcx5YQdCdJxUQ1WdTl6ANclt5xba5zLGDv5Bsur7qz8AD7BevaKxITwpgDeU0u8My3AIibW9ywA==",
-      "license": "MIT",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "2.2.4",
-        "tslib": "2"
+        "@formatjs/intl-localematcher": "0.5.4",
+        "tslib": "^2.4.0"
      }
    },
    "node_modules/intl-messageformat/node_modules/@formatjs/intl-localematcher": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.8.tgz",
-      "integrity": "sha512-I+WDNWWJFZie+jkfkiK5Mp4hEDyRSEvmyfYadflOno/mmKJKcB17fEpEH0oJu/OWhhCJ8kJBDz2YMd/6cDl7Mg==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+      "integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
      "license": "MIT",
      "dependencies": {
-        "tslib": "2"
+        "tslib": "^2.4.0"
      }
    },
    "node_modules/invariant": {
@@ -12362,14 +12070,12 @@
      }
    },
    "node_modules/is-array-buffer": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
-      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
-      "license": "MIT",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "get-intrinsic": "^1.2.6"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
      },
      "engines": {
        "node": ">= 0.4"
@@ -12383,35 +12089,12 @@
      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
    },
-    "node_modules/is-async-function": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
-      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
-      "license": "MIT",
-      "dependencies": {
-        "async-function": "^1.0.0",
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.1",
-        "has-tostringtag": "^1.0.2",
-        "safe-regex-test": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/is-bigint": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
-      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
-      "license": "MIT",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
      "dependencies": {
-        "has-bigints": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "has-bigints": "^1.0.1"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
@@ -12429,13 +12112,12 @@
      }
    },
    "node_modules/is-boolean-object": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
-      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
-      "license": "MIT",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
      "dependencies": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
      },
      "engines": {
        "node": ">= 0.4"
@@ -12478,28 +12160,21 @@
      }
    },
    "node_modules/is-core-module": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
-      "license": "MIT",
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
      "dependencies": {
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "hasown": "^2.0.0"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/is-data-view": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
-      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
-      "license": "MIT",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
      "dependencies": {
-        "call-bound": "^1.0.2",
-        "get-intrinsic": "^1.2.6",
        "is-typed-array": "^1.1.13"
      },
      "engines": {
@@ -12510,13 +12185,11 @@
      }
    },
    "node_modules/is-date-object": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
-      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
-      "license": "MIT",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
      "dependencies": {
-        "call-bound": "^1.0.2",
-        "has-tostringtag": "^1.0.2"
+        "has-tostringtag": "^1.0.0"
      },
      "engines": {
        "node": ">= 0.4"
@@ -12547,21 +12220,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/is-finalizationregistry": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
-      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/is-fullwidth-code-point": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -12579,24 +12237,6 @@
        "node": ">=6"
      }
    },
-    "node_modules/is-generator-function": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
-      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.0",
-        "has-tostringtag": "^1.0.2",
-        "safe-regex-test": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/is-glob": {
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -12647,10 +12287,17 @@
      }
    },
    "node_modules/is-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-negative-zero": {
      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
-      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
      "engines": {
        "node": ">= 0.4"
      },
@@ -12667,13 +12314,11 @@
      }
    },
    "node_modules/is-number-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
-      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
-      "license": "MIT",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
      "dependencies": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
+        "has-tostringtag": "^1.0.0"
      },
      "engines": {
        "node": ">= 0.4"
@@ -12747,16 +12392,19 @@
      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
    },
+    "node_modules/is-promise": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+      "dev": true
+    },
    "node_modules/is-regex": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
-      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
-      "license": "MIT",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
      "dependencies": {
-        "call-bound": "^1.0.2",
-        "gopd": "^1.2.0",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
      },
      "engines": {
        "node": ">= 0.4"
@@ -12774,24 +12422,19 @@
      }
    },
    "node_modules/is-set": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
-      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
-      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
-      "license": "MIT",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
      "dependencies": {
-        "call-bound": "^1.0.3"
+        "call-bind": "^1.0.7"
      },
      "engines": {
        "node": ">= 0.4"
@@ -12812,13 +12455,11 @@
      }
    },
    "node_modules/is-string": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
-      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
-      "license": "MIT",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
      "dependencies": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
+        "has-tostringtag": "^1.0.0"
      },
      "engines": {
        "node": ">= 0.4"
@@ -12828,14 +12469,11 @@
      }
    },
    "node_modules/is-symbol": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
-      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
-      "license": "MIT",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
      "dependencies": {
-        "call-bound": "^1.0.2",
-        "has-symbols": "^1.1.0",
-        "safe-regex-test": "^1.1.0"
+        "has-symbols": "^1.0.2"
      },
      "engines": {
        "node": ">= 0.4"
@@ -12845,12 +12483,11 @@
      }
    },
    "node_modules/is-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
-      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
-      "license": "MIT",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
      "dependencies": {
-        "which-typed-array": "^1.1.16"
+        "which-typed-array": "^1.1.14"
      },
      "engines": {
        "node": ">= 0.4"
@@ -12882,43 +12519,31 @@
      }
    },
    "node_modules/is-weakmap": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
-      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
+      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/is-weakref": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
-      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
-      "license": "MIT",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
      "dependencies": {
-        "call-bound": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "call-bind": "^1.0.2"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/is-weakset": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
-      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
-      "license": "MIT",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
+      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
      "dependencies": {
-        "call-bound": "^1.0.3",
-        "get-intrinsic": "^1.2.6"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
@@ -13072,23 +12697,6 @@
      "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==",
      "dev": true
    },
-    "node_modules/iterator.prototype": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
-      "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==",
-      "license": "MIT",
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.6",
-        "get-proto": "^1.0.0",
-        "has-symbols": "^1.1.0",
-        "set-function-name": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/jest": {
      "version": "29.7.0",
      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
@@ -13281,6 +12889,26 @@
        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
      }
    },
+    "node_modules/jest-config/node_modules/babel-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+      "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+      "dependencies": {
+        "@jest/transform": "^29.7.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.6.3",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
+      }
+    },
    "node_modules/jest-config/node_modules/pretty-format": {
      "version": "29.7.0",
      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
@@ -13420,18 +13048,17 @@
      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
    },
    "node_modules/jest-environment-jsdom": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
-      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
-      "license": "MIT",
+      "version": "29.6.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.1.tgz",
+      "integrity": "sha512-PoY+yLaHzVRhVEjcVKSfJ7wXmJW4UqPYNhR05h7u/TK0ouf6DmRNZFBL/Z00zgQMyWGMBXn69/FmOvhEJu8cIw==",
      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
+        "@jest/environment": "^29.6.1",
+        "@jest/fake-timers": "^29.6.1",
+        "@jest/types": "^29.6.1",
        "@types/jsdom": "^20.0.0",
        "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0",
+        "jest-mock": "^29.6.1",
+        "jest-util": "^29.6.1",
        "jsdom": "^20.0.0"
      },
      "engines": {
@@ -13948,11 +13575,10 @@
      }
    },
    "node_modules/jest-when": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/jest-when/-/jest-when-3.7.0.tgz",
-      "integrity": "sha512-aLbiyxmtksijcrKFir7n+t+XPbqSLV01eDkRyX28WM4VgA/iSc3mG8R8O2evDtOAa6SefrJiTIt/rTqqyrwVZg==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jest-when/-/jest-when-3.6.0.tgz",
+      "integrity": "sha512-+cZWTy0ekAJo7M9Om0Scdor1jm3wDiYJWmXE8U22UVnkH54YCXAuaqz3P+up/FdtOg8g4wHOxV7Thd7nKhT6Dg==",
      "dev": true,
-      "license": "MIT",
      "peerDependencies": {
        "jest": ">= 25"
      }
@@ -14116,15 +13742,14 @@
      }
    },
    "node_modules/jsesc": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
-      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
-      "license": "MIT",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
      "bin": {
        "jsesc": "bin/jsesc"
      },
      "engines": {
-        "node": ">=6"
+        "node": ">=4"
      }
    },
    "node_modules/json-buffer": {
@@ -14230,7 +13855,6 @@
      "version": "3.3.5",
      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
-      "license": "MIT",
      "dependencies": {
        "array-includes": "^3.1.6",
        "array.prototype.flat": "^1.3.1",
@@ -14281,14 +13905,12 @@
    "node_modules/language-subtag-registry": {
      "version": "0.3.23",
      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz",
-      "integrity": "sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==",
-      "license": "CC0-1.0"
+      "integrity": "sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ=="
    },
    "node_modules/language-tags": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
-      "license": "MIT",
      "dependencies": {
        "language-subtag-registry": "~0.3.2"
      }
@@ -14557,6 +14179,15 @@
        "yallist": "^3.0.2"
      }
    },
+    "node_modules/lru-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+      "integrity": "sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==",
+      "dev": true,
+      "dependencies": {
+        "es5-ext": "~0.10.2"
+      }
+    },
    "node_modules/lz-string": {
      "version": "1.5.0",
      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
@@ -14645,15 +14276,6 @@
        "css-mediaquery": "^0.1.2"
      }
    },
-    "node_modules/math-intrinsics": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/mdast-util-definitions": {
      "version": "5.1.2",
      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.2.tgz",
@@ -14746,6 +14368,22 @@
        "node": ">= 4.0.0"
      }
    },
+    "node_modules/memoizee": {
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
+      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.53",
+        "es6-weak-map": "^2.0.3",
+        "event-emitter": "^0.3.5",
+        "is-promise": "^2.2.2",
+        "lru-queue": "^0.1.0",
+        "next-tick": "^1.1.0",
+        "timers-ext": "^0.1.7"
+      }
+    },
    "node_modules/memory-fs": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
@@ -15369,9 +15007,9 @@
      "license": "ISC"
    },
    "node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
      "funding": [
        {
          "type": "github",
@@ -15398,8 +15036,7 @@
    "node_modules/natural-compare-lite": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
-      "license": "MIT"
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g=="
    },
    "node_modules/negotiator": {
      "version": "0.6.3",
@@ -15414,6 +15051,12 @@
      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
    },
+    "node_modules/next-tick": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
+      "dev": true
+    },
    "node_modules/no-case": {
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
@@ -15445,13 +15088,6 @@
        "node": ">=10"
      }
    },
-    "node_modules/node-addon-api": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-      "license": "MIT",
-      "optional": true
-    },
    "node_modules/node-forge": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
@@ -15539,9 +15175,9 @@
      "peer": true
    },
    "node_modules/node-releases": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
      "license": "MIT"
    },
    "node_modules/normalize-package-data": {
@@ -15577,7 +15213,6 @@
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-      "license": "MIT",
      "engines": {
        "node": ">=0.10.0"
      }
@@ -15618,10 +15253,9 @@
      }
    },
    "node_modules/object-code": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/object-code/-/object-code-1.3.3.tgz",
-      "integrity": "sha512-/Ds4Xd5xzrtUOJ+xJQ57iAy0BZsZltOHssnDgcZ8DOhgh41q1YJCnTPnWdWSLkNGNnxYzhYChjc5dgC9mEERCA==",
-      "license": "MIT"
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object-code/-/object-code-1.3.0.tgz",
+      "integrity": "sha512-PLplgvzuFhSPBuTX/mtaXEnU3c6g7qKflVVQbV9VWEnV/34iKeAX1jeDNCKq1OgGlsnkA/NjldCzTbHxa7Wj4A=="
    },
    "node_modules/object-filter": {
      "version": "1.0.2",
@@ -15629,13 +15263,9 @@
      "integrity": "sha512-NahvP2vZcy1ZiiYah30CEPw0FpDcSkSePJBMpzl5EQgCmISijiGuJm3SPYp7U+Lf2TljyaIw3E5EgkEx/TNEVA=="
    },
    "node_modules/object-inspect": {
-      "version": "1.13.4",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
-      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
@@ -15664,16 +15294,13 @@
      }
    },
    "node_modules/object.assign": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
-      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
-      "license": "MIT",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
+        "call-bind": "^1.0.5",
        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0",
-        "has-symbols": "^1.1.0",
+        "has-symbols": "^1.0.3",
        "object-keys": "^1.1.1"
      },
      "engines": {
@@ -15687,7 +15314,6 @@
      "version": "1.1.8",
      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
-      "license": "MIT",
      "dependencies": {
        "call-bind": "^1.0.7",
        "define-properties": "^1.2.1",
@@ -15701,7 +15327,6 @@
      "version": "2.0.8",
      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
-      "license": "MIT",
      "dependencies": {
        "call-bind": "^1.0.7",
        "define-properties": "^1.2.1",
@@ -15715,25 +15340,10 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/object.groupby": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
-      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/object.hasown": {
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz",
      "integrity": "sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==",
-      "license": "MIT",
      "dependencies": {
        "define-properties": "^1.2.1",
        "es-abstract": "^1.23.2",
@@ -15884,23 +15494,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/own-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
-      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
-      "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.2.6",
-        "object-keys": "^1.1.1",
-        "safe-push-apply": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/p-limit": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -16153,9 +15746,10 @@
      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
    },
    "node_modules/path-to-regexp": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
+      "license": "MIT"
    },
    "node_modules/path-type": {
      "version": "4.0.0",
@@ -16166,9 +15760,9 @@
      }
    },
    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
      "license": "ISC"
    },
    "node_modules/picomatch": {
@@ -16466,9 +16060,9 @@
      }
    },
    "node_modules/postcss": {
-      "version": "8.4.49",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "version": "8.4.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
+      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
      "funding": [
        {
          "type": "opencollective",
@@ -16486,8 +16080,8 @@
      "license": "MIT",
      "dependencies": {
        "nanoid": "^3.3.7",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
+        "picocolors": "^1.0.1",
+        "source-map-js": "^1.2.0"
      },
      "engines": {
        "node": "^10 || ^12 || >=14"
@@ -17269,10 +16863,9 @@
      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
    },
    "node_modules/pubsub-js": {
-      "version": "1.9.5",
-      "resolved": "https://registry.npmjs.org/pubsub-js/-/pubsub-js-1.9.5.tgz",
-      "integrity": "sha512-5MZ0I9i5JWVO7SizvOviKvZU2qaBbl2KQX150FAA+fJBwYpwOUId7aNygURWSdPzlsA/xZ/InUKXqBbzM0czTA==",
-      "license": "MIT"
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/pubsub-js/-/pubsub-js-1.9.4.tgz",
+      "integrity": "sha512-hJYpaDvPH4w8ZX/0Fdf9ma1AwRgU353GfbaVfPjfJQf1KxZ2iHaHl3fAUw1qlJIR5dr4F3RzjGaWohYUEyoh7A=="
    },
    "node_modules/pump": {
      "version": "3.0.0",
@@ -17766,21 +17359,21 @@
      }
    },
    "node_modules/react-intl": {
-      "version": "6.8.9",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.8.9.tgz",
-      "integrity": "sha512-TUfj5E7lyUDvz/GtovC9OMh441kBr08rtIbgh3p0R8iF3hVY+V2W9Am7rb8BpJ/29BH1utJOqOOhmvEVh3GfZg==",
+      "version": "6.6.8",
+      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.6.8.tgz",
+      "integrity": "sha512-M0pkhzcgV31h++2901BiRXWl69hp2zPyLxRrSwRjd1ErXbNoubz/f4M6DrRTd4OiSUrT4ajRQzrmtS5plG4FtA==",
      "license": "BSD-3-Clause",
      "dependencies": {
-        "@formatjs/ecma402-abstract": "2.2.4",
-        "@formatjs/icu-messageformat-parser": "2.9.4",
-        "@formatjs/intl": "2.10.15",
-        "@formatjs/intl-displaynames": "6.8.5",
-        "@formatjs/intl-listformat": "7.7.5",
-        "@types/hoist-non-react-statics": "3",
+        "@formatjs/ecma402-abstract": "2.0.0",
+        "@formatjs/icu-messageformat-parser": "2.7.8",
+        "@formatjs/intl": "2.10.4",
+        "@formatjs/intl-displaynames": "6.6.8",
+        "@formatjs/intl-listformat": "7.5.7",
+        "@types/hoist-non-react-statics": "^3.3.1",
        "@types/react": "16 || 17 || 18",
-        "hoist-non-react-statics": "3",
-        "intl-messageformat": "10.7.7",
-        "tslib": "2"
+        "hoist-non-react-statics": "^3.3.2",
+        "intl-messageformat": "10.5.14",
+        "tslib": "^2.4.0"
      },
      "peerDependencies": {
        "react": "^16.6.0 || 17 || 18",
@@ -17793,44 +17386,22 @@
      }
    },
    "node_modules/react-intl/node_modules/@formatjs/ecma402-abstract": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.2.4.tgz",
-      "integrity": "sha512-lFyiQDVvSbQOpU+WFd//ILolGj4UgA/qXrKeZxdV14uKiAUiPAtX6XAn7WBCRi7Mx6I7EybM9E5yYn4BIpZWYg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+      "integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
      "license": "MIT",
      "dependencies": {
-        "@formatjs/fast-memoize": "2.2.3",
-        "@formatjs/intl-localematcher": "0.5.8",
-        "tslib": "2"
-      }
-    },
-    "node_modules/react-intl/node_modules/@formatjs/icu-messageformat-parser": {
-      "version": "2.9.4",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.9.4.tgz",
-      "integrity": "sha512-Tbvp5a9IWuxUcpWNIW6GlMQYEc4rwNHR259uUFoKWNN1jM9obf9Ul0e+7r7MvFOBNcN+13K7NuKCKqQiAn1QEg==",
-      "license": "MIT",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "2.2.4",
-        "@formatjs/icu-skeleton-parser": "1.8.8",
-        "tslib": "2"
-      }
-    },
-    "node_modules/react-intl/node_modules/@formatjs/icu-skeleton-parser": {
-      "version": "1.8.8",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.8.tgz",
-      "integrity": "sha512-vHwK3piXwamFcx5YQdCdJxUQ1WdTl6ANclt5xba5zLGDv5Bsur7qz8AD7BevaKxITwpgDeU0u8My3AIibW9ywA==",
-      "license": "MIT",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "2.2.4",
-        "tslib": "2"
+        "@formatjs/intl-localematcher": "0.5.4",
+        "tslib": "^2.4.0"
      }
    },
    "node_modules/react-intl/node_modules/@formatjs/intl-localematcher": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.8.tgz",
-      "integrity": "sha512-I+WDNWWJFZie+jkfkiK5Mp4hEDyRSEvmyfYadflOno/mmKJKcB17fEpEH0oJu/OWhhCJ8kJBDz2YMd/6cDl7Mg==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+      "integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
      "license": "MIT",
      "dependencies": {
-        "tslib": "2"
+        "tslib": "^2.4.0"
      }
    },
    "node_modules/react-is": {
@@ -17949,9 +17520,9 @@
      }
    },
    "node_modules/react-refresh": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.16.0.tgz",
-      "integrity": "sha512-FPvF2XxTSikpJxcr+bHut2H4gJ17+18Uy20D5/F+SKzFap62R3cM5wH6b8WN3LyGSYeQilLEcJcR1fjBSI2S1A==",
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
+      "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
      "license": "MIT",
      "engines": {
        "node": ">=0.10.0"
@@ -18320,10 +17891,9 @@
      }
    },
    "node_modules/redux": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
-      "license": "MIT",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz",
+      "integrity": "sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==",
      "dependencies": {
        "@babel/runtime": "^7.9.2"
      }
@@ -18336,28 +17906,6 @@
        "redux": "^4"
      }
    },
-    "node_modules/reflect.getprototypeof": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
-      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.9",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.7",
-        "get-proto": "^1.0.1",
-        "which-builtin-type": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/regenerate": {
      "version": "1.4.2",
      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -18375,10 +17923,10 @@
      }
    },
    "node_modules/regenerator-runtime": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-      "license": "MIT"
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+      "peer": true
    },
    "node_modules/regenerator-transform": {
      "version": "0.15.2",
@@ -18395,17 +17943,14 @@
      "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg=="
    },
    "node_modules/regexp.prototype.flags": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
-      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
-      "license": "MIT",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
      "dependencies": {
-        "call-bind": "^1.0.8",
+        "call-bind": "^1.0.6",
        "define-properties": "^1.2.1",
        "es-errors": "^1.3.0",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "set-function-name": "^2.0.2"
+        "set-function-name": "^2.0.1"
      },
      "engines": {
        "node": ">= 0.4"
@@ -18710,15 +18255,13 @@
      }
    },
    "node_modules/safe-array-concat": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
-      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
-      "license": "MIT",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
-        "get-intrinsic": "^1.2.6",
-        "has-symbols": "^1.1.0",
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
+        "has-symbols": "^1.0.3",
        "isarray": "^2.0.5"
      },
      "engines": {
@@ -18747,31 +18290,14 @@
        }
      ]
    },
-    "node_modules/safe-push-apply": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
-      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "isarray": "^2.0.5"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/safe-regex-test": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
-      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
-      "license": "MIT",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
      "dependencies": {
-        "call-bound": "^1.0.2",
+        "call-bind": "^1.0.6",
        "es-errors": "^1.3.0",
-        "is-regex": "^1.2.1"
+        "is-regex": "^1.1.4"
      },
      "engines": {
        "node": ">= 0.4"
@@ -18795,13 +18321,12 @@
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
    },
    "node_modules/sass": {
-      "version": "1.85.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.85.1.tgz",
-      "integrity": "sha512-Uk8WpxM5v+0cMR0XjX9KfRIacmSG86RH4DCCZjLU2rFh5tyutt9siAXJ7G+YfxQ99Q6wrRMbMlVl6KqUms71ag==",
-      "license": "MIT",
+      "version": "1.79.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.3.tgz",
+      "integrity": "sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA==",
      "dependencies": {
        "chokidar": "^4.0.0",
-        "immutable": "^5.0.2",
+        "immutable": "^4.0.0",
        "source-map-js": ">=0.6.2 <2.0.0"
      },
      "bin": {
@@ -18809,16 +18334,12 @@
      },
      "engines": {
        "node": ">=14.0.0"
-      },
-      "optionalDependencies": {
-        "@parcel/watcher": "^2.4.1"
      }
    },
    "node_modules/sass-loader": {
-      "version": "16.0.5",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.5.tgz",
-      "integrity": "sha512-oL+CMBXrj6BZ/zOq4os+UECPL+bWqt6OAC6DWS8Ln8GZRcMDjlJ4JC3FBDuHJdYaFWIdKNIBYmtZtK2MaMkNIw==",
-      "license": "MIT",
+      "version": "16.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.2.tgz",
+      "integrity": "sha512-Ll6iXZ1EYwYT19SqW4mSBb76vSSi8JgzElmzIerhEGgzB5hRjDQIWsPmuk1UrAXkR16KJHqVY0eH+5/uw9Tmfw==",
      "dependencies": {
        "neo-async": "^2.6.2"
      },
@@ -18855,10 +18376,9 @@
      }
    },
    "node_modules/sass/node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-      "license": "MIT",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
+      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
      "dependencies": {
        "readdirp": "^4.0.1"
      },
@@ -18869,19 +18389,12 @@
        "url": "https://paulmillr.com/funding/"
      }
    },
-    "node_modules/sass/node_modules/immutable": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
-      "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
-      "license": "MIT"
-    },
    "node_modules/sass/node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "license": "MIT",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz",
+      "integrity": "sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw==",
      "engines": {
-        "node": ">= 14.18.0"
+        "node": ">= 14.16.0"
      },
      "funding": {
        "type": "individual",
@@ -19011,10 +18524,9 @@
      "license": "MIT"
    },
    "node_modules/serialize-javascript": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
-      "license": "BSD-3-Clause",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
      "dependencies": {
        "randombytes": "^2.1.0"
      }
@@ -19134,20 +18646,6 @@
        "node": ">= 0.4"
      }
    },
-    "node_modules/set-proto": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
-      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
-      "license": "MIT",
-      "dependencies": {
-        "dunder-proto": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/setprototypeof": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -19242,69 +18740,14 @@
      "peer": true
    },
    "node_modules/side-channel": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
-      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
-      "license": "MIT",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
      "dependencies": {
+        "call-bind": "^1.0.7",
        "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3",
-        "side-channel-list": "^1.0.0",
-        "side-channel-map": "^1.0.1",
-        "side-channel-weakmap": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/side-channel-list": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
-      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/side-channel-map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
-      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.5",
-        "object-inspect": "^1.13.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/side-channel-weakmap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
-      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.5",
-        "object-inspect": "^1.13.3",
-        "side-channel-map": "^1.0.1"
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
      },
      "engines": {
        "node": ">= 0.4"
@@ -19450,10 +18893,9 @@
      }
    },
    "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "license": "BSD-3-Clause",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
      "engines": {
        "node": ">=0.10.0"
      }
@@ -19716,7 +19158,6 @@
      "version": "4.0.11",
      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz",
      "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==",
-      "license": "MIT",
      "dependencies": {
        "call-bind": "^1.0.7",
        "define-properties": "^1.2.1",
@@ -19739,18 +19180,14 @@
      }
    },
    "node_modules/string.prototype.trim": {
-      "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
-      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
-      "license": "MIT",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
-        "define-data-property": "^1.1.4",
+        "call-bind": "^1.0.7",
        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-object-atoms": "^1.0.0",
-        "has-property-descriptors": "^1.0.2"
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
      },
      "engines": {
        "node": ">= 0.4"
@@ -19760,19 +19197,14 @@
      }
    },
    "node_modules/string.prototype.trimend": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
-      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
-      "license": "MIT",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
+        "call-bind": "^1.0.7",
        "define-properties": "^1.2.1",
        "es-object-atoms": "^1.0.0"
      },
-      "engines": {
-        "node": ">= 0.4"
-      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
@@ -20127,16 +19559,15 @@
      }
    },
    "node_modules/terser-webpack-plugin": {
-      "version": "5.3.12",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.12.tgz",
-      "integrity": "sha512-jDLYqo7oF8tJIttjXO6jBY5Hk8p3A8W4ttih7cCEq64fQFWmgJ4VqAQjKr7WwIDlmXKEc6QeoRb5ecjZ+2afcg==",
-      "license": "MIT",
+      "version": "5.3.10",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.25",
+        "@jridgewell/trace-mapping": "^0.3.20",
        "jest-worker": "^27.4.5",
-        "schema-utils": "^4.3.0",
-        "serialize-javascript": "^6.0.2",
-        "terser": "^5.31.1"
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.26.0"
      },
      "engines": {
        "node": ">= 10.13.0"
@@ -20160,39 +19591,10 @@
        }
      }
    },
-    "node_modules/terser-webpack-plugin/node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
    "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
      "version": "27.5.1",
      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "license": "MIT",
      "dependencies": {
        "@types/node": "*",
        "merge-stream": "^2.0.0",
@@ -20202,36 +19604,10 @@
        "node": ">= 10.13.0"
      }
    },
-    "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "license": "MIT"
-    },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-      "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
    "node_modules/terser-webpack-plugin/node_modules/supports-color": {
      "version": "8.1.1",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "license": "MIT",
      "dependencies": {
        "has-flag": "^4.0.0"
      },
@@ -20284,6 +19660,16 @@
      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
    },
+    "node_modules/timers-ext": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
+      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+      "dev": true,
+      "dependencies": {
+        "es5-ext": "~0.10.46",
+        "next-tick": "1"
+      }
+    },
    "node_modules/tiny-invariant": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
@@ -20310,6 +19696,14 @@
      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/to-regex-range": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -20504,7 +19898,6 @@
      "version": "3.21.0",
      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "license": "MIT",
      "dependencies": {
        "tslib": "^1.8.1"
      },
@@ -20518,8 +19911,7 @@
    "node_modules/tsutils/node_modules/tslib": {
      "version": "1.14.1",
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "license": "0BSD"
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
    },
    "node_modules/tunnel-agent": {
      "version": "0.6.0",
@@ -20532,6 +19924,12 @@
        "node": "*"
      }
    },
+    "node_modules/type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
+    },
    "node_modules/type-check": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -20575,30 +19973,28 @@
      }
    },
    "node_modules/typed-array-buffer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
-      "license": "MIT",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
      "dependencies": {
-        "call-bound": "^1.0.3",
+        "call-bind": "^1.0.7",
        "es-errors": "^1.3.0",
-        "is-typed-array": "^1.1.14"
+        "is-typed-array": "^1.1.13"
      },
      "engines": {
        "node": ">= 0.4"
      }
    },
    "node_modules/typed-array-byte-length": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
-      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
-      "license": "MIT",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
      "dependencies": {
-        "call-bind": "^1.0.8",
+        "call-bind": "^1.0.7",
        "for-each": "^0.3.3",
-        "gopd": "^1.2.0",
-        "has-proto": "^1.2.0",
-        "is-typed-array": "^1.1.14"
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
      },
      "engines": {
        "node": ">= 0.4"
@@ -20608,18 +20004,16 @@
      }
    },
    "node_modules/typed-array-byte-offset": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
-      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
-      "license": "MIT",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
      "dependencies": {
        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
+        "call-bind": "^1.0.7",
        "for-each": "^0.3.3",
-        "gopd": "^1.2.0",
-        "has-proto": "^1.2.0",
-        "is-typed-array": "^1.1.15",
-        "reflect.getprototypeof": "^1.0.9"
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
      },
      "engines": {
        "node": ">= 0.4"
@@ -20629,17 +20023,16 @@
      }
    },
    "node_modules/typed-array-length": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
-      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
-      "license": "MIT",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
      "dependencies": {
        "call-bind": "^1.0.7",
        "for-each": "^0.3.3",
        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
        "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0",
-        "reflect.getprototypeof": "^1.0.6"
+        "possible-typed-array-names": "^1.0.0"
      },
      "engines": {
        "node": ">= 0.4"
@@ -20661,18 +20054,14 @@
      }
    },
    "node_modules/unbox-primitive": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
-      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
-      "license": "MIT",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
      "dependencies": {
-        "call-bound": "^1.0.3",
+        "call-bind": "^1.0.2",
        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.1.0",
-        "which-boxed-primitive": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
@@ -20742,18 +20131,6 @@
        "node": ">=4"
      }
    },
-    "node_modules/unicorn-magic": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
-      "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
    "node_modules/unified": {
      "version": "10.1.2",
      "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
@@ -20878,9 +20255,9 @@
      }
    },
    "node_modules/update-browserslist-db": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
-      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
      "funding": [
        {
          "type": "opencollective",
@@ -20897,8 +20274,8 @@
      ],
      "license": "MIT",
      "dependencies": {
-        "escalade": "^3.2.0",
-        "picocolors": "^1.1.1"
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
      },
      "bin": {
        "update-browserslist-db": "cli.js"
@@ -20991,15 +20368,6 @@
        }
      }
    },
-    "node_modules/use-sync-external-store": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz",
-      "integrity": "sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==",
-      "license": "MIT",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
-      }
-    },
    "node_modules/util-deprecate": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -21192,18 +20560,17 @@
      }
    },
    "node_modules/webpack": {
-      "version": "5.98.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz",
-      "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
-      "license": "MIT",
+      "version": "5.94.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
      "dependencies": {
-        "@types/eslint-scope": "^3.7.7",
-        "@types/estree": "^1.0.6",
-        "@webassemblyjs/ast": "^1.14.1",
-        "@webassemblyjs/wasm-edit": "^1.14.1",
-        "@webassemblyjs/wasm-parser": "^1.14.1",
-        "acorn": "^8.14.0",
-        "browserslist": "^4.24.0",
+        "@types/estree": "^1.0.5",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "acorn": "^8.7.1",
+        "acorn-import-attributes": "^1.9.5",
+        "browserslist": "^4.21.10",
        "chrome-trace-event": "^1.0.2",
        "enhanced-resolve": "^5.17.1",
        "es-module-lexer": "^1.2.1",
@@ -21215,9 +20582,9 @@
        "loader-runner": "^4.2.0",
        "mime-types": "^2.1.27",
        "neo-async": "^2.6.2",
-        "schema-utils": "^4.3.0",
+        "schema-utils": "^3.2.0",
        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.3.11",
+        "terser-webpack-plugin": "^5.3.10",
        "watchpack": "^2.4.1",
        "webpack-sources": "^3.2.3"
      },
@@ -21592,59 +20959,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/webpack/node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/webpack/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/webpack/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "license": "MIT"
-    },
-    "node_modules/webpack/node_modules/schema-utils": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-      "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
    "node_modules/webpack/node_modules/webpack-sources": {
      "version": "3.2.3",
      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
@@ -21731,80 +21045,43 @@
      }
    },
    "node_modules/which-boxed-primitive": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
-      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
-      "license": "MIT",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
      "dependencies": {
-        "is-bigint": "^1.1.0",
-        "is-boolean-object": "^1.2.1",
-        "is-number-object": "^1.1.1",
-        "is-string": "^1.1.1",
-        "is-symbol": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-builtin-type": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
-      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "function.prototype.name": "^1.1.6",
-        "has-tostringtag": "^1.0.2",
-        "is-async-function": "^2.0.0",
-        "is-date-object": "^1.1.0",
-        "is-finalizationregistry": "^1.1.0",
-        "is-generator-function": "^1.0.10",
-        "is-regex": "^1.2.1",
-        "is-weakref": "^1.0.2",
-        "isarray": "^2.0.5",
-        "which-boxed-primitive": "^1.1.0",
-        "which-collection": "^1.0.2",
-        "which-typed-array": "^1.1.16"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/which-collection": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
-      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
-      "license": "MIT",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
+      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
      "dependencies": {
-        "is-map": "^2.0.3",
-        "is-set": "^2.0.3",
-        "is-weakmap": "^2.0.2",
-        "is-weakset": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "is-map": "^2.0.1",
+        "is-set": "^2.0.1",
+        "is-weakmap": "^2.0.1",
+        "is-weakset": "^2.0.1"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/which-typed-array": {
-      "version": "1.1.18",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz",
-      "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==",
-      "license": "MIT",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
      "dependencies": {
        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
+        "call-bind": "^1.0.7",
        "for-each": "^0.3.3",
-        "gopd": "^1.2.0",
+        "gopd": "^1.0.1",
        "has-tostringtag": "^1.0.2"
      },
      "engines": {
--- a/package.json
+++ b/package.json
@@ -15,12 +15,12 @@
    "i18n_extract": "fedx-scripts formatjs extract",
    "lint": "fedx-scripts eslint --ext .js --ext .jsx --ext .ts --ext .tsx .",
    "lint:fix": "fedx-scripts eslint --fix --ext .js --ext .jsx --ext .ts --ext .tsx .",
+    "prepare": "husky install",
    "postinstall": "patch-package",
    "snapshot": "fedx-scripts jest --updateSnapshot",
    "start": "fedx-scripts webpack-dev-server --progress",
    "dev": "PUBLIC_PATH=/learning/ MFE_CONFIG_API_URL='http://localhost:8000/api/mfe_config/v1' fedx-scripts webpack-dev-server --progress --host apps.local.openedx.io",
    "test": "fedx-scripts jest --coverage --passWithNoTests",
-    "test:watch": "fedx-scripts jest --watch --passWithNoTests",
    "types": "tsc --noEmit"
  },
  "author": "edX",
@@ -34,9 +34,9 @@
  },
  "dependencies": {
    "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
-    "@edx/browserslist-config": "1.5.0",
+    "@edx/browserslist-config": "1.2.0",
    "@edx/frontend-component-header": "^5.8.0",
-    "@edx/frontend-lib-learning-assistant": "^2.19.2",
+    "@edx/frontend-lib-learning-assistant": "^2.2.4",
    "@edx/frontend-lib-special-exams": "^3.1.3",
    "@edx/frontend-platform": "^8.0.0",
    "@edx/openedx-atlas": "^0.6.0",
@@ -45,15 +45,16 @@
    "@fortawesome/free-regular-svg-icons": "5.15.4",
    "@fortawesome/free-solid-svg-icons": "5.15.4",
    "@fortawesome/react-fontawesome": "^0.1.4",
-    "@openedx/frontend-build": "^14.2.0",
+    "@openedx/frontend-build": "14.1.2",
    "@openedx/frontend-plugin-framework": "^1.2.1",
    "@openedx/frontend-slot-footer": "^1.0.2",
    "@openedx/paragon": "^22.3.0",
    "@popperjs/core": "2.11.8",
-    "@reduxjs/toolkit": "1.9.7",
+    "@reduxjs/toolkit": "1.8.1",
    "buffer": "^6.0.3",
    "classnames": "2.5.1",
-    "copy-webpack-plugin": "^12.0.0",
+    "copy-webpack-plugin": "^11.0.0",
+    "husky": "7.0.4",
    "joi": "^17.11.0",
    "js-cookie": "3.0.5",
    "lodash": "^4.17.21",
@@ -69,7 +70,7 @@
    "react-router": "6.15.0",
    "react-router-dom": "6.15.0",
    "react-share": "4.4.1",
-    "redux": "4.2.1",
+    "redux": "4.1.2",
    "reselect": "4.1.8",
    "sass": "^1.79.3",
    "sass-loader": "^16.0.2",
@@ -82,8 +83,8 @@
    "@testing-library/jest-dom": "5.17.0",
    "@testing-library/react": "12.1.5",
    "@testing-library/react-hooks": "^8.0.1",
-    "@testing-library/user-event": "14.6.1",
-    "axios-mock-adapter": "2.1.0",
+    "@testing-library/user-event": "13.5.0",
+    "axios-mock-adapter": "2.0.0",
    "bundlewatch": "^0.4.0",
    "eslint-import-resolver-webpack": "^0.13.9",
    "jest": "^29.7.0",
@@ -95,7 +96,7 @@
    "files": [
      {
        "path": "dist/*.js",
-        "maxSize": "1400kB"
+        "maxSize": "1300kB"
      }
    ],
    "normalizeFilenames": "^.+?(\\..+?)\\.\\w+$"
--- a/public/index.html
+++ b/public/index.html
@@ -9,9 +9,6 @@
    <% if (htmlWebpackPlugin.options.OPTIMIZELY_PROJECT_ID) { %>
      <script src="https://www.edx.org/optimizelyjs/<%= htmlWebpackPlugin.options.OPTIMIZELY_PROJECT_ID %>.js"></script>
    <% } %>
-    <% if (htmlWebpackPlugin.options.META_TAG_ROBOTS_CONTENT_ATTR) { %>
-      <meta name="robots" content="<%= htmlWebpackPlugin.options.META_TAG_ROBOTS_CONTENT_ATTR %>">
-    <% } %>
  </head>
  <body>
    <div id="root"></div>
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -13,8 +13,6 @@ export const DECODE_ROUTES = {
    '/course/:courseId/:sequenceId/:unitId',
    '/course/:courseId/:sequenceId',
    '/course/:courseId',
-    '/preview/course/:courseId/:sequenceId/:unitId',
-    '/preview/course/:courseId/:sequenceId',
  ],
  REDIRECT_HOME: 'home/:courseId',
  REDIRECT_SURVEY: 'survey/:courseId',
@@ -48,20 +46,6 @@ export const VERIFIED_MODES = [
  'paid-bootcamp',
 ] as const satisfies readonly string[];

-export const AUDIT_MODES = [
-  'audit',
-  'honor',
-  'unpaid-executive-education',
-  'unpaid-bootcamp',
-] as const satisfies readonly string[];
-
-// In sync with CourseMode.UPSELL_TO_VERIFIED_MODES
-// https://github.com/openedx/edx-platform/blob/master/common/djangoapps/course_modes/models.py#L231
-export const ALLOW_UPSELL_MODES = [
-  'audit',
-  'honor',
-] as const satisfies readonly string[];
-
 export const WIDGETS = {
  DISCUSSIONS: 'DISCUSSIONS',
  NOTIFICATIONS: 'NOTIFICATIONS',
--- a/src/course-home/courseware-search/CoursewareResultsFilter.jsx
+++ b/src/course-home/courseware-search/CoursewareResultsFilter.jsx
@@ -63,7 +63,6 @@ export const CoursewareSearchResultsFilter = ({ intl }) => {
      variant="tabs"
      activeKey={activeKey}
      onSelect={setFilter}
-      aria-label={intl.formatMessage(messages.searchResultsFilterDescription)}
    >
      {filters.filter(({ count }) => (count > 0)).map(({ key, label }) => (
        <Tab key={key} eventKey={key} title={label} data-testid={`courseware-search-results-tabs-${key}`}>
--- a/src/course-home/courseware-search/CoursewareSearch.jsx
+++ b/src/course-home/courseware-search/CoursewareSearch.jsx
@@ -1,8 +1,8 @@
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect } from 'react';
 import { useParams } from 'react-router';
 import { useDispatch } from 'react-redux';
 import { sendTrackingLogEvent } from '@edx/frontend-platform/analytics';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import {
  Alert, Button, Icon, Spinner,
 } from '@openedx/paragon';
@@ -18,8 +18,7 @@ import CoursewareSearchResultsFilterContainer from './CoursewareResultsFilter';
 import { updateModel, useModel } from '../../generic/model-store';
 import { searchCourseContent } from '../data/thunks';

-const CoursewareSearch = ({ ...sectionProps }) => {
-  const { formatMessage } = useIntl();
+const CoursewareSearch = ({ intl, ...sectionProps }) => {
  const { courseId } = useParams();
  const { query: searchKeyword, setQuery, clearSearchParams } = useCoursewareSearchParams();
  const dispatch = useDispatch();
@@ -30,7 +29,6 @@ const CoursewareSearch = ({ ...sectionProps }) => {
    errors,
    total,
  } = useModel('contentSearchResults', courseId);
-  const dialogRef = useRef();

  useLockScroll();

@@ -46,8 +44,7 @@ const CoursewareSearch = ({ ...sectionProps }) => {
        searchKeyword: '',
        results: [],
        errors: undefined,
-        loading:
-        false,
+        loading: false,
      },
    }));
  };
@@ -69,46 +66,20 @@ const CoursewareSearch = ({ ...sectionProps }) => {
    setQuery(value);
  };

+  useEffect(() => {
+    handleSubmit(searchKeyword);
+  }, []);
+
  const handleOnChange = (value) => {
    if (value === searchKeyword) { return; }
    if (!value) { clearSearch(); }
  };

-  const close = () => {
+  const handleSearchCloseClick = () => {
    clearSearch();
    dispatch(setShowSearch(false));
  };

-  const handlePopState = () => close();
-
-  const handleBackdropClick = function (event) {
-    if (event.target === dialogRef.current) {
-      dialogRef.current.close();
-    }
-  };
-
-  useEffect(() => {
-    // We need this to keep the dialog reference when unmounting.
-    const dialog = dialogRef.current;
-
-    // Open the dialog as a modal on render to confine focus within it.
-    dialogRef.current.showModal();
-
-    if (searchKeyword) {
-      handleSubmit(searchKeyword); // In case it's opened with a search link, we run the search.
-    }
-
-    const controller = new AbortController();
-    const { signal } = controller;
-
-    window.addEventListener('popstate', handlePopState, { signal });
-    dialog.addEventListener('click', handleBackdropClick, { signal });
-
-    return () => controller.abort(); // Removes event listeners.
-  }, []);
-
-  const handleSearchClose = () => close();
-
  let status = 'idle';
  if (loading) {
    status = 'loading';
@@ -119,64 +90,59 @@ const CoursewareSearch = ({ ...sectionProps }) => {
  }

  return (
-    <dialog ref={dialogRef} className="courseware-search" style={{ '--modal-top-position': top }} data-testid="courseware-search-dialog" onClose={handleSearchClose} {...sectionProps}>
+    <section className="courseware-search" style={{ '--modal-top-position': top }} data-testid="courseware-search-section" {...sectionProps}>
+      <div className="courseware-search__close">
+        <Button
+          variant="tertiary"
+          className="p-1"
+          aria-label={intl.formatMessage(messages.searchCloseAction)}
+          onClick={handleSearchCloseClick}
+          data-testid="courseware-search-close-button"
+        ><Icon src={Close} />
+        </Button>
+      </div>
      <div className="courseware-search__outer-content">
-        <div className="courseware-search__content" data-testid="courseware-search-content">
-          <div className="courseware-search__form">
-            <h1 className="h2">{formatMessage(messages.searchModuleTitle)}</h1>
-            <CoursewareSearchForm
-              searchTerm={searchKeyword}
-              onSubmit={handleSubmit}
-              onChange={handleOnChange}
-              placeholder={formatMessage(messages.searchBarPlaceholderText)}
-            />
-            <div className="courseware-search__close">
-              <Button
-                variant="tertiary"
-                className="p-1"
-                aria-label={formatMessage(messages.searchCloseAction)}
-                onClick={() => dialogRef.current.close()}
-                data-testid="courseware-search-close-button"
-              ><Icon src={Close} />
-              </Button>
+        <div className="courseware-search__content">
+          <h1 className="h2">{intl.formatMessage(messages.searchModuleTitle)}</h1>
+          <CoursewareSearchForm
+            searchTerm={searchKeyword}
+            onSubmit={handleSubmit}
+            onChange={handleOnChange}
+            placeholder={intl.formatMessage(messages.searchBarPlaceholderText)}
+          />
+          {status === 'loading' ? (
+            <div className="courseware-search__spinner" data-testid="courseware-search-spinner">
+              <Spinner animation="border" variant="light" screenReaderText={intl.formatMessage(messages.loading)} />
            </div>
-          </div>
-          <div
-            key={status}
-            className="courseware-search__results"
-            aria-live="assertive"
-            aria-atomic="true"
-            aria-busy={status === 'loading'}
-            data-testid="courseware-search-results"
-            role={status === 'results' ? 'alert' : 'none'}
-          >
-            {status === 'loading' ? (
-              <div className="courseware-search__spinner" data-testid="courseware-search-spinner">
-                <Spinner animation="border" variant="light" screenReaderText={formatMessage(messages.loading)} />
-              </div>
-            ) : null}
-            {status === 'error' && (
-              <Alert className="mt-4" variant="danger" data-testid="courseware-search-error">
-                {formatMessage(messages.searchResultsError)}
-              </Alert>
-            )}
-            {status === 'results' ? (
-              <>
-                {total > 0 ? (
-                  <div
-                    className="courseware-search__results-summary"
-                    data-testid="courseware-search-summary"
-                  >{formatMessage(messages.searchResultsLabel, { total, keyword: lastSearchKeyword })}
-                  </div>
-                ) : null}
-                <CoursewareSearchResultsFilterContainer />
-              </>
-            ) : null}
-          </div>
+          ) : null}
+          {status === 'error' && (
+            <Alert className="mt-4" variant="danger" data-testid="courseware-search-error">
+              {intl.formatMessage(messages.searchResultsError)}
+            </Alert>
+          )}
+          {status === 'results' ? (
+            <>
+              {total > 0 ? (
+                <div
+                  className="courseware-search__results-summary"
+                  aria-live="polite"
+                  aria-relevant="all"
+                  aria-atomic="true"
+                  data-testid="courseware-search-summary"
+                >{intl.formatMessage(messages.searchResultsLabel, { total, keyword: lastSearchKeyword })}
+                </div>
+              ) : null}
+              <CoursewareSearchResultsFilterContainer />
+            </>
+          ) : null}
        </div>
      </div>
-    </dialog>
+    </section>
  );
 };

-export default CoursewareSearch;
+CoursewareSearch.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(CoursewareSearch);
--- a/src/course-home/courseware-search/CoursewareSearch.test.jsx
+++ b/src/course-home/courseware-search/CoursewareSearch.test.jsx
@@ -9,7 +9,6 @@ import {
  screen,
  waitFor,
  fireEvent,
-  within,
 } from '../../setupTest';
 import { CoursewareSearch } from './index';
 import { useElementBoundingBox, useLockScroll, useCoursewareSearchParams } from './hooks';
@@ -20,7 +19,6 @@ import { updateModel, useModel } from '../../generic/model-store';

 jest.mock('./hooks');
 jest.mock('../../generic/model-store', () => ({
-  ...jest.requireActual('../../generic/model-store'),
  updateModel: jest.fn(),
  useModel: jest.fn(),
 }));
@@ -58,7 +56,7 @@ const defaultProps = {
  total: 0,
 };

-const defaultSearchParams = {
+const coursewareSearch = {
  query: '',
  filter: '',
  setQuery: jest.fn(),
@@ -98,20 +96,14 @@ const mockModels = ((props = defaultProps) => {
  });
 });

-const mockSearchParams = ((params) => {
-  const props = { ...defaultSearchParams, ...params };
+const mockSearchParams = ((props = coursewareSearch) => {
  useCoursewareSearchParams.mockReturnValue(props);
 });

 describe('CoursewareSearch', () => {
-  beforeAll(() => initializeMockApp());
+  beforeAll(initializeMockApp);

  beforeEach(() => {
-    mockModels();
-    mockSearchParams();
-  });
-
-  afterEach(() => {
    jest.clearAllMocks();
  });

@@ -121,22 +113,27 @@ describe('CoursewareSearch', () => {
    });

    it('should use useElementBoundingBox() and useLockScroll() hooks', () => {
+      mockModels();
+      mockSearchParams();
      renderComponent();

-      expect(useElementBoundingBox).toHaveBeenCalledTimes(1);
-      expect(useLockScroll).toHaveBeenCalledTimes(1);
+      expect(useElementBoundingBox).toBeCalledTimes(1);
+      expect(useLockScroll).toBeCalledTimes(1);
    });

    it('should have a "--modal-top-position" CSS variable matching the CourseTabsNavigation top position', () => {
+      mockModels();
+      mockSearchParams();
      renderComponent();

-      const section = screen.getByTestId('courseware-search-dialog');
+      const section = screen.getByTestId('courseware-search-section');
      expect(section.style.getPropertyValue('--modal-top-position')).toBe(`${tabsTopPosition}px`);
    });
  });

  describe('when clicking on the "Close" button', () => {
-    it('should close the dialog', async () => {
+    it('should dispatch setShowSearch(false)', async () => {
+      mockModels();
      renderComponent();

      await waitFor(() => {
@@ -144,8 +141,7 @@ describe('CoursewareSearch', () => {
        fireEvent.click(close);
      });

-      expect(HTMLDialogElement.prototype.close).toHaveBeenCalled();
-      expect(setShowSearch).toHaveBeenCalledWith(false);
+      expect(setShowSearch).toBeCalledWith(false);
    });
  });

@@ -153,24 +149,29 @@ describe('CoursewareSearch', () => {
    it('should use "--modal-top-position: 0" if  nce element is not present', () => {
      useElementBoundingBox.mockImplementation(() => undefined);

+      mockModels();
+      mockSearchParams();
      renderComponent();

-      const section = screen.getByTestId('courseware-search-dialog');
+      const section = screen.getByTestId('courseware-search-section');
      expect(section.style.getPropertyValue('--modal-top-position')).toBe('0');
    });
  });

  describe('when passing extra props', () => {
    it('should pass on extra props to section element', () => {
+      mockModels();
+      mockSearchParams();
      renderComponent({ foo: 'bar' });

-      const section = screen.getByTestId('courseware-search-dialog');
+      const section = screen.getByTestId('courseware-search-section');
      expect(section).toHaveAttribute('foo', 'bar');
    });
  });

  describe('when submitting an empty search', () => {
    it('should clear the search by dispatch updateModel', async () => {
+      mockModels();
      renderComponent();

      await waitFor(() => {
@@ -202,6 +203,7 @@ describe('CoursewareSearch', () => {
    });

    it('should call searchCourseContent', async () => {
+      mockModels();
      renderComponent();

      const searchKeyword = 'course';
@@ -244,25 +246,19 @@ describe('CoursewareSearch', () => {
      expect(screen.queryByTestId('courseware-search-summary')).not.toBeInTheDocument();
    });

-    it('should show a wrapper div with proper aria attributes', () => {
+    it('should show a summary for the results', () => {
      mockModels({
        searchKeyword: 'fubar',
        total: 1,
      });
      renderComponent();

-      const results = screen.queryByTestId('courseware-search-results');
-
-      expect(results).toHaveAttribute('aria-live', 'assertive');
-      expect(results).toHaveAttribute('aria-atomic', 'true');
-      expect(results).toHaveAttribute('role', 'alert');
-      expect(within(results).queryByTestId('courseware-search-summary').textContent).toBe('Results for "fubar":');
+      expect(screen.queryByTestId('courseware-search-summary').textContent).toBe('Results for "fubar":');
    });
  });

  describe('when clearing the search input', () => {
    it('should clear the search by dispatch updateModel', async () => {
-      mockSearchParams({ query: 'fubar' });
      mockModels({
        searchKeyword: 'fubar',
        total: 2,
--- a/src/course-home/courseware-search/CoursewareSearchForm.jsx
+++ b/src/course-home/courseware-search/CoursewareSearchForm.jsx
@@ -1,44 +1,43 @@
+import React from 'react';
 import PropTypes from 'prop-types';
 import { SearchField } from '@openedx/paragon';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import messages from './messages';

 const CoursewareSearchForm = ({
+  intl,
  searchTerm,
  onSubmit,
  onChange,
  placeholder,
-}) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <SearchField.Advanced
-      value={searchTerm}
-      onSubmit={onSubmit}
-      onChange={onChange}
+}) => (
+  <SearchField.Advanced
+    value={searchTerm}
+    onSubmit={onSubmit}
+    onChange={onChange}
+    submitButtonLocation="external"
+    className="courseware-search-form"
+    screenReaderText={{
+      label: intl.formatMessage(messages.searchSubmitLabel),
+      clearButton: intl.formatMessage(messages.searchClearAction),
+      submitButton: null, // Remove the sr-only label in the button.
+    }}
+  >
+    <div className="pgn__searchfield_wrapper" data-testid="courseware-search-form">
+      <SearchField.Label />
+      <SearchField.Input placeholder={placeholder} autoFocus />
+      <SearchField.ClearButton />
+    </div>
+    <SearchField.SubmitButton
+      buttonText={intl.formatMessage(messages.searchSubmitLabel)}
      submitButtonLocation="external"
-      className="courseware-search-form"
-      screenReaderText={{
-        label: formatMessage(messages.searchSubmitLabel),
-        clearButton: formatMessage(messages.searchClearAction),
-        submitButton: null, // Remove the sr-only label in the button.
-      }}
-    >
-      <div className="pgn__searchfield_wrapper" data-testid="courseware-search-form">
-        <SearchField.Label />
-        <SearchField.Input placeholder={placeholder} autoFocus />
-        <SearchField.ClearButton />
-      </div>
-      <SearchField.SubmitButton
-        buttonText={formatMessage(messages.searchSubmitLabel)}
-        submitButtonLocation="external"
-        data-testid="courseware-search-form-submit"
-      />
-    </SearchField.Advanced>
-  );
-};
+      data-testid="courseware-search-form-submit"
+    />
+  </SearchField.Advanced>
+);

 CoursewareSearchForm.propTypes = {
+  intl: intlShape.isRequired,
  searchTerm: PropTypes.string,
  onSubmit: PropTypes.func,
  onChange: PropTypes.func,
@@ -52,4 +51,4 @@ CoursewareSearchForm.defaultProps = {
  placeholder: undefined,
 };

-export default CoursewareSearchForm;
+export default injectIntl(CoursewareSearchForm);
--- a/src/course-home/courseware-search/CoursewareSearchResults.jsx
+++ b/src/course-home/courseware-search/CoursewareSearchResults.jsx
@@ -1,4 +1,4 @@
-import { useIntl } from '@edx/frontend-platform/i18n';
+import React from 'react';
 import {
  Folder, TextFields, VideoCamera, Article,
 } from '@openedx/paragon/icons';
@@ -6,7 +6,6 @@ import { getConfig } from '@edx/frontend-platform';
 import { Icon } from '@openedx/paragon';
 import PropTypes from 'prop-types';
 import CoursewareSearchEmpty from './CoursewareSearchEmpty';
-import messages from './messages';

 const iconTypeMapping = {
  text: TextFields,
@@ -22,8 +21,6 @@ const CoursewareSearchResults = ({ results = [] }) => {
    return <CoursewareSearchEmpty />;
  }

-  const { formatMessage } = useIntl();
-
  const baseUrl = `${getConfig().LMS_BASE_URL}`;

  return (
@@ -45,30 +42,24 @@ const CoursewareSearchResults = ({ results = [] }) => {
          rel: 'nofollow',
        } : { href: `${baseUrl}${url}` };

-        const ariaSeaparator = formatMessage(messages.searchResultsBreadcrumbSeparator);
-        const ariaLocation = location?.length ? formatMessage(messages.searchResultsBreadcrumb, { path: location.join(ariaSeaparator) }) : '';
-
        return (
          <a key={id} className="courseware-search-results__item" {...linkProps}>
            <div className="courseware-search-results__icon"><Icon src={icon} /></div>
            <div className="courseware-search-results__info">
              <div className="courseware-search-results__title">
-                <h3>{title}</h3>
-                {contentHits ? (<em aria-hidden="true">{contentHits}</em>) : null }
+                <span>{title}</span>
+                {contentHits ? (<em>{contentHits}</em>) : null }
              </div>
-
-              <div aria-label={ariaLocation}>
-                {location?.length ? (
-                  <ul className="courseware-search-results__breadcrumbs" aria-hidden="true">
-                    {
+              {location?.length ? (
+                <ul className="courseware-search-results__breadcrumbs">
+                  {
                  // This ignore is necessary because the breadcrumb texts might have duplicates.
                  // The breadcrumbs are not expected to change.
                  // eslint-disable-next-line react/no-array-index-key
                  location.map((breadcrumb, i) => (<li key={`${i}:${breadcrumb}`}><div>{breadcrumb}</div></li>))
                  }
-                  </ul>
-                ) : null}
-              </div>
+                </ul>
+              ) : null}
            </div>
          </a>
        );
--- a/src/course-home/courseware-search/snapshots/CoursewareSearchResults.test.jsx.snap
+++ b/src/course-home/courseware-search/snapshots/CoursewareSearchResults.test.jsx.snap
@@ -38,29 +38,24 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Demo Course Overview
-        </h3>
+        </span>
      </div>
-      <div
-        aria-label="Location: Introduction, then Demo Course Overview."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Introduction
-            </div>
-          </li>
-          <li>
-            <div>
-              Demo Course Overview
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Introduction
+          </div>
+        </li>
+        <li>
+          <div>
+            Demo Course Overview
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -96,39 +91,32 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Passing a Course
-        </h3>
-        <em
-          aria-hidden="true"
-        >
+        </span>
+        <em>
          1
        </em>
      </div>
-      <div
-        aria-label="Location: About Exams and Certificates, then edX Exams, then Passing a Course."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              About Exams and Certificates
-            </div>
-          </li>
-          <li>
-            <div>
-              edX Exams
-            </div>
-          </li>
-          <li>
-            <div>
-              Passing a Course
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            About Exams and Certificates
+          </div>
+        </li>
+        <li>
+          <div>
+            edX Exams
+          </div>
+        </li>
+        <li>
+          <div>
+            Passing a Course
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -164,34 +152,29 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Passing a Course
-        </h3>
+        </span>
      </div>
-      <div
-        aria-label="Location: About Exams and Certificates, then edX Exams, then Passing a Course."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              About Exams and Certificates
-            </div>
-          </li>
-          <li>
-            <div>
-              edX Exams
-            </div>
-          </li>
-          <li>
-            <div>
-              Passing a Course
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            About Exams and Certificates
+          </div>
+        </li>
+        <li>
+          <div>
+            edX Exams
+          </div>
+        </li>
+        <li>
+          <div>
+            Passing a Course
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -227,34 +210,29 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Text Input
-        </h3>
+        </span>
      </div>
-      <div
-        aria-label="Location: Example Week 1: Getting Started, then Homework - Question Styles, then Text input."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Example Week 1: Getting Started
-            </div>
-          </li>
-          <li>
-            <div>
-              Homework - Question Styles
-            </div>
-          </li>
-          <li>
-            <div>
-              Text input
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Example Week 1: Getting Started
+          </div>
+        </li>
+        <li>
+          <div>
+            Homework - Question Styles
+          </div>
+        </li>
+        <li>
+          <div>
+            Text input
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -290,34 +268,29 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Pointing on a Picture
-        </h3>
+        </span>
      </div>
-      <div
-        aria-label="Location: Example Week 1: Getting Started, then Homework - Question Styles, then Pointing on a Picture."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Example Week 1: Getting Started
-            </div>
-          </li>
-          <li>
-            <div>
-              Homework - Question Styles
-            </div>
-          </li>
-          <li>
-            <div>
-              Pointing on a Picture
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Example Week 1: Getting Started
+          </div>
+        </li>
+        <li>
+          <div>
+            Homework - Question Styles
+          </div>
+        </li>
+        <li>
+          <div>
+            Pointing on a Picture
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -353,34 +326,29 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Getting Answers
-        </h3>
+        </span>
      </div>
-      <div
-        aria-label="Location: About Exams and Certificates, then edX Exams, then Getting Answers."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              About Exams and Certificates
-            </div>
-          </li>
-          <li>
-            <div>
-              edX Exams
-            </div>
-          </li>
-          <li>
-            <div>
-              Getting Answers
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            About Exams and Certificates
+          </div>
+        </li>
+        <li>
+          <div>
+            edX Exams
+          </div>
+        </li>
+        <li>
+          <div>
+            Getting Answers
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -416,39 +384,32 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Welcome!
-        </h3>
-        <em
-          aria-hidden="true"
-        >
+        </span>
+        <em>
          30
        </em>
      </div>
-      <div
-        aria-label="Location: Introduction, then Demo Course Overview, then Introduction: Video and Sequences."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Introduction
-            </div>
-          </li>
-          <li>
-            <div>
-              Demo Course Overview
-            </div>
-          </li>
-          <li>
-            <div>
-              Introduction: Video and Sequences
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Introduction
+          </div>
+        </li>
+        <li>
+          <div>
+            Demo Course Overview
+          </div>
+        </li>
+        <li>
+          <div>
+            Introduction: Video and Sequences
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -484,34 +445,29 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Multiple Choice Questions
-        </h3>
+        </span>
      </div>
-      <div
-        aria-label="Location: Example Week 1: Getting Started, then Homework - Question Styles, then Multiple Choice Questions."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Example Week 1: Getting Started
-            </div>
-          </li>
-          <li>
-            <div>
-              Homework - Question Styles
-            </div>
-          </li>
-          <li>
-            <div>
-              Multiple Choice Questions
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Example Week 1: Getting Started
+          </div>
+        </li>
+        <li>
+          <div>
+            Homework - Question Styles
+          </div>
+        </li>
+        <li>
+          <div>
+            Multiple Choice Questions
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -547,34 +503,29 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Numerical Input
-        </h3>
+        </span>
      </div>
-      <div
-        aria-label="Location: Example Week 1: Getting Started, then Homework - Question Styles, then Numerical Input."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Example Week 1: Getting Started
-            </div>
-          </li>
-          <li>
-            <div>
-              Homework - Question Styles
-            </div>
-          </li>
-          <li>
-            <div>
-              Numerical Input
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Example Week 1: Getting Started
+          </div>
+        </li>
+        <li>
+          <div>
+            Homework - Question Styles
+          </div>
+        </li>
+        <li>
+          <div>
+            Numerical Input
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -610,39 +561,32 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Connecting a Circuit and a Circuit Diagram
-        </h3>
-        <em
-          aria-hidden="true"
-        >
+        </span>
+        <em>
          3
        </em>
      </div>
-      <div
-        aria-label="Location: Example Week 1: Getting Started, then Lesson 1 - Getting Started, then Video Presentation Styles."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Example Week 1: Getting Started
-            </div>
-          </li>
-          <li>
-            <div>
-              Lesson 1 - Getting Started
-            </div>
-          </li>
-          <li>
-            <div>
-              Video Presentation Styles
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Example Week 1: Getting Started
+          </div>
+        </li>
+        <li>
+          <div>
+            Lesson 1 - Getting Started
+          </div>
+        </li>
+        <li>
+          <div>
+            Video Presentation Styles
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -678,34 +622,29 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          CAPA
-        </h3>
+        </span>
      </div>
-      <div
-        aria-label="Location: Example Week 2: Get Interactive, then Homework - Labs and Demos, then Code Grader."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Example Week 2: Get Interactive
-            </div>
-          </li>
-          <li>
-            <div>
-              Homework - Labs and Demos
-            </div>
-          </li>
-          <li>
-            <div>
-              Code Grader
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Example Week 2: Get Interactive
+          </div>
+        </li>
+        <li>
+          <div>
+            Homework - Labs and Demos
+          </div>
+        </li>
+        <li>
+          <div>
+            Code Grader
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -741,34 +680,29 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Interactive Questions
-        </h3>
+        </span>
      </div>
-      <div
-        aria-label="Location: Example Week 1: Getting Started, then Lesson 1 - Getting Started, then Interactive Questions."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Example Week 1: Getting Started
-            </div>
-          </li>
-          <li>
-            <div>
-              Lesson 1 - Getting Started
-            </div>
-          </li>
-          <li>
-            <div>
-              Interactive Questions
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Example Week 1: Getting Started
+          </div>
+        </li>
+        <li>
+          <div>
+            Lesson 1 - Getting Started
+          </div>
+        </li>
+        <li>
+          <div>
+            Interactive Questions
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -804,39 +738,32 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Blank HTML Page
-        </h3>
-        <em
-          aria-hidden="true"
-        >
+        </span>
+        <em>
          6
        </em>
      </div>
-      <div
-        aria-label="Location: Introduction, then Demo Course Overview, then Introduction: Video and Sequences."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Introduction
-            </div>
-          </li>
-          <li>
-            <div>
-              Demo Course Overview
-            </div>
-          </li>
-          <li>
-            <div>
-              Introduction: Video and Sequences
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Introduction
+          </div>
+        </li>
+        <li>
+          <div>
+            Demo Course Overview
+          </div>
+        </li>
+        <li>
+          <div>
+            Introduction: Video and Sequences
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -872,39 +799,32 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Discussion Forums
-        </h3>
-        <em
-          aria-hidden="true"
-        >
+        </span>
+        <em>
          5
        </em>
      </div>
-      <div
-        aria-label="Location: Example Week 3: Be Social, then Lesson 3 - Be Social, then Discussion Forums."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Example Week 3: Be Social
-            </div>
-          </li>
-          <li>
-            <div>
-              Lesson 3 - Be Social
-            </div>
-          </li>
-          <li>
-            <div>
-              Discussion Forums
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Example Week 3: Be Social
+          </div>
+        </li>
+        <li>
+          <div>
+            Lesson 3 - Be Social
+          </div>
+        </li>
+        <li>
+          <div>
+            Discussion Forums
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -940,39 +860,32 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Overall Grade
-        </h3>
-        <em
-          aria-hidden="true"
-        >
+        </span>
+        <em>
          7
        </em>
      </div>
-      <div
-        aria-label="Location: About Exams and Certificates, then edX Exams, then Overall Grade Performance."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              About Exams and Certificates
-            </div>
-          </li>
-          <li>
-            <div>
-              edX Exams
-            </div>
-          </li>
-          <li>
-            <div>
-              Overall Grade Performance
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            About Exams and Certificates
+          </div>
+        </li>
+        <li>
+          <div>
+            edX Exams
+          </div>
+        </li>
+        <li>
+          <div>
+            Overall Grade Performance
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -1008,39 +921,32 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Blank HTML Page
-        </h3>
-        <em
-          aria-hidden="true"
-        >
+        </span>
+        <em>
          3
        </em>
      </div>
-      <div
-        aria-label="Location: Example Week 3: Be Social, then Lesson 3 - Be Social, then Homework - Find Your Study Buddy."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Example Week 3: Be Social
-            </div>
-          </li>
-          <li>
-            <div>
-              Lesson 3 - Be Social
-            </div>
-          </li>
-          <li>
-            <div>
-              Homework - Find Your Study Buddy
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Example Week 3: Be Social
+          </div>
+        </li>
+        <li>
+          <div>
+            Lesson 3 - Be Social
+          </div>
+        </li>
+        <li>
+          <div>
+            Homework - Find Your Study Buddy
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -1076,39 +982,32 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Find Your Study Buddy
-        </h3>
-        <em
-          aria-hidden="true"
-        >
+        </span>
+        <em>
          3
        </em>
      </div>
-      <div
-        aria-label="Location: Example Week 3: Be Social, then Homework - Find Your Study Buddy, then Homework - Find Your Study Buddy."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Example Week 3: Be Social
-            </div>
-          </li>
-          <li>
-            <div>
-              Homework - Find Your Study Buddy
-            </div>
-          </li>
-          <li>
-            <div>
-              Homework - Find Your Study Buddy
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Example Week 3: Be Social
+          </div>
+        </li>
+        <li>
+          <div>
+            Homework - Find Your Study Buddy
+          </div>
+        </li>
+        <li>
+          <div>
+            Homework - Find Your Study Buddy
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -1144,39 +1043,32 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          Be Social
-        </h3>
-        <em
-          aria-hidden="true"
-        >
+        </span>
+        <em>
          4
        </em>
      </div>
-      <div
-        aria-label="Location: Example Week 3: Be Social, then Lesson 3 - Be Social, then Be Social."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Example Week 3: Be Social
-            </div>
-          </li>
-          <li>
-            <div>
-              Lesson 3 - Be Social
-            </div>
-          </li>
-          <li>
-            <div>
-              Be Social
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Example Week 3: Be Social
+          </div>
+        </li>
+        <li>
+          <div>
+            Lesson 3 - Be Social
+          </div>
+        </li>
+        <li>
+          <div>
+            Be Social
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -1212,39 +1104,32 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          EdX Exams
-        </h3>
-        <em
-          aria-hidden="true"
-        >
+        </span>
+        <em>
          4
        </em>
      </div>
-      <div
-        aria-label="Location: About Exams and Certificates, then edX Exams, then EdX Exams."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              About Exams and Certificates
-            </div>
-          </li>
-          <li>
-            <div>
-              edX Exams
-            </div>
-          </li>
-          <li>
-            <div>
-              EdX Exams
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            About Exams and Certificates
+          </div>
+        </li>
+        <li>
+          <div>
+            edX Exams
+          </div>
+        </li>
+        <li>
+          <div>
+            EdX Exams
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -1280,39 +1165,32 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          When Are Your Exams? 
-        </h3>
-        <em
-          aria-hidden="true"
-        >
+        </span>
+        <em>
          2
        </em>
      </div>
-      <div
-        aria-label="Location: Example Week 1: Getting Started, then Lesson 1 - Getting Started, then When Are Your Exams? ."
+      <ul
+        class="courseware-search-results__breadcrumbs"
      >
-        <ul
-          aria-hidden="true"
-          class="courseware-search-results__breadcrumbs"
-        >
-          <li>
-            <div>
-              Example Week 1: Getting Started
-            </div>
-          </li>
-          <li>
-            <div>
-              Lesson 1 - Getting Started
-            </div>
-          </li>
-          <li>
-            <div>
-              When Are Your Exams? 
-            </div>
-          </li>
-        </ul>
-      </div>
+        <li>
+          <div>
+            Example Week 1: Getting Started
+          </div>
+        </li>
+        <li>
+          <div>
+            Lesson 1 - Getting Started
+          </div>
+        </li>
+        <li>
+          <div>
+            When Are Your Exams? 
+          </div>
+        </li>
+      </ul>
    </div>
  </a>
  <a
@@ -1350,13 +1228,10 @@ exports[`CoursewareSearchResults when list of results is provided should match t
      <div
        class="courseware-search-results__title"
      >
-        <h3>
+        <span>
          External Course Link Test
-        </h3>
+        </span>
      </div>
-      <div
-        aria-label=""
-      />
    </div>
  </a>
 </div>
--- a/src/course-home/courseware-search/courseware-search.scss
+++ b/src/course-home/courseware-search/courseware-search.scss
@@ -5,25 +5,13 @@
  left: 0;
  right: 0;
  bottom: 0;
-  width: 100%;
-  height: 100%;
-  max-width: none;
-  margin: 0;
  border-top: 1px solid $light-300;
  z-index: $zindex-modal; // Bootstrap's z-index layer for Modals.

-  &__form {
-    position: relative;
-
-    .h2 {
-      margin-right: 2.5rem;
-    }
-  }
-
  &__close {
    position: absolute !important; // For some reason it gets overridden
-    top: 0;
-    right: 0;
+    top: 0.5rem;
+    right: 1rem;
    font-size: 1.5rem;
    line-height: 1;
  }
@@ -101,11 +89,6 @@
    font-size: 0.875rem;
    color: $black;

-    > h3 {
-      font-size: inherit;
-      margin: 0;
-    }
-
    > span {
      display: block;
      overflow: hidden;
@@ -169,16 +152,9 @@
 }

@media (min-width: map-get($grid-breakpoints, 'md')) {
-  .courseware-search {
-    &__close {
-      right: -2.5rem;
-    }
-
-    &__content {
-      padding-top: 8rem;
-    }
+  .courseware-search__content {
+    padding-top: 8rem;
  }
-
 }

 body._search-no-scroll {
--- a/src/course-home/courseware-search/messages.ts
+++ b/src/course-home/courseware-search/messages.ts
@@ -56,21 +56,7 @@ const messages = defineMessages({
    defaultMessage: 'There was an error on the search process. Please try again in a few minutes. If the problem persists, please contact the support team.',
    description: 'Error message to show to the users when there\'s an error with the endpoint or the returned payload format.',
  },
-  searchResultsFilterDescription: {
-    id: 'learn.coursewareSearch.searchResultsFilterDescription',
-    defaultMessage: 'Search result filters',
-    description: 'Screen Reader text to describe the filter options.',
-  },
-  searchResultsBreadcrumb: {
-    id: 'learn.coursewareSearch.searchResultsBreadcrumb',
-    defaultMessage: 'Location: {path}.',
-    description: 'Screen Reader text to describe the search result breadcrumbs.',
-  },
-  searchResultsBreadcrumbSeparator: {
-    id: 'learn.searchResultsBreadcrumbSeparator',
-    defaultMessage: ', then ',
-    description: 'Screen Reader text to connect breadcrumb sections. i.e.: "Introduction, then Register, then Something else.',
-  },
+
  // These are translations for labeling the filters
  'filter:all': {
    id: 'learn.coursewareSearch.filter:all',
--- a/src/course-home/data/api.js
+++ b/src/course-home/data/api.js
@@ -289,17 +289,9 @@ export async function getProgressTabData(courseId, targetUserId) {
 }

 export async function getProctoringInfoData(courseId, username) {
-  let url;
-  if (!getConfig().EXAMS_BASE_URL) {
-    url = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/user_onboarding/status?is_learning_mfe=true&course_id=${encodeURIComponent(courseId)}`;
-    if (username) {
-      url += `&username=${encodeURIComponent(username)}`;
-    }
-  } else {
-    url = `${getConfig().EXAMS_BASE_URL}/api/v1/student/course_id/${encodeURIComponent(courseId)}/onboarding`;
-    if (username) {
-      url += `?username=${encodeURIComponent(username)}`;
-    }
+  let url = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/user_onboarding/status?is_learning_mfe=true&course_id=${encodeURIComponent(courseId)}`;
+  if (username) {
+    url += `&username=${encodeURIComponent(username)}`;
  }
  try {
    const { data } = await getAuthenticatedHttpClient().get(url);
@@ -457,7 +449,7 @@ export async function unsubscribeFromCourseGoal(token) {
    .then(res => camelCaseObject(res));
 }

-export async function getCoursewareSearchEnabled(courseId) {
+export async function getCoursewareSearchEnabledFlag(courseId) {
  const url = new URL(`${getConfig().LMS_BASE_URL}/courses/${courseId}/courseware-search/enabled/`);
  const { data } = await getAuthenticatedHttpClient().get(url.href);
  return { enabled: data.enabled || false };
--- a/src/course-home/data/pact-tests/lmsPact.test.jsx
+++ b/src/course-home/data/pact-tests/lmsPact.test.jsx
@@ -89,7 +89,6 @@ describe('Course Home Service', () => {
              }),
              title: string('Demonstration Course'),
              username: string('edx'),
-              has_course_author_access: boolean(true),
            },
          },
        });
@@ -134,7 +133,6 @@ describe('Course Home Service', () => {
          ],
          title: 'Demonstration Course',
          username: 'edx',
-          hasCourseAuthorAccess: true,
        };
        const response = getCourseHomeCourseMetadata(courseId, 'outline');
        expect(response).toBeTruthy();
--- a/src/course-home/data/thunks.js
+++ b/src/course-home/data/thunks.js
@@ -12,7 +12,7 @@ import {
  postDismissWelcomeMessage,
  postRequestCert,
  getLiveTabIframe,
-  getCoursewareSearchEnabled,
+  getCoursewareSearchEnabledFlag,
  searchCourseContentFromAPI,
 } from './api';

@@ -159,7 +159,7 @@ export function processEvent(eventData, getTabData) {

 export async function fetchCoursewareSearchSettings(courseId) {
  try {
-    const { enabled } = await getCoursewareSearchEnabled(courseId);
+    const { enabled } = await getCoursewareSearchEnabledFlag(courseId);
    return { enabled };
  } catch (e) {
    return { enabled: false };
--- a/src/course-home/dates-tab/DatesTab.test.jsx
+++ b/src/course-home/dates-tab/DatesTab.test.jsx
@@ -135,7 +135,6 @@ describe('DatesTab', () => {
    });

    it('shows extra info', async () => {
-      const user = userEvent.setup();
      const { items } = await getDay('Sat, Aug 17, 2030');
      expect(items).toHaveLength(3);

@@ -143,12 +142,10 @@ describe('DatesTab', () => {
      const tipText = "ORA Dates are set by the instructor, and can't be changed";

      expect(screen.queryByText(tipText)).toBeNull(); // tooltip does not start in DOM
-      await user.hover(tipIcon);
-      screen.getByText(tipText); // now it's there
-      await user.unhover(tipIcon);
-      await waitFor(() => {
-        expect(screen.queryByText(tipText)).toBeNull(); // and it's gone again
-      });
+      userEvent.hover(tipIcon);
+      const tooltip = screen.getByText(tipText); // now it's there
+      userEvent.unhover(tipIcon);
+      await waitForElementToBeRemoved(tooltip); // and it's gone again
    });
  });

--- a/src/course-home/outline-tab/OutlineTab.jsx
+++ b/src/course-home/outline-tab/OutlineTab.jsx
@@ -1,9 +1,9 @@
-import { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { useSelector } from 'react-redux';
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Button } from '@openedx/paragon';
 import { PluginSlot } from '@openedx/frontend-plugin-framework';
 import { AlertList } from '../../generic/user-messages';
@@ -15,6 +15,7 @@ import WeeklyLearningGoalCard from './widgets/WeeklyLearningGoalCard';
 import CourseTools from './widgets/CourseTools';
 import { fetchOutlineTab } from '../data';
 import messages from './messages';
+import Section from './Section';
 import ShiftDatesAlert from '../suggested-schedule-messaging/ShiftDatesAlert';
 import UpgradeNotification from '../../generic/upgrade-notification/UpgradeNotification';
 import UpgradeToShiftDatesAlert from '../suggested-schedule-messaging/UpgradeToShiftDatesAlert';
@@ -27,10 +28,8 @@ import { useModel } from '../../generic/model-store';
 import WelcomeMessage from './widgets/WelcomeMessage';
 import ProctoringInfoPanel from './widgets/ProctoringInfoPanel';
 import AccountActivationAlert from '../../alerts/logistration-alert/AccountActivationAlert';
-import CourseHomeSectionOutlineSlot from '../../plugin-slots/CourseHomeSectionOutlineSlot';

-const OutlineTab = () => {
-  const intl = useIntl();
+const OutlineTab = ({ intl }) => {
  const {
    courseId,
    proctoringPanelStatus,
@@ -43,8 +42,6 @@ const OutlineTab = () => {
    userTimezone,
  } = useModel('courseHomeMeta', courseId);

-  const expandButtonRef = useRef();
-
  const {
    accessExpiration,
    courseBlocks: {
@@ -162,21 +159,27 @@ const OutlineTab = () => {
            </>
          )}
          <StartOrResumeCourseCard />
-          <WelcomeMessage courseId={courseId} nextElementRef={expandButtonRef} />
+          <WelcomeMessage courseId={courseId} />
          {rootCourseId && (
            <>
-              <div id="expand-button-row" className="row w-100 m-0 mb-3 justify-content-end">
+              <div className="row w-100 m-0 mb-3 justify-content-end">
                <div className="col-12 col-md-auto p-0">
-                  <Button ref={expandButtonRef} variant="outline-primary" block onClick={() => { setExpandAll(!expandAll); }}>
+                  <Button variant="outline-primary" block onClick={() => { setExpandAll(!expandAll); }}>
                    {expandAll ? intl.formatMessage(messages.collapseAll) : intl.formatMessage(messages.expandAll)}
                  </Button>
                </div>
              </div>
-              <CourseHomeSectionOutlineSlot
-                expandAll={expandAll}
-                sectionIds={courses[rootCourseId].sectionIds}
-                sections={sections}
-              />
+              <ol id="courseHome-outline" className="list-unstyled">
+                {courses[rootCourseId].sectionIds.map((sectionId) => (
+                  <Section
+                    key={sectionId}
+                    courseId={courseId}
+                    defaultOpen={sections[sectionId].resumeBlock}
+                    expand={expandAll}
+                    section={sections[sectionId]}
+                  />
+                ))}
+              </ol>
            </>
          )}
        </div>
@@ -222,4 +225,8 @@ const OutlineTab = () => {
  );
 };

-export default OutlineTab;
+OutlineTab.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(OutlineTab);
--- a/src/course-home/outline-tab/OutlineTab.test.jsx
+++ b/src/course-home/outline-tab/OutlineTab.test.jsx
@@ -54,7 +54,7 @@ describe('Outline Tab', () => {
  const goalUrl = `${getConfig().LMS_BASE_URL}/api/course_home/save_course_goal`;
  const masqueradeUrl = `${getConfig().LMS_BASE_URL}/courses/${courseId}/masquerade`;
  const outlineUrl = `${getConfig().LMS_BASE_URL}/api/course_home/outline/${courseId}`;
-  const proctoringInfoUrl = `${getConfig().EXAMS_BASE_URL}/api/v1/student/course_id/${encodeURIComponent(courseId)}/onboarding?username=MockUser`;
+  const proctoringInfoUrl = `${getConfig().LMS_BASE_URL}/api/edx_proctoring/v1/user_onboarding/status?is_learning_mfe=true&course_id=${encodeURIComponent(courseId)}&username=MockUser`;

  const store = initializeStore();
  const defaultMetadata = Factory.build('courseHomeMetadata');
@@ -143,7 +143,6 @@ describe('Outline Tab', () => {
    });

    it('handles expand/collapse all button click', async () => {
-      const user = userEvent.setup();
      await fetchAndRender();
      // Button renders as "Expand All"
      const expandButton = screen.getByRole('button', { name: 'Expand all' });
@@ -154,11 +153,11 @@ describe('Outline Tab', () => {
      expect(collapsedSectionNode).toHaveAttribute('aria-expanded', 'false');

      // Click to expand section
-      await user.click(expandButton);
+      userEvent.click(expandButton);
      await waitFor(() => expect(collapsedSectionNode).toHaveAttribute('aria-expanded', 'true'));

      // Click to collapse section
-      await user.click(expandButton);
+      userEvent.click(expandButton);
      await waitFor(() => expect(collapsedSectionNode).toHaveAttribute('aria-expanded', 'false'));
    });

@@ -168,7 +167,7 @@ describe('Outline Tab', () => {
        course_blocks: { blocks: courseBlocks.blocks },
      });
      await fetchAndRender();
-      expect(screen.getByLabelText('Completed section')).toBeInTheDocument();
+      expect(screen.getByTitle('Completed section')).toBeInTheDocument();
    });

    it('displays correct icon for incomplete assignment', async () => {
@@ -177,7 +176,7 @@ describe('Outline Tab', () => {
        course_blocks: { blocks: courseBlocks.blocks },
      });
      await fetchAndRender();
-      expect(screen.getByLabelText('Incomplete section')).toBeInTheDocument();
+      expect(screen.getByTitle('Incomplete section')).toBeInTheDocument();
    });

    it('SequenceLink displays link', async () => {
@@ -276,34 +275,21 @@ describe('Outline Tab', () => {
      });

      it('renders show more/less button and handles click', async () => {
-        const user = userEvent.setup();
        expect(screen.getByTestId('alert-container-welcome')).toBeInTheDocument();
        let showMoreButton = screen.getByRole('button', { name: 'Show More' });
        expect(showMoreButton).toBeInTheDocument();

-        await user.click(showMoreButton);
+        userEvent.click(showMoreButton);
        let showLessButton = screen.getByRole('button', { name: 'Show Less' });
        expect(showLessButton).toBeInTheDocument();
        expect(screen.getByTestId('long-welcome-message-iframe')).toBeInTheDocument();

-        await user.click(showLessButton);
+        userEvent.click(showLessButton);
        showLessButton = screen.queryByRole('button', { name: 'Show Less' });
        expect(showLessButton).not.toBeInTheDocument();
        showMoreButton = screen.getByRole('button', { name: 'Show More' });
        expect(showMoreButton).toBeInTheDocument();
      });
-
-      it('dismisses message', async () => {
-        expect(screen.getByTestId('alert-container-welcome')).toBeInTheDocument();
-        const dismissButton = screen.queryByRole('button', { name: 'Dismiss' });
-        const expandButton = screen.queryByRole('button', { name: 'Expand all' });
-
-        fireEvent.click(dismissButton);
-
-        expect(expandButton).toHaveFocus();
-
-        expect(screen.queryByText('Welcome Message')).toBeNull();
-      });
    });

    it('ignores comments and misformatted HTML', async () => {
--- a/src/course-home/outline-tab/Section.jsx
+++ b/src/course-home/outline-tab/Section.jsx
@@ -0,0 +1,137 @@
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { Collapsible, IconButton, Icon } from '@openedx/paragon';
+import { faCheckCircle as fasCheckCircle, faMinus, faPlus } from '@fortawesome/free-solid-svg-icons';
+import { faCheckCircle as farCheckCircle } from '@fortawesome/free-regular-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+
+import { DisabledVisible } from '@openedx/paragon/icons';
+import SequenceLink from './SequenceLink';
+import { useModel } from '../../generic/model-store';
+
+import genericMessages from '../../generic/messages';
+import messages from './messages';
+
+const Section = ({
+  courseId,
+  defaultOpen,
+  expand,
+  intl,
+  section,
+}) => {
+  const {
+    complete,
+    sequenceIds,
+    title,
+    hideFromTOC,
+  } = section;
+  const {
+    courseBlocks: {
+      sequences,
+    },
+  } = useModel('outline', courseId);
+
+  const [open, setOpen] = useState(defaultOpen);
+
+  useEffect(() => {
+    setOpen(expand);
+  }, [expand]);
+
+  useEffect(() => {
+    setOpen(defaultOpen);
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  const sectionTitle = (
+    <div className="d-flex row w-100 m-0">
+      <div className="col-auto p-0">
+        {complete ? (
+          <FontAwesomeIcon
+            icon={fasCheckCircle}
+            fixedWidth
+            className="float-left mt-1 text-success"
+            aria-hidden="true"
+            title={intl.formatMessage(messages.completedSection)}
+          />
+        ) : (
+          <FontAwesomeIcon
+            icon={farCheckCircle}
+            fixedWidth
+            className="float-left mt-1 text-gray-400"
+            aria-hidden="true"
+            title={intl.formatMessage(messages.incompleteSection)}
+          />
+        )}
+      </div>
+      <div className="col-7 ml-3 p-0 font-weight-bold text-dark-500">
+        <span className="align-middle col-6">{title}</span>
+        <span className="sr-only">
+          , {intl.formatMessage(complete ? messages.completedSection : messages.incompleteSection)}
+        </span>
+      </div>
+      {hideFromTOC && (
+      <div className="row">
+        {hideFromTOC && (
+          <span className="small d-flex align-content-end">
+            <Icon className="mr-2" src={DisabledVisible} data-testid="hide-from-toc-section-icon" />
+            <span data-testid="hide-from-toc-section-text">
+              {intl.formatMessage(messages.hiddenSection)}
+            </span>
+          </span>
+        )}
+      </div>
+      )}
+    </div>
+  );
+
+  return (
+    <li>
+      <Collapsible
+        className="mb-2"
+        styling="card-lg"
+        title={sectionTitle}
+        open={open}
+        onToggle={() => { setOpen(!open); }}
+        iconWhenClosed={(
+          <IconButton
+            alt={intl.formatMessage(messages.openSection)}
+            icon={faPlus}
+            onClick={() => { setOpen(true); }}
+            size="sm"
+          />
+        )}
+        iconWhenOpen={(
+          <IconButton
+            alt={intl.formatMessage(genericMessages.close)}
+            icon={faMinus}
+            onClick={() => { setOpen(false); }}
+            size="sm"
+          />
+        )}
+      >
+        <ol className="list-unstyled">
+          {sequenceIds.map((sequenceId, index) => (
+            <SequenceLink
+              key={sequenceId}
+              id={sequenceId}
+              courseId={courseId}
+              sequence={sequences[sequenceId]}
+              first={index === 0}
+            />
+          ))}
+        </ol>
+      </Collapsible>
+    </li>
+  );
+};
+
+Section.propTypes = {
+  courseId: PropTypes.string.isRequired,
+  defaultOpen: PropTypes.bool.isRequired,
+  expand: PropTypes.bool.isRequired,
+  intl: intlShape.isRequired,
+  section: PropTypes.shape().isRequired,
+};
+
+export default injectIntl(Section);
--- a/src/course-home/outline-tab/SequenceLink.jsx
+++ b/src/course-home/outline-tab/SequenceLink.jsx
@@ -0,0 +1,147 @@
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+import { Link } from 'react-router-dom';
+import {
+  FormattedMessage,
+  FormattedTime,
+  injectIntl,
+  intlShape,
+} from '@edx/frontend-platform/i18n';
+import { faCheckCircle as fasCheckCircle } from '@fortawesome/free-solid-svg-icons';
+import { faCheckCircle as farCheckCircle } from '@fortawesome/free-regular-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+
+import { Icon } from '@openedx/paragon';
+import { Block } from '@openedx/paragon/icons';
+import EffortEstimate from '../../shared/effort-estimate';
+import { useModel } from '../../generic/model-store';
+import messages from './messages';
+
+const SequenceLink = ({
+  id,
+  intl,
+  courseId,
+  first,
+  sequence,
+}) => {
+  const {
+    complete,
+    description,
+    due,
+    showLink,
+    title,
+    hideFromTOC,
+  } = sequence;
+  const {
+    userTimezone,
+  } = useModel('outline', courseId);
+
+  const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
+
+  const coursewareUrl = <Link to={`/course/${courseId}/${id}`}>{title}</Link>;
+  const displayTitle = showLink ? coursewareUrl : title;
+
+  const dueDateMessage = (
+    <FormattedMessage
+      id="learning.outline.sequence-due-date-set"
+      defaultMessage="{description} due {assignmentDue}"
+      description="Used below an assignment title"
+      values={{
+        assignmentDue: (
+          <FormattedTime
+            key={`${id}-due`}
+            day="numeric"
+            month="short"
+            year="numeric"
+            timeZoneName="short"
+            value={due}
+            {...timezoneFormatArgs}
+          />
+        ),
+        description: description || '',
+      }}
+    />
+  );
+
+  const noDueDateMessage = (
+    <FormattedMessage
+      id="learning.outline.sequence-due-date-not-set"
+      defaultMessage="{description}"
+      description="Used below an assignment title"
+      values={{
+        assignmentDue: (
+          <FormattedTime
+            key={`${id}-due`}
+            day="numeric"
+            month="short"
+            year="numeric"
+            timeZoneName="short"
+            value={due}
+            {...timezoneFormatArgs}
+          />
+        ),
+        description: description || '',
+      }}
+    />
+  );
+
+  return (
+    <li>
+      <div className={classNames('', { 'mt-2 pt-2 border-top border-light': !first })}>
+        <div className="row w-100 m-0">
+          <div className="col-auto p-0">
+            {complete ? (
+              <FontAwesomeIcon
+                icon={fasCheckCircle}
+                fixedWidth
+                className="float-left text-success mt-1"
+                aria-hidden={complete}
+                title={intl.formatMessage(messages.completedAssignment)}
+              />
+            ) : (
+              <FontAwesomeIcon
+                icon={farCheckCircle}
+                fixedWidth
+                className="float-left text-gray-400 mt-1"
+                aria-hidden={complete}
+                title={intl.formatMessage(messages.incompleteAssignment)}
+              />
+            )}
+          </div>
+          <div className="col-10 p-0 ml-3 text-break">
+            <span className="align-middle">{displayTitle}</span>
+            <span className="sr-only">
+              , {intl.formatMessage(complete ? messages.completedAssignment : messages.incompleteAssignment)}
+            </span>
+            <EffortEstimate className="ml-3 align-middle" block={sequence} />
+          </div>
+        </div>
+        {hideFromTOC && (
+          <div className="row w-100 my-2 mx-4 pl-3">
+            <span className="small d-flex">
+              <Icon className="mr-2" src={Block} data-testid="hide-from-toc-sequence-link-icon" />
+              <span data-testid="hide-from-toc-sequence-link-text">
+                {intl.formatMessage(messages.hiddenSequenceLink)}
+              </span>
+            </span>
+          </div>
+        )}
+        <div className="row w-100 m-0 ml-3 pl-3">
+          <small className="text-body pl-2">
+            {due ? dueDateMessage : noDueDateMessage}
+          </small>
+        </div>
+      </div>
+    </li>
+  );
+};
+
+SequenceLink.propTypes = {
+  id: PropTypes.string.isRequired,
+  intl: intlShape.isRequired,
+  courseId: PropTypes.string.isRequired,
+  first: PropTypes.bool.isRequired,
+  sequence: PropTypes.shape().isRequired,
+};
+
+export default injectIntl(SequenceLink);
--- a/src/course-home/outline-tab/messages.ts
+++ b/src/course-home/outline-tab/messages.ts
@@ -341,16 +341,6 @@ const messages = defineMessages({
    defaultMessage: 'Onboarding Past Due',
    description: 'Text that show when the deadline of proctortrack onboarding exam has passed, it appears on button that start the onboarding exam however for this case the button is disabled for obvious reason',
  },
-  sequenceDueDate: {
-    id: 'learning.outline.sequence-due-date-set',
-    defaultMessage: '{description} due {assignmentDue}',
-    description: 'Used below an assignment title',
-  },
-  sequenceNoDueDate: {
-    id: 'learning.outline.sequence-due-date-not-set',
-    defaultMessage: '{description}',
-    description: 'Used below an assignment title',
-  },
 });

 export default messages;
--- a/src/course-home/outline-tab/section-outline/HiddenSequenceLink.tsx
+++ b/src/course-home/outline-tab/section-outline/HiddenSequenceLink.tsx
@@ -1,25 +0,0 @@
-import React from 'react';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Icon } from '@openedx/paragon';
-import { Block } from '@openedx/paragon/icons';
-
-import messages from '../messages';
-
-interface Props {}
-
-const HiddenSequenceLink: React.FC<Props> = () => {
-  const intl = useIntl();
-
-  return (
-    <div className="row w-100 my-2 mx-4 pl-3">
-      <span className="small d-flex">
-        <Icon className="mr-2" src={Block} data-testid="hide-from-toc-sequence-link-icon" />
-        <span data-testid="hide-from-toc-sequence-link-text">
-          {intl.formatMessage(messages.hiddenSequenceLink)}
-        </span>
-      </span>
-    </div>
-  );
-};
-
-export default HiddenSequenceLink;
--- a/src/course-home/outline-tab/section-outline/Section.tsx
+++ b/src/course-home/outline-tab/section-outline/Section.tsx
@@ -1,94 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Collapsible, IconButton } from '@openedx/paragon';
-import { Minus, Plus } from '@openedx/paragon/icons';
-
-import { useModel } from '../../../generic/model-store';
-import genericMessages from '../../../generic/messages';
-import { useContextId } from '../../../data/hooks';
-import messages from '../messages';
-import SectionTitle from './SectionTitle';
-import SequenceLink from './SequenceLink';
-
-interface Props {
-  defaultOpen: boolean;
-  expand: boolean;
-  section: {
-    complete: boolean;
-    sequenceIds: string[];
-    title: string;
-    hideFromTOC: boolean;
-  };
-}
-
-const Section: React.FC<Props> = ({
-  defaultOpen,
-  expand,
-  section,
-}) => {
-  const intl = useIntl();
-  const courseId = useContextId();
-  const {
-    complete,
-    sequenceIds,
-    title,
-    hideFromTOC,
-  } = section;
-  const {
-    courseBlocks: {
-      sequences,
-    },
-  } = useModel('outline', courseId);
-
-  const [open, setOpen] = useState(defaultOpen);
-
-  useEffect(() => {
-    setOpen(expand);
-  }, [expand]);
-
-  useEffect(() => {
-    setOpen(defaultOpen);
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  return (
-    <li>
-      <Collapsible
-        className="mb-2"
-        styling="card-lg"
-        title={<SectionTitle {...{ complete, hideFromTOC, title }} />}
-        open={open}
-        onToggle={() => { setOpen(!open); }}
-        iconWhenClosed={(
-          <IconButton
-            alt={intl.formatMessage(messages.openSection)}
-            iconAs={Plus}
-            onClick={() => { setOpen(true); }}
-            size="sm"
-          />
-        )}
-        iconWhenOpen={(
-          <IconButton
-            alt={intl.formatMessage(genericMessages.close)}
-            iconAs={Minus}
-            onClick={() => { setOpen(false); }}
-            size="sm"
-          />
-        )}
-      >
-        <ol className="list-unstyled">
-          {sequenceIds.map((sequenceId, index) => (
-            <SequenceLink
-              key={sequenceId}
-              id={sequenceId}
-              sequence={sequences[sequenceId]}
-              first={index === 0}
-            />
-          ))}
-        </ol>
-      </Collapsible>
-    </li>
-  );
-};
-
-export default Section;
--- a/src/course-home/outline-tab/section-outline/SectionTitle.tsx
+++ b/src/course-home/outline-tab/section-outline/SectionTitle.tsx
@@ -1,59 +0,0 @@
-import React from 'react';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Icon } from '@openedx/paragon';
-import { CheckCircle, CheckCircleOutline, DisabledVisible } from '@openedx/paragon/icons';
-
-import messages from '../messages';
-
-interface Props {
-  complete: boolean;
-  hideFromTOC: boolean;
-  title: string;
-}
-
-const SectionTitle: React.FC<Props> = ({ complete, hideFromTOC, title }) => {
-  const intl = useIntl();
-  return (
-    <div className="d-flex row w-100 m-0">
-      <div className="col-auto p-0">
-        {complete ? (
-          <Icon
-            src={CheckCircle}
-            className="float-left mt-1 text-success"
-            aria-hidden="true"
-            svgAttrs={{ 'aria-label': intl.formatMessage(messages.completedSection) }}
-            size="sm"
-          />
-        ) : (
-          <Icon
-            src={CheckCircleOutline}
-            className="float-left mt-1 text-gray-400"
-            aria-hidden="true"
-            svgAttrs={{ 'aria-label': intl.formatMessage(messages.incompleteSection) }}
-            size="sm"
-          />
-        )}
-      </div>
-      <div className="col-7 ml-3 p-0 font-weight-bold text-dark-500">
-        <span className="align-middle col-6">{title}</span>
-        <span className="sr-only">
-          , {intl.formatMessage(complete ? messages.completedSection : messages.incompleteSection)}
-        </span>
-      </div>
-      {hideFromTOC && (
-      <div className="row">
-        {hideFromTOC && (
-          <span className="small d-flex align-content-end">
-            <Icon className="mr-2" src={DisabledVisible} data-testid="hide-from-toc-section-icon" />
-            <span data-testid="hide-from-toc-section-text">
-              {intl.formatMessage(messages.hiddenSection)}
-            </span>
-          </span>
-        )}
-      </div>
-      )}
-    </div>
-  );
-};
-
-export default SectionTitle;
--- a/src/course-home/outline-tab/section-outline/SequenceDueDate.tsx
+++ b/src/course-home/outline-tab/section-outline/SequenceDueDate.tsx
@@ -1,60 +0,0 @@
-import React from 'react';
-import { FormattedTime, useIntl } from '@edx/frontend-platform/i18n';
-import { useModel } from '../../../generic/model-store';
-
-import { useContextId } from '../../../data/hooks';
-import messages from '../messages';
-
-interface Props {
-  due: string;
-  id: string;
-  description: string;
-}
-
-const SequenceDueDate: React.FC<Props> = ({
-  due,
-  id,
-  description,
-}) => {
-  const intl = useIntl();
-  const courseId = useContextId();
-  let dueDateMessage: string | React.ReactNode = intl.formatMessage(
-    messages.sequenceNoDueDate,
-    { description: description || '' },
-  );
-  const {
-    userTimezone,
-  } = useModel('outline', courseId);
-
-  if (due) {
-    const timezoneFormatArgs = userTimezone ? { timeZone: userTimezone } : {};
-
-    dueDateMessage = intl.formatMessage(
-      messages.sequenceDueDate,
-      {
-        assignmentDue: (
-          <FormattedTime
-            key={`${id}-due`}
-            day="numeric"
-            month="short"
-            year="numeric"
-            timeZoneName="short"
-            value={due}
-            {...timezoneFormatArgs}
-          />
-        ),
-        description: description || '',
-      },
-    );
-  }
-
-  return (
-    <div className="row w-100 m-0 ml-3 pl-3">
-      <small className="text-body pl-2">
-        {dueDateMessage}
-      </small>
-    </div>
-  );
-};
-
-export default SequenceDueDate;
--- a/src/course-home/outline-tab/section-outline/SequenceLink.tsx
+++ b/src/course-home/outline-tab/section-outline/SequenceLink.tsx
@@ -1,56 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-
-import SequenceDueDate from './SequenceDueDate';
-import HiddenSequenceLink from './HiddenSequenceLink';
-import SequenceTitle from './SequenceTitle';
-
-interface Props {
-  id: string;
-  first: boolean;
-  sequence: {
-    complete: boolean;
-    description: string;
-    due: string;
-    showLink: boolean;
-    title: string;
-    hideFromTOC: boolean;
-  }
-}
-
-const SequenceLink: React.FC<Props> = ({
-  id,
-  first,
-  sequence,
-}) => {
-  const {
-    complete,
-    description,
-    due,
-    showLink,
-    title,
-    hideFromTOC,
-  } = sequence;
-
-  return (
-    <li>
-      <div className={classNames('', { 'mt-2 pt-2 border-top border-light': !first })}>
-        <SequenceTitle
-          {...{
-            complete,
-            showLink,
-            title,
-            sequence,
-            id,
-          }}
-        />
-        {hideFromTOC && (
-          <HiddenSequenceLink />
-        )}
-        <SequenceDueDate {...{ due, id, description }} />
-      </div>
-    </li>
-  );
-};
-
-export default SequenceLink;
--- a/src/course-home/outline-tab/section-outline/SequenceTitle.tsx
+++ b/src/course-home/outline-tab/section-outline/SequenceTitle.tsx
@@ -1,63 +0,0 @@
-import React from 'react';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Link } from 'react-router-dom';
-import { Icon } from '@openedx/paragon';
-import { CheckCircleOutline, CheckCircle } from '@openedx/paragon/icons';
-
-import EffortEstimate from '../../../shared/effort-estimate';
-import messages from '../messages';
-import { useContextId } from '../../../data/hooks';
-
-interface Props {
-  complete: boolean;
-  showLink: boolean;
-  title: string;
-  sequence: object;
-  id: string;
-}
-
-const SequenceTitle: React.FC<Props> = ({
-  complete,
-  showLink,
-  title,
-  sequence,
-  id,
-}) => {
-  const intl = useIntl();
-  const courseId = useContextId();
-  const coursewareUrl = <Link to={`/course/${courseId}/${id}`}>{title}</Link>;
-  const displayTitle = showLink ? coursewareUrl : title;
-
-  return (
-    <div className="row w-100 m-0">
-      <div className="col-auto p-0">
-        {complete ? (
-          <Icon
-            src={CheckCircle}
-            className="float-left text-success mt-1"
-            aria-hidden={complete}
-            svgAttrs={{ 'aria-label': intl.formatMessage(messages.completedAssignment) }}
-            size="sm"
-          />
-        ) : (
-          <Icon
-            src={CheckCircleOutline}
-            className="float-left text-gray-400 mt-1"
-            aria-hidden={complete}
-            svgAttrs={{ 'aria-label': intl.formatMessage(messages.incompleteAssignment) }}
-            size="sm"
-          />
-        )}
-      </div>
-      <div className="col-10 p-0 ml-3 text-break">
-        <span className="align-middle">{displayTitle}</span>
-        <span className="sr-only">
-          , {intl.formatMessage(complete ? messages.completedAssignment : messages.incompleteAssignment)}
-        </span>
-        <EffortEstimate className="ml-3 align-middle" block={sequence} />
-      </div>
-    </div>
-  );
-};
-
-export default SequenceTitle;
--- a/src/course-home/outline-tab/widgets/WelcomeMessage.jsx
+++ b/src/course-home/outline-tab/widgets/WelcomeMessage.jsx
@@ -1,7 +1,7 @@
-import { useState, useMemo, useRef } from 'react';
+import React, { useState, useMemo } from 'react';
 import PropTypes from 'prop-types';

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

@@ -11,13 +11,11 @@ import messages from '../messages';
 import { useModel } from '../../../generic/model-store';
 import { dismissWelcomeMessage } from '../../data/thunks';

-const WelcomeMessage = ({ courseId, nextElementRef }) => {
-  const intl = useIntl();
+const WelcomeMessage = ({ courseId, intl }) => {
  const {
    welcomeMessageHtml,
  } = useModel('outline', courseId);

-  const messageBodyRef = useRef();
  const [display, setDisplay] = useState(true);

  // welcomeMessageHtml can contain comments or malformatted HTML which can impact the length that determines
@@ -51,20 +49,13 @@ const WelcomeMessage = ({ courseId, nextElementRef }) => {
      dismissible
      show={display}
      onClose={() => {
-        nextElementRef.current?.focus();
        setDisplay(false);
        dispatch(dismissWelcomeMessage(courseId));
      }}
      className="raised-card"
      actions={messageCanBeShortened ? [
        <Button
-          onClick={() => {
-            if (showShortMessage) {
-              messageBodyRef.current?.focus();
-            }
-
-            setShowShortMessage(!showShortMessage);
-          }}
+          onClick={() => setShowShortMessage(!showShortMessage)}
          variant="outline-primary"
        >
          {showShortMessage ? intl.formatMessage(messages.welcomeMessageShowMoreButton)
@@ -72,34 +63,32 @@ const WelcomeMessage = ({ courseId, nextElementRef }) => {
        </Button>,
      ] : []}
    >
-      <div ref={messageBodyRef} tabIndex="-1">
-        <TransitionReplace className="mb-3" enterDuration={400} exitDuration={200}>
-          {showShortMessage ? (
-            <LmsHtmlFragment
-              className="inline-link"
-              data-testid="short-welcome-message-iframe"
-              key="short-html"
-              html={shortWelcomeMessageHtml}
-              title={intl.formatMessage(messages.welcomeMessage)}
-            />
-          ) : (
-            <LmsHtmlFragment
-              className="inline-link"
-              data-testid="long-welcome-message-iframe"
-              key="full-html"
-              html={cleanedWelcomeMessageHtml}
-              title={intl.formatMessage(messages.welcomeMessage)}
-            />
-          )}
-        </TransitionReplace>
-      </div>
+      <TransitionReplace className="mb-3" enterDuration={400} exitDuration={200}>
+        {showShortMessage ? (
+          <LmsHtmlFragment
+            className="inline-link"
+            data-testid="short-welcome-message-iframe"
+            key="short-html"
+            html={shortWelcomeMessageHtml}
+            title={intl.formatMessage(messages.welcomeMessage)}
+          />
+        ) : (
+          <LmsHtmlFragment
+            className="inline-link"
+            data-testid="long-welcome-message-iframe"
+            key="full-html"
+            html={cleanedWelcomeMessageHtml}
+            title={intl.formatMessage(messages.welcomeMessage)}
+          />
+        )}
+      </TransitionReplace>
    </Alert>
  );
 };

 WelcomeMessage.propTypes = {
  courseId: PropTypes.string.isRequired,
-  nextElementRef: PropTypes.shape({ current: PropTypes.instanceOf(HTMLInputElement) }),
+  intl: intlShape.isRequired,
 };

-export default WelcomeMessage;
+export default injectIntl(WelcomeMessage);
--- a/src/course-home/progress-tab/ProgressHeader.jsx
+++ b/src/course-home/progress-tab/ProgressHeader.jsx
@@ -1,14 +1,15 @@
-import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Button } from '@openedx/paragon';
+import React from 'react';
 import { useSelector } from 'react-redux';

+import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { Button } from '@openedx/paragon';
+
 import { useModel } from '../../generic/model-store';

 import messages from './messages';

-const ProgressHeader = () => {
-  const intl = useIntl();
+const ProgressHeader = ({ intl }) => {
  const {
    courseId,
    targetUserId,
@@ -36,4 +37,8 @@ const ProgressHeader = () => {
  );
 };

-export default ProgressHeader;
+ProgressHeader.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(ProgressHeader);
--- a/src/course-home/progress-tab/ProgressTab.jsx
+++ b/src/course-home/progress-tab/ProgressTab.jsx
@@ -1,20 +1,27 @@
 import React from 'react';
-import { useWindowSize } from '@openedx/paragon';
-import { useContextId } from '../../data/hooks';
-import ProgressTabCertificateStatusSidePanelSlot from '../../plugin-slots/ProgressTabCertificateStatusSidePanelSlot';
+import { useSelector } from 'react-redux';
+import { breakpoints, useWindowSize } from '@openedx/paragon';

+import CertificateStatus from './certificate-status/CertificateStatus';
 import CourseCompletion from './course-completion/CourseCompletion';
+import CourseGrade from './grades/course-grade/CourseGrade';
+import DetailedGrades from './grades/detailed-grades/DetailedGrades';
+import GradeSummary from './grades/grade-summary/GradeSummary';
 import ProgressHeader from './ProgressHeader';
+import RelatedLinks from './related-links/RelatedLinks';

-import ProgressTabCertificateStatusMainBodySlot from '../../plugin-slots/ProgressTabCertificateStatusMainBodySlot';
-import ProgressTabCourseGradeSlot from '../../plugin-slots/ProgressTabCourseGradeSlot';
-import ProgressTabGradeBreakdownSlot from '../../plugin-slots/ProgressTabGradeBreakdownSlot';
-import ProgressTabRelatedLinksSlot from '../../plugin-slots/ProgressTabRelatedLinksSlot';
 import { useModel } from '../../generic/model-store';

 const ProgressTab = () => {
-  const courseId = useContextId();
-  const { disableProgressGraph } = useModel('progress', courseId);
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);
+
+  const {
+    gradesFeatureIsFullyLocked, disableProgressGraph,
+  } = useModel('progress', courseId);
+
+  const applyLockedOverlay = gradesFeatureIsFullyLocked ? 'locked-overlay' : '';

  const windowWidth = useWindowSize().width;
  if (windowWidth === undefined) {
@@ -24,6 +31,7 @@ const ProgressTab = () => {
    return null;
  }

+  const wideScreen = windowWidth >= breakpoints.large.minWidth;
  return (
    <>
      <ProgressHeader />
@@ -31,15 +39,18 @@ const ProgressTab = () => {
        {/* Main body */}
        <div className="col-12 col-md-8 p-0">
          {!disableProgressGraph && <CourseCompletion />}
-          <ProgressTabCertificateStatusMainBodySlot />
-          <ProgressTabCourseGradeSlot />
-          <ProgressTabGradeBreakdownSlot />
+          {!wideScreen && <CertificateStatus />}
+          <CourseGrade />
+          <div className={`grades my-4 p-4 rounded raised-card ${applyLockedOverlay}`} aria-hidden={gradesFeatureIsFullyLocked}>
+            <GradeSummary />
+            <DetailedGrades />
+          </div>
        </div>

        {/* Side panel */}
        <div className="col-12 col-md-4 p-0 px-md-4">
-          <ProgressTabCertificateStatusSidePanelSlot />
-          <ProgressTabRelatedLinksSlot />
+          {wideScreen && <CertificateStatus />}
+          <RelatedLinks />
        </div>
      </div>
    </>
--- a/src/course-home/progress-tab/ProgressTab.test.jsx
+++ b/src/course-home/progress-tab/ProgressTab.test.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Factory } from 'rosie';
-import { getConfig, setConfig } from '@edx/frontend-platform';
+import { getConfig } from '@edx/frontend-platform';
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import { breakpoints } from '@openedx/paragon';
@@ -111,7 +111,7 @@ describe('Progress Tab', () => {
      await fetchAndRender();
      sendTrackEvent.mockClear();

-      const outlineTabLink = screen.getAllByRole('link', { name: 'Course outline' });
+      const outlineTabLink = screen.getAllByRole('link', { name: 'Course Outline' });
      fireEvent.click(outlineTabLink[1]); // outlineTabLink[0] corresponds to the link in the DetailedGrades component

      expect(sendTrackEvent).toHaveBeenCalledTimes(1);
@@ -471,12 +471,9 @@ describe('Progress Tab', () => {
      await fetchAndRender();
      expect(screen.getByText('limited feature')).toBeInTheDocument();
      expect(screen.getByText('Unlock to work towards a certificate.')).toBeInTheDocument();
-      expect(screen.queryAllByText(
-        'You have limited access to graded assignments as part of the audit track in this course.',
-        { exact: false },
-      )).toHaveLength(2);
+      expect(screen.queryAllByText('You have limited access to graded assignments as part of the audit track in this course.')).toHaveLength(2);

-      expect(screen.queryAllByTestId('locked-icon')).toHaveLength(4);
+      expect(screen.queryAllByTestId('blocked-icon')).toHaveLength(4);
    });

    it('does not render subsections for which showGrades is false', async () => {
@@ -548,111 +545,6 @@ describe('Progress Tab', () => {
      await fetchAndRender();
      expect(screen.getByText('Grades & Credit')).toBeInTheDocument();
    });
-
-    it('does not render ungraded subsections when SHOW_UNGRADED_ASSIGNMENT_PROGRESS is false', async () => {
-      // The second assignment has has_graded_assignment set to false, so it should not be shown.
-      setTabData({
-        section_scores: [
-          {
-            display_name: 'First section',
-            subsections: [
-              {
-                assignment_type: 'Homework',
-                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
-                display_name: 'First subsection',
-                learner_has_access: true,
-                has_graded_assignment: true,
-                num_points_earned: 1,
-                num_points_possible: 2,
-                percent_graded: 1.0,
-                show_correctness: 'always',
-                show_grades: true,
-                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection',
-              },
-            ],
-          },
-          {
-            display_name: 'Second section',
-            subsections: [
-              {
-                assignment_type: 'Homework',
-                display_name: 'Second subsection',
-                learner_has_access: true,
-                has_graded_assignment: false,
-                num_points_earned: 1,
-                num_points_possible: 1,
-                percent_graded: 1.0,
-                show_correctness: 'always',
-                show_grades: true,
-                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/second_subsection',
-              },
-            ],
-          },
-        ],
-      });
-
-      await fetchAndRender();
-      expect(screen.getByText('First subsection')).toBeInTheDocument();
-      expect(screen.queryByText('Second subsection')).not.toBeInTheDocument();
-    });
-
-    it('renders both graded and ungraded subsections when SHOW_UNGRADED_ASSIGNMENT_PROGRESS is true', async () => {
-      // The second assignment has has_graded_assignment set to false.
-      setConfig({
-        ...getConfig(),
-        SHOW_UNGRADED_ASSIGNMENT_PROGRESS: true,
-      });
-
-      setTabData({
-        section_scores: [
-          {
-            display_name: 'First section',
-            subsections: [
-              {
-                assignment_type: 'Homework',
-                block_key: 'block-v1:edX+DemoX+Demo_Course+type@sequential+block@12345',
-                display_name: 'First subsection',
-                learner_has_access: true,
-                has_graded_assignment: true,
-                num_points_earned: 1,
-                num_points_possible: 2,
-                percent_graded: 1.0,
-                show_correctness: 'always',
-                show_grades: true,
-                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/first_subsection',
-              },
-            ],
-          },
-          {
-            display_name: 'Second section',
-            subsections: [
-              {
-                assignment_type: 'Homework',
-                display_name: 'Second subsection',
-                learner_has_access: true,
-                has_graded_assignment: false,
-                num_points_earned: 1,
-                num_points_possible: 1,
-                percent_graded: 1.0,
-                show_correctness: 'always',
-                show_grades: true,
-                url: 'http://learning.edx.org/course/course-v1:edX+Test+run/second_subsection',
-              },
-            ],
-          },
-        ],
-      });
-
-      await fetchAndRender();
-      expect(screen.getByText('First subsection')).toBeInTheDocument();
-      expect(screen.getByText('Second subsection')).toBeInTheDocument();
-
-      // reset config for other tests
-      setConfig({
-        ...getConfig(),
-        SHOW_UNGRADED_ASSIGNMENT_PROGRESS: false,
-      });
-    });
  });

  describe('Grade Summary', () => {
@@ -896,7 +788,7 @@ describe('Progress Tab', () => {
      sendTrackEvent.mockClear();
      expect(screen.getByText('Detailed grades')).toBeInTheDocument();

-      const outlineLink = screen.getAllByRole('link', { name: 'Course outline' })[0];
+      const outlineLink = screen.getAllByRole('link', { name: 'Course Outline' })[0];
      fireEvent.click(outlineLink);

      expect(sendTrackEvent).toHaveBeenCalledTimes(1);
@@ -917,7 +809,7 @@ describe('Progress Tab', () => {

      // Open the problem score drawer
      fireEvent.click(problemScoreDrawerToggle);
-      expect(screen.getAllByText('Graded Scores:').length).toBeGreaterThan(1);
+      expect(screen.getByText('Problem Scores:')).toBeInTheDocument();
      expect(screen.getAllByText('0/1')).toHaveLength(3);
    });

@@ -929,14 +821,6 @@ describe('Progress Tab', () => {
      expect(screen.getByText('Detailed grades')).toBeInTheDocument();
      expect(screen.getByText('You currently have no graded problem scores.')).toBeInTheDocument();
    });
-
-    it('renders Detailed Grades table when section scores are populated', async () => {
-      await fetchAndRender();
-      expect(screen.getByText('Detailed grades')).toBeInTheDocument();
-
-      expect(screen.getByText('First subsection'));
-      expect(screen.getByText('Second subsection'));
-    });
  });

  describe('Certificate Status', () => {
--- a/src/course-home/progress-tab/certificate-status/CertificateStatus.jsx
+++ b/src/course-home/progress-tab/certificate-status/CertificateStatus.jsx
@@ -1,22 +1,23 @@
-import { useEffect } from 'react';
-import { useDispatch } from 'react-redux';
+import React, { useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { FormattedDate, FormattedMessage, useIntl } from '@edx/frontend-platform/i18n';
+import {
+  FormattedDate, FormattedMessage, injectIntl, intlShape,
+} from '@edx/frontend-platform/i18n';

 import { Button, Card } from '@openedx/paragon';
 import { getConfig } from '@edx/frontend-platform';
-import { useContextId } from '../../../data/hooks';
 import { useModel } from '../../../generic/model-store';
 import { COURSE_EXIT_MODES, getCourseExitMode } from '../../../courseware/course/course-exit/utils';
 import { DashboardLink, IdVerificationSupportLink, ProfileLink } from '../../../shared/links';
 import { requestCert } from '../../data/thunks';
 import messages from './messages';
-import ProgressCertificateStatusSlot from '../../../plugin-slots/ProgressCertificateStatusSlot';

-const CertificateStatus = () => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const CertificateStatus = ({ intl }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);

  const {
    entranceExamData,
@@ -214,6 +215,7 @@ const CertificateStatus = () => {
    });
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, []);
+
  if (!certCase) {
    return null;
  }
@@ -241,32 +243,32 @@ const CertificateStatus = () => {
  return (
    <section data-testid="certificate-status-component" className="text-dark-700 mb-4">
      <Card className="bg-light-200 raised-card">
-        <ProgressCertificateStatusSlot courseId={courseId}>
-          <div id={`${certCase}_certificate_status`}>
-            <Card.Header title={header} />
-            <Card.Section className="small text-gray-700">
-              {body}
-            </Card.Section>
-            <Card.Footer>
-              {buttonText && (buttonLocation || buttonAction) && (
-                <Button
-                  variant="outline-brand"
-                  onClick={() => {
-                    logCertificateStatusButtonClicked(certStatus);
-                    if (buttonAction) { buttonAction(); }
-                  }}
-                  href={buttonLocation}
-                  block
-                >
-                  {buttonText}
-                </Button>
-              )}
-            </Card.Footer>
-          </div>
-        </ProgressCertificateStatusSlot>
+        <Card.Header title={header} />
+        <Card.Section className="small text-gray-700">
+          {body}
+        </Card.Section>
+        <Card.Footer>
+          {buttonText && (buttonLocation || buttonAction) && (
+            <Button
+              variant="outline-brand"
+              onClick={() => {
+                logCertificateStatusButtonClicked(certStatus);
+                if (buttonAction) { buttonAction(); }
+              }}
+              href={buttonLocation}
+              block
+            >
+              {buttonText}
+            </Button>
+          )}
+        </Card.Footer>
      </Card>
    </section>
  );
 };

-export default CertificateStatus;
+CertificateStatus.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(CertificateStatus);
--- a/src/course-home/progress-tab/course-completion/CompleteDonutSegment.jsx
+++ b/src/course-home/progress-tab/course-completion/CompleteDonutSegment.jsx
@@ -1,13 +1,12 @@
-import { useState } from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';

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

 import messages from './messages';

-const CompleteDonutSegment = ({ completePercentage, lockedPercentage }) => {
-  const intl = useIntl();
+const CompleteDonutSegment = ({ completePercentage, intl, lockedPercentage }) => {
  const [showCompletePopover, setShowCompletePopover] = useState(false);

  if (!completePercentage) {
@@ -83,7 +82,8 @@ const CompleteDonutSegment = ({ completePercentage, lockedPercentage }) => {

 CompleteDonutSegment.propTypes = {
  completePercentage: PropTypes.number.isRequired,
+  intl: intlShape.isRequired,
  lockedPercentage: PropTypes.number.isRequired,
 };

-export default CompleteDonutSegment;
+export default injectIntl(CompleteDonutSegment);
--- a/src/course-home/progress-tab/course-completion/CompletionDonutChart.jsx
+++ b/src/course-home/progress-tab/course-completion/CompletionDonutChart.jsx
@@ -1,5 +1,8 @@
-import { getLocale, isRtl, useIntl } from '@edx/frontend-platform/i18n';
-import { useContextId } from '../../../data/hooks';
+import React from 'react';
+import { useSelector } from 'react-redux';
+import {
+  getLocale, injectIntl, intlShape, isRtl,
+} from '@edx/frontend-platform/i18n';
 import { useModel } from '../../../generic/model-store';

 import CompleteDonutSegment from './CompleteDonutSegment';
@@ -7,9 +10,10 @@ import IncompleteDonutSegment from './IncompleteDonutSegment';
 import LockedDonutSegment from './LockedDonutSegment';
 import messages from './messages';

-const CompletionDonutChart = () => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const CompletionDonutChart = ({ intl }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);

  const {
    completionSummary: {
@@ -58,4 +62,8 @@ const CompletionDonutChart = () => {
  );
 };

-export default CompletionDonutChart;
+CompletionDonutChart.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(CompletionDonutChart);
--- a/src/course-home/progress-tab/course-completion/CourseCompletion.jsx
+++ b/src/course-home/progress-tab/course-completion/CourseCompletion.jsx
@@ -1,26 +1,27 @@
-import { useIntl } from '@edx/frontend-platform/i18n';
+import React from 'react';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

 import CompletionDonutChart from './CompletionDonutChart';
 import messages from './messages';

-const CourseCompletion = () => {
-  const intl = useIntl();
-
-  return (
-    <section className="text-dark-700 mb-4 rounded raised-card p-4">
-      <div className="row w-100 m-0">
-        <div className="col-12 col-sm-6 col-md-7 p-0">
-          <h2>{intl.formatMessage(messages.courseCompletion)}</h2>
-          <p className="small">
-            {intl.formatMessage(messages.completionBody)}
-          </p>
-        </div>
-        <div className="col-12 col-sm-6 col-md-5 mt-sm-n3 p-0 text-center">
-          <CompletionDonutChart />
-        </div>
+const CourseCompletion = ({ intl }) => (
+  <section className="text-dark-700 mb-4 rounded raised-card p-4">
+    <div className="row w-100 m-0">
+      <div className="col-12 col-sm-6 col-md-7 p-0">
+        <h2>{intl.formatMessage(messages.courseCompletion)}</h2>
+        <p className="small">
+          {intl.formatMessage(messages.completionBody)}
+        </p>
      </div>
-    </section>
-  );
+      <div className="col-12 col-sm-6 col-md-5 mt-sm-n3 p-0 text-center">
+        <CompletionDonutChart />
+      </div>
+    </div>
+  </section>
+);
+
+CourseCompletion.propTypes = {
+  intl: intlShape.isRequired,
 };

-export default CourseCompletion;
+export default injectIntl(CourseCompletion);
--- a/src/course-home/progress-tab/course-completion/IncompleteDonutSegment.jsx
+++ b/src/course-home/progress-tab/course-completion/IncompleteDonutSegment.jsx
@@ -1,13 +1,12 @@
-import { useState } from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';

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

 import messages from './messages';

-const IncompleteDonutSegment = ({ incompletePercentage }) => {
-  const intl = useIntl();
+const IncompleteDonutSegment = ({ incompletePercentage, intl }) => {
  const [showIncompletePopover, setShowIncompletePopover] = useState(false);

  if (!incompletePercentage) {
@@ -54,6 +53,7 @@ const IncompleteDonutSegment = ({ incompletePercentage }) => {

 IncompleteDonutSegment.propTypes = {
  incompletePercentage: PropTypes.number.isRequired,
+  intl: intlShape.isRequired,
 };

-export default IncompleteDonutSegment;
+export default injectIntl(IncompleteDonutSegment);
--- a/src/course-home/progress-tab/course-completion/LockedDonutSegment.jsx
+++ b/src/course-home/progress-tab/course-completion/LockedDonutSegment.jsx
@@ -1,13 +1,12 @@
-import { useState } from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';

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

 import messages from './messages';

-const LockedDonutSegment = ({ lockedPercentage }) => {
-  const intl = useIntl();
+const LockedDonutSegment = ({ intl, lockedPercentage }) => {
  const [showLockedPopover, setShowLockedPopover] = useState(false);

  if (!lockedPercentage) {
@@ -66,7 +65,8 @@ const LockedDonutSegment = ({ lockedPercentage }) => {
 };

 LockedDonutSegment.propTypes = {
+  intl: intlShape.isRequired,
  lockedPercentage: PropTypes.number.isRequired,
 };

-export default LockedDonutSegment;
+export default injectIntl(LockedDonutSegment);
--- a/src/course-home/progress-tab/credit-information/CreditInformation.jsx
+++ b/src/course-home/progress-tab/credit-information/CreditInformation.jsx
@@ -1,17 +1,19 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
 import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { CheckCircle, WarningFilled, WatchFilled } from '@openedx/paragon/icons';
 import { Hyperlink, Icon } from '@openedx/paragon';
-import { useContextId } from '../../../data/hooks';

 import { useModel } from '../../../generic/model-store';
 import { DashboardLink } from '../../../shared/links';

 import messages from './messages';

-const CreditInformation = () => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const CreditInformation = ({ intl }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);

  const {
    creditCourseRequirements,
@@ -34,13 +36,36 @@ const CreditInformation = () => {

  switch (creditCourseRequirements.eligibilityStatus) {
    case 'not_eligible':
-      eligibilityStatus = intl.formatMessage(messages.creditNotEligibleStatus, { creditLink });
+      eligibilityStatus = (
+        <FormattedMessage
+          id="progress.creditInformation.creditNotEligible"
+          defaultMessage="You are no longer eligible for credit in this course. Learn more about {creditLink}."
+          description="Message to learner who are not eligible for course credit, it can because the a requirement deadline have passed"
+          values={{ creditLink }}
+        />
+      );
      break;
    case 'eligible':
-      eligibilityStatus = intl.formatMessage(messages.creditEligibleStatus, { dashboardLink, creditLink });
+      eligibilityStatus = (
+        <FormattedMessage
+          id="progress.creditInformation.creditEligible"
+          defaultMessage="
+          You have met the requirements for credit in this course. Go to your
+          {dashboardLink} to purchase course credit. Or learn more about {creditLink}."
+          description="After the credit requirements are met, leaners can then do the last step which purchasing the credit. Note that is only doable for leaners after they met all the requirements"
+          values={{ dashboardLink, creditLink }}
+        />
+      );
      break;
    case 'partial_eligible':
-      eligibilityStatus = intl.formatMessage(messages.creditPartialEligibleStatus, { creditLink });
+      eligibilityStatus = (
+        <FormattedMessage
+          id="progress.creditInformation.creditPartialEligible"
+          defaultMessage="You have not yet met the requirements for credit. Learn more about {creditLink}."
+          description="This means that one or more requirements is not satisfied yet"
+          values={{ creditLink }}
+        />
+      );
      break;
    default:
      break;
@@ -83,4 +108,8 @@ const CreditInformation = () => {
  );
 };

-export default CreditInformation;
+CreditInformation.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(CreditInformation);
--- a/src/course-home/progress-tab/credit-information/messages.ts
+++ b/src/course-home/progress-tab/credit-information/messages.ts
@@ -35,22 +35,6 @@ const messages = defineMessages({
    defaultMessage: 'Verification submitted',
    description: 'It indicate that the learner submitted a requirement but is not graded or reviewed yet',
  },
-  creditNotEligibleStatus: {
-    id: 'progress.creditInformation.creditNotEligible',
-    defaultMessage: 'You are no longer eligible for credit in this course. Learn more about {creditLink}.',
-    description: 'Message to learner who are not eligible for course credit, it can be that a requirement deadline has passed',
-  },
-  creditEligibleStatus: {
-    id: 'progress.creditInformation.creditEligible',
-    defaultMessage: `You have met the requirements for credit in this course. Go to your
-      {dashboardLink} to purchase course credit. Or learn more about {creditLink}.`,
-    description: 'After the credit requirements are met, leaners can then do the last step which purchasing the credit. Note that is only doable for leaners after they met all the requirements',
-  },
-  creditPartialEligibleStatus: {
-    id: 'progress.creditInformation.creditPartialEligible',
-    defaultMessage: 'You have not yet met the requirements for credit. Learn more about {creditLink}.',
-    description: 'This means that one or more requirements is not satisfied yet',
-  },
 });

 export default messages;
--- a/src/course-home/progress-tab/grades/course-grade/CourseGrade.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/CourseGrade.jsx
@@ -1,5 +1,6 @@
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { useContextId } from '../../../../data/hooks';
+import React from 'react';
+import { useSelector } from 'react-redux';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

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

@@ -10,9 +11,10 @@ import CreditInformation from '../../credit-information/CreditInformation';

 import messages from '../messages';

-const CourseGrade = () => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const CourseGrade = ({ intl }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);

  const {
    creditCourseRequirements,
@@ -52,4 +54,8 @@ const CourseGrade = () => {
  );
 };

-export default CourseGrade;
+CourseGrade.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(CourseGrade);
--- a/src/course-home/progress-tab/grades/course-grade/CourseGradeFooter.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/CourseGradeFooter.jsx
@@ -1,17 +1,19 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';

-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { CheckCircle, WarningFilled } from '@openedx/paragon/icons';
 import { breakpoints, Icon, useWindowSize } from '@openedx/paragon';
-import { useContextId } from '../../../../data/hooks';
 import { useModel } from '../../../../generic/model-store';

 import GradeRangeTooltip from './GradeRangeTooltip';
 import messages from '../messages';

-const CourseGradeFooter = ({ passingGrade }) => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const CourseGradeFooter = ({ intl, passingGrade }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);

  const {
    courseGrade: {
@@ -84,7 +86,8 @@ const CourseGradeFooter = ({ passingGrade }) => {
 };

 CourseGradeFooter.propTypes = {
+  intl: intlShape.isRequired,
  passingGrade: PropTypes.number.isRequired,
 };

-export default CourseGradeFooter;
+export default injectIntl(CourseGradeFooter);
--- a/src/course-home/progress-tab/grades/course-grade/CourseGradeHeader.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/CourseGradeHeader.jsx
@@ -1,16 +1,19 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Locked } from '@openedx/paragon/icons';
 import { Button, Icon } from '@openedx/paragon';
-import { useContextId } from '../../../../data/hooks';

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

-const CourseGradeHeader = () => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const CourseGradeHeader = ({ intl }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);
  const {
    org,
  } = useModel('courseHomeMeta', courseId);
@@ -80,4 +83,8 @@ const CourseGradeHeader = () => {
  );
 };

-export default CourseGradeHeader;
+CourseGradeHeader.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(CourseGradeHeader);
--- a/src/course-home/progress-tab/grades/course-grade/CurrentGradeTooltip.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/CurrentGradeTooltip.jsx
@@ -1,16 +1,20 @@
+import React from 'react';
 import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';

-import { getLocale, isRtl, useIntl } from '@edx/frontend-platform/i18n';
+import {
+  getLocale, injectIntl, intlShape, isRtl,
+} from '@edx/frontend-platform/i18n';
 import { OverlayTrigger, Popover } from '@openedx/paragon';
-import { useContextId } from '../../../../data/hooks';

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

 import messages from '../messages';

-const CurrentGradeTooltip = ({ tooltipClassName }) => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const CurrentGradeTooltip = ({ intl, tooltipClassName }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);

  const {
    courseGrade: {
@@ -65,7 +69,8 @@ CurrentGradeTooltip.defaultProps = {
 };

 CurrentGradeTooltip.propTypes = {
+  intl: intlShape.isRequired,
  tooltipClassName: PropTypes.string,
 };

-export default CurrentGradeTooltip;
+export default injectIntl(CurrentGradeTooltip);
--- a/src/course-home/progress-tab/grades/course-grade/GradeBar.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/GradeBar.jsx
@@ -1,16 +1,20 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';

-import { getLocale, isRtl, useIntl } from '@edx/frontend-platform/i18n';
-import { useContextId } from '../../../../data/hooks';
+import {
+  getLocale, injectIntl, intlShape, isRtl,
+} from '@edx/frontend-platform/i18n';
 import { useModel } from '../../../../generic/model-store';
 import CurrentGradeTooltip from './CurrentGradeTooltip';
 import PassingGradeTooltip from './PassingGradeTooltip';

 import messages from '../messages';

-const GradeBar = ({ passingGrade }) => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const GradeBar = ({ intl, passingGrade }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);

  const {
    courseGrade: {
@@ -48,7 +52,8 @@ const GradeBar = ({ passingGrade }) => {
 };

 GradeBar.propTypes = {
+  intl: intlShape.isRequired,
  passingGrade: PropTypes.number.isRequired,
 };

-export default GradeBar;
+export default injectIntl(GradeBar);
--- a/src/course-home/progress-tab/grades/course-grade/GradeRangeTooltip.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/GradeRangeTooltip.jsx
@@ -1,19 +1,20 @@
-import { useState } from 'react';
+import React, { useState } from 'react';
+import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';

-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { InfoOutline } from '@openedx/paragon/icons';
 import {
  Icon, IconButton, OverlayTrigger, Popover,
 } from '@openedx/paragon';
-import { useContextId } from '../../../../data/hooks';
 import { useModel } from '../../../../generic/model-store';

 import messages from '../messages';

-const GradeRangeTooltip = ({ iconButtonClassName, passingGrade }) => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const GradeRangeTooltip = ({ intl, iconButtonClassName, passingGrade }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);

  const {
    gradesFeatureIsFullyLocked,
@@ -79,7 +80,8 @@ GradeRangeTooltip.defaultProps = {

 GradeRangeTooltip.propTypes = {
  iconButtonClassName: PropTypes.string,
+  intl: intlShape.isRequired,
  passingGrade: PropTypes.number.isRequired,
 };

-export default GradeRangeTooltip;
+export default injectIntl(GradeRangeTooltip);
--- a/src/course-home/progress-tab/grades/course-grade/PassingGradeTooltip.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/PassingGradeTooltip.jsx
@@ -1,12 +1,14 @@
+import React from 'react';
 import PropTypes from 'prop-types';

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

 import messages from '../messages';

-const PassingGradeTooltip = ({ passingGrade, tooltipClassName }) => {
-  const intl = useIntl();
+const PassingGradeTooltip = ({ intl, passingGrade, tooltipClassName }) => {
  const isLocaleRtl = isRtl(getLocale());

  let passingGradeDirection = passingGrade < 50 ? '' : '-';
@@ -52,8 +54,9 @@ PassingGradeTooltip.defaultProps = {
 };

 PassingGradeTooltip.propTypes = {
+  intl: intlShape.isRequired,
  passingGrade: PropTypes.number.isRequired,
  tooltipClassName: PropTypes.string,
 };

-export default PassingGradeTooltip;
+export default injectIntl(PassingGradeTooltip);
--- a/src/course-home/progress-tab/grades/detailed-grades/DetailedGrades.jsx
+++ b/src/course-home/progress-tab/grades/detailed-grades/DetailedGrades.jsx
@@ -1,20 +1,22 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Locked } from '@openedx/paragon/icons';
+import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { Blocked } from '@openedx/paragon/icons';
 import { Icon, Hyperlink } from '@openedx/paragon';
-import { useContextId } from '../../../../data/hooks';
 import { useModel } from '../../../../generic/model-store';
-import { showUngradedAssignments } from '../../utils';

 import DetailedGradesTable from './DetailedGradesTable';

 import messages from '../messages';

-const DetailedGrades = () => {
-  const intl = useIntl();
+const DetailedGrades = ({ intl }) => {
  const { administrator } = getAuthenticatedUser();
-  const courseId = useContextId();
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);
  const {
    org,
    tabs,
@@ -26,8 +28,6 @@ const DetailedGrades = () => {
  } = useModel('progress', courseId);

  const hasSectionScores = sectionScores.length > 0;
-  const emptyTableMsg = showUngradedAssignments()
-    ? messages.detailedGradesEmpty : messages.detailedGradesEmptyOnlyGraded;

  const logOutlineLinkClick = () => {
    sendTrackEvent('edx.ui.lms.course_progress.detailed_grades.course_outline_link.clicked', {
@@ -54,36 +54,35 @@ const DetailedGrades = () => {

  return (
    <section className="text-dark-700">
-      <h3 className="h4">{intl.formatMessage(messages.detailedGrades)}</h3>
-      <ul className="micro mb-3 pl-3 text-gray-700">
-        <li>
-          <b>{intl.formatMessage(messages.practiceScoreLabel)} </b>
-          {intl.formatMessage(messages.practiceScoreInfoText)}
-        </li>
-        <li>
-          <b>{intl.formatMessage(messages.gradedScoreLabel)} </b>
-          {intl.formatMessage(messages.gradedScoreInfoText)}
-        </li>
-      </ul>
+      <h3 className="h4 mb-3">{intl.formatMessage(messages.detailedGrades)}</h3>
      {gradesFeatureIsPartiallyLocked && (
        <div className="mb-3 small ml-0 d-inline">
-          <Icon className="mr-1 mt-1 d-inline-flex" style={{ height: '1rem', width: '1rem' }} src={Locked} data-testid="locked-icon" />
-          {intl.formatMessage(messages.gradeSummaryLimitedAccessExplanation, { upgradeLink: '' })}
+          <Icon className="mr-1 mt-1 d-inline-flex" style={{ height: '1rem', width: '1rem' }} src={Blocked} data-testid="blocked-icon" />
+          {intl.formatMessage(messages.gradeSummaryLimitedAccessExplanation)}
        </div>
      )}
      {hasSectionScores && (
        <DetailedGradesTable />
      )}
      {!hasSectionScores && (
-        <p className="small">{intl.formatMessage(emptyTableMsg)}</p>
+        <p className="small">{intl.formatMessage(messages.detailedGradesEmpty)}</p>
      )}
-      {overviewTabUrl && !showUngradedAssignments() && (
+      {overviewTabUrl && (
        <p className="x-small m-0">
-          {intl.formatMessage(messages.ungradedAlert, { outlineLink })}
+          <FormattedMessage
+            id="progress.ungradedAlert"
+            defaultMessage="For progress on ungraded aspects of the course, view your {outlineLink}."
+            description="Text that precede link that redirect to course outline page"
+            values={{ outlineLink }}
+          />
        </p>
      )}
    </section>
  );
 };

-export default DetailedGrades;
+DetailedGrades.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(DetailedGrades);
--- a/src/course-home/progress-tab/grades/detailed-grades/DetailedGradesTable.jsx
+++ b/src/course-home/progress-tab/grades/detailed-grades/DetailedGradesTable.jsx
@@ -1,15 +1,19 @@
-import { getLocale, isRtl, useIntl } from '@edx/frontend-platform/i18n';
+import React from 'react';
+import { useSelector } from 'react-redux';
+
+import {
+  getLocale, injectIntl, intlShape, isRtl,
+} from '@edx/frontend-platform/i18n';
 import { DataTable } from '@openedx/paragon';
-import { useContextId } from '../../../../data/hooks';

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

-const DetailedGradesTable = () => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const DetailedGradesTable = ({ intl }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);

  const {
    sectionScores,
@@ -20,10 +24,9 @@ const DetailedGradesTable = () => {
    sectionScores.map((chapter) => {
      const subsectionScores = chapter.subsections.filter(
        (subsection) => !!(
-          (showUngradedAssignments() || subsection.hasGradedAssignment)
-            && subsection.showGrades
-            && (subsection.numPointsPossible > 0 || subsection.numPointsEarned > 0)
-        ),
+          subsection.hasGradedAssignment
+          && subsection.showGrades
+          && (subsection.numPointsPossible > 0 || subsection.numPointsEarned > 0)),
      );

      if (subsectionScores.length === 0) {
@@ -63,4 +66,8 @@ const DetailedGradesTable = () => {
  );
 };

-export default DetailedGradesTable;
+DetailedGradesTable.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(DetailedGradesTable);
--- a/src/course-home/progress-tab/grades/detailed-grades/ProblemScoreDrawer.jsx
+++ b/src/course-home/progress-tab/grades/detailed-grades/ProblemScoreDrawer.jsx
@@ -1,19 +1,18 @@
+import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';

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

 import messages from '../messages';

-const ProblemScoreDrawer = ({ problemScores, subsection }) => {
-  const intl = useIntl();
+const ProblemScoreDrawer = ({ intl, problemScores, subsection }) => {
  const isLocaleRtl = isRtl(getLocale());
-
-  const scoreLabel = subsection.hasGradedAssignment ? messages.gradedScoreLabel : messages.practiceScoreLabel;
-
  return (
    <span className="row w-100 m-0 x-small ml-4 pt-2 pl-1 text-gray-700 flex-nowrap">
-      <span id="problem-score-label" className="col-auto p-0">{intl.formatMessage(scoreLabel)}</span>
+      <span id="problem-score-label" className="col-auto p-0">{intl.formatMessage(messages.problemScoreLabel)}</span>
      <div className={classNames('col', 'p-0', { 'greyed-out': !subsection.learnerHasAccess })}>
        <ul className="list-unstyled row w-100 m-0" aria-labelledby="problem-score-label">
          {problemScores.map((problemScore, i) => (
@@ -27,14 +26,12 @@ const ProblemScoreDrawer = ({ problemScores, subsection }) => {
 };

 ProblemScoreDrawer.propTypes = {
+  intl: intlShape.isRequired,
  problemScores: PropTypes.arrayOf(PropTypes.shape({
    earned: PropTypes.number.isRequired,
    possible: PropTypes.number.isRequired,
  })).isRequired,
-  subsection: PropTypes.shape({
-    learnerHasAccess: PropTypes.bool,
-    hasGradedAssignment: PropTypes.bool,
-  }).isRequired,
+  subsection: PropTypes.shape({ learnerHasAccess: PropTypes.bool }).isRequired,
 };

-export default ProblemScoreDrawer;
+export default injectIntl(ProblemScoreDrawer);
--- a/src/course-home/progress-tab/grades/detailed-grades/SubsectionTitleCell.jsx
+++ b/src/course-home/progress-tab/grades/detailed-grades/SubsectionTitleCell.jsx
@@ -1,24 +1,23 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';

 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Collapsible, Icon, Row } from '@openedx/paragon';
 import {
-  ArrowDropDown,
-  ArrowDropUp,
-  Info,
-  Locked,
+  ArrowDropDown, ArrowDropUp, Blocked, Info,
 } from '@openedx/paragon/icons';
-import { useContextId } from '../../../../data/hooks';

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

-const SubsectionTitleCell = ({ subsection }) => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const SubsectionTitleCell = ({ intl, subsection }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);
  const {
    org,
  } = useModel('courseHomeMeta', courseId);
@@ -62,8 +61,8 @@ const SubsectionTitleCell = ({ subsection }) => {
                aria-label={intl.formatMessage(messages.noAccessToSubsection, { displayName })}
                className="mr-1 mt-1 d-inline-flex"
                style={{ height: '1rem', width: '1rem' }}
-                src={Locked}
-                data-testid="locked-icon"
+                src={Blocked}
+                data-testid="blocked-icon"
              />
            )}
          {url ? (
@@ -103,6 +102,7 @@ const SubsectionTitleCell = ({ subsection }) => {
 };

 SubsectionTitleCell.propTypes = {
+  intl: intlShape.isRequired,
  subsection: PropTypes.shape({
    blockKey: PropTypes.string.isRequired,
    displayName: PropTypes.string.isRequired,
@@ -119,4 +119,4 @@ SubsectionTitleCell.propTypes = {
  }).isRequired,
 };

-export default SubsectionTitleCell;
+export default injectIntl(SubsectionTitleCell);
--- a/src/course-home/progress-tab/grades/grade-summary/AssignmentTypeCell.jsx
+++ b/src/course-home/progress-tab/grades/grade-summary/AssignmentTypeCell.jsx
@@ -1,22 +1,24 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Locked } from '@openedx/paragon/icons';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { Blocked } from '@openedx/paragon/icons';
 import { Icon } from '@openedx/paragon';
-import { useContextId } from '../../../../data/hooks';
 import { useModel } from '../../../../generic/model-store';
 import messages from '../messages';

 const AssignmentTypeCell = ({
-  assignmentType, footnoteMarker, footnoteId, locked,
+  intl, assignmentType, footnoteMarker, footnoteId, locked,
 }) => {
-  const intl = useIntl();
-  const courseId = useContextId();
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);

  const {
    gradesFeatureIsFullyLocked,
  } = useModel('progress', courseId);

-  const lockedIcon = locked ? <Icon id={`assignmentTypeBlockedIcon${assignmentType}`} aria-label={intl.formatMessage(messages.noAccessToAssignmentType, { assignmentType })} className="mr-1 mt-1 d-inline-flex" style={{ height: '1rem', width: '1rem' }} src={Locked} data-testid="locked-icon" /> : '';
+  const lockedIcon = locked ? <Icon id={`assignmentTypeBlockedIcon${assignmentType}`} aria-label={intl.formatMessage(messages.noAccessToAssignmentType, { assignmentType })} className="mr-1 mt-1 d-inline-flex" style={{ height: '1rem', width: '1rem' }} src={Blocked} data-testid="blocked-icon" /> : '';

  return (
    <div className="d-flex small">
@@ -43,6 +45,7 @@ const AssignmentTypeCell = ({
 };

 AssignmentTypeCell.propTypes = {
+  intl: intlShape.isRequired,
  assignmentType: PropTypes.string.isRequired,
  footnoteId: PropTypes.string,
  footnoteMarker: PropTypes.number,
@@ -55,4 +58,4 @@ AssignmentTypeCell.defaultProps = {
  locked: false,
 };

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

-import { useIntl } from '@edx/frontend-platform/i18n';
-import { useContextId } from '../../../../data/hooks';
+import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';

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

-const DroppableAssignmentFootnote = ({ footnotes }) => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const DroppableAssignmentFootnote = ({ footnotes, intl }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);
  const {
    gradesFeatureIsFullyLocked,
  } = useModel('progress', courseId);
@@ -19,10 +21,14 @@ const DroppableAssignmentFootnote = ({ footnotes }) => {
        {footnotes.map((footnote, index) => (
          <li id={`${footnote.id}-footnote`} key={footnote.id} className="x-small mt-1">
            <sup>{index + 1}</sup>
-            {intl.formatMessage(messages.droppableAssignmentsText, {
-              numDroppable: footnote.numDroppable,
-              assignmentType: footnote.assignmentType,
-            })}
+            <FormattedMessage
+              id="progress.footnotes.droppableAssignments"
+              defaultMessage="The lowest {numDroppable, plural, one{# {assignmentType} score is} other{# {assignmentType} scores are}} dropped."
+              values={{
+                numDroppable: footnote.numDroppable,
+                assignmentType: footnote.assignmentType,
+              }}
+            />
            <a className="sr-only" href={`#${footnote.id}-ref`} tabIndex={gradesFeatureIsFullyLocked ? '-1' : '0'}>
              {intl.formatMessage(messages.backToContent)}
            </a>
@@ -39,6 +45,7 @@ DroppableAssignmentFootnote.propTypes = {
    id: PropTypes.string.isRequired,
    numDroppable: PropTypes.number.isRequired,
  })).isRequired,
+  intl: intlShape.isRequired,
 };

-export default DroppableAssignmentFootnote;
+export default injectIntl(DroppableAssignmentFootnote);
--- a/src/course-home/progress-tab/grades/grade-summary/GradeSummary.jsx
+++ b/src/course-home/progress-tab/grades/grade-summary/GradeSummary.jsx
@@ -1,13 +1,14 @@
 import React, { useState } from 'react';
-
-import { useContextId } from '../../../../data/hooks';
+import { useSelector } from 'react-redux';
 import { useModel } from '../../../../generic/model-store';

 import GradeSummaryHeader from './GradeSummaryHeader';
 import GradeSummaryTable from './GradeSummaryTable';

 const GradeSummary = () => {
-  const courseId = useContextId();
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);

  const {
    gradingPolicy: {
--- a/src/course-home/progress-tab/grades/grade-summary/GradeSummaryHeader.jsx
+++ b/src/course-home/progress-tab/grades/grade-summary/GradeSummaryHeader.jsx
@@ -1,69 +1,64 @@
+import React, { useState } from 'react';
+import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
-import { useIntl } from '@edx/frontend-platform/i18n';
+
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import {
-  Hyperlink,
-  Icon,
-  OverlayTrigger,
-  Stack,
-  Tooltip,
+  Icon, IconButton, OverlayTrigger, Popover,
 } from '@openedx/paragon';
-import { InfoOutline, Locked } from '@openedx/paragon/icons';
-import { useContextId } from '../../../../data/hooks';
+import { Blocked, InfoOutline } from '@openedx/paragon/icons';

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

-const GradeSummaryHeader = ({ allOfSomeAssignmentTypeIsLocked }) => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const GradeSummaryHeader = ({ intl, allOfSomeAssignmentTypeIsLocked }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);
  const {
-    verifiedMode,
    gradesFeatureIsFullyLocked,
  } = useModel('progress', courseId);
+  const [showTooltip, setShowTooltip] = useState(false);

  return (
-    <Stack gap={2} className="mb-3">
-      <Stack direction="horizontal" gap={2}>
-        <h3 className="h4 m-0">{intl.formatMessage(messages.gradeSummary)}</h3>
-        <OverlayTrigger
-          trigger="hover"
-          placement="top"
-          overlay={(
-            <Tooltip>
+    <div className="row w-100 m-0 align-items-center">
+      <h3 className="h4 mb-3 mr-1">{intl.formatMessage(messages.gradeSummary)}</h3>
+      <OverlayTrigger
+        trigger="click"
+        placement="top"
+        show={showTooltip}
+        overlay={(
+          <Popover>
+            <Popover.Content className="small text-dark-700">
              {intl.formatMessage(messages.gradeSummaryTooltipBody)}
-            </Tooltip>
-          )}
-        >
-          <Icon
-            alt={intl.formatMessage(messages.gradeSummaryTooltipAlt)}
-            src={InfoOutline}
-            size="sm"
-          />
-        </OverlayTrigger>
-      </Stack>
+            </Popover.Content>
+          </Popover>
+        )}
+      >
+        <IconButton
+          onClick={() => { setShowTooltip(!showTooltip); }}
+          onBlur={() => { setShowTooltip(false); }}
+          alt={intl.formatMessage(messages.gradeSummaryTooltipAlt)}
+          src={InfoOutline}
+          iconAs={Icon}
+          className="mb-3"
+          size="sm"
+          disabled={gradesFeatureIsFullyLocked}
+        />
+      </OverlayTrigger>
      {!gradesFeatureIsFullyLocked && allOfSomeAssignmentTypeIsLocked && (
-        <Stack direction="horizontal" className="small" gap={2}>
-          <Icon size="sm" src={Locked} data-testid="locked-icon" />
-          <span>
-            {intl.formatMessage(
-              messages.gradeSummaryLimitedAccessExplanation,
-              {
-                upgradeLink: verifiedMode && (
-                  <Hyperlink destination={verifiedMode.upgradeUrl}>
-                    {intl.formatMessage(messages.courseGradePreviewUpgradeButton)}.
-                  </Hyperlink>
-                ),
-              },
-            )}
-          </span>
-        </Stack>
+        <div className="mb-3 small ml-0 d-inline">
+          <Icon className="mr-1 mt-1 d-inline-flex" style={{ height: '1rem', width: '1rem' }} src={Blocked} data-testid="blocked-icon" />
+          {intl.formatMessage(messages.gradeSummaryLimitedAccessExplanation)}
+        </div>
      )}
-    </Stack>
+    </div>
  );
 };

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

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

-import { getLocale, isRtl, useIntl } from '@edx/frontend-platform/i18n';
+import {
+  getLocale, injectIntl, intlShape, isRtl,
+} from '@edx/frontend-platform/i18n';
 import { DataTable } from '@openedx/paragon';
-import { useContextId } from '../../../../data/hooks';
 import { useModel } from '../../../../generic/model-store';

 import AssignmentTypeCell from './AssignmentTypeCell';
@@ -11,9 +14,10 @@ import GradeSummaryTableFooter from './GradeSummaryTableFooter';

 import messages from '../messages';

-const GradeSummaryTable = ({ setAllOfSomeAssignmentTypeIsLocked }) => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const GradeSummaryTable = ({ intl, setAllOfSomeAssignmentTypeIsLocked }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);

  const {
    gradingPolicy: {
@@ -30,14 +34,6 @@ const GradeSummaryTable = ({ setAllOfSomeAssignmentTypeIsLocked }) => {
    return footnoteId.replace(/[^A-Za-z0-9.-_]+/g, '-');
  };

-  const getGradePercent = (grade) => {
-    if (Number.isInteger(grade * 100)) {
-      return (grade * 100).toFixed(0);
-    }
-
-    return (grade * 100).toFixed(2);
-  };
-
  const hasNoAccessToAssignmentsOfType = (assignmentType) => {
    const subsectionAssignmentsOfType = sectionScores.map((chapter) => chapter.subsections.filter((subsection) => (
      subsection.assignmentType === assignmentType && subsection.hasGradedAssignment
@@ -56,37 +52,31 @@ const GradeSummaryTable = ({ setAllOfSomeAssignmentTypeIsLocked }) => {
  };

  const gradeSummaryData = assignmentPolicies.map((assignment) => {
-    const {
-      averageGrade,
-      numDroppable,
-      type: assignmentType,
-      weight,
-      weightedGrade,
-    } = assignment;
    let footnoteId = '';
    let footnoteMarker;

-    if (numDroppable > 0) {
+    if (assignment.numDroppable > 0) {
      footnoteId = getFootnoteId(assignment);
      footnotes.push({
        id: footnoteId,
-        numDroppable,
-        assignmentType,
+        numDroppable: assignment.numDroppable,
+        assignmentType: assignment.type,
      });

      footnoteMarker = footnotes.length;
    }

-    const locked = !gradesFeatureIsFullyLocked && hasNoAccessToAssignmentsOfType(assignmentType);
+    const locked = !gradesFeatureIsFullyLocked && hasNoAccessToAssignmentsOfType(assignment.type);
+
    const isLocaleRtl = isRtl(getLocale());

    return {
      type: {
-        footnoteId, footnoteMarker, type: assignmentType, locked,
+        footnoteId, footnoteMarker, type: assignment.type, locked,
      },
-      weight: { weight: `${(weight * 100).toFixed(0)}${isLocaleRtl ? '\u200f' : ''}%`, locked },
-      grade: { grade: `${getGradePercent(averageGrade)}${isLocaleRtl ? '\u200f' : ''}%`, locked },
-      weightedGrade: { weightedGrade: `${getGradePercent(weightedGrade)}${isLocaleRtl ? '\u200f' : ''}%`, locked },
+      weight: { weight: `${(assignment.weight * 100).toFixed(0)}${isLocaleRtl ? '\u200f' : ''}%`, locked },
+      grade: { grade: `${(assignment.averageGrade * 100).toFixed(0)}${isLocaleRtl ? '\u200f' : ''}%`, locked },
+      weightedGrade: { weightedGrade: `${(assignment.weightedGrade * 100).toFixed(0)}${isLocaleRtl ? '\u200f' : ''}%`, locked },
    };
  });
  const getAssignmentTypeCell = (value) => (
@@ -147,7 +137,8 @@ const GradeSummaryTable = ({ setAllOfSomeAssignmentTypeIsLocked }) => {
 };

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

-export default GradeSummaryTable;
+export default injectIntl(GradeSummaryTable);
--- a/src/course-home/progress-tab/grades/grade-summary/GradeSummaryTableFooter.jsx
+++ b/src/course-home/progress-tab/grades/grade-summary/GradeSummaryTableFooter.jsx
@@ -1,35 +1,18 @@
-import { useContext } from 'react';
+import React from 'react';
+import { useSelector } from 'react-redux';

-import { getLocale, isRtl, useIntl } from '@edx/frontend-platform/i18n';
 import {
-  DataTable,
-  DataTableContext,
-  Icon,
-  OverlayTrigger,
-  Stack,
-  Tooltip,
-} from '@openedx/paragon';
-import { InfoOutline } from '@openedx/paragon/icons';
-import { useContextId } from '../../../../data/hooks';
-
+  getLocale, injectIntl, intlShape, isRtl,
+} from '@edx/frontend-platform/i18n';
+import { DataTable } from '@openedx/paragon';
 import { useModel } from '../../../../generic/model-store';
+
 import messages from '../messages';

-const GradeSummaryTableFooter = () => {
-  const intl = useIntl();
-
-  const { data } = useContext(DataTableContext);
-
-  const rawGrade = data.reduce(
-    (grade, currentValue) => {
-      const { weightedGrade } = currentValue.weightedGrade;
-      const percent = weightedGrade.replace(/%/g, '').trim();
-      return grade + parseFloat(percent);
-    },
-    0,
-  ).toFixed(2);
-
-  const courseId = useContextId();
+const GradeSummaryTableFooter = ({ intl }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);

  const {
    courseGrade: {
@@ -46,33 +29,15 @@ const GradeSummaryTableFooter = () => {
  return (
    <DataTable.TableFooter className={`border-top border-primary ${bgColor}`}>
      <div className="row w-100 m-0">
-        <div id="weighted-grade-summary" className="col-8 p-0 small">
-          <Stack gap={2} direction="horizontal">
-            {intl.formatMessage(messages.weightedGradeSummary)}
-            <OverlayTrigger
-              trigger="hover"
-              placement="bottom"
-              overlay={(
-                <Tooltip>
-                  {intl.formatMessage(
-                    messages.weightedGradeSummaryTooltip,
-                    { roundedGrade: totalGrade, rawGrade },
-                  )}
-                </Tooltip>
-              )}
-            >
-              <Icon
-                src={InfoOutline}
-                size="sm"
-                alt={intl.formatMessage(messages.gradeSummaryTooltipAlt)}
-              />
-            </OverlayTrigger>
-          </Stack>
-        </div>
+        <div id="weighted-grade-summary" className="col-8 p-0 small">{intl.formatMessage(messages.weightedGradeSummary)}</div>
        <div data-testid="gradeSummaryFooterTotalWeightedGrade" aria-labelledby="weighted-grade-summary" className="col-4 p-0 text-right font-weight-bold small">{totalGrade}{isLocaleRtl && '\u200f'}%</div>
      </div>
    </DataTable.TableFooter>
  );
 };

-export default GradeSummaryTableFooter;
+GradeSummaryTableFooter.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(GradeSummaryTableFooter);
--- a/src/course-home/progress-tab/grades/messages.ts
+++ b/src/course-home/progress-tab/grades/messages.ts
@@ -78,7 +78,7 @@ const messages = defineMessages({
  },
  courseOutline: {
    id: 'progress.courseOutline',
-    defaultMessage: 'Course outline',
+    defaultMessage: 'Course Outline',
    description: 'Anchor text for link that redirects to (course outline) tab',
  },
  currentGradeLabel: {
@@ -91,14 +91,9 @@ const messages = defineMessages({
    defaultMessage: 'Detailed grades',
    description: 'Headline for the (detailed grade) section in the progress tab',
  },
-  detailedGradesEmptyOnlyGraded: {
+  detailedGradesEmpty: {
    id: 'progress.detailedGrades.emptyTable',
    defaultMessage: 'You currently have no graded problem scores.',
-    description: 'It indicate that there are no graded problem or assignments to be scored',
-  },
-  detailedGradesEmpty: {
-    id: 'progress.detailedGrades.including-ungraded.emptyTable',
-    defaultMessage: 'You currently have no graded or ungraded problem scores.',
    description: 'It indicate that there are no problem or assignments to be scored',
  },
  footnotesTitle: {
@@ -133,7 +128,7 @@ const messages = defineMessages({
  },
  gradeSummaryLimitedAccessExplanation: {
    id: 'progress.gradeSummary.limitedAccessExplanation',
-    defaultMessage: 'You have limited access to graded assignments as part of the audit track in this course. {upgradeLink}',
+    defaultMessage: 'You have limited access to graded assignments as part of the audit track in this course.',
    description: 'Text shown when learner has limited access to grade feature',
  },
  gradeSummaryTooltipAlt: {
@@ -163,16 +158,11 @@ const messages = defineMessages({
    defaultMessage: 'Passing grade',
    description: 'Label for mark on the (grade bar) chart which indicate the poisition of passing grade on the bar',
  },
-  gradedScoreLabel: {
+  problemScoreLabel: {
    id: 'progress.detailedGrades.problemScore.label',
-    defaultMessage: 'Graded Scores:',
+    defaultMessage: 'Problem Scores:',
    description: 'Label text which precedes detailed view of all scores per assignment',
  },
-  practiceScoreLabel: {
-    id: 'progress.detailedGrades.practice.problemScore.label',
-    defaultMessage: 'Practice Scores:',
-    description: 'Label text which precedes detailed view of all ungraded problem scores per assignment',
-  },
  problemScoreToggleAltText: {
    id: 'progress.detailedGrades.problemScore.toggleButton',
    defaultMessage: 'Toggle individual problem scores for {subsectionTitle}',
@@ -203,31 +193,7 @@ const messages = defineMessages({
    defaultMessage: 'Your current weighted grade summary',
    description: 'It the text precede the sum of weighted grades of all the assignment',
  },
-  weightedGradeSummaryTooltip: {
-    id: 'progress.weightedGradeSummary',
-    defaultMessage: 'Your raw weighted grade summary is {rawGrade} and rounds to {roundedGrade}.',
-    description: 'Tooltip content that explains the rounding of the summary versus individual assignments',
-  },
-  practiceScoreInfoText: {
-    id: 'progress.detailedGrades.practice-label.info.text',
-    defaultMessage: 'Scores from non-graded activities meant for practice and self-assessment.',
-    description: 'Information text about non-graded practice score label',
-  },
-  gradedScoreInfoText: {
-    id: 'progress.detailedGrades.problem-label.info.text',
-    defaultMessage: 'Scores from activities that contribute to your final grade.',
-    description: 'Information text about graded problem score label',
-  },
-  ungradedAlert: {
-    id: 'progress.ungradedAlert',
-    defaultMessage: 'For progress on ungraded aspects of the course, view your {outlineLink}.',
-    description: 'Text that precede link that redirect to course outline page',
-  },
-  droppableAssignmentsText: {
-    id: 'progress.footnotes.droppableAssignments',
-    defaultMessage: 'The lowest {numDroppable, plural, one{# {assignmentType} score is} other{# {assignmentType} scores are}} dropped.',
-    description: 'Footnote text stating how many assignments are dropped',
-  },
+
 });

 export default messages;
--- a/src/course-home/progress-tab/related-links/RelatedLinks.jsx
+++ b/src/course-home/progress-tab/related-links/RelatedLinks.jsx
@@ -1,15 +1,18 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Hyperlink } from '@openedx/paragon';
-import { useContextId } from '../../../data/hooks';

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

-const RelatedLinks = () => {
-  const intl = useIntl();
-  const courseId = useContextId();
+const RelatedLinks = ({ intl }) => {
+  const {
+    courseId,
+  } = useSelector(state => state.courseHome);
  const {
    org,
    tabs,
@@ -55,4 +58,8 @@ const RelatedLinks = () => {
  );
 };

-export default RelatedLinks;
+RelatedLinks.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(RelatedLinks);
--- a/src/course-home/progress-tab/related-links/messages.ts
+++ b/src/course-home/progress-tab/related-links/messages.ts
@@ -18,7 +18,7 @@ const messages = defineMessages({
  },
  outlineCardLink: {
    id: 'progress.relatedLinks.outlineCard.link',
-    defaultMessage: 'Course outline',
+    defaultMessage: 'Course Outline',
    description: 'Anchor text for link that redirects to course outline tab',
  },
  relatedLinks: {
--- a/src/course-home/progress-tab/utils.ts
+++ b/src/course-home/progress-tab/utils.ts
@@ -1,7 +0,0 @@
-import { getConfig } from '@edx/frontend-platform';
-
-/* eslint-disable import/prefer-default-export */
-export const showUngradedAssignments = () => (
-  getConfig().SHOW_UNGRADED_ASSIGNMENT_PROGRESS === 'true'
-  || getConfig().SHOW_UNGRADED_ASSIGNMENT_PROGRESS === true
-);
--- a/src/course-tabs/CourseTabsNavigation.test.jsx
+++ b/src/course-tabs/CourseTabsNavigation.test.jsx
@@ -73,13 +73,13 @@ describe('Course Tabs Navigation', () => {
  it('should NOT render CoursewareSearch if the flag is off', () => {
    renderComponent();

-    expect(screen.queryByTestId('courseware-search-dialog')).not.toBeInTheDocument();
+    expect(screen.queryByTestId('courseware-search-section')).not.toBeInTheDocument();
  });

  it('should render CoursewareSearch if the flag is on', () => {
    useCoursewareSearchState.mockImplementation(() => ({ show: true }));
    renderComponent();

-    expect(screen.queryByTestId('courseware-search-dialog')).toBeInTheDocument();
+    expect(screen.queryByTestId('courseware-search-section')).toBeInTheDocument();
  });
 });
--- a/src/courseware/CoursewareContainer.jsx
+++ b/src/courseware/CoursewareContainer.jsx
@@ -19,50 +19,62 @@ import { handleNextSectionCelebration } from './course/celebration';
 import withParamsAndNavigation from './utils';

 // Look at where this is called in componentDidUpdate for more info about its usage
-export const checkResumeRedirect = memoize(
-  (courseStatus, courseId, sequenceId, firstSequenceId, navigate, isPreview) => {
-    if (courseStatus === 'loaded' && !sequenceId) {
-      // Note that getResumeBlock is just an API call, not a redux thunk.
-      getResumeBlock(courseId).then((data) => {
-        // This is a replace because we don't want this change saved in the browser's history.
-        if (data.sectionId && data.unitId) {
-          const baseUrl = `/course/${courseId}/${data.sectionId}`;
-          const sequenceUrl = isPreview ? `/preview${baseUrl}` : baseUrl;
-          navigate(`${sequenceUrl}/${data.unitId}`, { replace: true });
-        } else if (firstSequenceId) {
-          navigate(`/course/${courseId}/${firstSequenceId}`, { replace: true });
-        }
-      }, () => {});
-    }
-  },
-);
-
-// Look at where this is called in componentDidUpdate for more info about its usage
-export const checkSectionUnitToUnitRedirect = memoize((
-  courseStatus,
-  courseId,
-  sequenceStatus,
-  section,
-  unitId,
-  navigate,
-  isPreview,
-) => {
-  if (courseStatus === 'loaded' && sequenceStatus === 'failed' && section && unitId) {
-    const baseUrl = `/course/${courseId}`;
-    const courseUrl = isPreview ? `/preview${baseUrl}` : baseUrl;
-    navigate(`${courseUrl}/${unitId}`, { replace: true });
+const checkResumeRedirect = memoize((courseStatus, courseId, sequenceId, firstSequenceId, navigate) => {
+  if (courseStatus === 'loaded' && !sequenceId) {
+    // Note that getResumeBlock is just an API call, not a redux thunk.
+    getResumeBlock(courseId).then((data) => {
+      // This is a replace because we don't want this change saved in the browser's history.
+      if (data.sectionId && data.unitId) {
+        navigate(`/course/${courseId}/${data.sectionId}/${data.unitId}`, { replace: true });
+      } else if (firstSequenceId) {
+        navigate(`/course/${courseId}/${firstSequenceId}`, { replace: true });
+      }
+    });
  }
 });

 // Look at where this is called in componentDidUpdate for more info about its usage
-export const checkSectionToSequenceRedirect = memoize(
-  (courseStatus, courseId, sequenceStatus, section, unitId, navigate) => {
-    if (courseStatus === 'loaded' && sequenceStatus === 'failed' && section && !unitId) {
-      // If the section is non-empty, redirect to its first sequence.
-      if (section.sequenceIds && section.sequenceIds[0]) {
-        navigate(`/course/${courseId}/${section.sequenceIds[0]}`, { replace: true });
-      // Otherwise, just go to the course root, letting the resume redirect take care of things.
+const checkSectionUnitToUnitRedirect = memoize((courseStatus, courseId, sequenceStatus, section, unitId, navigate) => {
+  if (courseStatus === 'loaded' && sequenceStatus === 'failed' && section && unitId) {
+    navigate(`/course/${courseId}/${unitId}`, { replace: true });
+  }
+});
+
+// Look at where this is called in componentDidUpdate for more info about its usage
+const checkSectionToSequenceRedirect = memoize((courseStatus, courseId, sequenceStatus, section, unitId, navigate) => {
+  if (courseStatus === 'loaded' && sequenceStatus === 'failed' && section && !unitId) {
+    // If the section is non-empty, redirect to its first sequence.
+    if (section.sequenceIds && section.sequenceIds[0]) {
+      navigate(`/course/${courseId}/${section.sequenceIds[0]}`, { replace: true });
+    // Otherwise, just go to the course root, letting the resume redirect take care of things.
+    } else {
+      navigate(`/course/${courseId}`, { replace: true });
+    }
+  }
+});
+
+// Look at where this is called in componentDidUpdate for more info about its usage
+const checkUnitToSequenceUnitRedirect = memoize(
+  (courseStatus, courseId, sequenceStatus, sequenceMightBeUnit, sequenceId, section, routeUnitId, navigate) => {
+    if (courseStatus === 'loaded' && sequenceStatus === 'failed' && !section && !routeUnitId) {
+      if (sequenceMightBeUnit) {
+        // If the sequence failed to load as a sequence, but it is marked as a possible unit, then
+        // we need to look up the correct parent sequence for it, and redirect there.
+        const unitId = sequenceId; // just for clarity during the rest of this method
+        getSequenceForUnitDeprecated(courseId, unitId).then(
+          parentId => {
+            if (parentId) {
+              navigate(`/course/${courseId}/${parentId}/${unitId}`, { replace: true });
+            } else {
+              navigate(`/course/${courseId}`, { replace: true });
+            }
+          },
+          () => { // error case
+            navigate(`/course/${courseId}`, { replace: true });
+          },
+        );
      } else {
+        // Invalid sequence that isn't a unit either. Redirect up to main course.
        navigate(`/course/${courseId}`, { replace: true });
      }
    }
@@ -70,80 +82,41 @@ export const checkSectionToSequenceRedirect = memoize(
 );

 // Look at where this is called in componentDidUpdate for more info about its usage
-export const checkUnitToSequenceUnitRedirect = memoize((
-  courseStatus,
-  courseId,
-  sequenceStatus,
-  sequenceMightBeUnit,
-  sequenceId,
-  section,
-  routeUnitId,
-  navigate,
-  isPreview,
-) => {
-  if (courseStatus === 'loaded' && sequenceStatus === 'failed' && !section && !routeUnitId) {
-    if (sequenceMightBeUnit) {
-      // If the sequence failed to load as a sequence, but it is marked as a possible unit, then
-      // we need to look up the correct parent sequence for it, and redirect there.
-      const unitId = sequenceId; // just for clarity during the rest of this method
-      getSequenceForUnitDeprecated(courseId, unitId).then(
-        parentId => {
-          if (parentId) {
-            const baseUrl = `/course/${courseId}/${parentId}`;
-            const sequenceUrl = isPreview ? `/preview${baseUrl}` : baseUrl;
-            navigate(`${sequenceUrl}/${unitId}`, { replace: true });
-          } else {
-            navigate(`/course/${courseId}`, { replace: true });
-          }
-        },
-        () => { // error case
-          navigate(`/course/${courseId}`, { replace: true });
-        },
-      );
-    } else {
-      // Invalid sequence that isn't a unit either. Redirect up to main course.
-      navigate(`/course/${courseId}`, { replace: true });
+const checkSequenceToSequenceUnitRedirect = memoize((courseId, sequenceStatus, sequence, unitId, navigate) => {
+  if (sequenceStatus === 'loaded' && sequence.id && !unitId) {
+    if (sequence.unitIds !== undefined && sequence.unitIds.length > 0) {
+      const nextUnitId = sequence.unitIds[sequence.activeUnitIndex];
+      // This is a replace because we don't want this change saved in the browser's history.
+      navigate(`/course/${courseId}/${sequence.id}/${nextUnitId}`, { replace: true });
    }
  }
 });

 // Look at where this is called in componentDidUpdate for more info about its usage
-export const checkSequenceToSequenceUnitRedirect = memoize(
-  (courseId, sequenceStatus, sequence, unitId, navigate, isPreview) => {
-    if (sequenceStatus === 'loaded' && sequence.id && !unitId) {
-      if (sequence.unitIds !== undefined && sequence.unitIds.length > 0) {
-        const baseUrl = `/course/${courseId}/${sequence.id}`;
-        const sequenceUrl = isPreview ? `/preview${baseUrl}` : baseUrl;
-        const nextUnitId = sequence.unitIds[sequence.activeUnitIndex];
-        // This is a replace because we don't want this change saved in the browser's history.
-        navigate(`${sequenceUrl}/${nextUnitId}`, { replace: true });
-      }
-    }
-  },
-);
-
-// Look at where this is called in componentDidUpdate for more info about its usage
-export const checkSequenceUnitMarkerToSequenceUnitRedirect = memoize(
-  (courseId, sequenceStatus, sequence, unitId, navigate, isPreview) => {
+const checkSequenceUnitMarkerToSequenceUnitRedirect = memoize(
+  (courseId, sequenceStatus, sequence, unitId, navigate) => {
    if (sequenceStatus !== 'loaded' || !sequence.id) {
      return;
    }

-    const baseUrl = `/course/${courseId}/${sequence.id}`;
    const hasUnits = sequence.unitIds?.length > 0;

-    if (hasUnits) {
-      const sequenceUrl = isPreview ? `/preview${baseUrl}` : baseUrl;
-      if (unitId === 'first') {
+    if (unitId === 'first') {
+      if (hasUnits) {
        const firstUnitId = sequence.unitIds[0];
-        navigate(`${sequenceUrl}/${firstUnitId}`, { replace: true });
-      } else if (unitId === 'last') {
-        const lastUnitId = sequence.unitIds[sequence.unitIds.length - 1];
-        navigate(`${sequenceUrl}/${lastUnitId}`, { replace: true });
-      }
-    } else {
+        navigate(`/course/${courseId}/${sequence.id}/${firstUnitId}`, { replace: true });
+      } else {
      // No units... go to general sequence page
-      navigate(baseUrl, { replace: true });
+        navigate(`/course/${courseId}/${sequence.id}`, { replace: true });
+      }
+    } else if (unitId === 'last') {
+      if (hasUnits) {
+        const lastUnitId = sequence.unitIds[sequence.unitIds.length - 1];
+        navigate(`/course/${courseId}/${sequence.id}/${lastUnitId}`, { replace: true });
+      } else {
+      // No units... go to general sequence page
+        navigate(`/course/${courseId}/${sequence.id}`, { replace: true });
+      }
    }
  },
 );
@@ -168,7 +141,7 @@ class CoursewareContainer extends Component {

  checkFetchSequence = memoize((sequenceId) => {
    if (sequenceId) {
-      this.props.fetchSequence(sequenceId, this.props.isPreview);
+      this.props.fetchSequence(sequenceId);
    }
  });

@@ -196,7 +169,6 @@ class CoursewareContainer extends Component {
      routeSequenceId,
      routeUnitId,
      navigate,
-      isPreview,
    } = this.props;

    // Load data whenever the course or sequence ID changes.
@@ -225,7 +197,7 @@ class CoursewareContainer extends Component {
    // Check resume redirect:
    //   /course/:courseId -> /course/:courseId/:sequenceId/:unitId
    // based on sequence/unit where user was last active.
-    checkResumeRedirect(courseStatus, courseId, sequenceId, firstSequenceId, navigate, isPreview);
+    checkResumeRedirect(courseStatus, courseId, sequenceId, firstSequenceId, navigate);

    // Check section-unit to unit redirect:
    //    /course/:courseId/:sectionId/:unitId -> /course/:courseId/:unitId
@@ -238,69 +210,33 @@ class CoursewareContainer extends Component {
    // otherwise, we could get stuck in a redirect loop, since a sequence that failed to load
    // would endlessly redirect to itself through `checkSectionUnitToUnitRedirect`
    // and `checkUnitToSequenceUnitRedirect`.
-    checkSectionUnitToUnitRedirect(
-      courseStatus,
-      courseId,
-      sequenceStatus,
-      sectionViaSequenceId,
-      routeUnitId,
-      navigate,
-      isPreview,
-    );
+    checkSectionUnitToUnitRedirect(courseStatus, courseId, sequenceStatus, sectionViaSequenceId, routeUnitId, navigate);

    // Check section to sequence redirect:
    //    /course/:courseId/:sectionId         -> /course/:courseId/:sequenceId
    // by redirecting to the first sequence within the section.
-    checkSectionToSequenceRedirect(
-      courseStatus,
-      courseId,
-      sequenceStatus,
-      sectionViaSequenceId,
-      routeUnitId,
-      navigate,
-    );
+    checkSectionToSequenceRedirect(courseStatus, courseId, sequenceStatus, sectionViaSequenceId, routeUnitId, navigate);

    // Check unit to sequence-unit redirect:
    //    /course/:courseId/:unitId -> /course/:courseId/:sequenceId/:unitId
    // by filling in the ID of the parent sequence of :unitId.
-    checkUnitToSequenceUnitRedirect(
-      courseStatus,
-      courseId,
-      sequenceStatus,
-      sequenceMightBeUnit,
-      sequenceId,
-      sectionViaSequenceId,
-      routeUnitId,
-      navigate,
-      isPreview,
-    );
+    checkUnitToSequenceUnitRedirect((
+      courseStatus, courseId, sequenceStatus, sequenceMightBeUnit,
+      sequenceId, sectionViaSequenceId, routeUnitId, navigate
+    ));

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

    // Check sequence-unit marker to sequence-unit redirect:
    //    /course/:courseId/:sequenceId/first -> /course/:courseId/:sequenceId/:unitId
    //    /course/:courseId/:sequenceId/last -> /course/:courseId/:sequenceId/:unitId
    // by filling in the ID the first or last unit in the sequence.
    // "Sequence unit marker" is an invented term used only in this component.
-    checkSequenceUnitMarkerToSequenceUnitRedirect(
-      courseId,
-      sequenceStatus,
-      sequence,
-      routeUnitId,
-      navigate,
-      isPreview,
-    );
+    checkSequenceUnitMarkerToSequenceUnitRedirect(courseId, sequenceStatus, sequence, routeUnitId, navigate);
  }

  handleUnitNavigationClick = () => {
@@ -398,7 +334,6 @@ CoursewareContainer.propTypes = {
  fetchCourse: PropTypes.func.isRequired,
  fetchSequence: PropTypes.func.isRequired,
  navigate: PropTypes.func.isRequired,
-  isPreview: PropTypes.bool.isRequired,
 };

 CoursewareContainer.defaultProps = {
--- a/src/courseware/CoursewareContainer.test.jsx
+++ b/src/courseware/CoursewareContainer.test.jsx
@@ -16,19 +16,11 @@ import tabMessages from '../tab-page/messages';
 import { initializeMockApp, waitFor } from '../setupTest';
 import { DECODE_ROUTES } from '../constants';

-import CoursewareContainer, {
-  checkResumeRedirect,
-  checkSectionToSequenceRedirect,
-  checkSectionUnitToUnitRedirect,
-  checkSequenceToSequenceUnitRedirect,
-  checkSequenceUnitMarkerToSequenceUnitRedirect,
-  checkUnitToSequenceUnitRedirect,
-} from './CoursewareContainer';
+import CoursewareContainer from './CoursewareContainer';
 import { buildSimpleCourseBlocks, buildBinaryCourseBlocks } from '../shared/data/__factories__/courseBlocks.factory';
 import initializeStore from '../store';
 import { appendBrowserTimezoneToUrl } from '../utils';
 import { buildOutlineFromBlocks } from './data/__factories__/learningSequencesOutline.factory';
-import { getSequenceForUnitDeprecatedUrl } from './data/api';

 // NOTE: Because the unit creates an iframe, we choose to mock it out as its rendering isn't
 // pertinent to this test.  Instead, we render a simple div that displays the properties we expect
@@ -533,838 +525,3 @@ describe('CoursewareContainer', () => {
    });
  });
 });
-
-describe('Course redirect functions', () => {
-  let navigate;
-  let axiosMock;
-
-  beforeEach(() => {
-    navigate = jest.fn();
-    axiosMock = new MockAdapter(getAuthenticatedHttpClient());
-  });
-
-  describe('isPreview equals true', () => {
-    describe('checkSequenceUnitMarkerToSequenceUnitRedirect', () => {
-      it('return when sequence is not loaded', () => {
-        checkSequenceUnitMarkerToSequenceUnitRedirect(
-          'courseId',
-          'loading',
-          { id: 'sequence_1', unitIds: ['unit_1'] },
-          'first',
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('return when sequence id is null', () => {
-        checkSequenceUnitMarkerToSequenceUnitRedirect(
-          'courseId',
-          'loaded',
-          { id: null, unitIds: ['unit_1'] },
-          'first',
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('calls navigate with first unit id', () => {
-        checkSequenceUnitMarkerToSequenceUnitRedirect(
-          'courseId',
-          'loaded',
-          { id: 'sequence_1', unitIds: ['unit_1', 'unit_2'] },
-          'first',
-          navigate,
-          true,
-        );
-        const expectedUrl = '/preview/course/courseId/sequence_1/unit_1';
-
-        expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-      });
-
-      it('calls navigate with last unit id', () => {
-        checkSequenceUnitMarkerToSequenceUnitRedirect(
-          'courseId',
-          'loaded',
-          { id: 'sequence_1', unitIds: ['unit_1', 'unit_2'] },
-          'last',
-          navigate,
-          true,
-        );
-        const expectedUrl = '/preview/course/courseId/sequence_1/unit_2';
-
-        expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-      });
-    });
-
-    describe('checkSequenceToSequenceUnitRedirect', () => {
-      it('calls navigate with next unit id', () => {
-        checkSequenceToSequenceUnitRedirect(
-          'courseId',
-          'loaded',
-          { id: 'sequence_1', unitIds: ['unit_1', 'unit_2'], activeUnitIndex: 0 },
-          null,
-          navigate,
-          true,
-        );
-        const expectedUrl = '/preview/course/courseId/sequence_1/unit_1';
-
-        expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-      });
-
-      it('returns when sequence status is loading', () => {
-        checkSequenceToSequenceUnitRedirect(
-          'courseId',
-          'loading',
-          { id: 'sequence_1', unitIds: ['unit_1', 'unit_2'], activeUnitIndex: 0 },
-          null,
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when sequence id is null', () => {
-        checkSequenceToSequenceUnitRedirect(
-          'courseId',
-          'loading',
-          { unitIds: ['unit_1', 'unit_2'], activeUnitIndex: 0 },
-          null,
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when unit id is defined', () => {
-        checkSequenceToSequenceUnitRedirect(
-          'courseId',
-          'loaded',
-          { id: 'sequence_1', unitIds: ['unit_1', 'unit_2'], activeUnitIndex: 0 },
-          'unit_2',
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when unit ids are undefiend', () => {
-        checkSequenceToSequenceUnitRedirect(
-          'courseId',
-          'loaded',
-          { id: 'sequence_1', activeUnitIndex: 0 },
-          null,
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-    });
-
-    describe('checkUnitToSequenceUnitRedirect', () => {
-      const { href: apiUrl } = getSequenceForUnitDeprecatedUrl('courseId');
-
-      it('calls navigate with parentId and sequenceId', () => {
-        const getSequenceForUnitDeprecated = jest.fn();
-        axiosMock.onGet(apiUrl).reply(200, {
-          blocks: [{
-            id: 'sequence_1',
-            type: 'sequential',
-            children: ['unit_1'],
-          }],
-        });
-
-        checkUnitToSequenceUnitRedirect(
-          'loaded',
-          'courseId',
-          'failed',
-          true,
-          'unit_1',
-          false,
-          null,
-          navigate,
-          true,
-        );
-        const expectedUrl = '/course/courseId/sequence_1';
-
-        waitFor(() => {
-          expect(getSequenceForUnitDeprecated).toHaveBeenCalled();
-          expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-        });
-      });
-
-      it('calls navigate to course page when getSequenceForUnitDeprecated errors', () => {
-        const getSequenceForUnitDeprecated = jest.fn();
-        axiosMock.onGet(apiUrl).reply(404);
-
-        checkUnitToSequenceUnitRedirect(
-          'loaded',
-          'courseId',
-          'failed',
-          true,
-          'unit_1',
-          false,
-          null,
-          navigate,
-          true,
-        );
-        const expectedUrl = '/course/courseId';
-
-        waitFor(() => {
-          expect(getSequenceForUnitDeprecated).toHaveBeenCalled();
-          expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-        });
-      });
-
-      it('calls navigate to course page when no parent id is returned', () => {
-        const getSequenceForUnitDeprecated = jest.fn();
-        axiosMock.onGet(apiUrl).reply(200, {
-          blocks: [{
-            id: 'sequence_1',
-            type: 'sequential',
-            children: ['block_1'],
-          }],
-        });
-
-        checkUnitToSequenceUnitRedirect(
-          'loaded',
-          'courseId',
-          'failed',
-          true,
-          'unit_1',
-          false,
-          null,
-          navigate,
-          true,
-        );
-        const expectedUrl = '/course/courseId';
-
-        waitFor(() => {
-          expect(getSequenceForUnitDeprecated).toHaveBeenCalled();
-          expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-        });
-      });
-
-      it('calls navigate to course page when sequnce is not unit', () => {
-        const getSequenceForUnitDeprecated = jest.fn();
-
-        checkUnitToSequenceUnitRedirect(
-          'loaded',
-          'courseId',
-          'failed',
-          false,
-          'unit_1',
-          false,
-          null,
-          navigate,
-          true,
-        );
-        const expectedUrl = '/course/courseId';
-
-        waitFor(() => {
-          expect(getSequenceForUnitDeprecated).not.toHaveBeenCalled();
-          expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-        });
-      });
-
-      it('returns when course status is loading', () => {
-        checkUnitToSequenceUnitRedirect(
-          'loading',
-          'courseId',
-          'failed',
-          true,
-          'unit_1',
-          false,
-          null,
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when sequence status is not failed', () => {
-        checkUnitToSequenceUnitRedirect(
-          'loaded',
-          'courseId',
-          'loaded',
-          true,
-          'unit_1',
-          false,
-          null,
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when section is defined', () => {
-        checkUnitToSequenceUnitRedirect(
-          'loaded',
-          'courseId',
-          'loaded',
-          true,
-          'unit_1',
-          true,
-          null,
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when routeUnitId is defined', () => {
-        checkUnitToSequenceUnitRedirect(
-          'loaded',
-          'courseId',
-          'loaded',
-          true,
-          'unit_1',
-          false,
-          'unit_1',
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-    });
-
-    describe('checkSectionUnitToUnitRedirect', () => {
-      it('calls navigate with unitId', () => {
-        checkSectionUnitToUnitRedirect(
-          'loaded',
-          'courseId',
-          'failed',
-          true,
-          'unit_2',
-          navigate,
-          true,
-        );
-        const expectedUrl = '/preview/course/courseId/unit_2';
-
-        expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-      });
-
-      it('returns when course status is loading', () => {
-        checkSectionUnitToUnitRedirect(
-          'loading',
-          'courseId',
-          'loaded',
-          true,
-          'unit_2',
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when sequence status is loading', () => {
-        checkSectionUnitToUnitRedirect(
-          'loaded',
-          'courseId',
-          'loaded',
-          true,
-          'unit_2',
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when section is null', () => {
-        checkSectionUnitToUnitRedirect(
-          'loaded',
-          'courseId',
-          'loaded',
-          null,
-          'unit_2',
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when unitId is null', () => {
-        checkSectionUnitToUnitRedirect(
-          'loaded',
-          'courseId',
-          'loaded',
-          true,
-          null,
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-    });
-
-    describe('checkResumeRedirect', () => {
-      it('calls navigate with unitId', () => {
-        axiosMock.onGet(
-          `${getConfig().LMS_BASE_URL}/api/courseware/resume/courseId`,
-        ).reply(200, {
-          section_id: 'section_1',
-          unitId: 'unit_1',
-        });
-        checkResumeRedirect(
-          'loaded',
-          'courseId',
-          null,
-          'sequence_1',
-          navigate,
-          true,
-        );
-        const expectedUrl = '/preview/course/courseId/section_1/unit_1';
-
-        waitFor(() => {
-          expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-        });
-      });
-
-      it('calls navigate with firstSequenceId', () => {
-        axiosMock.onGet(
-          `${getConfig().LMS_BASE_URL}/api/courseware/resume/courseId`,
-        ).reply(200, {
-          section_id: 'section_1',
-          first_sequence_id: 'sequence_1',
-        });
-        checkResumeRedirect(
-          'loaded',
-          'courseId',
-          null,
-          'sequence_1',
-          navigate,
-          true,
-        );
-        const expectedUrl = '/course/courseId/sequence_1';
-
-        waitFor(() => {
-          expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-        });
-      });
-
-      it('returns after calling getResumeBlock', () => {
-        const getResumeBlock = jest.fn();
-        axiosMock.onGet(
-          `${getConfig().LMS_BASE_URL}/api/courseware/resume/courseId`,
-        ).reply(200, {
-          course_id: 'courseId',
-        });
-        checkResumeRedirect(
-          'loaded',
-          'courseId',
-          null,
-          'sequence_1',
-          navigate,
-          true,
-        );
-
-        waitFor(() => {
-          expect(getResumeBlock).toHaveBeenCalled();
-          expect(navigate).not.toHaveBeenCalled();
-        });
-      });
-
-      it('returns when course status is loading', () => {
-        checkResumeRedirect(
-          'loading',
-          'courseId',
-          null,
-          'sequence_1',
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when sequenceId is defined', () => {
-        checkResumeRedirect(
-          'loaded',
-          'courseId',
-          'sequence_3',
-          'sequence_1',
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when getResumeBlock throws error', () => {
-        const getResumeBlock = jest.fn();
-        axiosMock.onGet(`${getConfig().LMS_BASE_URL}/api/courseware/resume/courseId`).reply(404);
-        checkResumeRedirect(
-          'loaded',
-          'courseId',
-          null,
-          'sequence_1',
-          navigate,
-          true,
-        );
-
-        waitFor(() => {
-          expect(getResumeBlock).toHaveBeenCalled();
-          expect(navigate).not.toHaveBeenCalled();
-        });
-      });
-    });
-  });
-
-  describe('isPreview equals false', () => {
-    describe('checkSectionToSequenceRedirect', () => {
-      it('calls navigate with section based sequence id', () => {
-        checkSectionToSequenceRedirect(
-          'loaded',
-          'courseId',
-          'failed',
-          { sequenceIds: ['sequence_1'] },
-          null,
-          navigate,
-        );
-        const expectedUrl = '/course/courseId/sequence_1';
-
-        expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-      });
-
-      it('calls navigate with course id only', () => {
-        checkSectionToSequenceRedirect(
-          'loaded',
-          'courseId',
-          'failed',
-          { sequenceIds: [] },
-          null,
-          navigate,
-        );
-        const expectedUrl = '/course/courseId';
-
-        expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-      });
-
-      it('returns when course status is loading', () => {
-        checkSectionToSequenceRedirect(
-          'loading',
-          'courseId',
-          'failed',
-          { sequenceIds: [] },
-          null,
-          navigate,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when sequence status is not failed', () => {
-        checkSectionToSequenceRedirect(
-          'loaded',
-          'courseId',
-          'loading',
-          { sequenceIds: [] },
-          null,
-          navigate,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when section is not defined', () => {
-        checkSectionToSequenceRedirect(
-          'loaded',
-          'courseId',
-          'failed',
-          null,
-          null,
-          navigate,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when unitId is defined', () => {
-        checkSectionToSequenceRedirect(
-          'loaded',
-          'courseId',
-          'failed',
-          null,
-          'unit_1',
-          navigate,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-    });
-
-    describe('checkResumeRedirect', () => {
-      it('calls navigate with unitId', () => {
-        axiosMock.onGet(
-          `${getConfig().LMS_BASE_URL}/api/courseware/resume/courseId`,
-        ).reply(200, {
-          section_id: 'section_1',
-          unitId: 'unit_1',
-        });
-        checkResumeRedirect(
-          'loaded',
-          'courseId',
-          null,
-          'sequence_1',
-          navigate,
-          false,
-        );
-        const expectedUrl = '/preview/course/courseId/section_1/unit_1';
-
-        waitFor(() => {
-          expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-        });
-      });
-
-      it('calls navigate with firstSequenceId', () => {
-        axiosMock.onGet(
-          `${getConfig().LMS_BASE_URL}/api/courseware/resume/courseId`,
-        ).reply(200, {
-          section_id: 'section_1',
-          first_sequence_id: 'sequence_1',
-        });
-        checkResumeRedirect(
-          'loaded',
-          'courseId',
-          null,
-          'sequence_1',
-          navigate,
-          false,
-        );
-        const expectedUrl = '/course/courseId/sequence_1';
-
-        waitFor(() => {
-          expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-        });
-      });
-    });
-
-    describe('checkSequenceUnitMarkerToSequenceUnitRedirect', () => {
-      it('calls navigate with first unit id', () => {
-        checkSequenceUnitMarkerToSequenceUnitRedirect(
-          'courseId',
-          'loaded',
-          { id: 'sequence_1', unitIds: ['unit_1', 'unit_2'] },
-          'first',
-          navigate,
-          false,
-        );
-        const expectedUrl = '/course/courseId/sequence_1/unit_1';
-
-        expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-      });
-
-      it('calls navigate with base url when no unit id', () => {
-        checkSequenceUnitMarkerToSequenceUnitRedirect(
-          'courseId',
-          'loaded',
-          { id: 'sequence_1', unitIds: [] },
-          'first',
-          navigate,
-          true,
-        );
-        const expectedUrl = '/course/courseId/sequence_1';
-
-        expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-      });
-
-      it('calls navigate with last unit id', () => {
-        checkSequenceUnitMarkerToSequenceUnitRedirect(
-          'courseId',
-          'loaded',
-          { id: 'sequence_1', unitIds: ['unit_1', 'unit_2'] },
-          'last',
-          navigate,
-          false,
-        );
-        const expectedUrl = '/course/courseId/sequence_1/unit_2';
-
-        expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-      });
-    });
-
-    describe('checkSequenceToSequenceUnitRedirect', () => {
-      it('calls navigate with next unit id', () => {
-        checkSequenceToSequenceUnitRedirect(
-          'courseId',
-          'loaded',
-          { id: 'sequence_1', unitIds: ['unit_1', 'unit_2'], activeUnitIndex: 0 },
-          null,
-          navigate,
-          false,
-        );
-        const expectedUrl = '/course/courseId/sequence_1/unit_1';
-
-        expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-      });
-    });
-
-    describe('checkUnitToSequenceUnitRedirect', () => {
-      const apiUrl = getSequenceForUnitDeprecatedUrl('courseId');
-
-      it('calls navigate with parentId and sequenceId', () => {
-        axiosMock.onGet(apiUrl).reply(200, {
-          parent: { id: 'sequence_1' },
-        });
-        checkUnitToSequenceUnitRedirect(
-          'loaded',
-          'courseId',
-          'failed',
-          true,
-          'unit_1',
-          false,
-          null,
-          navigate,
-          true,
-        );
-        const expectedUrl = '/course/courseId/sequence_1';
-
-        waitFor(() => {
-          expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-        });
-      });
-
-      it('calls navigate to course page when getSequenceForUnitDeprecated errors', () => {
-        const getSequenceForUnitDeprecated = jest.fn();
-        axiosMock.onGet(apiUrl).reply(404);
-        checkUnitToSequenceUnitRedirect(
-          'loaded',
-          'courseId',
-          'failed',
-          true,
-          'unit_1',
-          false,
-          null,
-          navigate,
-          true,
-        );
-        const expectedUrl = '/course/courseId';
-
-        waitFor(() => {
-          expect(getSequenceForUnitDeprecated).toHaveBeenCalled();
-          expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-        });
-      });
-
-      it('calls navigate to course page when no parent id is returned', () => {
-        const getSequenceForUnitDeprecated = jest.fn();
-        axiosMock.onGet(apiUrl).reply(200, {
-          parent: { children: ['block_1'] },
-        });
-        checkUnitToSequenceUnitRedirect(
-          'loaded',
-          'courseId',
-          'failed',
-          true,
-          'unit_1',
-          false,
-          null,
-          navigate,
-          true,
-        );
-        const expectedUrl = '/course/courseId';
-
-        waitFor(() => {
-          expect(getSequenceForUnitDeprecated).toHaveBeenCalled();
-          expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-        });
-      });
-
-      it('returns when course status is loading', () => {
-        checkUnitToSequenceUnitRedirect(
-          'loading',
-          'courseId',
-          'failed',
-          true,
-          'unit_1',
-          false,
-          null,
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when sequence status is not failed', () => {
-        checkUnitToSequenceUnitRedirect(
-          'loaded',
-          'courseId',
-          'loaded',
-          true,
-          'unit_1',
-          false,
-          null,
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when section is defined', () => {
-        checkUnitToSequenceUnitRedirect(
-          'loaded',
-          'courseId',
-          'loaded',
-          true,
-          'unit_1',
-          true,
-          null,
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-
-      it('returns when routeUnitId is defined', () => {
-        checkUnitToSequenceUnitRedirect(
-          'loaded',
-          'courseId',
-          'loaded',
-          true,
-          'unit_1',
-          false,
-          'unit_1',
-          navigate,
-          true,
-        );
-
-        expect(navigate).not.toHaveBeenCalled();
-      });
-    });
-
-    describe('checkSectionUnitToUnitRedirect', () => {
-      it('calls navigate with unitId', () => {
-        checkSectionUnitToUnitRedirect(
-          'loaded',
-          'courseId',
-          'failed',
-          true,
-          'unit_2',
-          navigate,
-          false,
-        );
-        const expectedUrl = '/course/courseId/unit_2';
-
-        expect(navigate).toHaveBeenCalledWith(expectedUrl, { replace: true });
-      });
-    });
-  });
-});
--- a/src/courseware/course/Course.jsx
+++ b/src/courseware/course/Course.jsx
@@ -3,21 +3,21 @@ import PropTypes from 'prop-types';
 import { Helmet } from 'react-helmet';
 import { useDispatch, useSelector } from 'react-redux';
 import { getConfig } from '@edx/frontend-platform';
-import { useLocation, useNavigate } from 'react-router-dom';
 import { breakpoints, useWindowSize } from '@openedx/paragon';

 import { AlertList } from '@src/generic/user-messages';
 import { useModel } from '@src/generic/model-store';
 import { getCoursewareOutlineSidebarSettings } from '../data/selectors';
+import { Trigger as CourseOutlineTrigger } from './sidebar/sidebars/course-outline';
 import Chat from './chat/Chat';
 import SidebarProvider from './sidebar/SidebarContextProvider';
+import SidebarTriggers from './sidebar/SidebarTriggers';
 import NewSidebarProvider from './new-sidebar/SidebarContextProvider';
-import { NotificationsDiscussionsSidebarTriggerSlot } from '../../plugin-slots/NotificationsDiscussionsSidebarTriggerSlot';
+import NewSidebarTriggers from './new-sidebar/SidebarTriggers';
 import { CelebrationModal, shouldCelebrateOnSectionLoad, WeeklyGoalCelebrationModal } from './celebration';
+import CourseBreadcrumbs from './CourseBreadcrumbs';
 import ContentTools from './content-tools';
 import Sequence from './sequence';
-import { CourseOutlineMobileSidebarTriggerSlot } from '../../plugin-slots/CourseOutlineMobileSidebarTriggerSlot';
-import { CourseBreadcrumbsSlot } from '../../plugin-slots/CourseBreadcrumbsSlot';

 const Course = ({
  courseId,
@@ -33,19 +33,11 @@ const Course = ({
    celebrations,
    isStaff,
    isNewDiscussionSidebarViewEnabled,
-    originalUserIsStaff,
  } = useModel('courseHomeMeta', courseId);
  const sequence = useModel('sequences', sequenceId);
  const section = useModel('sections', sequence ? sequence.sectionId : null);
  const { enableNavigationSidebar } = useSelector(getCoursewareOutlineSidebarSettings);
  const navigationDisabled = enableNavigationSidebar || (sequence?.navigationDisabled ?? false);
-  const navigate = useNavigate();
-  const { pathname } = useLocation();
-
-  if (!originalUserIsStaff && pathname.startsWith('/preview')) {
-    const courseUrl = pathname.replace('/preview', '');
-    navigate(courseUrl, { replace: true });
-  }

  const pageTitleBreadCrumbs = [
    sequence,
@@ -86,7 +78,7 @@ const Course = ({
      <div className="position-relative d-flex align-items-xl-center mb-4 mt-1 flex-column flex-xl-row">
        {navigationDisabled || (
        <>
-          <CourseBreadcrumbsSlot
+          <CourseBreadcrumbs
            courseId={courseId}
            sectionId={section ? section.id : null}
            sequenceId={sequenceId}
@@ -108,8 +100,8 @@ const Course = ({
          </>
        )}
        <div className="w-100 d-flex align-items-center">
-          <CourseOutlineMobileSidebarTriggerSlot />
-          <NotificationsDiscussionsSidebarTriggerSlot courseId={courseId} />
+          <CourseOutlineTrigger isMobileView />
+          {isNewDiscussionSidebarViewEnabled ? <NewSidebarTriggers /> : <SidebarTriggers /> }
        </div>
      </div>

--- a/src/courseware/course/bookmark/BookmarkButton.jsx
+++ b/src/courseware/course/bookmark/BookmarkButton.jsx
@@ -1,9 +1,10 @@
-import { useCallback } from 'react';
+import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
-import { Icon, StatefulButton } from '@openedx/paragon';
+import { StatefulButton } from '@openedx/paragon';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 import { useDispatch } from 'react-redux';
-import { Bookmark, BookmarkBorder } from '@openedx/paragon/icons';
+import BookmarkOutlineIcon from './BookmarkOutlineIcon';
+import BookmarkFilledIcon from './BookmarkFilledIcon';
 import { removeBookmark, addBookmark } from './data/thunks';

 const addBookmarkLabel = (
@@ -41,11 +42,10 @@ const BookmarkButton = ({
  return (
    <StatefulButton
      variant="link"
-      className={`px-1 ml-n1 btn-sm text-primary-500 ${isProcessing && 'disabled'}`}
+      className="px-1 ml-n1 btn-sm text-primary-500"
      onClick={toggleBookmark}
      state={state}
-      aria-busy={isProcessing}
-      disabled={isProcessing}
+      disabledStates={['defaultProcessing', 'bookmarkedProcessing']}
      labels={{
        default: addBookmarkLabel,
        defaultProcessing: addBookmarkLabel,
@@ -53,10 +53,10 @@ const BookmarkButton = ({
        bookmarkedProcessing: hasBookmarkLabel,
      }}
      icons={{
-        default: <Icon src={BookmarkBorder} className="text-primary" />,
-        defaultProcessing: <Icon src={BookmarkBorder} className="text-primary" />,
-        bookmarked: <Icon src={Bookmark} className="text-primary" />,
-        bookmarkedProcessing: <Icon src={Bookmark} className="text-primary" />,
+        default: <BookmarkOutlineIcon className="text-primary" />,
+        defaultProcessing: <BookmarkOutlineIcon className="text-primary" />,
+        bookmarked: <BookmarkFilledIcon className="text-primary" />,
+        bookmarkedProcessing: <BookmarkFilledIcon className="text-primary" />,
      }}
    />
  );
--- a/src/courseware/course/bookmark/BookmarkFilledIcon.jsx
+++ b/src/courseware/course/bookmark/BookmarkFilledIcon.jsx
@@ -0,0 +1,7 @@
+import React from 'react';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faBookmark } from '@fortawesome/free-solid-svg-icons';
+
+const BookmarkFilledIcon = (props) => <FontAwesomeIcon icon={faBookmark} {...props} />;
+
+export default BookmarkFilledIcon;
--- a/src/courseware/course/bookmark/BookmarkOutlineIcon.jsx
+++ b/src/courseware/course/bookmark/BookmarkOutlineIcon.jsx
@@ -0,0 +1,7 @@
+import React from 'react';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faBookmark } from '@fortawesome/free-regular-svg-icons';
+
+const BookmarkOutlineIcon = (props) => <FontAwesomeIcon icon={faBookmark} {...props} />;
+
+export default BookmarkOutlineIcon;
--- a/src/courseware/course/bookmark/index.js
+++ b/src/courseware/course/bookmark/index.js
@@ -1 +1,3 @@
 export { default as BookmarkButton } from './BookmarkButton';
+export { default as BookmarkFilledIcon } from './BookmarkFilledIcon';
+export { default as BookmarkOutlineIcon } from './BookmarkFilledIcon';
--- a/src/courseware/course/chat/Chat.jsx
+++ b/src/courseware/course/chat/Chat.jsx
@@ -3,10 +3,9 @@ import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';

 import { Xpert } from '@edx/frontend-lib-learning-assistant';
-import { getConfig } from '@edx/frontend-platform';
 import { injectIntl } from '@edx/frontend-platform/i18n';

-import { ALLOW_UPSELL_MODES, VERIFIED_MODES } from '@src/constants';
+import { VERIFIED_MODES } from '@src/constants';
 import { useModel } from '../../../generic/model-store';

 const Chat = ({
@@ -22,48 +21,43 @@ const Chat = ({
  } = useSelector(state => state.specialExams);
  const course = useModel('coursewareMeta', courseId);

-  // If is disabled or taking an exam, we don't show the chat.
-  if (!enabled || activeAttempt?.attempt_id || exam?.id) { return null; }
-
-  // If is not staff and doesn't have an enrollment, we don't show the chat.
-  if (!isStaff && !enrollmentMode) { return null; }
-
-  const verifiedMode = VERIFIED_MODES.includes(enrollmentMode); // Enrollment verified
-  const auditMode = (
-    !isStaff
-    && !verifiedMode
-    && ALLOW_UPSELL_MODES.includes(enrollmentMode) // Can upgrade course
-    && getConfig().ENABLE_XPERT_AUDIT
+  const hasVerifiedEnrollment = (
+    enrollmentMode !== null
+    && enrollmentMode !== undefined
+    && VERIFIED_MODES.includes(enrollmentMode)
  );
-  // If user has no access, we don't show the chat.
-  if (!isStaff && !(verifiedMode || auditMode)) { return null; }

-  // Date validation
-  const {
-    accessExpiration,
-    start,
-    end,
-  } = course;
+  const validDates = () => {
+    const date = new Date();
+    const utcDate = date.toISOString();

-  const utcDate = (new Date()).toISOString();
-  const expiration = accessExpiration?.expirationDate || utcDate;
-  const validDate = (
-    (start ? start <= utcDate : true)
-    && (end ? end >= utcDate : true)
-    && (auditMode ? expiration >= utcDate : true)
+    const startDate = course.start || utcDate;
+    const endDate = course.end || utcDate;
+
+    return (
+      startDate <= utcDate
+      && utcDate <= endDate
+    );
+  };
+
+  const shouldDisplayChat = (
+    enabled
+    && (hasVerifiedEnrollment || isStaff) // display only to verified learners or staff
+    && validDates()
+    // it is necessary to check both whether the user is in an exam, and whether or not they are viewing an exam
+    // this will prevent the learner from interacting with the tool at any point of the exam flow, even at the
+    // entrance interstitial.
+    && !(activeAttempt?.attempt_id || exam?.id)
  );
-  // If date is invalid, we don't show the chat.
-  if (!validDate) { return null; }

-  // Use a portal to ensure that component overlay does not compete with learning MFE styles.
-  return createPortal(
-    <Xpert
-      courseId={courseId}
-      contentToolsEnabled={contentToolsEnabled}
-      unitId={unitId}
-      isUpgradeEligible={auditMode}
-    />,
-    document.body,
+  return (
+    <>
+      {/* Use a portal to ensure that component overlay does not compete with learning MFE styles. */}
+      {shouldDisplayChat && (createPortal(
+        <Xpert courseId={courseId} contentToolsEnabled={contentToolsEnabled} unitId={unitId} />,
+        document.body,
+      ))}
+    </>
  );
 };

--- a/src/courseware/course/chat/Chat.test.jsx
+++ b/src/courseware/course/chat/Chat.test.jsx
@@ -2,8 +2,6 @@ import { BrowserRouter } from 'react-router-dom';
 import React from 'react';
 import { Factory } from 'rosie';

-import { getConfig } from '@edx/frontend-platform';
-
 import {
  initializeMockApp,
  initializeTestStore,
@@ -30,10 +28,6 @@ jest.mock('@edx/frontend-lib-learning-assistant', () => {
  };
 });

-jest.mock('@edx/frontend-platform', () => ({
-  getConfig: jest.fn().mockReturnValue({ ENABLE_XPERT_AUDIT: false }),
-}));
-
 initializeMockApp();

 const courseId = 'course-v1:edX+DemoX+Demo_Course';
@@ -231,56 +225,4 @@ describe('Chat', () => {
    const chat = screen.queryByTestId(mockXpertTestId);
    expect(chat).toBeInTheDocument();
  });
-
-  it('displays component for audit learner if explicitly enabled', async () => {
-    getConfig.mockImplementation(() => ({ ENABLE_XPERT_AUDIT: true }));
-
-    store = await initializeTestStore({
-      courseMetadata: Factory.build('courseMetadata', {
-        access_expiration: { expiration_date: '' },
-      }),
-    });
-
-    render(
-      <BrowserRouter>
-        <Chat
-          enrollmentMode="audit"
-          isStaff={false}
-          enabled
-          courseId={courseId}
-          contentToolsEnabled={false}
-        />
-      </BrowserRouter>,
-      { store },
-    );
-
-    const chat = screen.queryByTestId(mockXpertTestId);
-    expect(chat).toBeInTheDocument();
-  });
-
-  it('does not display component for audit learner if access deadline has passed', async () => {
-    getConfig.mockImplementation(() => ({ ENABLE_XPERT_AUDIT: true }));
-
-    store = await initializeTestStore({
-      courseMetadata: Factory.build('courseMetadata', {
-        access_expiration: { expiration_date: '2014-02-03T05:00:00Z' },
-      }),
-    });
-
-    render(
-      <BrowserRouter>
-        <Chat
-          enrollmentMode="audit"
-          isStaff={false}
-          enabled
-          courseId={courseId}
-          contentToolsEnabled={false}
-        />
-      </BrowserRouter>,
-      { store },
-    );
-
-    const chat = screen.queryByTestId(mockXpertTestId);
-    expect(chat).not.toBeInTheDocument();
-  });
 });
--- a/src/courseware/course/course-exit/CourseCelebration.jsx
+++ b/src/courseware/course/course-exit/CourseCelebration.jsx
@@ -32,7 +32,7 @@ import UpgradeFootnote from './UpgradeFootnote';
 import SocialIcons from '../../social-share/SocialIcons';
 import { logClick, logVisit } from './utils';
 import { DashboardLink, IdVerificationSupportLink, ProfileLink } from '../../../shared/links';
-import CourseRecommendationsSlot from '../../../plugin-slots/CourseRecommendationsSlot';
+import CourseRecommendations from './CourseRecommendations';

 const LINKEDIN_BLUE = '#2867B2';

@@ -357,7 +357,7 @@ const CourseCelebration = ({ intl }) => {
            />
          ))}
          {footnote}
-          <CourseRecommendationsSlot variant={visitEvent} />
+          <CourseRecommendations variant={visitEvent} />
        </div>
      </div>
    </>
--- a/src/courseware/course/course-license/CourseLicense.jsx
+++ b/src/courseware/course/course-license/CourseLicense.jsx
@@ -134,9 +134,6 @@ const CourseLicense = ({
        </span>
      ))}
      {intl.formatMessage(messages['learn.course.license.creativeCommons.text'])}
-      <span className="sr-only">
-        {intl.formatMessage(messages['learn.course.license.creativeCommons.externalSite.screenreaderOnly.message'])}
-      </span>
    </a>
  );

--- a/src/courseware/course/course-license/messages.ts
+++ b/src/courseware/course/course-license/messages.ts
@@ -42,11 +42,6 @@ const messages = defineMessages({
    defaultMessage: 'Some Rights Reserved',
    description: 'License text shown when using all Creative Commons license types.',
  },
-  'learn.course.license.creativeCommons.externalSite.screenreaderOnly.message': {
-    id: 'learn.course.license.creativeCommons.externalSite.screenreaderOnly.message',
-    defaultMessage: 'external site, in a new tab',
-    description: 'Screenreader only text for external site link',
-  },
 });

 export default messages;
--- a/src/courseware/course/new-sidebar/SidebarContextProvider.tsx
+++ b/src/courseware/course/new-sidebar/SidebarContextProvider.tsx
@@ -25,9 +25,8 @@ const SidebarProvider: React.FC<Props> = ({
 }) => {
  const { verifiedMode } = useModel('courseHomeMeta', courseId);
  const topic = useModel('discussionTopics', unitId);
-  const windowWidth = useWindowSize().width ?? window.innerWidth;
-  const shouldDisplayFullScreen = windowWidth < breakpoints.large.minWidth;
-  const shouldDisplaySidebarOpen = windowWidth > breakpoints.medium.minWidth;
+  const shouldDisplayFullScreen = useWindowSize().width < breakpoints.large.minWidth;
+  const shouldDisplaySidebarOpen = useWindowSize().width > breakpoints.medium.minWidth;
  const query = new URLSearchParams(window.location.search);
  const isInitiallySidebarOpen = shouldDisplaySidebarOpen || query.get('sidebar') === 'true';
  const sidebarKey = `sidebar.${courseId}`;
--- a/src/courseware/course/new-sidebar/sidebars/discussions-notifications/DiscussionsNotificationsTrigger.tsx
+++ b/src/courseware/course/new-sidebar/sidebars/discussions-notifications/DiscussionsNotificationsTrigger.tsx
@@ -36,8 +36,6 @@ const DiscussionsNotificationsTrigger = ({ onClick }) => {
    [tabs],
  );

-  const sidebarIcon = currentSidebar === ID ? RightSidebarFilled : RightSidebarOutlined;
-
  useEffect(() => {
    if (baseUrl && edxProvider) {
      dispatch(getCourseDiscussionTopics(courseId));
@@ -83,7 +81,7 @@ const DiscussionsNotificationsTrigger = ({ onClick }) => {

  return (
    <IconButton
-      src={sidebarIcon}
+      src={currentSidebar ? RightSidebarFilled : RightSidebarOutlined}
      iconAs={Icon}
      onClick={handleClick}
      alt={intl.formatMessage(messages.openSidebarTrigger)}
--- a/src/courseware/course/sequence/Sequence.jsx
+++ b/src/courseware/course/sequence/Sequence.jsx
@@ -9,6 +9,7 @@ import {
 import { useIntl } from '@edx/frontend-platform/i18n';
 import { useSelector } from 'react-redux';
 import SequenceExamWrapper from '@edx/frontend-lib-special-exams';
+import { useToggle } from '@openedx/paragon';

 import PageLoading from '@src/generic/PageLoading';
 import { useModel } from '@src/generic/model-store';
@@ -17,13 +18,16 @@ import SequenceContainerSlot from '../../../plugin-slots/SequenceContainerSlot';

 import { getCoursewareOutlineSidebarSettings } from '../../data/selectors';
 import CourseLicense from '../course-license';
-import { NotificationsDiscussionsSidebarSlot } from '../../../plugin-slots/NotificationsDiscussionsSidebarSlot';
+import Sidebar from '../sidebar/Sidebar';
+import NewSidebar from '../new-sidebar/Sidebar';
+import {
+  Trigger as CourseOutlineTrigger,
+  Sidebar as CourseOutlineTray,
+} from '../sidebar/sidebars/course-outline';
 import messages from './messages';
 import HiddenAfterDue from './hidden-after-due';
 import { SequenceNavigation, UnitNavigation } from './sequence-navigation';
 import SequenceContent from './SequenceContent';
-import { CourseOutlineSidebarSlot } from '../../../plugin-slots/CourseOutlineSidebarSlot';
-import { CourseOutlineSidebarTriggerSlot } from '../../../plugin-slots/CourseOutlineSidebarTriggerSlot';

 const Sequence = ({
  unitId,
@@ -34,6 +38,7 @@ const Sequence = ({
  previousSequenceHandler,
 }) => {
  const intl = useIntl();
+  const [isOpen, open, close] = useToggle();
  const {
    canAccessProctoredExams,
    license,
@@ -41,9 +46,9 @@ const Sequence = ({
  const {
    isStaff,
    originalUserIsStaff,
+    isNewDiscussionSidebarViewEnabled,
  } = useModel('courseHomeMeta', courseId);
  const sequence = useModel('sequences', sequenceId);
-  const section = useModel('sections', sequence ? sequence.sectionId : null);
  const unit = useModel('units', unitId);
  const sequenceStatus = useSelector(state => state.courseware.sequenceStatus);
  const sequenceMightBeUnit = useSelector(state => state.courseware.sequenceMightBeUnit);
@@ -144,7 +149,6 @@ const Sequence = ({

  const renderUnitNavigation = (isAtTop) => (
    <UnitNavigation
-      courseId={courseId}
      sequenceId={sequenceId}
      unitId={unitId}
      isAtTop={isAtTop}
@@ -162,13 +166,8 @@ const Sequence = ({
  const defaultContent = (
    <>
      <div className="sequence-container d-inline-flex flex-row w-100">
-        <CourseOutlineSidebarTriggerSlot
-          sectionId={section ? section.id : null}
-          sequenceId={sequenceId}
-          isStaff={isStaff}
-          unitId={unitId}
-        />
-        <CourseOutlineSidebarSlot />
+        <CourseOutlineTrigger />
+        <CourseOutlineTray />
        <div className="sequence w-100">
          {!isEnabledOutlineSidebar && (
            <div className="sequence-navigation-container">
@@ -190,6 +189,9 @@ const Sequence = ({
                {...{
                  nextSequenceHandler,
                  handleNavigate,
+                  isOpen,
+                  open,
+                  close,
                }}
              />
            </div>
@@ -202,14 +204,11 @@ const Sequence = ({
              sequenceId={sequenceId}
              unitId={unitId}
              unitLoadedHandler={handleUnitLoaded}
-              isOriginalUserStaff={originalUserIsStaff}
-              isEnabledOutlineSidebar={isEnabledOutlineSidebar}
-              renderUnitNavigation={renderUnitNavigation}
            />
            {unitHasLoaded && renderUnitNavigation(false)}
          </div>
        </div>
-        <NotificationsDiscussionsSidebarSlot courseId={courseId} />
+        {isNewDiscussionSidebarViewEnabled ? <NewSidebar /> : <Sidebar />}
      </div>
      <SequenceContainerSlot courseId={courseId} unitId={unitId} />
    </>
@@ -225,6 +224,7 @@ const Sequence = ({
          originalUserIsStaff={originalUserIsStaff}
          canAccessProctoredExams={canAccessProctoredExams}
        >
+          {isEnabledOutlineSidebar && renderUnitNavigation(true)}
          {defaultContent}
        </SequenceExamWrapper>
        <CourseLicense license={license || undefined} />
--- a/src/courseware/course/sequence/SequenceContent.jsx
+++ b/src/courseware/course/sequence/SequenceContent.jsx
@@ -1,6 +1,6 @@
 import React, { Suspense, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import PageLoading from '../../../generic/PageLoading';
 import { useModel } from '../../../generic/model-store';

@@ -11,15 +11,12 @@ const ContentLock = React.lazy(() => import('./content-lock'));

 const SequenceContent = ({
  gated,
+  intl,
  courseId,
  sequenceId,
  unitId,
  unitLoadedHandler,
-  isOriginalUserStaff,
-  isEnabledOutlineSidebar,
-  renderUnitNavigation,
 }) => {
-  const intl = useIntl();
  const sequence = useModel('sequences', sequenceId);

  // Go back to the top of the page whenever the unit or sequence changes.
@@ -62,9 +59,6 @@ const SequenceContent = ({
      key={unitId}
      id={unitId}
      onLoaded={unitLoadedHandler}
-      isOriginalUserStaff={isOriginalUserStaff}
-      isEnabledOutlineSidebar={isEnabledOutlineSidebar}
-      renderUnitNavigation={renderUnitNavigation}
    />
  );
 };
@@ -75,13 +69,11 @@ SequenceContent.propTypes = {
  sequenceId: PropTypes.string.isRequired,
  unitId: PropTypes.string,
  unitLoadedHandler: PropTypes.func.isRequired,
-  isOriginalUserStaff: PropTypes.bool.isRequired,
-  isEnabledOutlineSidebar: PropTypes.bool.isRequired,
-  renderUnitNavigation: PropTypes.func.isRequired,
+  intl: intlShape.isRequired,
 };

 SequenceContent.defaultProps = {
  unitId: null,
 };

-export default SequenceContent;
+export default injectIntl(SequenceContent);
--- a/src/courseware/course/sequence/Unit/ContentIFrame.jsx
+++ b/src/courseware/course/sequence/Unit/ContentIFrame.jsx
@@ -20,7 +20,7 @@ import * as hooks from './hooks';
 * Changes to it should be vetted by them (security@edx.org).
 */
 export const IFRAME_FEATURE_POLICY = (
-  'microphone *; camera *; midi *; geolocation *; encrypted-media *; clipboard-write *; autoplay *'
+  'microphone *; camera *; midi *; geolocation *; encrypted-media *, clipboard-write *'
 );

 export const testIDs = StrictDict({
--- a/src/courseware/course/sequence/Unit/snapshots/index.test.jsx.snap
+++ b/src/courseware/course/sequence/Unit/snapshots/index.test.jsx.snap
@@ -0,0 +1,61 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Unit component output BookmarkButton props bookmarked, bookmark update pending snapshot 1`] = `
+<BookmarkButton
+  isBookmarked={true}
+  isProcessing={false}
+  unitId="unit-id"
+/>
+`;
+
+exports[`Unit component output BookmarkButton props not bookmarked, bookmark update loading snapshot 1`] = `
+<BookmarkButton
+  isBookmarked={false}
+  isProcessing={true}
+  unitId="unit-id"
+/>
+`;
+
+exports[`Unit component output snapshot: not bookmarked, do not show content 1`] = `
+<div
+  className="unit"
+>
+  <div
+    className="mb-0"
+  >
+    <h3
+      className="h3"
+    >
+      unit-title
+    </h3>
+    <UnitTitleSlot
+      courseId="test-course-id"
+      unitId="test-props-id"
+      unitTitle="unit-title"
+    />
+  </div>
+  <h2
+    className="sr-only"
+  >
+    Level 2 headings may be created by course providers in the future.
+  </h2>
+  <BookmarkButton
+    isBookmarked={false}
+    isProcessing={false}
+    unitId="unit-id"
+  />
+  <UnitSuspense
+    courseId="test-course-id"
+    id="test-props-id"
+  />
+  <ContentIFrame
+    courseId="test-course-id"
+    elementId="unit-iframe"
+    id="test-props-id"
+    loadingMessage="Loading learning sequence..."
+    onLoaded={[MockFunction props.onLoaded]}
+    shouldShowContent={true}
+    title="unit-title"
+  />
+</div>
+`;
--- a/src/courseware/course/sequence/Unit/hooks/useExamAccess.js
+++ b/src/courseware/course/sequence/Unit/hooks/useExamAccess.js
@@ -18,10 +18,9 @@ const useExamAccess = ({
  const fetchExamAccessToken = useFetchExamAccessToken();

  // NOTE: We cannot use this hook in the useEffect hook below to grab the updated exam access token in the finally
-  //       block, due to the rules of hooks. Instead, we get the value of the exam access token from a call to
-  //       the hook below.
+  //       block, due to the rules of hooks. Instead, we get the value of the exam access token from a call to the hook.
  //       When the fetchExamAccessToken call completes, the useExamAccess hook will re-run
-  //       (due to a change to the Redux store, and, thus, a change to the context), at which point the updated
+  //       (due to a change to the Redux store, and, thus, a change to the the context), at which point the updated
  //       exam access token will be fetched via the useExamAccessToken hook call below.
  //       The important detail is that there should never be a return value (false, '').
  const examAccessToken = useExamAccessToken();
@@ -36,7 +35,7 @@ const useExamAccess = ({
          logError(error);
        });
    }
-  }, [id, isExam]);
+  }, [id]);

  return {
    blockAccess,
--- a/src/courseware/course/sequence/Unit/hooks/useExamAccess.test.jsx
+++ b/src/courseware/course/sequence/Unit/hooks/useExamAccess.test.jsx
@@ -1,6 +1,5 @@
-import { useState } from 'react';
 import { logError } from '@edx/frontend-platform/logging';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@testing-library/react-hooks';
 import { useExamAccessToken, useFetchExamAccessToken, useIsExam } from '@edx/frontend-lib-special-exams';

 import { initializeMockApp } from '../../../../../setupTest';
@@ -17,27 +16,10 @@ jest.mock('@edx/frontend-lib-special-exams', () => ({

 const id = 'test-id';

-// This object allows us to manipulate the value of the accessToken.
-const testAccessToken = { curr: '' };
-
 const mockFetchExamAccessToken = jest.fn().mockImplementation(() => Promise.resolve());
 useFetchExamAccessToken.mockReturnValue(mockFetchExamAccessToken);

-const mockUseIsExam = (initialState = false) => {
-  const [isExam, setIsExam] = useState(initialState);
-
-  // This setTimeout block is intended to replicate the case where a unit is an exam, but
-  // the call to fetch exam metadata has not yet completed. That is the value of isExam starts
-  // as false and transitions to true once the call resolves.
-  if (!initialState) {
-    setTimeout(
-      () => setIsExam(true),
-      500,
-    );
-  }
-
-  return isExam;
-};
+const testAccessToken = 'test-access-token';

 describe('useExamAccess hook', () => {
  beforeAll(async () => {
@@ -46,13 +28,13 @@ describe('useExamAccess hook', () => {
  });
  beforeEach(() => {
    jest.clearAllMocks();
-    jest.useFakeTimers();
-    useExamAccessToken.mockReset();

-    useIsExam.mockImplementation(() => mockUseIsExam());
-    useExamAccessToken.mockImplementation(() => testAccessToken.curr);
+    // Mock implementations from previous test runs may not have been "consumed", so reset mock implementations.
+    useExamAccessToken.mockReset();
+    useExamAccessToken.mockReturnValueOnce('');
+    useExamAccessToken.mockReturnValueOnce(testAccessToken);
  });
-  describe('behavior', () => {
+  describe.only('behavior', () => {
    it('returns accessToken and blockAccess and doesn\'t call token API if not an exam', () => {
      const { result } = renderHook(() => useExamAccess({ id }));
      const { accessToken, blockAccess } = result.current;
@@ -61,23 +43,18 @@ describe('useExamAccess hook', () => {
      expect(blockAccess).toBe(false);
      expect(mockFetchExamAccessToken).not.toHaveBeenCalled();
    });
-    it('returns true for blockAccess if an exam but accessToken not yet fetched', async () => {
-      useIsExam.mockImplementation(() => mockUseIsExam(true));
+    it('returns true for blockAccess if an exam but accessToken not yet fetched', () => {
+      useIsExam.mockImplementation(() => (true));

-      const { result, waitForNextUpdate } = renderHook(() => useExamAccess({ id }));
+      const { result } = renderHook(() => useExamAccess({ id }));
      const { accessToken, blockAccess } = result.current;

      expect(accessToken).toEqual('');
      expect(blockAccess).toBe(true);
      expect(mockFetchExamAccessToken).toHaveBeenCalled();
-
-      // This is to get rid of the act(...) warning.
-      await act(async () => {
-        await waitForNextUpdate();
-      });
    });
    it('returns false for blockAccess if an exam and accessToken fetch succeeds', async () => {
-      useIsExam.mockImplementation(() => mockUseIsExam(true));
+      useIsExam.mockImplementation(() => (true));
      const { result, waitForNextUpdate } = renderHook(() => useExamAccess({ id }));

      // We wait for the promise to resolve and for updates to state to complete so that blockAccess is updated.
@@ -85,36 +62,12 @@ describe('useExamAccess hook', () => {

      const { accessToken, blockAccess } = result.current;

-      expect(accessToken).toEqual(testAccessToken.curr);
-      expect(blockAccess).toBe(false);
-      expect(mockFetchExamAccessToken).toHaveBeenCalled();
-    });
-    it('in progress', async () => {
-      const { result, waitForNextUpdate } = renderHook(() => useExamAccess({ id }));
-
-      let { accessToken, blockAccess } = result.current;
-
-      expect(accessToken).toEqual('');
-      expect(blockAccess).toBe(false);
-      expect(mockFetchExamAccessToken).not.toHaveBeenCalled();
-
-      testAccessToken.curr = 'test-access-token';
-
-      // The runAllTimers will update the value of isExam, and the waitForNextUpdate will
-      // wait for call to setBlockAccess in the finally clause of useEffect hook.
-      await act(async () => {
-        jest.runAllTimers();
-        await waitForNextUpdate();
-      });
-
-      ({ accessToken, blockAccess } = result.current);
-
-      expect(accessToken).toEqual('test-access-token');
+      expect(accessToken).toEqual(testAccessToken);
      expect(blockAccess).toBe(false);
      expect(mockFetchExamAccessToken).toHaveBeenCalled();
    });
    it('returns false for blockAccess if an exam and accessToken fetch fails', async () => {
-      useIsExam.mockImplementation(() => mockUseIsExam(true));
+      useIsExam.mockImplementation(() => (true));

      const testError = 'test-error';
      mockFetchExamAccessToken.mockImplementationOnce(() => Promise.reject(testError));
@@ -126,7 +79,7 @@ describe('useExamAccess hook', () => {

      const { accessToken, blockAccess } = result.current;

-      expect(accessToken).toEqual(testAccessToken.curr);
+      expect(accessToken).toEqual(testAccessToken);
      expect(blockAccess).toBe(false);
      expect(mockFetchExamAccessToken).toHaveBeenCalled();
      expect(logError).toHaveBeenCalledWith(testError);
--- a/src/courseware/course/sequence/Unit/index.jsx
+++ b/src/courseware/course/sequence/Unit/index.jsx
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import { useSearchParams, useLocation } from 'react-router-dom';
+import { useSearchParams } from 'react-router-dom';

 import { AppContext } from '@edx/frontend-platform/react';
 import { useIntl } from '@edx/frontend-platform/i18n';
@@ -8,6 +8,7 @@ import { useIntl } from '@edx/frontend-platform/i18n';
 import { useModel } from '@src/generic/model-store';
 import { usePluginsCallback } from '@src/generic/plugin-store';

+import BookmarkButton from '../../bookmark/BookmarkButton';
 import messages from '../messages';
 import ContentIFrame from './ContentIFrame';
 import UnitSuspense from './UnitSuspense';
@@ -21,19 +22,15 @@ const Unit = ({
  format,
  onLoaded,
  id,
-  isOriginalUserStaff,
-  isEnabledOutlineSidebar,
-  renderUnitNavigation,
 }) => {
  const { formatMessage } = useIntl();
  const [searchParams] = useSearchParams();
-  const { pathname } = useLocation();
  const { authenticatedUser } = React.useContext(AppContext);
  const examAccess = useExamAccess({ id });
  const shouldDisplayHonorCode = useShouldDisplayHonorCode({ courseId, id });
  const unit = useModel(modelKeys.units, id);
+  const isProcessing = unit.bookmarkedUpdateState === 'loading';
  const view = authenticatedUser ? views.student : views.public;
-  const shouldDisplayUnitPreview = pathname.startsWith('/preview') && isOriginalUserStaff;

  const getUrl = usePluginsCallback('getIFrameUrl', () => getIFrameUrl({
    id,
@@ -41,14 +38,22 @@ const Unit = ({
    format,
    examAccess,
    jumpToId: searchParams.get('jumpToId'),
-    preview: shouldDisplayUnitPreview ? '1' : '0',
  }));

  const iframeUrl = getUrl();

  return (
    <div className="unit">
-      <UnitTitleSlot unitId={id} {...{ unit, isEnabledOutlineSidebar, renderUnitNavigation }} />
+      <div className="mb-0">
+        <h3 className="h3">{unit.title}</h3>
+        <UnitTitleSlot courseId={courseId} unitId={id} unitTitle={unit.title} />
+      </div>
+      <h2 className="sr-only">{formatMessage(messages.headerPlaceholder)}</h2>
+      <BookmarkButton
+        unitId={unit.id}
+        isBookmarked={unit.bookmarked}
+        isProcessing={isProcessing}
+      />
      <UnitSuspense {...{ courseId, id }} />
      <ContentIFrame
        elementId="unit-iframe"
@@ -69,9 +74,6 @@ Unit.propTypes = {
  format: PropTypes.string,
  id: PropTypes.string.isRequired,
  onLoaded: PropTypes.func,
-  isOriginalUserStaff: PropTypes.bool.isRequired,
-  isEnabledOutlineSidebar: PropTypes.bool.isRequired,
-  renderUnitNavigation: PropTypes.func.isRequired,
 };

 Unit.defaultProps = {
--- a/src/courseware/course/sequence/Unit/index.test.jsx
+++ b/src/courseware/course/sequence/Unit/index.test.jsx
@@ -1,122 +1,205 @@
-import { MemoryRouter } from 'react-router';
-import { Factory } from 'rosie';
+import React from 'react';
+import { when } from 'jest-when';
+import { formatMessage, shallow } from '@edx/react-unit-test-utils/dist';
+import { useSearchParams } from 'react-router-dom';

-import {
-  initializeMockApp, initializeTestStore, render, screen,
-} from '../../../../setupTest';
-import { getIFrameUrl } from './urls';
-import { views } from './constants';
+import { useModel } from '@src/generic/model-store';
+
+import BookmarkButton from '../../bookmark/BookmarkButton';
+import UnitSuspense from './UnitSuspense';
+import ContentIFrame from './ContentIFrame';
 import Unit from '.';
+import messages from '../messages';
+import { getIFrameUrl } from './urls';
+import { modelKeys, views } from './constants';
+import * as hooks from './hooks';

-const defaultProps = {
+jest.mock('./hooks', () => ({ useUnitData: jest.fn() }));
+jest.mock('react-router-dom');
+
+jest.mock('@edx/frontend-platform/i18n', () => {
+  const utils = jest.requireActual('@edx/react-unit-test-utils/dist');
+  return {
+    useIntl: () => ({ formatMessage: utils.formatMessage }),
+    defineMessages: m => m,
+  };
+});
+
+jest.mock('@src/generic/PageLoading', () => 'PageLoading');
+jest.mock('../../bookmark/BookmarkButton', () => 'BookmarkButton');
+jest.mock('./ContentIFrame', () => 'ContentIFrame');
+jest.mock('./UnitSuspense', () => 'UnitSuspense');
+jest.mock('../honor-code', () => 'HonorCode');
+jest.mock('../lock-paywall', () => 'LockPaywall');
+
+jest.mock('@src/generic/model-store', () => ({
+  useModel: jest.fn(),
+}));
+
+jest.mock('react', () => ({
+  ...jest.requireActual('react'),
+  useContext: jest.fn(v => v),
+}));
+
+jest.mock('./hooks', () => ({
+  useExamAccess: jest.fn(),
+  useShouldDisplayHonorCode: jest.fn(),
+}));
+
+jest.mock('./urls', () => ({
+  getIFrameUrl: jest.fn(),
+}));
+
+const props = {
  courseId: 'test-course-id',
  format: 'test-format',
  onLoaded: jest.fn().mockName('props.onLoaded'),
-  id: 'unit-id',
-  isOriginalUserStaff: false,
-  isEnabledOutlineSidebar: false,
-  renderUnitNavigation: jest.fn(enabled => enabled && 'UnitNaviagtion'),
+  id: 'test-props-id',
 };

+const context = { authenticatedUser: { test: 'user' } };
+React.useContext.mockReturnValue(context);
+
+const examAccess = {
+  accessToken: 'test-token',
+  blockAccess: false,
+};
+hooks.useExamAccess.mockReturnValue(examAccess);
+hooks.useShouldDisplayHonorCode.mockReturnValue(false);
+
 const unit = {
  id: 'unit-id',
  title: 'unit-title',
  bookmarked: false,
  bookmarkedUpdateState: 'pending',
 };
+const mockCoursewareMetaFn = jest.fn(() => ({ wholeCourseTranslationEnabled: false }));
+const mockUnitsFn = jest.fn(() => unit);

-let store;
+when(useModel)
+  .calledWith('courseHomeMeta', props.courseId)
+  .mockImplementation(mockCoursewareMetaFn)
+  .calledWith(modelKeys.units, props.id)
+  .mockImplementation(mockUnitsFn);

-const renderComponent = (props) => {
-  render(
-    <MemoryRouter initialEntries={[{ pathname: `/course/${props.courseID}` }]}>
-      <Unit {...props} />
-    </MemoryRouter>,
-    { store, wrapWithRouter: false },
-  );
-};
+let el;
+describe('Unit component', () => {
+  const searchParams = { get: (prop) => prop };
+  const setSearchParams = jest.fn();

-initializeMockApp();
-
-async function setupStoreState() {
-  const courseMetadata = Factory.build('courseMetadata');
-  const unitBlocks = [Factory.build(
-    'block',
-    { type: 'vertical', ...unit },
-    { courseId: courseMetadata.id },
-  )];
-
-  store = await initializeTestStore({ courseMetadata, unitBlocks });
-}
-
-describe('<Unit />', () => {
-  beforeEach(async () => {
-    await setupStoreState();
+  beforeEach(() => {
+    useSearchParams.mockImplementation(() => [searchParams, setSearchParams]);
+    jest.clearAllMocks();
+    el = shallow(<Unit {...props} />);
  });
-
-  describe('unit title', () => {
-    it('has two children', () => {
-      renderComponent(defaultProps);
-      const unitTitleWrapper = screen.getByTestId('unit_title_slot').children[0];
-
-      expect(unitTitleWrapper.children).toHaveLength(3);
-    });
-
-    it('renders bookmark button', () => {
-      renderComponent(defaultProps);
-
-      expect(screen.getByText('Bookmark this page')).toBeInTheDocument();
-    });
-
-    it('does not render unit navigation buttons', () => {
-      renderComponent(defaultProps);
-
-      const nextButton = screen.queryByText('UnitNaviagtion');
-
-      expect(nextButton).toBeNull();
-    });
-
-    it('renders unit navigation buttons when isEnabledOutlineSidebar is true', () => {
-      const props = { ...defaultProps, isEnabledOutlineSidebar: true };
-      renderComponent(props);
-
-      const nextButton = screen.getByText('UnitNaviagtion');
-
-      expect(nextButton).toBeVisible();
+  describe('behavior', () => {
+    it('initializes hooks', () => {
+      expect(hooks.useShouldDisplayHonorCode).toHaveBeenCalledWith({
+        courseId: props.courseId,
+        id: props.id,
+      });
    });
  });
-
-  describe('UnitSuspense', () => {
-    it('renders loading message', () => {
-      renderComponent(defaultProps);
-
-      expect(screen.getByText('Loading', { exact: false })).toBeInTheDocument();
+  describe('output', () => {
+    let component;
+    test('snapshot: not bookmarked, do not show content', () => {
+      el = shallow(<Unit {...props} />);
+      expect(el.snapshot).toMatchSnapshot();
    });
-  });
-
-  describe('ContentIFrame', () => {
-    let iframe;
-    beforeEach(() => {
-      renderComponent(defaultProps);
-      iframe = screen.getByTestId('content-iframe-test-id');
+    describe('BookmarkButton props', () => {
+      const renderComponent = () => {
+        el = shallow(<Unit {...props} />);
+        [component] = el.instance.findByType(BookmarkButton);
+      };
+      describe('not bookmarked, bookmark update loading', () => {
+        beforeEach(() => {
+          useModel.mockReturnValueOnce({ ...unit, bookmarkedUpdateState: 'loading' });
+          renderComponent();
+        });
+        test('snapshot', () => {
+          expect(component.snapshot).toMatchSnapshot();
+        });
+        test('props', () => {
+          expect(component.props.isBookmarked).toEqual(false);
+          expect(component.props.isProcessing).toEqual(true);
+          expect(component.props.unitId).toEqual(unit.id);
+        });
+      });
+      describe('bookmarked, bookmark update pending', () => {
+        beforeEach(() => {
+          mockUnitsFn.mockReturnValueOnce({ ...unit, bookmarked: true });
+          renderComponent();
+        });
+        test('snapshot', () => {
+          expect(component.snapshot).toMatchSnapshot();
+        });
+        test('props', () => {
+          expect(component.props.isBookmarked).toEqual(true);
+          expect(component.props.isProcessing).toEqual(false);
+          expect(component.props.unitId).toEqual(unit.id);
+        });
+      });
    });
-
-    it('renders content iframe', () => {
-      expect(iframe).toBeVisible();
+    test('UnitSuspense props', () => {
+      el = shallow(<Unit {...props} />);
+      [component] = el.instance.findByType(UnitSuspense);
+      expect(component.props.courseId).toEqual(props.courseId);
+      expect(component.props.id).toEqual(props.id);
    });
-
-    it('generates correct iframeUrl', () => {
-      expect(iframe.getAttribute('src')).toEqual(getIFrameUrl({
-        id: defaultProps.id,
-        view: views.student,
-        format: defaultProps.format,
-        examAccess: {
-          accessToken: '',
-          blockAccess: false,
-        },
-        jumpToId: null,
-        preview: 0,
-      }));
+    describe('ContentIFrame props', () => {
+      const testComponentProps = () => {
+        expect(component.props.elementId).toEqual('unit-iframe');
+        expect(component.props.id).toEqual(props.id);
+        expect(component.props.loadingMessage).toEqual(formatMessage(messages.loadingSequence));
+        expect(component.props.onLoaded).toEqual(props.onLoaded);
+        expect(component.props.title).toEqual(unit.title);
+      };
+      const loadComponent = () => {
+        el = shallow(<Unit {...props} />);
+        [component] = el.instance.findByType(ContentIFrame);
+      };
+      describe('shouldShowContent', () => {
+        test('do not show content if displaying honor code', () => {
+          hooks.useShouldDisplayHonorCode.mockReturnValueOnce(true);
+          loadComponent();
+          testComponentProps();
+          expect(component.props.shouldShowContent).toEqual(false);
+        });
+        test('do not show content if examAccess is blocked', () => {
+          hooks.useExamAccess.mockReturnValueOnce({ ...examAccess, blockAccess: true });
+          loadComponent();
+          testComponentProps();
+          expect(component.props.shouldShowContent).toEqual(false);
+        });
+        test('show content if not displaying honor code or blocked by exam access', () => {
+          loadComponent();
+          testComponentProps();
+          expect(component.props.shouldShowContent).toEqual(true);
+        });
+      });
+      describe('iframeUrl', () => {
+        test('loads iframe url with student view if authenticated user', () => {
+          loadComponent();
+          testComponentProps();
+          expect(component.props.iframeUrl).toEqual(getIFrameUrl({
+            id: props.id,
+            view: views.student,
+            format: props.format,
+            examAccess,
+          }));
+        });
+        test('loads iframe url with public view if no authenticated user', () => {
+          React.useContext.mockReturnValueOnce({});
+          loadComponent();
+          testComponentProps();
+          expect(component.props.iframeUrl).toEqual(getIFrameUrl({
+            id: props.id,
+            view: views.public,
+            format: props.format,
+            examAccess,
+          }));
+        });
+      });
    });
  });
 });
--- a/src/courseware/course/sequence/Unit/urls.js
+++ b/src/courseware/course/sequence/Unit/urls.js
@@ -13,7 +13,6 @@ export const getIFrameUrl = ({
  format,
  examAccess,
  jumpToId,
-  preview,
 }) => {
  const xblockUrl = `${getConfig().LMS_BASE_URL}/xblock/${id}`;
  return stringifyUrl({
@@ -21,7 +20,6 @@ export const getIFrameUrl = ({
    query: {
      ...iframeParams,
      view,
-      preview,
      ...(format && { format }),
      ...(!examAccess.blockAccess && { exam_access: examAccess.accessToken }),
      jumpToId, // Pass jumpToId as query param as fragmentIdentifier is not passed to server.
--- a/src/courseware/course/sequence/Unit/urls.test.js
+++ b/src/courseware/course/sequence/Unit/urls.test.js
@@ -17,7 +17,6 @@ const props = {
  view: 'test-view',
  format: 'test-format',
  examAccess: { blockAccess: false, accessToken: 'test-access-token' },
-  preview: false,
 };

 describe('urls module getIFrameUrl', () => {
@@ -29,7 +28,6 @@ describe('urls module getIFrameUrl', () => {
        view: props.view,
        format: props.format,
        exam_access: props.examAccess.accessToken,
-        preview: props.preview,
      },
    });
    expect(getIFrameUrl(props)).toEqual(url);
@@ -37,12 +35,11 @@ describe('urls module getIFrameUrl', () => {
  test('no format provided, exam access blocked', () => {
    const url = stringifyUrl({
      url: `${config.LMS_BASE_URL}/xblock/${props.id}`,
-      query: { ...iframeParams, view: props.view, preview: props.preview },
+      query: { ...iframeParams, view: props.view },
    });
    expect(getIFrameUrl({
      id: props.id,
      view: props.view,
-      preview: props.preview,
      examAccess: { blockAccess: true },
    })).toEqual(url);
  });
@@ -53,7 +50,6 @@ describe('urls module getIFrameUrl', () => {
        ...iframeParams,
        view: props.view,
        format: props.format,
-        preview: props.preview,
        exam_access: props.examAccess.accessToken,
        jumpToId: 'some-xblock-id',
      },
@@ -64,20 +60,4 @@ describe('urls module getIFrameUrl', () => {
      jumpToId: 'some-xblock-id',
    })).toEqual(url);
  });
-  test('preview is true and url param equals 1', () => {
-    const url = stringifyUrl({
-      url: `${config.LMS_BASE_URL}/xblock/${props.id}`,
-      query: {
-        ...iframeParams,
-        view: props.view,
-        format: props.format,
-        preview: true,
-        exam_access: props.examAccess.accessToken,
-      },
-    });
-    expect(getIFrameUrl({
-      ...props,
-      preview: true,
-    })).toEqual(url);
-  });
 });
--- a/src/courseware/course/sequence/sequence-navigation/SequenceNavigation.jsx
+++ b/src/courseware/course/sequence/sequence-navigation/SequenceNavigation.jsx
@@ -1,7 +1,16 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
-import { breakpoints, useWindowSize } from '@openedx/paragon';
+import { breakpoints, Button, useWindowSize } from '@openedx/paragon';
+import { ChevronLeft, ChevronRight } from '@openedx/paragon/icons';
 import classNames from 'classnames';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import {
+  injectIntl,
+  intlShape,
+  isRtl,
+  getLocale,
+} from '@edx/frontend-platform/i18n';
+import { PluginSlot } from '@openedx/frontend-plugin-framework';
 import { useSelector } from 'react-redux';

 import { LOADED } from '@src/constants';
@@ -12,18 +21,21 @@ import { useSequenceNavigationMetadata } from './hooks';
 import { useModel } from '../../../../generic/model-store';

 import messages from './messages';
-import PreviousButton from './generic/PreviousButton';
-import { NextUnitTopNavTriggerSlot } from '../../../../plugin-slots/NextUnitTopNavTriggerSlot';

 const SequenceNavigation = ({
+  intl,
  unitId,
  sequenceId,
  className,
  onNavigate,
  nextHandler,
  previousHandler,
+  nextSequenceHandler,
+  handleNavigate,
+  isOpen,
+  open,
+  close,
 }) => {
-  const intl = useIntl();
  const sequence = useModel('sequences', sequenceId);
  const {
    isFirstUnit,
@@ -64,39 +76,62 @@ const SequenceNavigation = ({
    );
  };

-  const renderPreviousButton = () => navigationDisabledPrevSequence || (
-    <PreviousButton
-      variant="link"
-      buttonStyle="previous-btn"
-      onClick={previousHandler}
-      previousLink={previousLink}
-      isFirstUnit={isFirstUnit}
-      buttonLabel={shouldDisplayNotificationTriggerInSequence ? null : intl.formatMessage(messages.previousButton)}
-    />
-  );
+  const renderPreviousButton = () => {
+    const disabled = isFirstUnit;
+    const prevArrow = isRtl(getLocale()) ? ChevronRight : ChevronLeft;
+    return navigationDisabledPrevSequence || (
+      <Button
+        variant="link"
+        className="previous-btn"
+        onClick={previousHandler}
+        disabled={disabled}
+        iconBefore={prevArrow}
+        as={disabled ? undefined : Link}
+        to={disabled ? undefined : previousLink}
+      >
+        {shouldDisplayNotificationTriggerInSequence ? null : intl.formatMessage(messages.previousButton)}
+      </Button>
+    );
+  };

  const renderNextButton = () => {
-    let buttonText;
    const { exitActive, exitText } = GetCourseExitNavigation(courseId, intl);
+    const buttonText = (isLastUnit && exitText) ? exitText : intl.formatMessage(messages.nextButton);
    const disabled = isLastUnit && !exitActive;
+    const nextArrow = isRtl(getLocale()) ? ChevronLeft : ChevronRight;

-    if (isLastUnit && exitText) {
-      buttonText = exitText;
-    } else if (!shouldDisplayNotificationTriggerInSequence) {
-      buttonText = intl.formatMessage(messages.nextButton);
-    }
    return navigationDisabledNextSequence || (
-      <NextUnitTopNavTriggerSlot
-        {...{
+      <PluginSlot
+        id="next_button_slot"
+        pluginProps={{
+          courseId,
          disabled,
          buttonText,
+          nextArrow,
          nextLink,
+          shouldDisplayNotificationTriggerInSequence,
          sequenceId,
-          onClickHandler: nextHandler,
-          variant: 'link',
-          buttonStyle: 'next-btn',
+          unitId,
+          nextSequenceHandler,
+          handleNavigate,
+          isOpen,
+          open,
+          close,
+          linkComponent: Link,
        }}
-      />
+      >
+        <Button
+          variant="link"
+          className="next-btn"
+          onClick={nextHandler}
+          disabled={disabled}
+          iconAfter={nextArrow}
+          as={disabled ? undefined : Link}
+          to={disabled ? undefined : nextLink}
+        >
+          {shouldDisplayNotificationTriggerInSequence ? null : buttonText}
+        </Button>
+      </PluginSlot>
    );
  };

@@ -110,17 +145,28 @@ const SequenceNavigation = ({
 };

 SequenceNavigation.propTypes = {
+  intl: intlShape.isRequired,
  sequenceId: PropTypes.string.isRequired,
  unitId: PropTypes.string,
  className: PropTypes.string,
  onNavigate: PropTypes.func.isRequired,
  nextHandler: PropTypes.func.isRequired,
  previousHandler: PropTypes.func.isRequired,
+  close: PropTypes.func,
+  open: PropTypes.func,
+  isOpen: PropTypes.bool,
+  handleNavigate: PropTypes.func,
+  nextSequenceHandler: PropTypes.func,
 };

 SequenceNavigation.defaultProps = {
  className: null,
  unitId: null,
+  close: null,
+  open: null,
+  isOpen: false,
+  handleNavigate: null,
+  nextSequenceHandler: null,
 };

-export default SequenceNavigation;
+export default injectIntl(SequenceNavigation);
--- a/src/courseware/course/sequence/sequence-navigation/UnitButton.jsx
+++ b/src/courseware/course/sequence/sequence-navigation/UnitButton.jsx
@@ -1,13 +1,13 @@
-import { useCallback } from 'react';
-import { Link, useLocation } from 'react-router-dom';
+import React, { useCallback } from 'react';
+import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import { connect, useSelector } from 'react-redux';
 import classNames from 'classnames';
-import { Button, Icon } from '@openedx/paragon';
-import { Bookmark } from '@openedx/paragon/icons';
+import { Button } from '@openedx/paragon';

 import UnitIcon from './UnitIcon';
 import CompleteIcon from './CompleteIcon';
+import BookmarkFilledIcon from '../../bookmark/BookmarkFilledIcon';

 const UnitButton = ({
  onClick,
@@ -22,9 +22,6 @@ const UnitButton = ({
  showTitle,
 }) => {
  const { courseId, sequenceId } = useSelector(state => state.courseware);
-  const { pathname } = useLocation();
-  const basePath = `/course/${courseId}/${sequenceId}/${unitId}`;
-  const unitPath = pathname.startsWith('/preview') ? `/preview${basePath}` : basePath;

  const handleClick = useCallback(() => {
    onClick(unitId);
@@ -40,15 +37,13 @@ const UnitButton = ({
      onClick={handleClick}
      title={title}
      as={Link}
-      to={unitPath}
+      to={`/course/${courseId}/${sequenceId}/${unitId}`}
    >
      <UnitIcon type={contentType} />
      {showTitle && <span className="unit-title">{title}</span>}
      {showCompletion && complete ? <CompleteIcon size="sm" className="text-success ml-2" /> : null}
      {bookmarked ? (
-        <Icon
-          data-testid="bookmark-icon"
-          src={Bookmark}
+        <BookmarkFilledIcon
          className="text-primary small position-absolute"
          style={{ top: '-3px', right: '5px' }}
        />
--- a/src/courseware/course/sequence/sequence-navigation/UnitButton.test.jsx
+++ b/src/courseware/course/sequence/sequence-navigation/UnitButton.test.jsx
@@ -63,17 +63,17 @@ describe('Unit Button', () => {
  });

  it('does not show bookmark', () => {
-    const { queryByTestId } = render(<UnitButton {...mockData} />);
-    expect(queryByTestId('bookmark-icon')).toBeNull();
+    const { container } = render(<UnitButton {...mockData} />);
+    container.querySelectorAll('svg').forEach(icon => {
+      expect(icon).not.toHaveClass('fa-bookmark');
+    });
  });

  it('shows bookmark', () => {
    const { container } = render(<UnitButton {...mockData} unitId={bookmarkedUnit.id} />, { wrapWithRouter: true });
    const buttonIcons = container.querySelectorAll('svg');
    expect(buttonIcons).toHaveLength(3);
-
-    const bookmarkIcon = buttonIcons[2].closest('span');
-    expect(bookmarkIcon.getAttribute('data-testid')).toBe('bookmark-icon');
+    expect(buttonIcons[2]).toHaveClass('fa-bookmark');
  });

  it('handles the click', () => {
--- a/src/courseware/course/sequence/sequence-navigation/UnitNavigation.jsx
+++ b/src/courseware/course/sequence/sequence-navigation/UnitNavigation.jsx
@@ -1,40 +1,48 @@
 import classNames from 'classnames';
+import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { Button } from '@openedx/paragon';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faChevronLeft, faChevronRight } from '@fortawesome/free-solid-svg-icons';
+import {
+  injectIntl, intlShape, isRtl, getLocale,
+} from '@edx/frontend-platform/i18n';
+import { useSelector } from 'react-redux';

 import { GetCourseExitNavigation } from '../../course-exit';

+import UnitNavigationEffortEstimate from './UnitNavigationEffortEstimate';
 import { useSequenceNavigationMetadata } from './hooks';
 import messages from './messages';
-import PreviousButton from './generic/PreviousButton';
-import NextButton from './generic/NextButton';
-import { NextUnitTopNavTriggerSlot } from '../../../../plugin-slots/NextUnitTopNavTriggerSlot';

 const UnitNavigation = ({
+  intl,
  sequenceId,
  unitId,
  onClickPrevious,
  onClickNext,
  isAtTop,
-  courseId,
 }) => {
-  const intl = useIntl();
  const {
    isFirstUnit, isLastUnit, nextLink, previousLink,
  } = useSequenceNavigationMetadata(sequenceId, unitId);
+  const { courseId } = useSelector(state => state.courseware);

  const renderPreviousButton = () => {
-    const buttonStyle = `previous-button ${isAtTop ? 'text-dark mr-3' : 'justify-content-center'}`;
+    const disabled = isFirstUnit;
+    const prevArrow = isRtl(getLocale()) ? faChevronRight : faChevronLeft;
    return (
-      <PreviousButton
-        isFirstUnit={isFirstUnit}
+      <Button
        variant="outline-secondary"
-        buttonLabel={intl.formatMessage(messages.previousButton)}
-        buttonStyle={buttonStyle}
+        className="previous-button mr-sm-2 d-flex align-items-center justify-content-center"
+        disabled={disabled}
        onClick={onClickPrevious}
-        previousLink={previousLink}
-        isAtTop={isAtTop}
-      />
+        as={disabled ? undefined : Link}
+        to={disabled ? undefined : previousLink}
+      >
+        <FontAwesomeIcon icon={prevArrow} className="mr-2" size="sm" />
+        {intl.formatMessage(messages.previousButton)}
+      </Button>
    );
  };

@@ -42,45 +50,26 @@ const UnitNavigation = ({
    const { exitActive, exitText } = GetCourseExitNavigation(courseId, intl);
    const buttonText = (isLastUnit && exitText) ? exitText : intl.formatMessage(messages.nextButton);
    const disabled = isLastUnit && !exitActive;
-    const variant = 'outline-primary';
-    const buttonStyle = `next-button ${isAtTop ? 'text-dark' : 'justify-content-center'}`;
-
-    if (isAtTop) {
-      return (
-        <NextUnitTopNavTriggerSlot
-          {...{
-            variant,
-            buttonStyle,
-            buttonText,
-            disabled,
-            sequenceId,
-            nextLink,
-            onClickHandler: onClickNext,
-            isAtTop,
-          }}
-        />
-      );
-    }
-
+    const nextArrow = isRtl(getLocale()) ? faChevronLeft : faChevronRight;
    return (
-      <NextButton
-        variant={variant}
-        buttonStyle={buttonStyle}
-        onClickHandler={onClickNext}
+      <Button
+        variant="outline-primary"
+        className="next-button d-flex align-items-center justify-content-center"
+        onClick={onClickNext}
        disabled={disabled}
-        buttonText={buttonText}
-        nextLink={nextLink}
-        hasEffortEstimate
-      />
+        as={disabled ? undefined : Link}
+        to={disabled ? undefined : nextLink}
+      >
+        <UnitNavigationEffortEstimate sequenceId={sequenceId} unitId={unitId}>
+          {buttonText}
+        </UnitNavigationEffortEstimate>
+        <FontAwesomeIcon icon={nextArrow} className="ml-2" size="sm" />
+      </Button>
    );
  };

  return (
-    <div className={classNames('d-flex', {
-      'unit-navigation': !isAtTop,
-      'top-unit-navigation': isAtTop,
-    })}
-    >
+    <div className={classNames('unit-navigation d-flex', { 'top-unit-navigation mb-3 w-100': isAtTop })}>
      {renderPreviousButton()}
      {renderNextButton()}
    </div>
@@ -88,7 +77,7 @@ const UnitNavigation = ({
 };

 UnitNavigation.propTypes = {
-  courseId: PropTypes.string.isRequired,
+  intl: intlShape.isRequired,
  sequenceId: PropTypes.string.isRequired,
  unitId: PropTypes.string,
  onClickPrevious: PropTypes.func.isRequired,
@@ -101,4 +90,4 @@ UnitNavigation.defaultProps = {
  isAtTop: false,
 };

-export default UnitNavigation;
+export default injectIntl(UnitNavigation);
--- a/src/courseware/course/sequence/sequence-navigation/UnitNavigation.test.jsx
+++ b/src/courseware/course/sequence/sequence-navigation/UnitNavigation.test.jsx
@@ -5,13 +5,6 @@ import {
 } from '../../../../setupTest';
 import UnitNavigation from './UnitNavigation';

-const mockNavigate = jest.fn();
-
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useNavigate: () => mockNavigate,
-}));
-
 describe('Unit Navigation', () => {
  let mockData;
  const courseMetadata = Factory.build('courseMetadata');
@@ -25,7 +18,6 @@ describe('Unit Navigation', () => {
    const store = await initializeTestStore({ courseMetadata, unitBlocks });
    const { courseware } = store.getState();
    mockData = {
-      courseId: courseware.courseId,
      unitId: unitBlocks[1].id,
      sequenceId: courseware.sequenceId,
      onClickPrevious: () => {},
@@ -63,26 +55,6 @@ describe('Unit Navigation', () => {
    expect(onClickNext).toHaveBeenCalledTimes(1);
  });

-  it('when clicked it calls navigate when is at the top', () => {
-    const onClickPrevious = jest.fn();
-    const onClickNext = jest.fn();
-
-    render(<UnitNavigation
-      {...mockData}
-      onClickPrevious={onClickPrevious}
-      onClickNext={onClickNext}
-      isAtTop
-    />, { wrapWithRouter: true });
-
-    fireEvent.click(screen.getByRole('button', { name: /previous/i }));
-    expect(onClickPrevious).toHaveBeenCalledTimes(1);
-    expect(mockNavigate).toHaveBeenCalledTimes(1);
-
-    fireEvent.click(screen.getByRole('button', { name: /next/i }));
-    expect(onClickNext).toHaveBeenCalledTimes(1);
-    expect(mockNavigate).toHaveBeenCalledTimes(2);
-  });
-
  it('has the navigation buttons enabled for the non-corner unit in the sequence', () => {
    render(<UnitNavigation {...mockData} />, { wrapWithRouter: true });

--- a/src/courseware/course/sequence/sequence-navigation/generic/NextButton.jsx
+++ b/src/courseware/course/sequence/sequence-navigation/generic/NextButton.jsx
@@ -1,91 +0,0 @@
-import PropTypes from 'prop-types';
-import { Link, useLocation, useNavigate } from 'react-router-dom';
-import { Button, IconButton, Icon } from '@openedx/paragon';
-import {
-  ArrowBack,
-  ArrowForward,
-  ChevronLeft,
-  ChevronRight,
-} from '@openedx/paragon/icons';
-import { isRtl, getLocale } from '@edx/frontend-platform/i18n';
-
-import UnitNavigationEffortEstimate from '../UnitNavigationEffortEstimate';
-
-const NextButton = ({
-  onClickHandler,
-  buttonText,
-  nextLink,
-  variant,
-  buttonStyle,
-  disabled,
-  hasEffortEstimate,
-  isAtTop,
-}) => {
-  const navigate = useNavigate();
-  const { pathname } = useLocation();
-  const navLink = pathname.startsWith('/preview') ? `/preview${nextLink}` : nextLink;
-  const buttonContent = hasEffortEstimate ? (
-    <UnitNavigationEffortEstimate>
-      {buttonText}
-    </UnitNavigationEffortEstimate>
-  ) : buttonText;
-
-  const getNextArrow = () => {
-    if (isAtTop) {
-      return isRtl(getLocale()) ? ArrowBack : ArrowForward;
-    }
-    return isRtl(getLocale()) ? ChevronLeft : ChevronRight;
-  };
-
-  const nextArrow = getNextArrow();
-
-  const onClick = () => {
-    navigate(navLink);
-    onClickHandler();
-  };
-
-  if (isAtTop) {
-    return (
-      <IconButton
-        variant="light"
-        className={buttonStyle}
-        onClick={onClick}
-        src={nextArrow}
-        disabled={disabled}
-        iconAs={Icon}
-        alt={buttonText}
-      />
-    );
-  }
-
-  return (
-    <Button
-      variant={variant}
-      className={buttonStyle}
-      disabled={disabled}
-      onClick={onClickHandler}
-      as={disabled ? undefined : Link}
-      to={disabled ? undefined : navLink}
-      iconAfter={nextArrow}
-    >
-      {buttonContent}
-    </Button>
-  );
-};
-
-NextButton.defaultProps = {
-  hasEffortEstimate: false,
-};
-
-NextButton.propTypes = {
-  onClickHandler: PropTypes.func.isRequired,
-  buttonText: PropTypes.string.isRequired,
-  nextLink: PropTypes.string.isRequired,
-  variant: PropTypes.string.isRequired,
-  buttonStyle: PropTypes.string.isRequired,
-  disabled: PropTypes.bool.isRequired,
-  hasEffortEstimate: PropTypes.bool,
-  isAtTop: PropTypes.bool.isRequired,
-};
-
-export default NextButton;
--- a/Show More
+++ b/Show More