Upgrade frontend build and satisfy new linting rules

2020-03-23 17:25:45 -04:00
42 changed files with 3249 additions and 4870 deletions
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ ECOMMERCE_BASE_URL='http://localhost:18130'
 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'
+LOGOUT_URL='http://localhost:18000/login'
 MARKETING_SITE_BASE_URL='http://localhost:18000'
 NODE_ENV='development'
 ORDER_HISTORY_URL='localhost:1996/orders'
@@ -17,4 +17,4 @@ SITE_NAME='edX'
 SUPPORT_URL='http://localhost:18000/support'
 USER_INFO_COOKIE_NAME='edx-user-info'
 # Temporary, Remove this once we are ready to release the feature.
-COACHING_ENABLED=true
+COACHING_ENABLED=''
--- a/.env.test
+++ b/.env.test
@@ -6,7 +6,7 @@ ECOMMERCE_BASE_URL='http://localhost:18130'
 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'
+LOGOUT_URL='http://localhost:18000/login'
 MARKETING_SITE_BASE_URL='http://localhost:18000'
 NODE_ENV=null
 ORDER_HISTORY_URL='localhost:1996/orders'
--- a/docs/decisions/0002-coaching-addition.rst
+++ b/docs/decisions/0002-coaching-addition.rst
@@ -1,30 +0,0 @@
-1. Add Coaching Consent
--------------------------------
-
-Status
------
-
-Accepted
-
-Context
-------
-
-We need to provide users who are eligible for coaching with both an always available
-coaching toggle and a one-time form they can view to signup for coaching.
-
-Decision
--------
-
-While the coaching functionality is currently both limited, closed source, and the form
-exists outside of the standard design of this MFE, it was decided to add it here as a
-temporary measure due to it being at it's core, an account setting.
-
-The longer term solutions include either:
-  - using the frontend plugins feature when they become available to inject our coaching
-    work into the account MFE
-  - roll it into it's own MFE if enough additional coaching frontend work is required
-
-Consequences
------------
-
-Code will exist inside this Open edX MFE that integrates with a closed source app.
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
    "build": "fedx-scripts webpack",
    "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
    "is-es5": "es-check es5 ./dist/*.js",
-    "lint": "fedx-scripts eslint",
+    "lint": "fedx-scripts eslint . --ext .js,.jsx",
    "snapshot": "fedx-scripts jest --updateSnapshot",
    "start": "fedx-scripts webpack-dev-server --progress",
    "test": "fedx-scripts jest --coverage --passWithNoTests"
@@ -73,7 +73,7 @@
    "universal-cookie": "4.0.3"
  },
  "devDependencies": {
-    "@edx/frontend-build": "2.0.6",
+    "@edx/frontend-build": "3.1.14",
    "codecov": "3.6.5",
    "enzyme": "3.10.0",
    "enzyme-adapter-react-16": "1.15.2",
--- a/src/account-settings/AccountSettingsPage.jsx
+++ b/src/account-settings/AccountSettingsPage.jsx
@@ -31,8 +31,6 @@ import {
  YEAR_OF_BIRTH_OPTIONS,
  EDUCATION_LEVELS,
  GENDER_OPTIONS,
-  COUNTRY_WITH_STATES,
-  getStatesList,
 } from './data/constants';
 import { fetchSiteLanguages } from './site-language';
 import CoachingToggle from './coaching/CoachingToggle';
@@ -84,15 +82,11 @@ class AccountSettingsPage extends React.Component {
    return concatTimeZoneOptions;
  });

