Merge branch 'master' into mfrank/sync-local-translations

Author: MaxFrank13

.env

@@ -37,7 +37,6 @@ HOTJAR_VERSION='6'
 HOTJAR_DEBUG=''
 ACCOUNT_SETTINGS_URL=''
 ACCOUNT_PROFILE_URL=''
-ENABLE_NOTICES=''
 CAREER_LINK_URL=''
 ENABLE_EDX_PERSONAL_DASHBOARD=false
 ENABLE_PROGRAMS=false

.env.development

@@ -43,7 +43,6 @@ HOTJAR_VERSION='6'
 HOTJAR_DEBUG=''
 ACCOUNT_SETTINGS_URL='http://localhost:1997'
 ACCOUNT_PROFILE_URL='http://localhost:1995'
-ENABLE_NOTICES=''
 CAREER_LINK_URL=''
 ENABLE_EDX_PERSONAL_DASHBOARD=false
 ENABLE_PROGRAMS=false

.env.test

@@ -42,7 +42,6 @@ HOTJAR_VERSION='6'
 HOTJAR_DEBUG=''
 ACCOUNT_SETTINGS_URL='http://account-settings-url.test'
 ACCOUNT_PROFILE_URL='http://account-profile-url.test'
-ENABLE_NOTICES=''
 CAREER_LINK_URL=''
 ENABLE_EDX_PERSONAL_DASHBOARD=true
 ENABLE_PROGRAMS=false

example.env.config.js

@@ -67,7 +67,6 @@ module.exports = {
   NEW_RELIC_LICENSE_KEY: '',
   ACCOUNT_SETTINGS_URL: 'http://localhost:1997',
   ACCOUNT_PROFILE_URL: 'http://localhost:1995',
-  ENABLE_NOTICES: '',
   CAREER_LINK_URL: '',
   EXPERIMENT_08_23_VAN_PAINTED_DOOR: true,
 };

package-lock.json

@@ -31,7 +31,7 @@
   "dependencies": {
     "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
     "@edx/frontend-component-footer": "^14.6.0",
-    "@edx/frontend-component-header": "^6.6.0",
+    "@edx/frontend-component-header": "^8.0.0",
     "@edx/frontend-enterprise-hotjar": "7.2.0",
     "@edx/frontend-platform": "^8.3.1",
     "@edx/openedx-atlas": "^0.7.0",
@@ -56,7 +56,7 @@
     "react-helmet": "^6.1.0",
     "react-intl": "6.8.9",
     "react-redux": "^7.2.4",
-    "react-router-dom": "6.30.1",
+    "react-router-dom": "6.30.2",
     "react-share": "^4.4.0",
     "redux": "4.2.1",
     "redux-logger": "3.0.6",