From ea5c7f516aa1be7939a75957120f92487b7793c2 Mon Sep 17 00:00:00 2001
From: Michael Terry <mterry@edx.org>
Date: Mon, 25 Oct 2021 10:24:23 -0400
Subject: [PATCH] fix: Revert "fix: disable the call to ecommerce for now
 (#701)" (#706)

This reverts commit f93519f6756eb7e3adc020b3831ee2e3d4b0ab1f.

The original fix may have been working after all and a bogus
test by me using a staff account made me think the discount was
not being offered. Reverting the emergency fix and going to test
the original fix again.
---
 .../streak-celebration/StreakCelebrationModal.jsx | 15 ++-------------
 .../StreakCelebrationModal.test.jsx               |  8 +-------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/shared/streak-celebration/StreakCelebrationModal.jsx b/src/shared/streak-celebration/StreakCelebrationModal.jsx
index 0e3a267b..ec203bc1 100644
--- a/src/shared/streak-celebration/StreakCelebrationModal.jsx
+++ b/src/shared/streak-celebration/StreakCelebrationModal.jsx
@@ -1,8 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-// import { camelCaseObject, getConfig } from '@edx/frontend-platform';
+import { camelCaseObject, getConfig } from '@edx/frontend-platform';
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
-// import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
+import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import {
   FormattedMessage, injectIntl, intlShape,
 } from '@edx/frontend-platform/i18n';
@@ -44,14 +44,12 @@ function getRandomFactoid(intl, streakLength) {
   return factoids[Math.floor(Math.random() * (factoids.length))];
 }
 
-/*
 async function calculateVoucherDiscount(voucher, sku, username) {
   const urlBase = `${getConfig().ECOMMERCE_BASE_URL}/api/v2/baskets/calculate`;
   const url = `${urlBase}/?code=${voucher}&sku=${sku}&username=${username}`;
   return getAuthenticatedHttpClient().get(url)
     .then(res => camelCaseObject(res));
 }
-*/
 
 function StreakModal({
   courseId, metadataModel, streakLengthToCelebrate, intl, isStreakCelebrationOpen,
@@ -88,7 +86,6 @@ function StreakModal({
 
   // Ask ecommerce to calculate discount savings
   useEffect(() => {
-    /*
     if (streakDiscountCouponEnabled && verifiedMode && getConfig().ECOMMERCE_BASE_URL) {
       calculateVoucherDiscount(discountCode, verifiedMode.sku, username)
         .then(
@@ -113,14 +110,6 @@ function StreakModal({
             setDiscountPercent(0);
           },
         );
-   */
-    // TEMPORARY code to bypass the above call-to-ecom feature since it didn't work as expected in prod
-    if (streakDiscountCouponEnabled && verifiedMode) {
-      setDiscountPercent(0.15);
-      sendTrackEvent('edx.bi.course.streak_discount_enabled', {
-        course_id: courseId,
-        sku: verifiedMode.sku,
-      });
     } else {
       setDiscountPercent(0);
     }
diff --git a/src/shared/streak-celebration/StreakCelebrationModal.test.jsx b/src/shared/streak-celebration/StreakCelebrationModal.test.jsx
index cf884062..bfabfa18 100644
--- a/src/shared/streak-celebration/StreakCelebrationModal.test.jsx
+++ b/src/shared/streak-celebration/StreakCelebrationModal.test.jsx
@@ -32,12 +32,10 @@ describe('Loaded Tab Page', () => {
     });
   }
 
-  /*
   function setDiscountError() {
     mockData.streakDiscountCouponEnabled = true;
     axiosMock.onGet(calculateUrl).reply(500);
   }
-  */
 
   async function renderModal() {
     await act(async () => render(<StreakModal {...mockData} />, { store: testStore }));
@@ -70,8 +68,6 @@ describe('Loaded Tab Page', () => {
     });
   });
 
-  // TEMPORARY disable these tests until we can debug why this feature doesn't work
-  /*
   it('shows normal streak celebration modal when discount call fails', async () => {
     setDiscountError();
     await renderModal();
@@ -87,7 +83,6 @@ describe('Loaded Tab Page', () => {
     // This text is only for the non-discount case
     expect(screen.getByText('Keep it up')).toBeInTheDocument();
   });
-  */
 
   it('shows discount version of streak celebration modal when available', async () => {
     Object.defineProperty(window, 'matchMedia', {
@@ -110,8 +105,7 @@ describe('Loaded Tab Page', () => {
     await renderModal();
 
     const endDateText = `Ends ${new Date(Date.now() + 14 * 24 * 60 * 60 * 1000).toLocaleDateString({ timeZone: 'UTC' })}.`;
-    // TEMPORARY set this discount back to 14 once we fix this feature
-    expect(screen.getByText('You’ve unlocked a 15% off discount when you upgrade this course for a limited time only.')).toBeInTheDocument();
+    expect(screen.getByText('You’ve unlocked a 14% off discount when you upgrade this course for a limited time only.')).toBeInTheDocument();
     expect(screen.getByText(endDateText)).toBeInTheDocument();
     expect(screen.getByText('Continue with course')).toBeInTheDocument();
     expect(screen.queryByText('Keep it up')).not.toBeInTheDocument();