From be7bf19b6923660c031a8a894bcbbdc5db61b5f6 Mon Sep 17 00:00:00 2001
From: Raza Dar <5585262+mrazadar@users.noreply.github.com>
Date: Thu, 22 Jun 2023 19:03:36 +0500
Subject: [PATCH] refactor: updated SUBSCRIPTION_LEGAL_URL with
 LEARNER_SUPPORT_URL

---
 .env                                                    | 2 +-
 .env.development                                        | 2 +-
 .env.development-stage                                  | 2 +-
 .env.test                                               | 2 +-
 src/index.jsx                                           | 2 +-
 src/subscription/checkout/SubscriptionCheckout.test.jsx | 2 ++
 src/subscription/details/legal/SubscriptionLegal.jsx    | 2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index 5d1739c14..93a7bcef5 100644
--- a/.env
+++ b/.env
@@ -38,4 +38,4 @@ STRIPE_RESPONSE_URL=null
 STRIPE_DEFERRED_INTENT_BETA_FLAG=elements_enable_deferred_intent_beta_1
 SUBSCRIPTIONS_BASE_URL=null
 ENABLE_B2C_SUBSCRIPTIONS=false
-SUBSCRIPTIONS_LEGAL_SUPPORT_URL=null
+LEARNER_SUPPORT_URL=null
diff --git a/.env.development b/.env.development
index 48521128a..9af052f4c 100644
--- a/.env.development
+++ b/.env.development
@@ -36,4 +36,4 @@ STRIPE_RESPONSE_URL=http://localhost:18130/payment/stripe/checkout/
 STRIPE_DEFERRED_INTENT_BETA_FLAG=elements_enable_deferred_intent_beta_1
 SUBSCRIPTIONS_BASE_URL='http://localhost:18750'
 ENABLE_B2C_SUBSCRIPTIONS=true
-SUBSCRIPTIONS_LEGAL_SUPPORT_URL=https://support.edx.org/hc/en-us/articles/12975352138007
+LEARNER_SUPPORT_URL=https://support.edx.org/hc/articles/12975352138007
diff --git a/.env.development-stage b/.env.development-stage
index 56aea982e..bf44dea4c 100644
--- a/.env.development-stage
+++ b/.env.development-stage
@@ -36,4 +36,4 @@ STRIPE_RESPONSE_URL=http://localhost:18130/payment/stripe/checkout/
 STRIPE_DEFERRED_INTENT_BETA_FLAG=elements_enable_deferred_intent_beta_1
 SUBSCRIPTIONS_BASE_URL='http://localhost:18750'
 ENABLE_B2C_SUBSCRIPTIONS=false
-SUBSCRIPTIONS_LEGAL_SUPPORT_URL=https://support.edx.org/hc/en-us/articles/12975352138007
+LEARNER_SUPPORT_URL=https://support.edx.org/hc/articles/12975352138007
diff --git a/.env.test b/.env.test
index 62faf58ca..38821ce27 100644
--- a/.env.test
+++ b/.env.test
@@ -36,4 +36,4 @@ STRIPE_RESPONSE_URL=http://localhost:18130/payment/stripe/checkout/
 STRIPE_DEFERRED_INTENT_BETA_FLAG=elements_enable_deferred_intent_beta_1
 SUBSCRIPTIONS_BASE_URL='http://localhost:18750'
 ENABLE_B2C_SUBSCRIPTIONS=false
-SUBSCRIPTIONS_LEGAL_SUPPORT_URL=https://support.edx.org/hc/en-us/articles/12975352138007
+LEARNER_SUPPORT_URL=https://support.edx.org/hc/articles/12975352138007
diff --git a/src/index.jsx b/src/index.jsx
index f6a259ff1..41c4b1b8c 100755
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -70,7 +70,7 @@ mergeConfig({
   STRIPE_DEFERRED_INTENT_BETA_FLAG: process.env.STRIPE_DEFERRED_INTENT_BETA_FLAG,
   SUBSCRIPTIONS_BASE_URL: process.env.SUBSCRIPTIONS_BASE_URL,
   ENABLE_B2C_SUBSCRIPTIONS: process.env.ENABLE_B2C_SUBSCRIPTIONS,
-  SUBSCRIPTIONS_LEGAL_SUPPORT_URL: process.env.SUBSCRIPTIONS_LEGAL_SUPPORT_URL,
+  LEARNER_SUPPORT_URL: process.env.LEARNER_SUPPORT_URL,
 });
 
 subscribe(APP_READY, () => {
diff --git a/src/subscription/checkout/SubscriptionCheckout.test.jsx b/src/subscription/checkout/SubscriptionCheckout.test.jsx
index 7089a580c..bcba61c38 100644
--- a/src/subscription/checkout/SubscriptionCheckout.test.jsx
+++ b/src/subscription/checkout/SubscriptionCheckout.test.jsx
@@ -89,5 +89,7 @@ describe('<SubscriptionCheckout />', () => {
 
     // verify that Checkout Form fields are present in the DOM
     expect(screen.queryByText('Last Name (required)')).toBeDefined();
+    expect(screen.queryByLabelText('City')).toBeDefined();
+    expect(screen.queryByLabelText('Country')).toBeDefined();
   });
 });
diff --git a/src/subscription/details/legal/SubscriptionLegal.jsx b/src/subscription/details/legal/SubscriptionLegal.jsx
index ec1d513fd..32e8b287d 100644
--- a/src/subscription/details/legal/SubscriptionLegal.jsx
+++ b/src/subscription/details/legal/SubscriptionLegal.jsx
@@ -15,7 +15,7 @@ const SubscriptionLegal = ({
   const intl = useIntl();
   const supportLink = (
     <Hyperlink
-      destination={getConfig().SUBSCRIPTIONS_LEGAL_SUPPORT_URL}
+      destination={getConfig().LEARNER_SUPPORT_URL}
     >
       {intl.formatMessage(messages['subscription.details.order.legal.link'])}
     </Hyperlink>