diff --git a/.env.development b/.env.development index df652a1..da5197d 100644 --- a/.env.development +++ b/.env.development @@ -7,7 +7,7 @@ LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference' LMS_BASE_URL='http://localhost:18000' LOGIN_URL='http://localhost:18000/login' LOGOUT_URL='http://localhost:18000/logout' -MARKETING_SITE_BASE_URL='http://localhost:18000' +MARKETING_SITE_BASE_URL='http://localhost:5335' DEMOGRAPHICS_BASE_URL='http://localhost:18360' NODE_ENV='development' ORDER_HISTORY_URL='localhost:1996/orders' diff --git a/.env.test b/.env.test index f82034f..d27abef 100644 --- a/.env.test +++ b/.env.test @@ -7,7 +7,7 @@ LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference' LMS_BASE_URL='http://localhost:18000' LOGIN_URL='http://localhost:18000/login' LOGOUT_URL='http://localhost:18000/logout' -MARKETING_SITE_BASE_URL='http://localhost:18000' +MARKETING_SITE_BASE_URL='http://localhost:5335' DEMOGRAPHICS_BASE_URL='http://localhost:18360' NODE_ENV=null ORDER_HISTORY_URL='localhost:1996/orders' diff --git a/src/account-settings/demographics/DemographicsSection.jsx b/src/account-settings/demographics/DemographicsSection.jsx index 242097f..dadd031 100644 --- a/src/account-settings/demographics/DemographicsSection.jsx +++ b/src/account-settings/demographics/DemographicsSection.jsx @@ -10,6 +10,7 @@ import { OTHER, SELF_DESCRIBE, } from '../data/constants'; +import { getConfig } from '@edx/frontend-platform'; import { FormattedMessage, injectIntl, @@ -33,7 +34,7 @@ import messages from './DemographicsSection.messages'; class DemographicsSection extends React.Component { constructor(props, context) { super(props, context); - + this.alertRef = React.createRef(); } @@ -128,7 +129,7 @@ class DemographicsSection extends React.Component { renderDemographicsServiceIssueWarning() { if (this.checkFormForDemographicsErrors()) { return ( -
@@ -169,7 +170,12 @@ class DemographicsSection extends React.Component {

{this.props.intl.formatMessage(messages['account.settings.section.demographics.information'])}

- {this.renderDemographicsServiceIssueWarning()} +
+ + {this.props.intl.formatMessage(messages['account.settings.section.demographics.why'])} + + {this.renderDemographicsServiceIssueWarning()} +
Optional Information +
+ + Why does edX collect this information? + +
-
-
-
- - An error occurred attempting to retrieve or save your account information. Please try again later. - + Why does edX collect this information? + +
+
+
+
+ + An error occurred attempting to retrieve or save your account information. Please try again later. + +
@@ -1182,6 +1202,16 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt > Optional Information +