Merge branch 'master' into abdullahwaheed/react-intl-to-formatjs

openedx · Oct 23, 2023 · a98fd50 · a98fd50
2 parents 7375c8f + fd57523
commit a98fd50
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,11 +26,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@edx/brand": "npm:@edx/brand-edx.org@^2.0.3",
+    "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
     "@edx/browserslist-config": "^1.1.0",
     "@edx/frontend-component-footer": "^12.2.1",
     "@edx/frontend-enterprise-hotjar": "^2.0.0",
-    "@edx/frontend-platform": "^5.1.0",
+    "@edx/frontend-platform": "^5.5.4",
     "@edx/paragon": "^20.44.0",
     "@edx/react-unit-test-utils": "^1.7.0",
     "@fortawesome/fontawesome-svg-core": "^1.2.36",

diff --git a/src/config/index.js b/src/config/index.js
@@ -16,6 +16,7 @@ const configuration = {
   SUPPORT_URL: process.env.SUPPORT_URL || null,
   ENABLE_NOTICES: process.env.ENABLE_NOTICES || null,
   CAREER_LINK_URL: process.env.CAREER_LINK_URL || null,
+  LOGO_URL: process.env.LOGO_URL,
 };
 
 const features = {};

diff --git a/src/containers/LearnerDashboardHeader/BrandLogo.jsx b/src/containers/LearnerDashboardHeader/BrandLogo.jsx
@@ -3,6 +3,7 @@ import React from 'react';
 import { useIntl } from '@edx/frontend-platform/i18n';
 
 import { reduxHooks } from 'hooks';
+import { configuration } from '../../config';
 
 import messages from './messages';
 
@@ -14,7 +15,7 @@ export const BrandLogo = () => {
     <a href={dashboard?.url || '/'} className="mx-auto">
       <img
         className="logo py-3"
-        src="https://edx-cdn.org/v3/prod/logo.svg"
+        src={configuration.LOGO_URL}
         alt={formatMessage(messages.logoAltText)}
       />
     </a>

diff --git a/src/containers/LearnerDashboardHeader/__snapshots__/BrandLogo.test.jsx.snap b/src/containers/LearnerDashboardHeader/__snapshots__/BrandLogo.test.jsx.snap
@@ -8,7 +8,7 @@ exports[`BrandLogo dashboard defined 1`] = `
   <img
     alt="edX, Inc. Dashboard"
     className="logo py-3"
-    src="https://edx-cdn.org/v3/prod/logo.svg"
+    src="https://edx-cdn.org/v3/default/logo.svg"
   />
 </a>
 `;
@@ -21,7 +21,7 @@ exports[`BrandLogo dashboard undefined 1`] = `
   <img
     alt="edX, Inc. Dashboard"
     className="logo py-3"
-    src="https://edx-cdn.org/v3/prod/logo.svg"
+    src="https://edx-cdn.org/v3/default/logo.svg"
   />
 </a>
 `;
diff --git a/src/i18n/messages/ar.json b/src/i18n/messages/ar.json
@@ -19,7 +19,7 @@
   "learnerVariantDashboard.menu.profile.label": "الملف الشخصي",
   "learnerVariantDashboard.menu.viewPrograms.label": "عرض البرامج",
   "learnerVariantDashboard.menu.account.label": "الحساب",
-  "learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Orders & Subscriptions",
+  "learnerVariantDashboard.menu.orderHistory.label": "Order History",
   "learnerVariantDashboard.menu.signOut.label": "تسجيل الخروج",
   "learnerVariantDashboard.course": "المساقات",
   "learnerVariantDashboard.program": "البرامج",

diff --git a/src/i18n/messages/es_419.json b/src/i18n/messages/es_419.json
@@ -19,7 +19,7 @@
   "learnerVariantDashboard.menu.profile.label": "Perfil",
   "learnerVariantDashboard.menu.viewPrograms.label": "Ver programas",
   "learnerVariantDashboard.menu.account.label": "Cuenta",
-  "learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Pedidos y Subscripciones",
+  "learnerVariantDashboard.menu.orderHistory.label": "Historial de órdenes",
   "learnerVariantDashboard.menu.signOut.label": "Cerrar sesión",
   "learnerVariantDashboard.course": "cursos",
   "learnerVariantDashboard.program": "Programas",

diff --git a/src/i18n/messages/fr.json b/src/i18n/messages/fr.json
@@ -19,7 +19,7 @@
   "learnerVariantDashboard.menu.profile.label": "Profil",
   "learnerVariantDashboard.menu.viewPrograms.label": "Voir les programmes",
   "learnerVariantDashboard.menu.account.label": "Compte",
-  "learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Orders & Subscriptions",
+  "learnerVariantDashboard.menu.orderHistory.label": "Order History",
   "learnerVariantDashboard.menu.signOut.label": "Se déconnecter",
   "learnerVariantDashboard.course": "Cours",
   "learnerVariantDashboard.program": "Programmes",

diff --git a/src/i18n/messages/fr_CA.json b/src/i18n/messages/fr_CA.json
@@ -19,7 +19,7 @@
   "learnerVariantDashboard.menu.profile.label": "Profil",
   "learnerVariantDashboard.menu.viewPrograms.label": "Voir les programmes",
   "learnerVariantDashboard.menu.account.label": "Compte",
-  "learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Commandes et abonnements",
+  "learnerVariantDashboard.menu.orderHistory.label": "Historique des commandes",
   "learnerVariantDashboard.menu.signOut.label": "Se déconnecter",
   "learnerVariantDashboard.course": "Cours",
   "learnerVariantDashboard.program": "Programmes",

diff --git a/src/i18n/messages/pt_BR.json b/src/i18n/messages/pt_BR.json
@@ -19,7 +19,7 @@
   "learnerVariantDashboard.menu.profile.label": "Perfil",
   "learnerVariantDashboard.menu.viewPrograms.label": "View Programs",
   "learnerVariantDashboard.menu.account.label": "Conta",
-  "learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Orders & Subscriptions",
+  "learnerVariantDashboard.menu.orderHistory.label": "Order History",
   "learnerVariantDashboard.menu.signOut.label": "Sair",
   "learnerVariantDashboard.course": "Cursos",
   "learnerVariantDashboard.program": "Programas",

diff --git a/src/i18n/messages/zh_CN.json b/src/i18n/messages/zh_CN.json
@@ -19,7 +19,7 @@
   "learnerVariantDashboard.menu.profile.label": "Profile",
   "learnerVariantDashboard.menu.viewPrograms.label": "View Programs",
   "learnerVariantDashboard.menu.account.label": "Account",
-  "learnerVariantDashboard.menu.ordersAndSubscriptions.label": "Orders & Subscriptions",
+  "learnerVariantDashboard.menu.orderHistory.label": "Order History",
   "learnerVariantDashboard.menu.signOut.label": "Sign Out",
   "learnerVariantDashboard.course": "Courses",
   "learnerVariantDashboard.program": "Programs",