fix: don't throw an error when there is no verified mode (openedx#444)

AA-759
chandrudev · May 11, 2021 · 6fa6de4 · 6fa6de4
1 parent d0bcb19
commit 6fa6de4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/src/shared/streak-celebration/StreakCelebrationModal.jsx b/src/shared/streak-celebration/StreakCelebrationModal.jsx
@@ -45,6 +45,9 @@ function StreakModal({
   courseId, metadataModel, streakLengthToCelebrate, intl, isStreakCelebrationOpen,
   closeStreakCelebration, AA759ExperimentEnabled, verifiedMode, ...rest
 }) {
+  if (!isStreakCelebrationOpen) {
+    return null;
+  }
   const { org, celebrations } = useModel(metadataModel, courseId);
   const factoid = getRandomFactoid(intl, streakLengthToCelebrate);
   // eslint-disable-next-line no-unused-vars
@@ -74,18 +77,24 @@ function StreakModal({
     );
   }
 
-  const upgradeUrl = `${verifiedMode.upgradeUrl}&code=3DayStreak`;
-  const mode = {
-    currencySymbol: verifiedMode.currencySymbol,
-    price: verifiedMode.price,
-    upgradeUrl,
-  };
+  let upgradeUrl;
+  let mode;
+  let offer;
+
+  if (verifiedMode) {
+    upgradeUrl = `${verifiedMode.upgradeUrl}&code=3DayStreak`;
+    mode = {
+      currencySymbol: verifiedMode.currencySymbol,
+      price: verifiedMode.price,
+      upgradeUrl,
+    };
 
-  const offer = {
-    discountedPrice: (mode.price * 0.85).toFixed(2).toString(),
-    originalPrice: mode.price.toString(),
-    upgradeUrl: mode.upgradeUrl,
-  };
+    offer = {
+      discountedPrice: (mode.price * 0.85).toFixed(2).toString(),
+      originalPrice: mode.price.toString(),
+      upgradeUrl: mode.upgradeUrl,
+    };
+  }
 
   const title = `${streakLengthToCelebrate} ${intl.formatMessage(messages.streakHeader)}`;
 

diff --git a/src/tab-page/LoadedTabPage.jsx b/src/tab-page/LoadedTabPage.jsx
@@ -28,6 +28,7 @@ function LoadedTabPage({
     title,
     celebrations,
     canViewLegacyCourseware,
+    verifiedMode,
   } = useModel(metadataModel, courseId);
 
   // Logistration and enrollment alerts are only really used for the outline tab, but loaded here to put them above
@@ -38,11 +39,9 @@ function LoadedTabPage({
   const activeTab = tabs.filter(tab => tab.slug === activeTabSlug)[0];
 
   const streakLengthToCelebrate = celebrations && celebrations.streakLengthToCelebrate;
-  const AA759ExperimentEnabled = celebrations && celebrations.streakDiscountExperimentEnabled;
+  const AA759ExperimentEnabled = celebrations && celebrations.streakDiscountExperimentEnabled && verifiedMode;
   const [isStreakCelebrationOpen,, closeStreakCelebration] = useToggle(streakLengthToCelebrate);
 
-  const { verifiedMode } = useModel(metadataModel, courseId);
-
   return (
     <>
       <Helmet>