From 955cf2686015b61a4ba70bc0f5f6b0dd389f00c9 Mon Sep 17 00:00:00 2001
From: Attiya Ishaque <atiya.ishaq@arbisoft.com>
Date: Wed, 20 Oct 2021 15:40:27 +0500
Subject: [PATCH] feat: [VAN-655] User's year of birth field behind the feature
 flag (#449)

---
 .env.development                       |  1 +
 src/welcome/WelcomePage.jsx            | 29 ++++++++++++++------------
 src/welcome/tests/WelcomePage.test.jsx |  4 +++-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.env.development b/.env.development
index 2feb7f77..98e396ab 100644
--- a/.env.development
+++ b/.env.development
@@ -30,3 +30,4 @@ WELCOME_PAGE_SUPPORT_LINK='http://localhost:1999/welcome'
 INFO_EMAIL='info@edx.org'
 DISABLE_ENTERPRISE_LOGIN=''
 REGISTER_CONVERSION_COOKIE_NAME='openedx-user-register-conversion'
+COLLECT_YEAR_OF_BIRTH='true'
diff --git a/src/welcome/WelcomePage.jsx b/src/welcome/WelcomePage.jsx
index 9ec7ff3a..f8218c46 100644
--- a/src/welcome/WelcomePage.jsx
+++ b/src/welcome/WelcomePage.jsx
@@ -170,19 +170,22 @@ const WelcomePage = (props) => {
                 {getOptions('levelOfEducation')}
               </Form.Control>
             </Form.Group>
-            <Form.Group controlId="yearOfBirth">
-              <Form.Control
-                as="select"
-                name="yearOfBirth"
-                value={values.yearOfBirth}
-                onChange={(e) => onChangeHandler(e)}
-                trailingElement={<Icon src={ExpandMore} />}
-                floatingLabel={intl.formatMessage(messages['year.of.birth.label'])}
-              >
-                <option value="">{intl.formatMessage(messages['year.of.birth.label'])}</option>
-                {getOptions('yearOfBirth')}
-              </Form.Control>
-            </Form.Group>
+            {(getConfig().COLLECT_YEAR_OF_BIRTH === 'true')
+              && (
+                <Form.Group controlId="yearOfBirth">
+                  <Form.Control
+                    as="select"
+                    name="yearOfBirth"
+                    value={values.yearOfBirth}
+                    onChange={(e) => onChangeHandler(e)}
+                    trailingElement={<Icon src={ExpandMore} />}
+                    floatingLabel={intl.formatMessage(messages['year.of.birth.label'])}
+                  >
+                    <option value="">{intl.formatMessage(messages['year.of.birth.label'])}</option>
+                    {getOptions('yearOfBirth')}
+                  </Form.Control>
+                </Form.Group>
+              )}
             <Form.Group controlId="gender" className="mb-3">
               <Form.Control
                 as="select"
diff --git a/src/welcome/tests/WelcomePage.test.jsx b/src/welcome/tests/WelcomePage.test.jsx
index 41a35653..e22cb65f 100644
--- a/src/welcome/tests/WelcomePage.test.jsx
+++ b/src/welcome/tests/WelcomePage.test.jsx
@@ -77,7 +77,9 @@ describe('WelcomePageTests', () => {
       level_of_education: 'other',
       gender: 'm',
     };
-
+    mergeConfig({
+      COLLECT_YEAR_OF_BIRTH: 'true',
+    });
     store.dispatch = jest.fn(store.dispatch);
     const welcomePage = await getWelcomePage();