-  getLocalizedOptions = memoize((locale, country) => ({
+  getLocalizedOptions = memoize(locale => ({
    countryOptions: [{
      value: '',
      label: this.props.intl.formatMessage(messages['account.settings.field.country.options.empty']),
    }].concat(getCountryList(locale).map(({ code, name }) => ({ value: code, label: name }))),
-    stateOptions: [{
-      value: '',
-      label: this.props.intl.formatMessage(messages['account.settings.field.state.options.empty']),
-    }].concat(getStatesList(country)),
    languageProficiencyOptions: [{
      value: '',
      label: this.props.intl.formatMessage(messages['account.settings.field.language_proficiencies.options.empty']),
@@ -111,16 +105,6 @@ class AccountSettingsPage extends React.Component {
    })),
  }));

-  isEditable(fieldName) {
-    return !this.props.staticFields.includes(fieldName);
-  }
-
-  isManagedProfile() {
-    // Enterprise customer profiles are managed by their organizations. We determine whether
-    // a profile is managed or not by the presence of the profileDataManager prop.
-    return Boolean(this.props.profileDataManager);
-  }
-
  handleEditableFieldChange = (name, value) => {
    this.props.updateDraft(name, value);
  };
@@ -129,6 +113,17 @@ class AccountSettingsPage extends React.Component {
    this.props.saveSettings(formId, values);
  };

+  isManagedProfile() {
+    // Enterprise customer profiles are managed by their organizations. We determine whether
+    // a profile is managed or not by the presence of the profileDataManager prop.
+    return Boolean(this.props.profileDataManager);
+  }
+
+
+  isEditable(fieldName) {
+    return !this.props.staticFields.includes(fieldName);
+  }
+
  renderDuplicateTpaProviderMessage() {
    if (!this.state.duplicateTpaProvider) {
      return null;
@@ -190,7 +185,7 @@ class AccountSettingsPage extends React.Component {
  }

  renderSecondaryEmailField(editableFieldProps) {
-    if (!Boolean(this.props.formValues.secondary_email_enabled)) {
+    if (this.props.hiddenFields.includes('secondary_email')) {
      return null;
    }

@@ -215,15 +210,11 @@ class AccountSettingsPage extends React.Component {
    // Memoized options lists
    const {
      countryOptions,
-      stateOptions,
      languageProficiencyOptions,
      yearOfBirthOptions,
      educationLevelOptions,
      genderOptions,
-    } = this.getLocalizedOptions(this.context.locale, this.props.formValues.country);
-
-    // Show State field only if the country is US (could include Canada later)
-    const showState = this.props.formValues.country == COUNTRY_WITH_STATES;
+    } = this.getLocalizedOptions(this.context.locale);

    const timeZoneOptions = this.getLocalizedTimeZoneOptions(
      this.props.timeZoneOptions,
@@ -234,7 +225,7 @@ class AccountSettingsPage extends React.Component {
    const hasLinkedTPA = findIndex(this.props.tpaProviders, provider => provider.connected) >= 0;

    return (
-      <React.Fragment>
+      <>
        <div className="account-section" id="basic-information">
          <h2 className="section-heading">
            {this.props.intl.formatMessage(messages['account.settings.section.account.information'])}
@@ -257,9 +248,9 @@ class AccountSettingsPage extends React.Component {
            value={this.props.formValues.name}
            label={this.props.intl.formatMessage(messages['account.settings.field.full.name'])}
            emptyLabel={
-              this.isEditable('name') ?
-                this.props.intl.formatMessage(messages['account.settings.field.full.name.empty']) :
-                this.renderEmptyStaticFieldMessage()
+              this.isEditable('name')
+                ? this.props.intl.formatMessage(messages['account.settings.field.full.name.empty'])
+                : this.renderEmptyStaticFieldMessage()
            }
            helpText={this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text'])}
            isEditable={this.isEditable('name')}
@@ -269,9 +260,9 @@ class AccountSettingsPage extends React.Component {
            name="email"
            label={this.props.intl.formatMessage(messages['account.settings.field.email'])}
            emptyLabel={
-              this.isEditable('email') ?
-                this.props.intl.formatMessage(messages['account.settings.field.email.empty']) :
-                this.renderEmptyStaticFieldMessage()
+              this.isEditable('email')
+                ? this.props.intl.formatMessage(messages['account.settings.field.email.empty'])
+                : this.renderEmptyStaticFieldMessage()
            }
            value={this.props.formValues.email}
            confirmationMessageDefinition={messages['account.settings.field.email.confirmation']}
@@ -297,29 +288,13 @@ class AccountSettingsPage extends React.Component {
            options={countryOptions}
            label={this.props.intl.formatMessage(messages['account.settings.field.country'])}
            emptyLabel={
-              this.isEditable('country') ?
-                this.props.intl.formatMessage(messages['account.settings.field.country.empty']) :
-                this.renderEmptyStaticFieldMessage()
+              this.isEditable('country')
+                ? this.props.intl.formatMessage(messages['account.settings.field.country.empty'])
+                : this.renderEmptyStaticFieldMessage()
            }
            isEditable={this.isEditable('country')}
            {...editableFieldProps}
          />
-          {showState &&
-            <EditableField
-              name="state"
-              type="select"
-              value={this.props.formValues.state}
-              options={stateOptions}
-              label={this.props.intl.formatMessage(messages['account.settings.field.state'])}
-              emptyLabel={
-                this.isEditable('state') ?
-                  this.props.intl.formatMessage(messages['account.settings.field.state.empty']) :
-                  this.renderEmptyStaticFieldMessage()
-              }
-              isEditable={this.isEditable('state')}
-              {...editableFieldProps}
-            />
-          }
        </div>

        <div className="account-section" id="profile-information">
@@ -354,14 +329,15 @@ class AccountSettingsPage extends React.Component {
            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.language.proficiencies.empty'])}
            {...editableFieldProps}
          />
-          {getConfig().COACHING_ENABLED &&
-            this.props.formValues.coaching.eligible_for_coaching &&
+          {getConfig().COACHING_ENABLED
+            && this.props.formValues.coaching.eligible_for_coaching
+            && (
            <CoachingToggle
              name="coaching"
              phone_number={this.props.formValues.phone_number}
              coaching={this.props.formValues.coaching}
            />
-          }
+            )}
        </div>

        <div className="account-section" id="social-media">
@@ -440,7 +416,7 @@ class AccountSettingsPage extends React.Component {
          />
        </div>

-      </React.Fragment>
+      </>
    );
  }

@@ -514,11 +490,11 @@ AccountSettingsPage.propTypes = {
    social_link_facebook: PropTypes.string,
    social_link_twitter: PropTypes.string,
    time_zone: PropTypes.string,
-    coaching: PropTypes.shape({
-      coaching_consent: PropTypes.bool.isRequired,
+    coaching: PropTypes.objectOf(PropTypes.shape({
+      coaching_consent: PropTypes.string.isRequired,
      user: PropTypes.number.isRequired,
      eligible_for_coaching: PropTypes.bool.isRequired,
-    }),
+    })),
  }).isRequired,
  siteLanguage: PropTypes.shape({
    previousValue: PropTypes.string,
@@ -530,8 +506,8 @@ AccountSettingsPage.propTypes = {
  })),
  profileDataManager: PropTypes.string,
  staticFields: PropTypes.arrayOf(PropTypes.string),
+  hiddenFields: PropTypes.arrayOf(PropTypes.string),
  isActive: PropTypes.bool,
-  secondary_email_enabled: PropTypes.bool,

  timeZoneOptions: PropTypes.arrayOf(PropTypes.shape({
    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
@@ -558,9 +534,9 @@ AccountSettingsPage.defaultProps = {
  countryTimeZoneOptions: [],
  profileDataManager: null,
  staticFields: [],
+  hiddenFields: ['secondary_email'],
  tpaProviders: [],
  isActive: true,
-  secondary_email_enabled: false,
 };

 export default connect(accountSettingsPageSelector, {
--- a/src/account-settings/AccountSettingsPage.messages.jsx
+++ b/src/account-settings/AccountSettingsPage.messages.jsx
@@ -156,21 +156,6 @@ const messages = defineMessages({
    defaultMessage: 'Select a Country',
    description: 'Option for empty value on account settings country field.',
  },
-  'account.settings.field.state': {
-    id: 'account.settings.field.state',
-    defaultMessage: 'State',
-    description: 'Label for account settings state field.',
-  },
-  'account.settings.field.state.empty': {
-    id: 'account.settings.field.state.empty',
-    defaultMessage: 'Add state',
-    description: 'Placeholder for empty account settings state field.',
-  },
-  'account.settings.field.state.options.empty': {
-    id: 'account.settings.field.state.options.empty',
-    defaultMessage: 'Select a State',
-    description: 'Option for empty value on account settings state field.',
-  },
  'account.settings.field.site.language': {
    id: 'account.settings.field.site.language',
    defaultMessage: 'Site language',
--- a/src/account-settings/EditableField.jsx
+++ b/src/account-settings/EditableField.jsx
@@ -2,7 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Button, Input, StatefulButton, ValidationFormGroup } from '@edx/paragon';
+import {
+  Button, Input, StatefulButton, ValidationFormGroup,
+} from '@edx/paragon';
 import { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

@@ -65,20 +67,20 @@ function EditableField(props) {
  };

  const renderValue = (rawValue) => {
-    if (!rawValue) return renderEmptyLabel();
+    if (!rawValue) { return renderEmptyLabel(); }

    if (options) {
      // Use == instead of === to prevent issues when HTML casts numbers as strings
      // eslint-disable-next-line eqeqeq
      const selectedOption = options.find(option => option.value == rawValue);
-      if (selectedOption) return selectedOption.label;
+      if (selectedOption) { return selectedOption.label; }
    }

    return rawValue;
  };

  const renderConfirmationMessage = () => {
-    if (!confirmationMessageDefinition || !confirmationValue) return null;
+    if (!confirmationMessageDefinition || !confirmationValue) { return null; }
    return intl.formatMessage(confirmationMessageDefinition, {
      value: confirmationValue,
    });
@@ -123,7 +125,7 @@ function EditableField(props) {
                  // Swallowing the onSubmit event on the form would be better, but
                  // we would have to add that logic for every field given our
                  // current structure of the application.
-                  if (saveState === 'pending') e.preventDefault();
+                  if (saveState === 'pending') { e.preventDefault(); }
                }}
                disabledStates={[]}
              />
--- a/src/account-settings/EmailField.jsx
+++ b/src/account-settings/EmailField.jsx
@@ -2,7 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
-import { Button, StatefulButton, Input, ValidationFormGroup } from '@edx/paragon';
+import {
+  Button, StatefulButton, Input, ValidationFormGroup,
+} from '@edx/paragon';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faExclamationTriangle, faPencilAlt } from '@fortawesome/free-solid-svg-icons';

@@ -56,7 +58,7 @@ function EmailField(props) {
  };

  const renderConfirmationMessage = () => {
-    if (!confirmationMessageDefinition || !confirmationValue) return null;
+    if (!confirmationMessageDefinition || !confirmationValue) { return null; }
    return (
      <Alert
        className="alert-warning mt-n2"
@@ -91,7 +93,7 @@ function EmailField(props) {
  };

  const renderValue = () => {
-    if (confirmationValue) return renderConfirmationValue();
+    if (confirmationValue) { return renderConfirmationValue(); }
    return value || renderEmptyLabel();
  };

@@ -132,7 +134,7 @@ function EmailField(props) {
                  // Swallowing the onSubmit event on the form would be better, but
                  // we would have to add that logic for every field given our
                  // current structure of the application.
-                  if (saveState === 'pending') e.preventDefault();
+                  if (saveState === 'pending') { e.preventDefault(); }
                }}
                disabledStates={[]}
              />
--- a/src/account-settings/SwitchContent.jsx
+++ b/src/account-settings/SwitchContent.jsx
@@ -11,7 +11,7 @@ const onChildExit = (htmlNode) => {
    const enteringChild = htmlNode.previousSibling || htmlNode.nextSibling;

    // There's no replacement, do nothing.
-    if (!enteringChild) return;
+    if (!enteringChild) { return; }

    // Get all the focusable elements in the entering child and focus the first one
    const focusableElements = enteringChild.querySelectorAll('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])');
@@ -29,7 +29,7 @@ function SwitchContent({ expression, cases, className }) {
        return getContent(cases[caseKey]);
      }
      return React.cloneElement(cases[caseKey], { key: caseKey });
-    } else if (cases.default) {
+    } if (cases.default) {
      if (typeof cases.default === 'string') {
        return getContent(cases.default);
      }
--- a/src/account-settings/coaching/CoachingConsent.jsx
+++ b/src/account-settings/coaching/CoachingConsent.jsx
@@ -1,316 +0,0 @@
-import React from 'react';
-
-import { getConfig, getQueryParameters } from '@edx/frontend-platform';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Hyperlink } from '@edx/paragon';
-import { faCheck } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-
-import PageLoading from '../PageLoading';
-import CoachingConsentForm from './CoachingConsentForm';
-import messages from './CoachingConsent.messages';
-import LogoSVG from '../../logo.svg';
-import { fetchSettings, saveSettings, saveMultipleSettings } from '../data/actions';
-import { coachingConsentPageSelector } from '../data/selectors';
-
-const Logo = ({ src, alt, ...attributes }) => (
-  <>
-    <img src={src} alt={alt} {...attributes} />
-  </>
-);
-
-const SuccessMessage = props => (
-  <div className="col-12 col-lg-6 shadow-lg mx-auto mt-4 p-5">
-    <FontAwesomeIcon className="text-success" icon={faCheck} size="5x" />
-    <div className="h3">{props.header}</div>
-    <div>{props.message}</div>
-    <Hyperlink destination={props.continueUrl} className="d-block p-2 my-3 text-center text-white bg-primary rounded">
-      {props.continue}
-    </Hyperlink>
-  </div>
-);
-
-const AutoRedirect = (props) => {
-  window.location.href = props.redirectUrl;
-  return <></>;
-};
-
-const VIEWS = {
-  NOT_LOADED: 'NOT_LOADED',
-  LOADED: 'LOADED',
-  SUCCESS: 'SUCCESS',
-  SUCCESS_PENDING: 'SUCCESS_PENDING',
-  DECLINED: 'DECLINED',
-  DECLINE_PENDING: 'DECLINE_PENDING',
-};
-
-class CoachingConsent extends React.Component {
-  constructor(props, context) {
-    super(props, context);
-
-    // Used to redirect back to the courseware.
-    const nextUrl = this.sanitizeForwardingUrl(getQueryParameters().next);
-    this.state = {
-      redirectUrl: nextUrl || `${getConfig().LMS_BASE_URL}/dashboard/`,
-      formErrors: {},
-      formSubmitted: false,
-      declineSubmitted: false,
-      allSubmissionsComplete: false,
-    };
-
-    this.handleSubmit = this.handleSubmit.bind(this);
-    this.declineCoaching = this.declineCoaching.bind(this);
-  }
-
-  componentDidMount() {
-    this.props.fetchSettings();
-  }
-
-  componentDidUpdate(prevProps, prevState) {
-    /*
-      When we are submitting the form, we're calling saveSettings 3 times, which causes
-      multiple parallel redux flows. Because of this we can't rely on just the redux states
-      being sent in through props. For instance if the coaching submission and name
-      submission happen in near parallel, the coaching flow could return errors in
-      formErrors and the name flow could overwrite the formErrors with an empty object.
-
-      To minimize disruption to the rest of the app, we're going to manage flow state from
-      within this component.
-    */
-
-    // If a new error comes in, store it before the next redux call overwrites it.
-    let allFormErrors = {};
-    let allSubmissionsComplete = false;
-
-    // Collect new errors and add to state (will be cleared on new submission)
-    const newErrorsFound = (
-      this.props.formErrors !== prevProps.formErrors
-      && Object.keys(this.props.formErrors).length > 0
-    );
-    if (newErrorsFound) {
-      allFormErrors = Object.assign({}, this.state.formErrors, this.props.formErrors);
-    }
-
-    // Check if all values from the form have confirmation values
-    if (
-      this.state.formSubmitted &&
-      this.props.saveState === 'complete'
-    ) {
-      allSubmissionsComplete = true;
-    }
-
-    // Check if all values from the decline link have confirmation values
-    if (this.props.confirmationValues.coaching && this.state.declineSubmitted) {
-      allSubmissionsComplete = true;
-    }
-    if (newErrorsFound || (allSubmissionsComplete !== prevState.allSubmissionsComplete)) {
-      this.setState({
-        formErrors: allFormErrors,
-        allSubmissionsComplete,
-      });
-    }
-  }
-
-  sanitizeForwardingUrl(url) {
-    // Redirect to root of MFE if invalid next param is sent
-    return url && url.startsWith(getConfig().LMS_BASE_URL) ? url : `${getConfig().LMS_BASE_URL}/dashboard/`;
-  }
-
-  async handleSubmit(e) {
-    e.preventDefault();
-    this.setState({
-      formErrors: {},
-      formSubmitted: true,
-      declineSubmitted: false,
-    });
-    // Must store target values or they disappear before the async function can use them.
-    const fullName = e.target.fullName.value;
-    const phoneNumber = e.target.phoneNumber.value;
-    const coachingValues = this.props.formValues.coaching;
-
-    // !important: The order of this data matters!
-    // The order that this data is in, is the order that the saveSettings() function
-    // is called.
-    const settingsSubmissions = [];
-    if (!this.props.profileDataManager) {
-      settingsSubmissions.push({
-        formId: 'name',
-        commitValues: fullName,
-      });
-    }
-    Array.prototype.push.apply(settingsSubmissions, [
-      {
-        formId: 'coaching',
-        commitValues: {
-          ...coachingValues,
-          phone_number: phoneNumber,
-          coaching_consent: true,
-          consent_form_seen: true,
-        },
-      },
-      {
-        formId: 'phone_number',
-        commitValues: phoneNumber,
-      },
-    ]);
-    this.props.saveMultipleSettings(settingsSubmissions);
-  }
-
-  async declineCoaching(e) {
-    e.preventDefault();
-    this.setState({
-      formErrors: {},
-      declineSubmitted: true,
-      formSubmitted: false,
-    });
-    // Must store target values or they disappear before the async function can use them.
-    const coachingValues = this.props.formValues.coaching;
-    this.props.saveSettings('coaching', {
-      ...coachingValues,
-      coaching_consent: false,
-      consent_form_seen: true,
-    });
-  }
-
-  renderView(currentView) {
-    switch (currentView) {
-      case VIEWS.NOT_LOADED:
-        return <PageLoading srMessage="" />;
-      case VIEWS.LOADED:
-        return (<CoachingConsentForm
-          onSubmit={this.handleSubmit}
-          declineCoaching={this.declineCoaching}
-          formErrors={this.state.formErrors}
-          formValues={this.props.formValues}
-          redirectUrl={this.state.redirectUrl}
-          profileDataManager={this.props.profileDataManager}
-        />);
-      case VIEWS.SUCCESS_PENDING:
-        return <PageLoading srMessage="Submitting..." />;
-      case VIEWS.SUCCESS:
-        return (<SuccessMessage
-          continueUrl={this.state.redirectUrl}
-          header={this.props.intl.formatMessage(messages['account.settings.coaching.consent.success.header'])}
-          message={this.props.intl.formatMessage(messages['account.settings.coaching.consent.success.message'])}
-          continue={this.props.intl.formatMessage(messages['account.settings.coaching.consent.success.continue'])}
-        />);
-      case VIEWS.DECLINE_PENDING:
-        return <PageLoading srMessage="Redirecting..." />;
-      case VIEWS.DECLINED:
-        return <AutoRedirect redirectUrl={this.state.redirectUrl} />;
-      default:
-        return <></>;
-    }
-  }
-
-  render() {
-    const { loaded } = this.props;
-    const formHasErrors = Object.keys(this.state.formErrors).length > 0;
-    let currentView = null;
-    // This amount of logic was making the template very hard to read, so I broke it out into views.
-    if (!loaded) {
-      currentView = VIEWS.NOT_LOADED;
-    } else if (this.state.formSubmitted && !formHasErrors) {
-      if (this.state.allSubmissionsComplete) {
-        currentView = VIEWS.SUCCESS;
-      } else {
-        currentView = VIEWS.SUCCESS_PENDING;
-      }
-    } else if (this.state.declineSubmitted && !formHasErrors) {
-      if (this.state.allSubmissionsComplete) {
-        currentView = VIEWS.DECLINED;
-      } else {
-        currentView = VIEWS.DECLINE_PENDING;
-      }
-    } else {
-      currentView = VIEWS.LOADED;
-    }
-
-    return (
-      <main>
-        <div className="w-100 d-flex justify-content-center align-items-center shadow coaching-header">
-          <Logo
-            className="logo"
-            src={LogoSVG}
-            alt="Logo"
-          />
-        </div>
-        {this.renderView(currentView)}
-      </main>
-    );
-  }
-}
-
-Logo.defaultProps = {
-  src: '',
-  alt: '',
-};
-
-Logo.propTypes = {
-  src: PropTypes.string,
-  alt: PropTypes.string,
-};
-
-SuccessMessage.defaultProps = {
-  header: '',
-  message: '',
-  continueUrl: '',
-  continue: '',
-};
-
-SuccessMessage.propTypes = {
-  header: PropTypes.string,
-  message: PropTypes.string,
-  continueUrl: PropTypes.string,
-  continue: PropTypes.string,
-};
-
-AutoRedirect.defaultProps = {
-  redirectUrl: '',
-};
-
-AutoRedirect.propTypes = {
-  redirectUrl: PropTypes.string,
-};
-
-CoachingConsent.defaultProps = {
-  loaded: false,
-  saveState: undefined,
-  profileDataManager: null,
-};
-
-CoachingConsent.propTypes = {
-  intl: intlShape.isRequired,
-  loaded: PropTypes.bool,
-  formValues: PropTypes.shape({
-    name: PropTypes.string,
-    phone_number: PropTypes.string,
-    coaching: PropTypes.shape({
-      coaching_consent: PropTypes.bool.isRequired,
-      user: PropTypes.number.isRequired,
-      eligible_for_coaching: PropTypes.bool.isRequired,
-      consent_form_seen: PropTypes.bool.isRequired,
-    }),
-  }).isRequired,
-  formErrors: PropTypes.shape({
-    coaching: PropTypes.object,
-  }).isRequired,
-  confirmationValues: PropTypes.shape({
-    coaching: PropTypes.object,
-    name: PropTypes.object,
-    phone_number: PropTypes.object,
-  }).isRequired,
-  fetchSettings: PropTypes.func.isRequired,
-  saveSettings: PropTypes.func.isRequired,
-  saveMultipleSettings: PropTypes.func.isRequired,
-  saveState: PropTypes.string,
-  profileDataManager: PropTypes.string,
-};
-
-export default connect(coachingConsentPageSelector, {
-  fetchSettings,
-  saveSettings,
-  saveMultipleSettings,
-})(injectIntl(CoachingConsent));
--- a/src/account-settings/coaching/CoachingConsent.messages.js
+++ b/src/account-settings/coaching/CoachingConsent.messages.js
@@ -1,66 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  'account.settings.coaching.consent.welcome.header': {
-    id: 'account.settings.coaching.consent.welcome.header',
-    defaultMessage: 'Let’s get started.',
-    description: 'The welcome header for consent form.',
-  },
-  'account.settings.coaching.consent.welcome.subheader': {
-    id: 'account.settings.coaching.consent.welcome.subheader',
-    defaultMessage: "We're here for you from start to finish",
-    description: 'The welcome subheader for consent form.',
-  },
-  'account.settings.coaching.consent.description': {
-    id: 'account.settings.coaching.consent.description',
-    defaultMessage: "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
-    description: 'Text describing what Coaching is.',
-  },
-  'account.settings.coaching.consent.text-messaging.disclaimer': {
-    id: 'account.settings.coaching.consent.text-messaging.disclaimer',
-    defaultMessage: '* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.',
-    description: 'Text describing what Coaching is.',
-  },
-  'account.settings.coaching.consent.accept-coaching': {
-    id: 'account.settings.coaching.consent.accept-coaching',
-    defaultMessage: 'Sign up for coaching',
-    description: 'Text to confirm coaching enablement',
-  },
-  'account.settings.coaching.consent.decline-coaching': {
-    id: 'account.settings.coaching.consent.decline-coaching',
-    defaultMessage: 'I prefer not to be contacted with free coaching services',
-    description: 'Text to decline coaching enablement',
-  },
-  'account.settings.coaching.consent.label.name': {
-    id: 'account.settings.coaching.consent.label.name',
-    defaultMessage: 'Please confirm your name',
-    description: 'Label for name input',
-  },
-  'account.settings.coaching.consent.label.phone-number': {
-    id: 'account.settings.coaching.consent.label.phone-number',
-    defaultMessage: 'Enter your mobile number',
-    description: 'Label for mobile phone number input',
-  },
-  'account.settings.coaching.consent.success.header': {
-    id: 'account.settings.coaching.consent.success.header',
-    defaultMessage: 'Success!',
-    description: 'Heading announcing that submission succeeded',
-  },
-  'account.settings.coaching.consent.success.message': {
-    id: 'account.settings.coaching.consent.success.message',
-    defaultMessage: "You're signed up for coaching. You will receive a text message confirmation.",
-    description: 'Text announcing that you have signed up and will receive texts',
-  },
-  'account.settings.coaching.consent.success.continue': {
-    id: 'account.settings.coaching.consent.success.continue',
-    defaultMessage: 'Start my course',
-    description: 'Text that the user will be sent back to the courseware',
-  },
-  'account.settings.coaching.managed.support': {
-    id: 'account.settings.coaching.managed.support',
-    defaultMessage: 'support',
-    description: 'website support',
-  },
-});
-
-export default messages;
--- a/src/account-settings/coaching/CoachingConsentForm.jsx
+++ b/src/account-settings/coaching/CoachingConsentForm.jsx
@@ -1,130 +0,0 @@
-import React from 'react';
-
-import { getConfig } from '@edx/frontend-platform';
-import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
-import { Input, Button, Hyperlink } from '@edx/paragon';
-
-import PropTypes from 'prop-types';
-
-import Alert from '../Alert';
-import messages from './CoachingConsent.messages';
-
-const ErrorMessage = props => (
-  <div className="alert-warning mb-2">{props.message}</div>
-);
-
-const ManagedProfileAlert = ({ profileDataManager }) => (
-  <Alert className="alert alert-primary" role="alert">
-    <FormattedMessage
-      id="account.settings.coaching.managed.alert"
-      defaultMessage="Your name is managed by {managerTitle}. Contact your administrator for help."
-      description="alert message informing the user their account data is managed by a third party"
-      values={{
-        managerTitle: <b>{profileDataManager}</b>,
-      }}
-    />
-  </Alert>
-);
-const CoachingForm = props => (
-  <div className="col-12 col-md-6 col-xl-5 mx-auto mt-4 p-5 shadow-lg">
-    <h2 className="h2">
-      {props.intl.formatMessage(messages['account.settings.coaching.consent.welcome.header'])}
-    </h2>
-    <p>{props.intl.formatMessage(messages['account.settings.coaching.consent.description'])}</p>
-    <div>
-      <form onSubmit={props.onSubmit}>
-        <div className="py-3">
-          {
-            !!props.profileDataManager &&
-            <ManagedProfileAlert profileDataManager={props.profileDataManager} />
-          }
-          <ErrorMessage message={props.formErrors.name} />
-          <label className="h6" htmlFor="fullName">{props.intl.formatMessage(messages['account.settings.coaching.consent.label.name'])}</label>
-          <Input
-            type="text"
-            name="full-name"
-            id="fullName"
-            disabled={!!props.profileDataManager}
-            defaultValue={props.formValues.name}
-          />
-        </div>
-        <div className="py-3">
-          <ErrorMessage message={props.formErrors.phone_number} />
-          <label className="h6" htmlFor="phoneNumber">{props.intl.formatMessage(messages['account.settings.coaching.consent.label.phone-number'])}</label>
-          <Input
-            type="text"
-            name="full-name"
-            id="phoneNumber"
-            defaultValue={props.formValues.phone_number}
-          />
-        </div>
-        <div className=" py-3">
-          <p className="small font-italic">
-            {props.intl.formatMessage(messages['account.settings.coaching.consent.text-messaging.disclaimer'])}
-          </p>
-        </div>
-        <ErrorMessage message={props.formErrors.coaching} />
-        <div className="d-flex flex-column align-items-center">
-          <Button className="w-100 btn-outline-primary" type="submit">
-            {props.intl.formatMessage(messages['account.settings.coaching.consent.accept-coaching'])}
-          </Button>
-        </div>
-        <div className="mt-3">
-          <Hyperlink
-            className="mt-3 text-dark btn-link small"
-            destination={props.redirectUrl}
-            onClick={props.declineCoaching}
-          >
-            {props.intl.formatMessage(messages['account.settings.coaching.consent.decline-coaching'])}
-          </Hyperlink>
-        </div>
-      </form>
-    </div>
-  </div>
-);
-
-CoachingForm.defaultProps = {
-  formErrors: {
-    coaching: '',
-    name: '',
-    phone_number: '',
-  },
-};
-
-CoachingForm.propTypes = {
-  intl: intlShape.isRequired,
-  onSubmit: PropTypes.func.isRequired,
-  declineCoaching: PropTypes.func.isRequired,
-  formValues: PropTypes.shape({
-    name: PropTypes.string,
-    phone_number: PropTypes.string,
-    coaching: PropTypes.shape({
-      coaching_consent: PropTypes.bool.isRequired,
-      user: PropTypes.number.isRequired,
-      eligible_for_coaching: PropTypes.bool.isRequired,
-      consent_form_seen: PropTypes.bool.isRequired,
-    }),
-  }).isRequired,
-  formErrors: PropTypes.shape({
-    coaching: PropTypes.string,
-    name: PropTypes.string,
-    phone_number: PropTypes.string,
-  }),
-  redirectUrl: PropTypes.string.isRequired,
-  profileDataManager: PropTypes.string.isRequired,
-};
-
-ErrorMessage.defaultProps = {
-  message: '',
-};
-
-ErrorMessage.propTypes = {
-  message: PropTypes.string,
-};
-
-ManagedProfileAlert.propTypes = {
-  profileDataManager: PropTypes.string.isRequired,
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(CoachingForm);
--- a/src/account-settings/coaching/CoachingToggle.jsx
+++ b/src/account-settings/coaching/CoachingToggle.jsx
@@ -5,11 +5,11 @@ import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { ValidationFormGroup, Input } from '@edx/paragon';
 import messages from './CoachingToggle.messages';
 import { editableFieldSelector } from '../data/selectors';
-import { saveSettings, updateDraft, saveMultipleSettings } from '../data/actions';
+import { saveSettings, updateDraft } from '../data/actions';
 import EditableField from '../EditableField';


-const CoachingToggle = props => (
+const CoatchingToggle = props => (
  <>
    <EditableField
      name="phone_number"
@@ -18,25 +18,7 @@ const CoachingToggle = props => (
      label={props.intl.formatMessage(messages['account.settings.field.phone_number'])}
      emptyLabel={props.intl.formatMessage(messages['account.settings.field.phone_number.empty'])}
      onChange={props.updateDraft}
-      onSubmit={() => {
-        const { coaching } = props;
-        if (coaching.coaching_consent === true) {
-          return props.saveMultipleSettings([
-            {
-              formId: 'coaching',
-              commitValues: {
-                ...coaching,
-                phone_number: props.phone_number,
-              },
-            },
-            {
-              formId: 'phone_number',
-              commitValues: props.phone_number,
-            },
-        ]);
-      }
-        return props.saveSettings('phone_number', props.phone_number);
-    }}
+      onSubmit={props.saveSettings}
    />
    <ValidationFormGroup
      for="coachingConsent"
@@ -55,11 +37,9 @@ const CoachingToggle = props => (
        value={props.coaching.coaching_consent}
        onChange={async (e) => {
          const { name } = e.target;
-          // eslint-disable-next-line camelcase
-          const { user, eligible_for_coaching } = props.coaching;
          const value = {
-            user,
-            eligible_for_coaching,
+            ...props.coaching,
+            phone_number: props.phone_number,
            coaching_consent: e.target.checked,
          };
          props.saveSettings(name, value);
@@ -70,23 +50,21 @@ const CoachingToggle = props => (
  </>
 );

-CoachingToggle.defaultProps = {
+CoatchingToggle.defaultProps = {
  phone_number: '',
  error: '',
-  saveState: undefined,
 };

-CoachingToggle.propTypes = {
+CoatchingToggle.propTypes = {
  name: PropTypes.string.isRequired,
  error: PropTypes.string,
-  coaching: PropTypes.shape({
-    coaching_consent: PropTypes.bool.isRequired,
+  coaching: PropTypes.objectOf(PropTypes.shape({
+    coaching_consent: PropTypes.string.isRequired,
    user: PropTypes.number.isRequired,
    eligible_for_coaching: PropTypes.bool.isRequired,
-  }).isRequired,
-  saveState: PropTypes.oneOf(['default', 'pending', 'complete', 'error']),
+  })).isRequired,
+  saveState: PropTypes.func.isRequired,
  saveSettings: PropTypes.func.isRequired,
-  saveMultipleSettings: PropTypes.func.isRequired,
  updateDraft: PropTypes.func.isRequired,
  intl: intlShape.isRequired,
  phone_number: PropTypes.string,
@@ -95,5 +73,4 @@ CoachingToggle.propTypes = {
 export default connect(editableFieldSelector, {
  saveSettings,
  updateDraft,
-  saveMultipleSettings,
-})(injectIntl(CoachingToggle));
+})(injectIntl(CoatchingToggle));
--- a/src/account-settings/coaching/CoachingToggle.messages.js
+++ b/src/account-settings/coaching/CoachingToggle.messages.js
@@ -18,7 +18,7 @@ const messages = defineMessages({
  },
  'account.settings.field.coaching_consent.tooltip': {
    id: 'account.settings.field.coaching_consent.tooltip',
-    defaultMessage: 'MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available to learners with U.S. mobile phone numbers. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.',
+    defaultMessage: 'MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available in English and Spanish languages. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.',
    description: 'A tooltip explaining what coaching is and who it is for',
  },
  'account.settings.field.coaching_consent.error': {
--- a/src/account-settings/coaching/data/service.js
+++ b/src/account-settings/coaching/data/service.js
@@ -1,6 +1,5 @@
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import { getConfig } from '@edx/frontend-platform';
-import get from 'lodash.get';

 /**
 * get all settings related to the coaching plugin. Settings used
@@ -8,20 +7,8 @@ import get from 'lodash.get';
 * @param {Number} userId users are identified in the api by LMS id
 */
 export async function getCoachingPreferences(userId) {
-  let data = {};
-  try {
-    ({ data } = await getAuthenticatedHttpClient()
-      .get(`${getConfig().LMS_BASE_URL}/api/coaching/v1/users/${userId}/`));
-  } catch (error) {
-    // If a user isn't active the API call will fail with a lack of credentials.
-    data = {
-      coaching_consent: false,
-      user: userId,
-      eligible_for_coaching: false,
-      consent_form_seen: false,
-    };
-  }
-
+  const { data } = await getAuthenticatedHttpClient()
+    .get(`${getConfig().LMS_BASE_URL}/api/coaching/v1/users/${userId}/`);
  return data;
 }

@@ -40,11 +27,9 @@ export async function patchCoachingPreferences(userId, commitValues) {
    .catch((error) => {
      const apiError = Object.create(error);
      apiError.fieldErrors = JSON.parse(error.customAttributes.httpErrorResponseData);
-      if (get(apiError, 'fieldErrors.phone_number')) {
-        // eslint-disable-next-line prefer-destructuring
-        apiError.fieldErrors.coaching = apiError.fieldErrors.phone_number[0];
-        delete apiError.fieldErrors.phone_number;
-      }
+      // eslint-disable-next-line prefer-destructuring
+      apiError.fieldErrors.coaching = apiError.fieldErrors.phone_number[0];
+      delete apiError.fieldErrors.phone_number;
      throw apiError;
    });
  return commitValues;
--- a/src/account-settings/data/actions.js
+++ b/src/account-settings/data/actions.js
@@ -2,7 +2,6 @@ import { AsyncActionType } from './utils';

 export const FETCH_SETTINGS = new AsyncActionType('ACCOUNT_SETTINGS', 'FETCH_SETTINGS');
 export const SAVE_SETTINGS = new AsyncActionType('ACCOUNT_SETTINGS', 'SAVE_SETTINGS');
-export const SAVE_MULTIPLE_SETTINGS = new AsyncActionType('ACCOUNT_SETTINGS', 'SAVE_MULTIPLE_SETTINGS');
 export const FETCH_TIME_ZONES = new AsyncActionType('ACCOUNT_SETTINGS', 'FETCH_TIME_ZONES');
 export const SAVE_PREVIOUS_SITE_LANGUAGE = 'SAVE_PREVIOUS_SITE_LANGUAGE';
 export const OPEN_FORM = 'OPEN_FORM';
@@ -100,25 +99,6 @@ export const savePreviousSiteLanguage = previousSiteLanguage => ({
  payload: { previousSiteLanguage },
 });

-export const saveMultipleSettings = settingsArray => ({
-  type: SAVE_MULTIPLE_SETTINGS.BASE,
-  payload: { settingsArray },
-});
-
-export const saveMultipleSettingsBegin = () => ({
-  type: SAVE_MULTIPLE_SETTINGS.BEGIN,
-});
-
-export const saveMultipleSettingsSuccess = settingsArray => ({
-  type: SAVE_MULTIPLE_SETTINGS.SUCCESS,
-  payload: { settingsArray },
-});
-
-export const saveMultipleSettingsFailure = ({ fieldErrors, message }) => ({
-  type: SAVE_MULTIPLE_SETTINGS.FAILURE,
-  payload: { errors: fieldErrors, message },
-});
-
 // FETCH TIME_ZONE ACTIONS

 export const fetchTimeZones = country => ({
--- a/src/account-settings/data/constants.js
+++ b/src/account-settings/data/constants.js
@@ -31,84 +31,4 @@ export const GENDER_OPTIONS = [
  'o',
 ];

-export const COUNTRY_WITH_STATES = 'US';
-
 export const TRANSIFEX_LANGUAGE_BASE_URL = 'https://www.transifex.com/open-edx/edx-platform/language/';
-
-const COUNTRY_STATES_MAP = {
-  CA: [
-    { value: 'AB', label: 'Alberta' },
-    { value: 'BC', label: 'British Columbia' },
-    { value: 'MB', label: 'Manitoba' },
-    { value: 'NB', label: 'New Brunswick' },
-    { value: 'NL', label: 'Newfoundland and Labrador' },
-    { value: 'NS', label: 'Nova Scotia' },
-    { value: 'NT', label: 'Northwest Territories' },
-    { value: 'NU', label: 'Nunavut' },
-    { value: 'ON', label: 'Ontario' },
-    { value: 'PE', label: 'Prince Edward Island' },
-    { value: 'QC', label: 'Québec' },
-    { value: 'SK', label: 'Saskatchewan' },
-    { value: 'YT', label: 'Yukon' },
-  ],
-  US: [
-    { value: 'AL', label: 'Alabama' },
-    { value: 'AK', label: 'Alaska' },
-    { value: 'AZ', label: 'Arizona' },
-    { value: 'AR', label: 'Arkansas' },
-    { value: 'AA', label: 'Armed Forces Americas' },
-    { value: 'AE', label: 'Armed Forces Europe' },
-    { value: 'AP', label: 'Armed Forces Pacific' },
-    { value: 'CA', label: 'California' },
-    { value: 'CO', label: 'Colorado' },
-    { value: 'CT', label: 'Connecticut' },
-    { value: 'DE', label: 'Delaware' },
-    { value: 'DC', label: 'District Of Columbia' },
-    { value: 'FL', label: 'Florida' },
-    { value: 'GA', label: 'Georgia' },
-    { value: 'HI', label: 'Hawaii' },
-    { value: 'ID', label: 'Idaho' },
-    { value: 'IL', label: 'Illinois' },
-    { value: 'IN', label: 'Indiana' },
-    { value: 'IA', label: 'Iowa' },
-    { value: 'KS', label: 'Kansas' },
-    { value: 'KY', label: 'Kentucky' },
-    { value: 'LA', label: 'Louisiana' },
-    { value: 'ME', label: 'Maine' },
-    { value: 'MD', label: 'Maryland' },
-    { value: 'MA', label: 'Massachusetts' },
-    { value: 'MI', label: 'Michigan' },
-    { value: 'MN', label: 'Minnesota' },
-    { value: 'MS', label: 'Mississippi' },
-    { value: 'MO', label: 'Missouri' },
-    { value: 'MT', label: 'Montana' },
-    { value: 'NE', label: 'Nebraska' },
-    { value: 'NV', label: 'Nevada' },
-    { value: 'NH', label: 'New Hampshire' },
-    { value: 'NJ', label: 'New Jersey' },
-    { value: 'NM', label: 'New Mexico' },
-    { value: 'NY', label: 'New York' },
-    { value: 'NC', label: 'North Carolina' },
-    { value: 'ND', label: 'North Dakota' },
-    { value: 'OH', label: 'Ohio' },
-    { value: 'OK', label: 'Oklahoma' },
-    { value: 'OR', label: 'Oregon' },
-    { value: 'PA', label: 'Pennsylvania' },
-    { value: 'RI', label: 'Rhode Island' },
-    { value: 'SC', label: 'South Carolina' },
-    { value: 'SD', label: 'South Dakota' },
-    { value: 'TN', label: 'Tennessee' },
-    { value: 'TX', label: 'Texas' },
-    { value: 'UT', label: 'Utah' },
-    { value: 'VT', label: 'Vermont' },
-    { value: 'VA', label: 'Virginia' },
-    { value: 'WA', label: 'Washington' },
-    { value: 'WV', label: 'West Virginia' },
-    { value: 'WI', label: 'Wisconsin' },
-    { value: 'WY', label: 'Wyoming' },
-  ],
-};
-
-export function getStatesList(country) {
-  return country && COUNTRY_STATES_MAP[country.toUpperCase()];
-}
--- a/src/account-settings/data/reducers.js
+++ b/src/account-settings/data/reducers.js
@@ -7,7 +7,6 @@ import {
  SAVE_PREVIOUS_SITE_LANGUAGE,
  UPDATE_DRAFT,
  RESET_DRAFTS,
-  SAVE_MULTIPLE_SETTINGS,
 } from './actions';

 import { reducer as deleteAccountReducer, DELETE_ACCOUNT } from '../delete-account';
@@ -48,11 +47,12 @@ const reducer = (state = defaultState, action) => {
    case FETCH_SETTINGS.SUCCESS:
      return {
        ...state,
-        values: Object.assign({}, state.values, action.payload.values),
+        values: { ...state.values, ...action.payload.values },
        // Dump the providers into thirdPartyAuth.
-        thirdPartyAuth: Object.assign({}, state.thirdPartyAuth, {
+        thirdPartyAuth: {
+          ...state.thirdPartyAuth,
          providers: action.payload.thirdPartyAuthProviders,
-        }),
+        },
        profileDataManager: action.payload.profileDataManager,
        timeZones: action.payload.timeZones,
        loading: false,
@@ -97,9 +97,10 @@ const reducer = (state = defaultState, action) => {
    case UPDATE_DRAFT:
      return {
        ...state,
-        drafts: Object.assign({}, state.drafts, {
+        drafts: {
+          ...state.drafts,
          [action.payload.name]: action.payload.value,
-        }),
+        },
        saveState: null,
        errors: {},
      };
@@ -120,19 +121,18 @@ const reducer = (state = defaultState, action) => {
      return {
        ...state,
        saveState: 'complete',
-        values: Object.assign({}, state.values, action.payload.values),
+        values: { ...state.values, ...action.payload.values },
        errors: {},
-        confirmationValues: Object.assign(
-          {},
-          state.confirmationValues,
-          action.payload.confirmationValues,
-        ),
+        confirmationValues: {
+          ...state.confirmationValues,
+          ...action.payload.confirmationValues,
+        },
      };
    case SAVE_SETTINGS.FAILURE:
      return {
        ...state,
        saveState: 'error',
-        errors: Object.assign({}, state.errors, action.payload.errors),
+        errors: { ...state.errors, ...action.payload.errors },
      };
    case SAVE_SETTINGS.RESET:
      return {
@@ -145,24 +145,6 @@ const reducer = (state = defaultState, action) => {
        ...state,
        previousSiteLanguage: action.payload.previousSiteLanguage,
      };
-    case SAVE_MULTIPLE_SETTINGS.BEGIN:
-      return {
-        ...state,
-        saveState: 'pending',
-      };
-
-    case SAVE_MULTIPLE_SETTINGS.SUCCESS:
-      return {
-        ...state,
-        saveState: 'complete',
-      };
-
-    case SAVE_MULTIPLE_SETTINGS.FAILURE:
-      return {
-        ...state,
-        saveState: 'error',
-        errors: Object.assign({}, state.errors, action.payload.errors),
-      };

    case FETCH_TIME_ZONES.SUCCESS:
      return {
@@ -196,7 +178,6 @@ const reducer = (state = defaultState, action) => {

    case RESET_PASSWORD.BEGIN:
    case RESET_PASSWORD.SUCCESS:
-    case RESET_PASSWORD.FORBIDDEN:
      return {
        ...state,
        resetPassword: resetPasswordReducer(state.resetPassword, action),
--- a/src/account-settings/data/sagas.js
+++ b/src/account-settings/data/sagas.js
@@ -1,4 +1,6 @@
-import { call, put, delay, takeEvery, all } from 'redux-saga/effects';
+import {
+  call, put, delay, takeEvery, all,
+} from 'redux-saga/effects';

 import { publish } from '@edx/frontend-platform';
 import { getLocale, handleRtl, LOCALE_CHANGED } from '@edx/frontend-platform/i18n';
@@ -12,7 +14,6 @@ import {
  fetchSettingsFailure,
  closeForm,
  SAVE_SETTINGS,
-  SAVE_MULTIPLE_SETTINGS,
  saveSettingsBegin,
  saveSettingsSuccess,
  saveSettingsFailure,
@@ -20,9 +21,6 @@ import {
  FETCH_TIME_ZONES,
  fetchTimeZones,
  fetchTimeZonesSuccess,
-  saveMultipleSettingsBegin,
-  saveMultipleSettingsSuccess,
-  saveMultipleSettingsFailure,
 } from './actions';

 // Sub-modules
@@ -52,7 +50,9 @@ export function* handleFetchSettings() {
      userId,
    );

-    if (values.country) yield put(fetchTimeZones(values.country));
+    if (values.country) {
+      yield put(fetchTimeZones(values.country));
+    }

    yield put(fetchSettingsSuccess({
      values,
@@ -91,7 +91,9 @@ export function* handleSaveSettings(action) {
      savedValues = yield call(patchSettings, username, commitData, userId);
    }
    yield put(saveSettingsSuccess(savedValues, commitData));
-    if (savedValues.country) yield put(fetchTimeZones(savedValues.country));
+    if (savedValues.country) {
+      yield put(fetchTimeZones(savedValues.country));
+    }
    yield delay(1000);
    yield put(closeForm(action.payload.formId));
  } catch (e) {
@@ -104,31 +106,6 @@ export function* handleSaveSettings(action) {
  }
 }

-
-// handles mutiple settings saved at once, in order, and stops executing on first failure.
-export function* handleSaveMultipleSettings(settings) {
-  try {
-    yield put(saveMultipleSettingsBegin());
-    const { username, userId } = getAuthenticatedUser();
-    const { settingsArray } = settings.payload;
-    for (let i = 0; i < settingsArray.length; i += 1) {
-      const { formId, commitValues } = settingsArray[i];
-      yield put(saveSettingsBegin());
-      const commitData = { [formId]: commitValues };
-      const savedSettings = yield call(patchSettings, username, commitData, userId);
-      yield put(saveSettingsSuccess(savedSettings, commitData));
-    }
-    yield put(saveMultipleSettingsSuccess(settings));
-  } catch (e) {
-    if (e.fieldErrors) {
-      yield put(saveMultipleSettingsFailure({ fieldErrors: e.fieldErrors }));
-    } else {
-      yield put(saveMultipleSettingsFailure(e.message));
-      throw e;
-    }
-  }
-}
-
 export function* handleFetchTimeZones(action) {
  const response = yield call(getTimeZones, action.payload.country);
  yield put(fetchTimeZonesSuccess(response, action.payload.country));
@@ -138,7 +115,6 @@ export function* handleFetchTimeZones(action) {
 export default function* saga() {
  yield takeEvery(FETCH_SETTINGS.BASE, handleFetchSettings);
  yield takeEvery(SAVE_SETTINGS.BASE, handleSaveSettings);
-  yield takeEvery(SAVE_MULTIPLE_SETTINGS.BASE, handleSaveMultipleSettings);
  yield takeEvery(FETCH_TIME_ZONES.BASE, handleFetchTimeZones);
  yield all([
    deleteAccountSaga(),
--- a/src/account-settings/data/selectors.js
+++ b/src/account-settings/data/selectors.js
@@ -41,16 +41,6 @@ const isEditingSelector = createSelector(
  (name, accountSettings) => accountSettings.openFormId === name,
 );

-const confirmationValuesSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => accountSettings.confirmationValues,
-);
-
-const errorSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => accountSettings.errors,
-);
-
 const saveStateSelector = createSelector(
  accountSettingsSelector,
  accountSettings => accountSettings.saveState,
@@ -73,6 +63,10 @@ export const staticFieldsSelector = createSelector(
  accountSettings => (accountSettings.profileDataManager ? ['name', 'email', 'country'] : []),
 );

+export const hiddenFieldsSelector = createSelector(
+  accountSettingsSelector,
+  accountSettings => (accountSettings.profileDataManager ? [] : ['secondary_email']),
+);

 /**
 * If there's no draft present at all (undefined), use the original committed value.
@@ -134,6 +128,7 @@ export const accountSettingsPageSelector = createSelector(
  formValuesSelector,
  profileDataManagerSelector,
  staticFieldsSelector,
+  hiddenFieldsSelector,
  timeZonesSelector,
  countryTimeZonesSelector,
  activeAccountSelector,
@@ -144,6 +139,7 @@ export const accountSettingsPageSelector = createSelector(
    formValues,
    profileDataManager,
    staticFields,
+    hiddenFields,
    timeZoneOptions,
    countryTimeZoneOptions,
    activeAccount,
@@ -159,35 +155,7 @@ export const accountSettingsPageSelector = createSelector(
    formValues,
    profileDataManager,
    staticFields,
+    hiddenFields,
    tpaProviders: accountSettings.thirdPartyAuth.providers,
  }),
 );
-
-export const coachingConsentPageSelector = createSelector(
-  accountSettingsSelector,
-  formValuesSelector,
-  activeAccountSelector,
-  profileDataManagerSelector,
-  saveStateSelector,
-  confirmationValuesSelector,
-  errorSelector,
-  (
-    accountSettings,
-    formValues,
-    activeAccount,
-    profileDataManager,
-    saveState,
-    confirmationValues,
-    errors,
-  ) => ({
-    loading: accountSettings.loading,
-    loaded: accountSettings.loaded,
-    loadingError: accountSettings.loadingError,
-    isActive: activeAccount,
-    profileDataManager,
-    formValues,
-    saveState,
-    confirmationValues,
-    formErrors: errors,
-  }),
-);
--- a/src/account-settings/data/service.js
+++ b/src/account-settings/data/service.js
@@ -41,7 +41,9 @@ function packAccountCommitData(commitData) {

  SOCIAL_PLATFORMS.forEach(({ id, key }) => {
    // Skip missing values. Empty strings are valid values and should be preserved.
-    if (commitData[key] === undefined) return;
+    if (commitData[key] === undefined) {
+      return;
+    }

    packedData.social_links = [{ platform: id, social_link: commitData[key] }];
    delete packedData[key];
@@ -137,11 +139,12 @@ export async function getProfileDataManager(username, userRoles) {
    const url = `${getConfig().LMS_BASE_URL}/enterprise/api/v1/enterprise-learner/?username=${username}`;
    const { data } = await getAuthenticatedHttpClient().get(url).catch(handleRequestError);

-    if (data.results.length > 0) {
-      const enterprise = data.results[0] && data.results[0].enterprise_customer;
-      // To ensure that enterprise returned is current enterprise & it manages profile settings
-      if (enterprise && enterprise.sync_learner_profile_data) {
-        return enterprise.name;
+    if ('results' in data) {
+      for (let i = 0; i < data.results.length; i += 1) {
+        const enterprise = data.results[i].enterprise_customer;
+        if (enterprise.sync_learner_profile_data) {
+          return enterprise.name;
+        }
      }
    }
  }
@@ -183,7 +186,7 @@ export async function patchSettings(username, commitValues, userId) {
  // user/v1/preferences where it does update. This is the one we use.
  const preferenceKeys = ['time_zone'];
  const coachingKeys = ['coaching'];
-  const accountCommitValues = omit(commitValues, preferenceKeys, coachingKeys);
+  const accountCommitValues = omit(commitValues, preferenceKeys);
  const preferenceCommitValues = pick(commitValues, preferenceKeys);
  const coachingCommitValues = pick(commitValues, coachingKeys);
  const patchRequests = [];
--- a/src/account-settings/data/utils/dataUtils.js
+++ b/src/account-settings/data/utils/dataUtils.js
@@ -4,9 +4,9 @@ import snakeCase from 'lodash.snakecase';
 export function modifyObjectKeys(object, modify) {
  // If the passed in object is not an object, return it.
  if (
-    object === undefined ||
-    object === null ||
-    (typeof object !== 'object' && !Array.isArray(object))
+    object === undefined
+    || object === null
+    || (typeof object !== 'object' && !Array.isArray(object))
  ) {
    return object;
  }
--- a/src/account-settings/data/utils/reduxUtils.js
+++ b/src/account-settings/data/utils/reduxUtils.js
@@ -27,10 +27,6 @@ export class AsyncActionType {
  get RESET() {
    return `${this.topic}__${this.name}__RESET`;
  }
-
-  get FORBIDDEN() {
-    return `${this.topic}__${this.name}__FORBIDDEN`;
-  }
 }

 /**
--- a/src/account-settings/data/utils/reduxUtils.test.js
+++ b/src/account-settings/data/utils/reduxUtils.test.js
@@ -12,7 +12,6 @@ describe('AsyncActionType', () => {
    expect(actionType.SUCCESS).toBe('HOUSE_CATS__START_THE_RACE__SUCCESS');
    expect(actionType.FAILURE).toBe('HOUSE_CATS__START_THE_RACE__FAILURE');
    expect(actionType.RESET).toBe('HOUSE_CATS__START_THE_RACE__RESET');
-    expect(actionType.FORBIDDEN).toBe('HOUSE_CATS__START_THE_RACE__FORBIDDEN');
  });
 });

--- a/src/account-settings/delete-account/ConfirmationModal.jsx
+++ b/src/account-settings/delete-account/ConfirmationModal.jsx
@@ -1,7 +1,9 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';

-import { Button, Input, Modal, ValidationFormGroup } from '@edx/paragon';
+import {
+  Button, Input, Modal, ValidationFormGroup,
+} from '@edx/paragon';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { faExclamationCircle, faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -31,10 +33,9 @@ export class ConfirmationModal extends Component {
      return null;
    }
    const headerMessageId = this.getShortErrorMessageId(errorType);
-    const detailsMessageId =
-      reason === 'empty-password'
-        ? null
-        : 'account.settings.delete.account.error.unable.to.delete.details';
+    const detailsMessageId = reason === 'empty-password'
+      ? null
+      : 'account.settings.delete.account.error.unable.to.delete.details';

    return (
      <Alert
@@ -66,7 +67,7 @@ export class ConfirmationModal extends Component {
      <Modal
        open={open}
        title={intl.formatMessage(messages['account.settings.delete.account.modal.header'])}
-        body={
+        body={(
          <div>
            {this.renderError()}
            <Alert
@@ -98,7 +99,7 @@ export class ConfirmationModal extends Component {
              />
            </ValidationFormGroup>
          </div>
-        }
+        )}
        buttons={[
          <Button className="btn-danger" onClick={onSubmit}>
            {intl.formatMessage(messages['account.settings.delete.account.modal.confirm.delete'])}
--- a/src/account-settings/delete-account/DeleteAccount.jsx
+++ b/src/account-settings/delete-account/DeleteAccount.jsx
@@ -24,9 +24,12 @@ import ConnectedSuccessModal from './SuccessModal';
 import BeforeProceedingBanner from './BeforeProceedingBanner';

 export class DeleteAccount extends React.Component {
-  state = {
-    password: '',
-  };
+  constructor(props) {
+    super(props);
+    this.state = {
+      password: '',
+    };
+  }

  handleSubmit = () => {
    if (this.state.password === '') {
--- a/src/account-settings/delete-account/SuccessModal.jsx
+++ b/src/account-settings/delete-account/SuccessModal.jsx
@@ -11,13 +11,13 @@ export const SuccessModal = (props) => {
    <Modal
      open={status === 'deleted'}
      title={intl.formatMessage(messages['account.settings.delete.account.modal.after.header'])}
-      body={
+      body={(
        <div>
          <p className="h6">
            {intl.formatMessage(messages['account.settings.delete.account.modal.after.text'])}
          </p>
        </div>
-      }
+      )}
      closeText={intl.formatMessage(messages['account.settings.delete.account.modal.after.button'])}
      renderHeaderCloseButton={false}
      onClose={onClose}
--- a/src/account-settings/reset-password/RequestInProgressAlert.jsx
+++ b/src/account-settings/reset-password/RequestInProgressAlert.jsx
@@ -1,24 +0,0 @@
-import React from 'react';
-import { FormattedMessage } from '@edx/frontend-platform/i18n';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
-
-import Alert from '../Alert';
-
-const RequestInProgressAlert = (props) => {
-
-  return (
-    <Alert
-      className="alert-warning mt-n2"
-      icon={<FontAwesomeIcon className="mr-2" icon={faExclamationTriangle} />}
-    >
-      <FormattedMessage
-        id="account.settings.editable.field.password.reset.button.forbidden"
-        defaultMessage="Your previous request is in progress, please try again in few moments."
-        description="A message displayed when a previous password reset request is still in progress."
-      />
-    </Alert>
-  );
-};
-
-export default RequestInProgressAlert;
--- a/src/account-settings/reset-password/ResetPassword.jsx
+++ b/src/account-settings/reset-password/ResetPassword.jsx
@@ -7,7 +7,6 @@ import { StatefulButton } from '@edx/paragon';
 import { resetPassword } from './data/actions';
 import messages from './messages';
 import ConfirmationAlert from './ConfirmationAlert';
-import RequestInProgressAlert from './RequestInProgressAlert';

 const ResetPassword = (props) => {
  const { email, intl, status } = props;
@@ -44,7 +43,6 @@ const ResetPassword = (props) => {
        />
      </p>
      {status === 'complete' ? <ConfirmationAlert email={email} /> : null}
-      {status === 'forbidden' ? <RequestInProgressAlert /> : null}
    </div>
  );
 };
--- a/src/account-settings/reset-password/data/actions.js
+++ b/src/account-settings/reset-password/data/actions.js
@@ -18,7 +18,3 @@ export const resetPasswordSuccess = () => ({
 export const resetPasswordReset = () => ({
  type: RESET_PASSWORD.RESET,
 });
-
-export const resetPasswordForbidden = () => ({
-  type: RESET_PASSWORD.FORBIDDEN,
-});
--- a/src/account-settings/reset-password/data/reducers.js
+++ b/src/account-settings/reset-password/data/reducers.js
@@ -17,11 +17,6 @@ const reducer = (state = defaultState, action = null) => {
          ...state,
          status: 'complete',
        };
-      case RESET_PASSWORD.FORBIDDEN:
-        return {
-          ...state,
-          status: 'forbidden',
-        };

      default:
    }
--- a/src/account-settings/reset-password/data/sagas.js
+++ b/src/account-settings/reset-password/data/sagas.js
@@ -1,20 +1,12 @@
 import { put, call, takeEvery } from 'redux-saga/effects';

-import { resetPasswordBegin, resetPasswordForbidden, resetPasswordSuccess, RESET_PASSWORD } from './actions';
+import { resetPasswordBegin, resetPasswordSuccess, RESET_PASSWORD } from './actions';
 import { postResetPassword } from './service';

 function* handleResetPassword(action) {
  yield put(resetPasswordBegin());
-  try {
-    const response = yield call(postResetPassword, action.payload.email);
-    yield put(resetPasswordSuccess(response));
-  } catch (error) {
-    if (error.response && error.response.status === 403) {
-      yield put(resetPasswordForbidden(error));
-    } else {
-      throw error;
-    }
-  }
+  const response = yield call(postResetPassword, action.payload.email);
+  yield put(resetPasswordSuccess(response));
 }

 export default function* saga() {
--- a/src/account-settings/site-language/selectors.js
+++ b/src/account-settings/site-language/selectors.js
@@ -12,9 +12,8 @@ export const siteLanguageListSelector = createSelector(

 export const siteLanguageOptionsSelector = createSelector(
  siteLanguageSelector,
-  siteLanguage =>
-    siteLanguage.siteLanguageList.map(({ code, name }) => ({
-      value: code,
-      label: name,
-    })),
+  siteLanguage => siteLanguage.siteLanguageList.map(({ code, name }) => ({
+    value: code,
+    label: name,
+  })),
 );
--- a/src/account-settings/third-party-auth/ThirdPartyAuth.jsx
+++ b/src/account-settings/third-party-auth/ThirdPartyAuth.jsx
@@ -11,14 +11,16 @@ class ThirdPartyAuth extends Component {
  onClickDisconnect = (e) => {
    e.preventDefault();
    const providerId = e.currentTarget.getAttribute('data-provider-id');
-    if (this.props.disconnectionStatuses[providerId] === 'pending') return;
+    if (this.props.disconnectionStatuses[providerId] === 'pending') {
+      return;
+    }
    const disconnectUrl = e.currentTarget.getAttribute('data-disconnect-url');
    this.props.disconnectAuth(disconnectUrl, providerId);
  }

  renderUnconnectedProvider(url, name) {
    return (
-      <React.Fragment>
+      <>
        <h6 aria-level="3">{name}</h6>
        <Hyperlink destination={url} className="btn btn-outline-primary">
          <FormattedMessage
@@ -28,7 +30,7 @@ class ThirdPartyAuth extends Component {
            values={{ name }}
          />
        </Hyperlink>
-      </React.Fragment>
+      </>
    );
  }

@@ -36,7 +38,7 @@ class ThirdPartyAuth extends Component {
    const hasError = this.props.errors[id];

    return (
-      <React.Fragment>
+      <>
        <h6 aria-level="3">
          {name}
          <span className="small font-weight-normal text-muted ml-2">
@@ -75,7 +77,7 @@ class ThirdPartyAuth extends Component {
          data-disconnect-url={url}
          data-provider-id={id}
        />
-      </React.Fragment>
+      </>
    );
  }

@@ -85,9 +87,9 @@ class ThirdPartyAuth extends Component {
    return (
      <div className="form-group" key={id}>
        {
-          connected ?
-          this.renderConnectedProvider(disconnectUrl, name, id) :
-          this.renderUnconnectedProvider(connectUrl, name)
+          connected
+            ? this.renderConnectedProvider(disconnectUrl, name, id)
+            : this.renderUnconnectedProvider(connectUrl, name)
        }
      </div>
    );
@@ -104,7 +106,7 @@ class ThirdPartyAuth extends Component {
  }

  render() {
-    if (this.props.providers === undefined) return null;
+    if (this.props.providers === undefined) { return null; }

    if (this.props.providers.length === 0) {
      return this.renderNoProviders();
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -33,9 +33,6 @@
  "account.settings.field.country": "Country",
  "account.settings.field.country.empty": "Add country",
  "account.settings.field.country.options.empty": "Select a Country",
-  "account.settings.field.state": "State",
-  "account.settings.field.state.empty": "Add state",
-  "account.settings.field.state.options.empty": "Select a State",
  "account.settings.field.site.language": "Site language",
  "account.settings.field.site.language.help.text": "The language used throughout this site. This site is currently available in a limited number of languages.",
  "account.settings.field.education": "Education",
@@ -79,23 +76,10 @@
  "account.settings.editable.field.action.edit": "Edit",
  "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
  "account.settings.static.field.empty.no.admin": "No value set.",
-  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
-  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
-  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
-  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
-  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
-  "account.settings.coaching.consent.label.name": "Please confirm your name",
-  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
-  "account.settings.coaching.consent.success.header": "Success!",
-  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You will receive a text message confirmation.",
-  "account.settings.coaching.consent.success.continue": "Start my course",
-  "account.settings.coaching.managed.support": "support",
-  "account.settings.coaching.managed.alert": "Your name is managed by {managerTitle}. Contact your administrator for help.",
  "account.settings.field.phone_number": "Phone Number",
  "account.settings.field.phone_number.empty": "Add a phone number",
  "account.settings.field.coaching_consent": "Coaching consent",
-  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available to learners with U.S. mobile phone numbers. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
+  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available in English and Spanish languages. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
  "account.settings.field.coaching_consent.error": "A valid US phone number is required to opt into coaching",
  "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
  "account.settings.delete.account.header": "Delete My Account",
@@ -125,7 +109,6 @@
  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
  "account.settings.editable.field.password.reset.button": "Reset Password",
-  "account.settings.editable.field.password.reset.button.forbidden": "Your previous request is in progress, please try again in few moments.",
  "account.settings.editable.field.password.reset.label": "Password",
  "account.settings.sso.link.account": "Sign in with {name}",
  "account.settings.sso.account.connected": "Linked",
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -33,9 +33,6 @@
  "account.settings.field.country": "País",
  "account.settings.field.country.empty": "Agregar país",
  "account.settings.field.country.options.empty": "Seleccionar un país",
-  "account.settings.field.state": "Estado",
-  "account.settings.field.state.empty": "Add state",
-  "account.settings.field.state.options.empty": "Select a State",
  "account.settings.field.site.language": "Idioma del sitio",
  "account.settings.field.site.language.help.text": "El idioma que se usará para el sitio. Actualmente solo hay disponibilidad de usar un número limitado de idiomas.",
  "account.settings.field.education": "Educación",
@@ -77,25 +74,12 @@
  "account.settings.editable.field.action.save": "Guardar",
  "account.settings.editable.field.action.cancel": "Cancelar",
  "account.settings.editable.field.action.edit": "Editar",
-  "account.settings.static.field.empty": "No hay valor establecido. Contacte su administrador {enterprise} para hacer cambios.",
-  "account.settings.static.field.empty.no.admin": "No hay valor establecido.",
-  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
-  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
-  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
-  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
-  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
-  "account.settings.coaching.consent.label.name": "Please confirm your name",
-  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
-  "account.settings.coaching.consent.success.header": "Success!",
-  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You will receive a text message confirmation.",
-  "account.settings.coaching.consent.success.continue": "Start my course",
-  "account.settings.coaching.managed.support": "soporte",
-  "account.settings.coaching.managed.alert": "Your name is managed by {managerTitle}. Contact your administrator for help.",
-  "account.settings.field.phone_number": "Teléfono",
+  "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
+  "account.settings.static.field.empty.no.admin": "No value set.",
+  "account.settings.field.phone_number": "Phone Number",
  "account.settings.field.phone_number.empty": "Add a phone number",
  "account.settings.field.coaching_consent": "Coaching consent",
-  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available to learners with U.S. mobile phone numbers. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
+  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available in English and Spanish languages. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
  "account.settings.field.coaching_consent.error": "A valid US phone number is required to opt into coaching",
  "account.settings.delete.account.before.proceeding": "Antes de continuar, por favor {actionLink}.",
  "account.settings.delete.account.header": "Eliminar mi cuenta",
@@ -107,7 +91,7 @@
  "account.settings.delete.account.text.change.instead": "En lugar de eso, ¿quieres cambiar tu correo electrónico, nombre o contraseña?",
  "account.settings.delete.account.button": "Eliminar mi cuenta",
  "account.settings.delete.account.please.activate": "activar su cuenta",
-  "account.settings.delete.account.please.unlink": "Desvincular todas las cuentas de redes sociales.",
+  "account.settings.delete.account.please.unlink": "unlink all social media accounts",
  "account.settings.delete.account.modal.header": "¿Está seguro?",
  "account.settings.delete.account.modal.text.1": "Has seleccionado “Eliminar mi cuenta”. La eliminación de tu cuenta y datos personales es permanente e irreversible. edX no será capaz de recuperar tu cuenta o los datos que se hayan borrado.",
  "account.settings.delete.account.modal.text.2": "Si procedes, no será posible usar esta cuenta para tomar cursos ni en la aplicación móvil de edX, ni en edx.org, ni en cualquier otro sitio hospedado por edX. Esto incluye el acceso a edx.org desde el sistema de tu empleador o universidad, y el acceso a sitios privados ofrecidos por MIT Open Learning, Wharton Executive Education, y Harvard Medical School.",
@@ -125,11 +109,10 @@
  "account.settings.editable.field.password.reset.button.confirmation.support.link": "soporte técnico",
  "account.settings.editable.field.password.reset.button.confirmation": "Hemos mandado un mensaje a {email}. Haz clic en el enlace en el mensaje para restablecer tu contraseña. ¿No recibiste el mensaje? Contáctate con {technicalSupportLink}.",
  "account.settings.editable.field.password.reset.button": "Restablecer contraseña",
-  "account.settings.editable.field.password.reset.button.forbidden": "Your previous request is in progress, please try again in few moments.",
  "account.settings.editable.field.password.reset.label": "Contraseña",
  "account.settings.sso.link.account": "Iniciar sesión con {name}",
  "account.settings.sso.account.connected": "Vinculado",
-  "account.settings.sso.account.disconnect.error": "Hubo un problema al desconectar esta Cuenta. Si el problema persiste, contacte soporte.",
+  "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
  "account.settings.sso.unlink.account": "Desvincular la cuenta de {accountName} ",
-  "account.settings.sso.no.providers": "No se pueden vincular cuentas en este momento."
+  "account.settings.sso.no.providers": "No accounts can be linked at this time."
 }
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -33,9 +33,6 @@
  "account.settings.field.country": "Country",
  "account.settings.field.country.empty": "Add country",
  "account.settings.field.country.options.empty": "Select a Country",
-  "account.settings.field.state": "State",
-  "account.settings.field.state.empty": "Add state",
-  "account.settings.field.state.options.empty": "Select a State",
  "account.settings.field.site.language": "Site language",
  "account.settings.field.site.language.help.text": "The language used throughout this site. This site is currently available in a limited number of languages.",
  "account.settings.field.education": "Education",
@@ -79,23 +76,10 @@
  "account.settings.editable.field.action.edit": "Edit",
  "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
  "account.settings.static.field.empty.no.admin": "No value set.",
-  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
-  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
-  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
-  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
-  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
-  "account.settings.coaching.consent.label.name": "Please confirm your name",
-  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
-  "account.settings.coaching.consent.success.header": "Success!",
-  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You will receive a text message confirmation.",
-  "account.settings.coaching.consent.success.continue": "Start my course",
-  "account.settings.coaching.managed.support": "support",
-  "account.settings.coaching.managed.alert": "Your name is managed by {managerTitle}. Contact your administrator for help.",
  "account.settings.field.phone_number": "Phone Number",
  "account.settings.field.phone_number.empty": "Add a phone number",
  "account.settings.field.coaching_consent": "Coaching consent",
-  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available to learners with U.S. mobile phone numbers. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
+  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available in English and Spanish languages. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
  "account.settings.field.coaching_consent.error": "A valid US phone number is required to opt into coaching",
  "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
  "account.settings.delete.account.header": "Delete My Account",
@@ -125,7 +109,6 @@
  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
  "account.settings.editable.field.password.reset.button": "Reset Password",
-  "account.settings.editable.field.password.reset.button.forbidden": "Your previous request is in progress, please try again in few moments.",
  "account.settings.editable.field.password.reset.label": "Password",
  "account.settings.sso.link.account": "Sign in with {name}",
  "account.settings.sso.account.connected": "Linked",
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -33,9 +33,6 @@
  "account.settings.field.country": "Country",
  "account.settings.field.country.empty": "Add country",
  "account.settings.field.country.options.empty": "Select a Country",
-  "account.settings.field.state": "State",
-  "account.settings.field.state.empty": "Add state",
-  "account.settings.field.state.options.empty": "Select a State",
  "account.settings.field.site.language": "Site language",
  "account.settings.field.site.language.help.text": "The language used throughout this site. This site is currently available in a limited number of languages.",
  "account.settings.field.education": "Education",
@@ -79,23 +76,10 @@
  "account.settings.editable.field.action.edit": "Edit",
  "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
  "account.settings.static.field.empty.no.admin": "No value set.",
-  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
-  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
-  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
-  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
-  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
-  "account.settings.coaching.consent.label.name": "Please confirm your name",
-  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
-  "account.settings.coaching.consent.success.header": "Success!",
-  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You will receive a text message confirmation.",
-  "account.settings.coaching.consent.success.continue": "Start my course",
-  "account.settings.coaching.managed.support": "support",
-  "account.settings.coaching.managed.alert": "Your name is managed by {managerTitle}. Contact your administrator for help.",
  "account.settings.field.phone_number": "Phone Number",
  "account.settings.field.phone_number.empty": "Add a phone number",
  "account.settings.field.coaching_consent": "Coaching consent",
-  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available to learners with U.S. mobile phone numbers. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
+  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available in English and Spanish languages. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
  "account.settings.field.coaching_consent.error": "A valid US phone number is required to opt into coaching",
  "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
  "account.settings.delete.account.header": "Delete My Account",
@@ -125,7 +109,6 @@
  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
  "account.settings.editable.field.password.reset.button": "Reset Password",
-  "account.settings.editable.field.password.reset.button.forbidden": "Your previous request is in progress, please try again in few moments.",
  "account.settings.editable.field.password.reset.label": "Password",
  "account.settings.sso.link.account": "Sign in with {name}",
  "account.settings.sso.account.connected": "Linked",
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -1,7 +1,9 @@
 import 'babel-polyfill';
 import 'formdata-polyfill';
 import { AppProvider, ErrorPage } from '@edx/frontend-platform/react';
-import { subscribe, initialize, APP_INIT_ERROR, APP_READY, mergeConfig } from '@edx/frontend-platform';
+import {
+  subscribe, initialize, APP_INIT_ERROR, APP_READY, mergeConfig,
+} from '@edx/frontend-platform';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, Switch } from 'react-router-dom';
@@ -11,33 +13,23 @@ import Footer, { messages as footerMessages } from '@edx/frontend-component-foot

 import configureStore from './data/configureStore';
 import AccountSettingsPage, { NotFoundPage } from './account-settings';
-import CoachingConsent from './account-settings/coaching/CoachingConsent';
 import appMessages from './i18n';

 import './index.scss';
 import './assets/favicon.ico';

-const HeaderFooterLayout = ({ children }) => (
-  <div>
-    <Header />
-      <main>
-        {children}
-      </main>
-    <Footer />
-  </div>
-);
-
 subscribe(APP_READY, () => {
  ReactDOM.render(
    <AppProvider store={configureStore()}>
-      <Switch>
-        <Route path="/coaching_consent" component={CoachingConsent} />
-        <HeaderFooterLayout>
+      <Header />
+      <main>
+        <Switch>
          <Route exact path="/" component={AccountSettingsPage} />
          <Route path="/notfound" component={NotFoundPage} />
          <Route path="*" component={NotFoundPage} />
-        </HeaderFooterLayout>
-      </Switch>
+        </Switch>
+      </main>
+      <Footer />
    </AppProvider>,
    document.getElementById('root'),
  );
--- a/src/index.scss
+++ b/src/index.scss
@@ -35,18 +35,3 @@ $fa-font-path: "~font-awesome/fonts";
    flex-grow: 1;
  }
 }
-
-.coaching-header {
-  .logo {
-    display: block;
-    box-sizing: content-box;
-    height: 1.75rem;
-    padding: .75rem 0;
-  }
-}
-
-.coaching-consent {
-  .disclaimer {
-    font-size: 	0.75rem;
-  }
-}
--- a/src/logo.svg
+++ b/src/logo.svg
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1168px" height="540px" viewBox="0 0 1168 540" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>logo</title>
-    <desc>Created with Sketch.</desc>
-    <g id="logo" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <polygon id="Path" fill="#209FDA" fill-rule="nonzero" points="1166.81993 85.5 1166.81993 2.84217094e-14 953.759925 2.84217094e-14 953.759925 85.5 1002.17993 85.5 915.859925 191.98 829.459925 85.5 878.099925 85.5 878.099925 2.84217094e-14 718.919925 2.84217094e-14 718.919925 95.72 856.479925 265.26 718.919925 434.96 718.919925 452.02 784.499925 452.02 784.499925 539.64 878.099925 539.64 878.099925 452.02 823.919925 452.02 915.919925 338.52 915.939925 338.52 1008.03993 452.02 953.759925 452.02 953.759925 539.64 1166.81993 539.64 1166.81993 452.02 1126.85993 452.02 975.319925 265.26 1121.01993 85.5"></polygon>
-        <polygon id="Path" fill="#026BA4" fill-rule="nonzero" points="664.019925 7.10542736e-15 664.019925 85.5 710.619925 85.5 718.919925 95.72 718.919925 7.10542736e-15"></polygon>
-        <polygon id="Path" fill="#026BA4" fill-rule="nonzero" points="718.919925 452.02 718.919925 434.96 705.079925 452.02 664.019925 452.02 664.019925 539.64 784.499925 539.64 784.499925 452.02"></polygon>
-        <path d="M321.999925,411.86 L397.659925,411.86 C388.805702,433.829527 376.258024,454.122269 360.559925,471.86 C344.364089,454.216816 331.320914,433.921419 321.999925,411.86" id="Path" fill="#78212E" fill-rule="nonzero"></path>
-        <path d="M360.559925,189.28 C338.58337,213.190393 322.501981,241.908137 313.599925,273.14 C317.134915,280.039338 320.007771,287.25831 322.179925,294.7 L397.059925,294.7 C399.306706,287.354671 402.25356,280.242036 405.859925,273.46 C397.464721,242.277678 381.959326,213.464341 360.559925,189.28 Z M322.179925,294.7 C328.784599,317.438017 328.978396,341.558795 322.739925,364.4 L396.399925,364.4 C389.855554,341.597488 390.06397,317.386469 396.999925,294.7 L322.179925,294.7 Z M322.179925,294.7 L308.679925,294.7 C304.690779,317.752715 304.575868,341.309464 308.339925,364.4 L322.739925,364.4 C328.978396,341.558795 328.784599,317.438017 322.179925,294.7 L322.179925,294.7 Z" id="Shape" fill="#78212E" fill-rule="nonzero"></path>
-        <path d="M710.619925,85.5 L664.019925,85.5 L664.019925,0.02 L576.019925,0.02 L576.019925,85.5 L632.859925,85.5 L632.859925,159.2 C598.417874,134.487772 557.04992,121.286425 514.659925,121.48 C456.044663,121.405246 400.107354,146.01621 360.559925,189.28 C381.937732,213.470272 397.422343,242.283149 405.799925,273.46 C426.944121,233.500977 468.451514,208.51034 513.659925,208.52 C581.059925,208.52 632.879925,263.16 632.879925,330.52 L632.879925,331.2 C632.539925,398.28 580.879925,452.56 513.659925,452.56 C468.477451,452.593197 426.976426,427.652566 405.799925,387.74 L405.799925,387.74 C401.869213,380.340239 398.718926,372.551658 396.399925,364.5 L308.399925,364.5 C309.686934,372.450225 311.443338,380.317312 313.659925,388.06 C315.970162,396.190434 318.775397,404.171995 322.059925,411.96 L397.659925,411.96 C388.805702,433.929527 376.258024,454.222269 360.559925,471.96 C400.107354,515.22379 456.044663,539.834754 514.659925,539.76 C571.465111,540.091874 625.745998,516.316729 664.019925,474.34 L664.019925,452.04 L705.059925,452.04 L718.899925,434.96 L718.899925,95.74 L710.619925,85.5 Z M632.879925,501.9 L632.879925,539.74 L664.019925,539.74 L664.019925,474.18 C654.623775,484.469293 644.18821,493.758755 632.879925,501.9 L632.879925,501.9 Z M313.599925,273.14 C311.569597,280.231983 309.927163,287.429316 308.679925,294.7 L322.179925,294.7 C320.007771,287.25831 317.134915,280.039338 313.599925,273.14 L313.599925,273.14 Z" id="Shape" fill="#8A8C8F" fill-rule="nonzero"></path>
-        <path d="M410.399925,294.7 C409.199925,287.5 407.659925,280.4 405.799925,273.46 C402.19356,280.242036 399.246706,287.354671 396.999925,294.7 C390.06397,317.386469 389.855554,341.597488 396.399925,364.4 L410.719925,364.4 C414.264276,341.293291 414.156293,317.77319 410.399925,294.7 L410.399925,294.7 Z M209.059925,121.48 C107.422724,121.487508 20.5081632,194.571683 3.05992537,294.7 L91.3999254,294.7 C107.135726,243.467257 154.465065,208.503753 208.059925,208.52 C252.638644,208.335148 293.496156,233.351373 313.599925,273.14 C322.501981,241.908137 338.58337,213.190393 360.559925,189.28 C322.206855,145.880863 266.976617,121.163964 209.059925,121.48 L209.059925,121.48 Z M297.479925,411.86 C275.077969,437.877726 242.392659,452.761934 208.059925,452.58 C153.691226,452.598435 105.87164,416.63791 90.7999254,364.4 L308.339925,364.4 C304.575868,341.309464 304.690779,317.752715 308.679925,294.7 L3.05992537,294.7 C-0.902504563,317.755068 -1.01739385,341.307372 2.71992537,364.4 L2.71992537,364.4 C19.3292424,465.441984 106.661918,539.594765 209.059925,539.6 C266.986094,539.900862 322.217868,515.161403 360.559925,471.74 C344.364089,454.096816 331.320914,433.801419 321.999925,411.74 L297.479925,411.86 Z" id="Shape" fill="#B72768" fill-rule="nonzero"></path>
-    </g>
-</svg>