Fix logout URL

Use devstack frontend-build branch; add dev-build command
Update .env.development for devstack
2020-04-15 11:43:01 -04:00 · 2020-04-15 11:43:00 -04:00 · 2020-04-15 11:43:00 -04:00 · 2020-04-15 11:43:00 -04:00
218 changed files with 23905 additions and 31486 deletions
--- a/.env
+++ b/.env
@@ -1,36 +1,17 @@
-ACCESS_TOKEN_COOKIE_NAME=''
-ACCOUNT_PROFILE_URL=''
-BASE_URL=''
-CREDENTIALS_BASE_URL=''
-CSRF_TOKEN_API_PATH=''
-DISCOVERY_API_BASE_URL=''
-ECOMMERCE_BASE_URL=''
-FAVICON_URL=''
-LANGUAGE_PREFERENCE_COOKIE_NAME=''
-LMS_BASE_URL=''
-LOGIN_URL=''
-LOGO_TRADEMARK_URL=''
-LOGO_URL=''
-LOGO_WHITE_URL=''
-SHOW_EMAIL_CHANNEL=''
-LOGOUT_URL=''
-MARKETING_SITE_BASE_URL=''
-NODE_ENV='production'
-ORDER_HISTORY_URL=''
-PUBLISHER_BASE_URL=''
-REFRESH_ACCESS_TOKEN_ENDPOINT=''
-SEGMENT_KEY=''
-SITE_NAME=''
-STUDIO_BASE_URL=''
-SUPPORT_URL=''
-USER_INFO_COOKIE_NAME=''
-ENABLE_COPPA_COMPLIANCE=''
-ENABLE_ACCOUNT_DELETION=''
-ENABLE_DOB_UPDATE=''
-MARKETING_EMAILS_OPT_IN=''
-APP_ID=
-MFE_CONFIG_API_URL=
-PASSWORD_RESET_SUPPORT_LINK=''
-LEARNER_FEEDBACK_URL=''
-SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT='https://help.edx.org/edxlearner/s/article/How-do-I-link-or-unlink-my-edX-account-to-a-social-media-account'
-COUNTRIES_WITH_DELETE_ACCOUNT_DISABLED='[]'
+ACCESS_TOKEN_COOKIE_NAME=null
+BASE_URL=null
+CREDENTIALS_BASE_URL=null
+CSRF_TOKEN_API_PATH=null
+ECOMMERCE_BASE_URL=null
+LANGUAGE_PREFERENCE_COOKIE_NAME=null
+LMS_BASE_URL=null
+LOGIN_URL=null
+LOGOUT_URL=null
+MARKETING_SITE_BASE_URL=null
+NODE_ENV=null
+ORDER_HISTORY_URL=null
+REFRESH_ACCESS_TOKEN_ENDPOINT=null
+SEGMENT_KEY=null
+SITE_NAME=null
+SUPPORT_URL=null
+USER_INFO_COOKIE_NAME=null
--- a/.env.development
+++ b/.env.development
@@ -1,37 +1,20 @@
 ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
-ACCOUNT_PROFILE_URL='http://localhost:1995'
-BASE_URL='localhost:1997'
+BASE_URL='localhost:19000/account/'
 CREDENTIALS_BASE_URL='http://localhost:18150'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
-DISCOVERY_API_BASE_URL=''
 ECOMMERCE_BASE_URL='http://localhost:18130'
-FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'
 LOGIN_URL='http://localhost:18000/login'
-LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
-LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
-LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
 LOGOUT_URL='http://localhost:18000/logout'
-MARKETING_SITE_BASE_URL='http://localhost:5335'
+MARKETING_SITE_BASE_URL='http://localhost:18000'
 NODE_ENV='development'
-ORDER_HISTORY_URL='http://localhost:1996/orders'
-PORT=1997
-PUBLISHER_BASE_URL=''
+ORDER_HISTORY_URL='localhost:19000/ecommerce/orders'
+PORT=1997  # For standalone dev server only.
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
-SEGMENT_KEY=''
-SITE_NAME=localhost
-STUDIO_BASE_URL=''
+SEGMENT_KEY=null
+SITE_NAME='edX'
 SUPPORT_URL='http://localhost:18000/support'
 USER_INFO_COOKIE_NAME='edx-user-info'
-ENABLE_COPPA_COMPLIANCE=''
-ENABLE_ACCOUNT_DELETION=''
-ENABLE_DOB_UPDATE=''
-MARKETING_EMAILS_OPT_IN=''
-SHOW_EMAIL_CHANNEL='true'
-APP_ID=
-MFE_CONFIG_API_URL=
-PASSWORD_RESET_SUPPORT_LINK='mailto:support@example.com'
-LEARNER_FEEDBACK_URL=''
-SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT='https://help.edx.org/edxlearner/s/article/How-do-I-link-or-unlink-my-edX-account-to-a-social-media-account'
-COUNTRIES_WITH_DELETE_ACCOUNT_DISABLED='[]'
+# Temporary, Remove this once we are ready to release the feature.
+COACHING_ENABLED=''
--- a/.env.test
+++ b/.env.test
@@ -2,33 +2,17 @@ ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
 BASE_URL='localhost:1997'
 CREDENTIALS_BASE_URL='http://localhost:18150'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
-DISCOVERY_API_BASE_URL=''
 ECOMMERCE_BASE_URL='http://localhost:18130'
-FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'
 LOGIN_URL='http://localhost:18000/login'
-LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
-LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
-LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
-LOGOUT_URL='http://localhost:18000/logout'
-MARKETING_SITE_BASE_URL='http://localhost:5335'
-NODE_ENV=''
-ORDER_HISTORY_URL='http://localhost:1996/orders'
-PUBLISHER_BASE_URL=''
+LOGOUT_URL='http://localhost:18000/login'
+MARKETING_SITE_BASE_URL='http://localhost:18000'
+NODE_ENV=null
+ORDER_HISTORY_URL='localhost:1996/orders'
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
-SEGMENT_KEY=''
-SITE_NAME=localhost
-STUDIO_BASE_URL=''
+SEGMENT_KEY=null
+SITE_NAME='edX'
 SUPPORT_URL='http://localhost:18000/support'
 USER_INFO_COOKIE_NAME='edx-user-info'
-ENABLE_COPPA_COMPLIANCE=''
-ENABLE_ACCOUNT_DELETION=''
-SHOW_EMAIL_CHANNEL=''
-ENABLE_DOB_UPDATE=''
-MARKETING_EMAILS_OPT_IN=''
-APP_ID=
-MFE_CONFIG_API_URL=
-LEARNER_FEEDBACK_URL=''
-SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT='https://help.edx.org/edxlearner/s/article/How-do-I-link-or-unlink-my-edX-account-to-a-social-media-account'
-COUNTRIES_WITH_DELETE_ACCOUNT_DISABLED='[]'
+COACHING_ENABLED=''
--- a/.eslintignore
+++ b/.eslintignore
@@ -3,4 +3,3 @@ dist/
 node_modules/
 __mocks__/
 __snapshots__/
-src/i18n/messages/
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-const { createConfig } = require('@openedx/frontend-build');
+const { createConfig } = require('@edx/frontend-build');

 module.exports = createConfig('eslint');
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,24 +0,0 @@
-### Description
-
-Include a description of your changes here, along with a link to any relevant Jira tickets and/or GitHub issues.
-
-#### How Has This Been Tested?
-
-Please describe in detail how you tested your changes.
-
-#### Screenshots/sandbox (optional):
-Include a link to the sandbox for design changes or screenshot for before and after. **Remove this section if it's not applicable.**
-
-|Before|After|
-|-------|-----|
-|      |      |
-
-#### Merge Checklist
-
-* [ ] If your update includes visual changes, have they been reviewed by a designer? Send them a link to the Sandbox, if applicable.
-* [ ] Is there adequate test coverage for your changes?
-
-#### Post-merge Checklist
-
-* [ ] Deploy the changes to prod after verifying on stage or ask **@openedx/edx-infinity** to do it. 
-* [ ] 🎉 🙌 Celebrate! Thanks for your contribution.
--- a/.github/workflows/add-depr-ticket-to-depr-board.yml
+++ b/.github/workflows/add-depr-ticket-to-depr-board.yml
@@ -1,19 +0,0 @@
-# Run the workflow that adds new tickets that are either:
-# - labelled "DEPR"
-# - title starts with "[DEPR]"
-# - body starts with "Proposal Date" (this is the first template field)
-# to the org-wide DEPR project board
-
-name: Add newly created DEPR issues to the DEPR project board
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  routeissue:
-    uses: openedx/.github/.github/workflows/add-depr-ticket-to-depr-board.yml@master
-    secrets:
-      GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
-      GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
-      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}
--- a/.github/workflows/add-remove-label-on-comment.yml
+++ b/.github/workflows/add-remove-label-on-comment.yml
@@ -1,20 +0,0 @@
-# This workflow runs when a comment is made on the ticket
-# If the comment starts with "label: " it tries to apply
-# the label indicated in rest of comment.
-# If the comment starts with "remove label: ", it tries
-# to remove the indicated label.
-# Note: Labels are allowed to have spaces and this script does
-# not parse spaces (as often a space is legitimate), so the command
-# "label: really long lots of words label" will apply the
-# label "really long lots of words label"
-
-name: Allows for the adding and removing of labels via comment
-
-on:
-  issue_comment:
-    types: [created]
-
-jobs:
-  add_remove_labels:
-    uses: openedx/.github/.github/workflows/add-remove-label-on-comment.yml@master
-
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,29 +0,0 @@
-name: ci
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        npm-test:
-        - i18n_extract
-        - lint
-        - test
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-    - run: make requirements
-    - run: make test NPM_TESTS=build
-    - run: make test NPM_TESTS=${{ matrix.npm-test }}
-    - name: Coverage
-      if: matrix.npm-test == 'test'
-      uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        fail_ci_if_error: true
--- a/.github/workflows/commitlint.yml
+++ b/.github/workflows/commitlint.yml
@@ -1,10 +0,0 @@
-# Run commitlint on the commit messages in a pull request.
-
-name: Lint Commit Messages
-
-on:
-  - pull_request
-
-jobs:
-  commitlint:
-    uses: openedx/.github/.github/workflows/commitlint.yml@master
--- a/.github/workflows/lockfileversion-check.yml
+++ b/.github/workflows/lockfileversion-check.yml
@@ -1,13 +0,0 @@
-#check package-lock file version
-
-name: Lockfile Version check
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-
-jobs:
-  version-check:
-    uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master
--- a/.github/workflows/self-assign-issue.yml
+++ b/.github/workflows/self-assign-issue.yml
@@ -1,12 +0,0 @@
-# This workflow runs when a comment is made on the ticket
-# If the comment starts with "assign me" it assigns the author to the
-# ticket (case insensitive)
-
-name: Assign comment author to ticket if they say "assign me"
-on:
-  issue_comment:
-    types: [created]
-
-jobs:
-  self_assign_by_comment:
-    uses: openedx/.github/.github/workflows/self-assign-issue.yml@master
--- a/.github/workflows/update-browserslist-db.yml
+++ b/.github/workflows/update-browserslist-db.yml
@@ -1,12 +0,0 @@
-name: Update Browserslist DB
-on:
-  schedule:
-    - cron:  '0 0 * * 1'
-  workflow_dispatch:
-
-jobs:
-  update-browserslist:
-    uses: openedx/.github/.github/workflows/update-browserslist-db.yml@master
-
-    secrets:
-        requirements_bot_github_token: ${{ secrets.requirements_bot_github_token }}
--- a/.gitignore
+++ b/.gitignore
@@ -16,5 +16,3 @@ temp/babel-plugin-react-intl
 *~
 /temp
 /.vscode
-/module.config.js
-src/i18n/messages/
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +0,0 @@
-20
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+language: node_js
+node_js: 12
+before_install:
+- npm install -g npm@6
+install:
+- npm ci
+script:
+- make validate-no-uncommitted-package-lock-changes
+- npm run i18n_extract
+- npm run lint
+- npm run test
+- npm run build
+- npm run is-es5
+after_success:
+- codecov
--- a/.tx/config
+++ b/.tx/config
@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[edx-platform.frontend-app-account]
+file_filter = src/i18n/messages/<lang>.json
+source_file = src/i18n/transifex_input.json
+source_lang = en
+type = KEYVALUEJSON
--- a/47
+++ b/47
@@ -1,29 +1,17 @@
-intl_imports = ./node_modules/.bin/intl-imports.js
+transifex_resource = frontend-app-account
+transifex_langs = "ar,fr,es_419,zh_CN"
+
 transifex_utils = ./node_modules/.bin/transifex-utils.js
 i18n = ./src/i18n
 transifex_input = $(i18n)/transifex_input.json
+tx_url1 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/translation/en/strings/
+tx_url2 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/source/

 # This directory must match .babelrc .
-transifex_temp = ./temp/babel-plugin-formatjs
+transifex_temp = ./temp/babel-plugin-react-intl

-NPM_TESTS=build i18n_extract lint test
-
-.PHONY: test
-test: $(addprefix test.npm.,$(NPM_TESTS))  ## validate ci suite
-
-.PHONY: test.npm.*
-test.npm.%: validate-no-uncommitted-package-lock-changes
-	test -d node_modules || $(MAKE) requirements
-	npm run $(*)
-
-.PHONY: requirements
-
-precommit:
-	npm run lint
-	npm audit
-
-requirements:  ## install ci requirements
-	npm ci
+requirements:
+	npm install

 i18n.extract:
 	# Pulling display strings from .jsx files into .json files...
@@ -46,24 +34,15 @@ push_translations:
 	# Pushing strings to Transifex...
 	tx push -s
 	# Fetching hashes from Transifex...
-	./node_modules/@edx/reactifex/bash_scripts/get_hashed_strings_v3.sh
+	./node_modules/reactifex/bash_scripts/get_hashed_strings.sh $(tx_url1)
 	# Writing out comments to file...
-	$(transifex_utils) $(transifex_temp) --comments --v3-scripts-path
+	$(transifex_utils) $(transifex_temp) --comments
 	# Pushing comments to Transifex...
-	./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
+	./node_modules/reactifex/bash_scripts/put_comments.sh $(tx_url2)

+# Pulls translations from Transifex.
 pull_translations:
-	rm -rf src/i18n/messages
-	mkdir src/i18n/messages
-	cd src/i18n/messages \
-      && atlas pull $(ATLAS_OPTIONS) \
-               translations/frontend-platform/src/i18n/messages:frontend-platform \
-               translations/paragon/src/i18n/messages:paragon \
-               translations/frontend-component-footer/src/i18n/messages:frontend-component-footer \
-               translations/frontend-component-header/src/i18n/messages:frontend-component-header \
-               translations/frontend-app-account/src/i18n/messages:frontend-app-account
-
-	$(intl_imports) frontend-platform paragon frontend-component-header frontend-component-footer frontend-app-account
+	tx pull -f --mode reviewed --language=$(transifex_langs)

 # This target is used by Travis.
 validate-no-uncommitted-package-lock-changes:
--- a/README.rst
+++ b/README.rst
@@ -1,216 +1,53 @@
-####################
+|Build Status| |Codecov| |npm_version| |npm_downloads| |license| |semantic-release|
+
 frontend-app-account
-####################
+====================

-|ci-badge| |Codecov| |npm_version| |npm_downloads| |license| |semantic-release|
+This is a micro-frontend application responsible for the display and updating of a user's account information.  Please tag **@edx/arch-team** on any PRs or issues.

+Development
+-----------

-********
-Purpose
-********
+Start Devstack
+^^^^^^^^^^^^^^

-This is a micro-frontend application responsible for the display and updating of a user's account information.
+To use this application `devstack <https://github.com/edx/devstack>`__ must be running and you must be logged into it.

-What is the domain of this MFE?
+-  Start devstack
+-  Log in (http://localhost:18000/login)

-In this MFE: Private user settings UIs. Public facing profile is in a `separate MFE (Profile) <https://github.com/openedx/frontend-app-profile>`_
+Start the development server
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^

- Account settings page
- IDV (Identity Verification)
+In this project, install requirements and start the development server by running:

-***************
-Getting Started
-***************
+.. code:: bash

-Prerequisites
-=============
+   npm install
+   npm start # The server will run on port 1997

-`Tutor`_ is currently recommended as a development environment for your
-new MFE. Please refer
-to the `relevant tutor-mfe documentation`_ to get started using it.
+Once the dev server is up visit http://localhost:1997.

-.. _Tutor: https://github.com/overhangio/tutor
+Configuration and Deployment
+----------------------------

-.. _relevant tutor-mfe documentation: https://github.com/overhangio/tutor-mfe?tab=readme-ov-file#mfe-development
-
-Plugins
-=======
-This MFE can be customized using `Frontend Plugin Framework <https://github.com/openedx/frontend-plugin-framework>`_.
-
-The parts of this MFE that can be customized in that manner are documented `here </src/plugin-slots>`_.
-
-Environment Variables/Setup Notes
-=================================
-
-This MFE is configured via the ``frontend-platform`` configuration module. For more information on MFE configuration see the `Configuration documentation`_.
-
-The account settings micro-frontend also supports the following additional variable:
-
-``SUPPORT_URL``
-
-Example: ``https://support.example.com``
-
-The fully-qualified URL to the support page in the target environment.
-
-``PASSWORD_RESET_SUPPORT_LINK``
-
-Examples:
-
- ``https://support.edx.org/hc/en-us/articles/206212088-What-if-I-did-not-receive-a-password-reset-message-``
-
- ``mailto:support@example.com``
-
-The fully-qualified URL to the support page or email to request the support from in the target environment.
-
-``ENABLE_ACCOUNT_DELETION``
-
-Example: ``'false'`` | ``''`` (empty strings are true)
-
-Enable the account deletion option, defaults to true.
-To disable account deletion set ``ENABLE_ACCOUNT_DELETION`` to ``'false'`` (string), otherwise it will default to true.
-
-Example build syntax with a single environment variable:
+This MFE is configured via node environment variables supplied at build time. See the .env file for the list of required environment variables. Example build syntax with a single environment variable:

 .. code:: bash

   NODE_ENV=development ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload' npm run build

-For more information see the document: `Configuration documentation`_

-.. _Configuration documentation: https://openedx.github.io/frontend-platform/module-Config.html
+For more information see the document: `Micro-frontend applications in Open
+edX <https://github.com/edx/edx-developer-docs/blob/5191e800bf16cf42f25c58c58f983bdaf7f9305d/docs/micro-frontends-in-open-edx.rst>`__.

-Cloning and Startup
-===================
+Notes
+-----

-.. code-block::
+The production Webpack configuration for this repo uses `Purgecss <https://www.purgecss.com/>`__ to remove unused CSS from the production css file. In ``webpack.prod.config.js`` the Purgecss plugin is configured to scan directories to determine what css selectors should remain. Currently the src/ directory is scanned along with all ``@edx/frontend-component*`` node modules and ``@edx/paragon``. **If you add and use a component in this repo that relies on HTML classes or ids for styling you must add it to the Purgecss configuration or it will be unstyled in the production build.**

-
-  1. Clone your new repo:
-
-    ``git clone https://github.com/openedx/frontend-app-account.git``
-
-  2. Use node v18.x.
-
-    The current version of the micro-frontend build scripts support node 18.
-    Using other major versions of node *may* work, but this is unsupported.  For
-    convenience, this repository includes an .nvmrc file to help in setting the
-    correct node version via `nvm <https://github.com/nvm-sh/nvm>`_.
-
-  3. Install npm dependencies:
-
-    ``cd frontend-app-account && npm ci``
-
-  4. Start the dev server:
-
-    ``npm start``
-
-Local module development
-=========================
-
-To develop locally on modules that are installed into this app, you'll need to create a ``module.config.js``
-file (which is git-ignored) that defines where to find your local modules, for instance:
-
-.. code-block:: js
-
-   module.exports = {
-     /*
-     Modules you want to use from local source code.  Adding a module here means that when this app
-     runs its build, it'll resolve the source from peer directories of this app.
-
-     moduleName: the name you use to import code from the module.
-     dir: The relative path to the module's source code.
-     dist: The sub-directory of the source code where it puts its build artifact.  Often "dist", though you
-       may want to use "src" if the module installs React as a peer/dev dependency.
-     */
-     localModules: [
-        { moduleName: '@openedx/paragon/scss', dir: '../paragon', dist: 'scss' },
-        { moduleName: '@openedx/paragon', dir: '../paragon', dist: 'dist' },
-        { moduleName: '@openedx/frontend-enterprise', dir: '../frontend-enterprise', dist: 'src' },
-        { moduleName: '@openedx/frontend-platform', dir: '../frontend-platform', dist: 'dist' },
-     ],
-   };
-
-See https://github.com/openedx/frontend-build#local-module-configuration-for-webpack for more details.
-
-Known Issues
-===========
-
-None
-
-Development Roadmap
-===================
-
-We don't have anything planned for the core of the MFE (the account settings page) - this MFE is currently in maintenance mode.
-There may be a replacement for IDV coming down the pipe, so that may be DEPRed.
-
-License
-=======
-
-The code in this repository is licensed under the AGPLv3 unless otherwise
-noted.
-
-Please see `LICENSE <LICENSE>`_ for details.
-
-Contributing
-============
-
-Contributions are very welcome.  Please read `How To Contribute`_ for details.
-
-.. _How To Contribute: https://openedx.org/r/how-to-contribute
-
-This project is currently accepting all types of contributions, bug fixes,
-security fixes, maintenance work, or new features.  However, please make sure
-to have a discussion about your new feature idea with the maintainers prior to
-beginning development to maximize the chances of your change being accepted.
-You can start a conversation by creating a new issue on this repo summarizing
-your idea.
-
-
-Getting Help
-===========
-
-If you're having trouble, we have discussion forums at
-https://discuss.openedx.org where you can connect with others in the community.
-
-Our real-time conversations are on Slack. You can request a `Slack
-invitation`_, then join our `community Slack workspace`_.  Because this is a
-frontend repository, the best place to discuss it would be in the `#wg-frontend
-channel`_.
-
-For anything non-trivial, the best path is to open an issue in this repository
-with as many details about the issue you are facing as you can provide.
-
-https://github.com/openedx/frontend-app-account/issues
-
-For more information about these options, see the `Getting Help`_ page.
-
-.. _Slack invitation: https://openedx.org/slack
-.. _community Slack workspace: https://openedx.slack.com/
-.. _#wg-frontend channel: https://openedx.slack.com/archives/C04BM6YC7A6
-.. _Getting Help: https://openedx.org/community/connect
-
-
-The Open edX Code of Conduct
-============================
-
-All community members are expected to follow the `Open edX Code of Conduct`_.
-
-.. _Open edX Code of Conduct: https://openedx.org/code-of-conduct/
-
-People
-======
-The assigned maintainers for this component and other project details may be found in Backstage or from inspecting catalog-info.yaml.
-
-Reporting Security Issues
-=========================
-
-Please do not report security issues in public. Please email security@openedx.org.
-
-==============================
-
-.. |ci-badge| image:: https://github.com/openedx/edx-developer-docs/actions/workflows/ci.yml/badge.svg
-   :target: https://github.com/openedx/edx-developer-docs/actions/workflows/ci.yml
-   :alt: Continuous Integration
+.. |Build Status| image:: https://api.travis-ci.org/edx/frontend-app-account.svg?branch=master
+   :target: https://travis-ci.org/edx/frontend-app-account
 .. |Codecov| image:: https://img.shields.io/codecov/c/github/edx/frontend-app-account
   :target: https://codecov.io/gh/edx/frontend-app-account
 .. |npm_version| image:: https://img.shields.io/npm/v/@edx/frontend-app-account.svg
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -1,19 +0,0 @@
-# This file records information about this repo. Its use is described in OEP-55:
-# https://open-edx-proposals.readthedocs.io/en/latest/processes/oep-0055-proc-project-maintainers.html
-
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: 'frontend-app-account'
-  description: "Open edX micro-frontend application for managing user account information."
-  links:
-    - url: "https://github.com/openedx/frontend-app-account"
-      title: "Frontend app account"
-      icon: "Web"
-  annotations:
-    openedx.org/arch-interest-groups: ""
-    openedx.org/release: "master"
-spec:
-  owner: group:2u-infinity
-  type: 'website'
-  lifecycle: 'production'
--- a/docs/images/localhost_preview.png
+++ b/docs/images/localhost_preview.png
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,7 +1,7 @@
-const { createConfig } = require('@openedx/frontend-build');
+const { createConfig } = require('@edx/frontend-build');

 module.exports = createConfig('jest', {
-  setupFilesAfterEnv: [
+  setupFiles: [
    '<rootDir>/src/setupTest.js',
  ],
 });
--- a/openedx.yaml
+++ b/openedx.yaml
@@ -0,0 +1,7 @@
+# This file describes this Open edX repo, as described in OEP-2:
+# https://open-edx-proposals.readthedocs.io/en/latest/oep-0002-bp-repo-metadata.html#specification
+
+nick: acct
+oeps: {}
+owner: edx/arch-team
+openedx-release: {ref: master}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -6,50 +6,45 @@
  "license": "AGPL-3.0",
  "repository": {
    "type": "git",
-    "url": "git+https://github.com/openedx/frontend-app-account.git"
+    "url": "git+https://github.com/edx/frontend-app-account.git"
  },
  "scripts": {
    "build": "fedx-scripts webpack",
-    "i18n_extract": "fedx-scripts formatjs extract",
-    "lint": "fedx-scripts eslint --ext .js --ext .jsx .",
-    "lint:fix": "npm run lint -- --fix",
+    "dev-build": "fedx-scripts webpack-dev",
+    "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
+    "is-es5": "es-check es5 ./dist/*.js",
+    "lint": "fedx-scripts eslint",
    "snapshot": "fedx-scripts jest --updateSnapshot",
    "start": "fedx-scripts webpack-dev-server --progress",
-    "test": "TZ=UTC fedx-scripts jest --coverage --passWithNoTests"
+    "test": "fedx-scripts jest --coverage --passWithNoTests"
  },
  "bugs": {
-    "url": "https://github.com/openedx/frontend-app-account/issues"
+    "url": "https://github.com/edx/frontend-app-account/issues"
  },
-  "homepage": "https://github.com/openedx/frontend-app-account#readme",
+  "homepage": "https://github.com/edx/frontend-app-account#readme",
  "publishConfig": {
    "access": "public"
  },
  "browserslist": [
-    "extends @edx/browserslist-config"
+    "last 2 versions",
+    "ie 11"
  ],
  "dependencies": {
-    "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
-    "@edx/frontend-component-footer": "^14.6.0",
-    "@edx/frontend-component-header": "^6.2.0",
-    "@edx/frontend-platform": "^8.3.3",
-    "@edx/openedx-atlas": "^0.6.0",
-    "@fortawesome/fontawesome-svg-core": "^6.6.0",
-    "@fortawesome/free-brands-svg-icons": "^6.6.0",
-    "@fortawesome/free-regular-svg-icons": "^6.6.0",
-    "@fortawesome/free-solid-svg-icons": "^6.6.0",
-    "@fortawesome/react-fontawesome": "0.2.2",
-    "@openedx/frontend-plugin-framework": "^1.7.0",
-    "@openedx/paragon": "^22.16.0",
-    "@tensorflow-models/blazeface": "0.1.0",
-    "@tensorflow/tfjs-converter": "4.22.0",
-    "@tensorflow/tfjs-core": "4.22.0",
-    "bowser": "2.11.0",
-    "classnames": "2.5.1",
-    "core-js": "3.41.0",
+    "@edx/frontend-component-footer": "10.0.9",
+    "@edx/frontend-component-header": "2.0.5",
+    "@edx/frontend-platform": "1.1.14",
+    "@edx/paragon": "7.1.5",
+    "@fortawesome/fontawesome-svg-core": "1.2.28",
+    "@fortawesome/free-brands-svg-icons": "5.8.2",
+    "@fortawesome/free-regular-svg-icons": "5.7.2",
+    "@fortawesome/free-solid-svg-icons": "5.8.2",
+    "@fortawesome/react-fontawesome": "0.1.9",
+    "babel-polyfill": "6.26.0",
+    "classnames": "2.2.6",
    "font-awesome": "4.7.0",
-    "form-urlencoded": "6.1.5",
-    "formdata-polyfill": "4.0.10",
-    "jslib-html5-camera-photo": "3.3.4",
+    "form-urlencoded": "4.0.1",
+    "formdata-polyfill": "3.0.19",
+    "history": "4.10.1",
    "lodash.camelcase": "4.3.0",
    "lodash.debounce": "4.0.8",
    "lodash.findindex": "4.6.0",
@@ -58,38 +53,37 @@
    "lodash.merge": "4.6.2",
    "lodash.omit": "4.5.0",
    "lodash.pick": "4.4.0",
-    "lodash.pickby": "4.6.0",
    "lodash.snakecase": "4.1.1",
-    "long": "5.3.2",
-    "memoize-one": "^6.0.0",
-    "prop-types": "15.8.1",
-    "qs": "6.14.0",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
-    "react-helmet": "6.1.0",
-    "react-redux": "7.2.9",
-    "react-router": "^6.25.1",
-    "react-router-dom": "^6.25.1",
-    "react-router-hash-link": "2.4.3",
-    "react-scrollspy": "3.4.3",
-    "react-transition-group": "4.4.5",
-    "redux": "4.2.1",
-    "redux-devtools-extension": "2.13.9",
+    "memoize-one": "5.1.1",
+    "newrelic": "5.13.1",
+    "prop-types": "15.7.2",
+    "react": "16.10.2",
+    "react-dom": "16.10.2",
+    "react-redux": "7.1.3",
+    "react-router": "5.1.2",
+    "react-router-dom": "5.1.2",
+    "react-router-hash-link": "1.2.2",
+    "react-scrollspy": "3.4.2",
+    "react-transition-group": "4.3.0",
+    "redux": "4.0.5",
+    "redux-devtools-extension": "2.13.8",
    "redux-logger": "3.0.6",
-    "redux-saga": "1.3.0",
-    "redux-thunk": "2.4.2",
-    "regenerator-runtime": "0.14.1",
-    "reselect": "^5.1.1",
-    "universal-cookie": "7.2.2"
+    "redux-saga": "1.1.3",
+    "redux-thunk": "2.3.0",
+    "reselect": "4.0.0",
+    "universal-cookie": "4.0.3"
  },
  "devDependencies": {
-    "@edx/browserslist-config": "1.5.0",
-    "@edx/reactifex": "2.2.0",
-    "@openedx/frontend-build": "^14.3.3",
-    "@testing-library/jest-dom": "6.6.3",
-    "@testing-library/react": "14.3.1",
-    "react-test-renderer": "^18.3.1",
+    "@edx/frontend-build": "github:edx/frontend-build#kdmccormick/devstack-frontends",
+    "codecov": "3.6.5",
+    "enzyme": "3.10.0",
+    "enzyme-adapter-react-16": "1.15.2",
+    "es-check": "5.0.0",
+    "glob": "7.1.6",
+    "husky": "3.0.9",
+    "purgecss-webpack-plugin": "1.6.0",
+    "react-test-renderer": "16.8.6",
    "reactifex": "1.1.1",
-    "redux-mock-store": "1.5.5"
+    "redux-mock-store": "1.5.4"
  }
 }
--- a/public/index.html
+++ b/public/index.html
@@ -1,148 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-us">
  <head>
-    <title>Account | <%= process.env.SITE_NAME %></title>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link
-      rel="shortcut icon"
-      href="<%=htmlWebpackPlugin.options.FAVICON_URL%>"
-      type="image/x-icon"
-    />
-    <% if (process.env.OPTIMIZELY_PROJECT_ID) { %>
-    <script src="<%= process.env.MARKETING_SITE_BASE_URL %>/optimizelyjs/<%= process.env.OPTIMIZELY_PROJECT_ID %>.js"></script>
-    <% } %>
+      <title>Account | edX</title>
+      <meta charset="utf-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
  </head>
  <body>
-    <!-- begin usabilla live embed code -->
-    <script defer type="text/javascript">
-      window.lightningjs ||
-        (function (n) {
-          var e = "lightningjs";
-          function t(e, t) {
-            var r, i, a, o, d, c;
-            return (
-              t && (t += (/\?/.test(t) ? "&" : "?") + "lv=1"),
-              n[e] ||
-                ((r = window),
-                (i = document),
-                (a = e),
-                (o = i.location.protocol),
-                (d = "load"),
-                (c = 0),
-                (function () {
-                  n[a] = function () {
-                    var t = arguments,
-                      i = this,
-                      o = ++c,
-                      d = (i && i != r && i.id) || 0;
-                    function s() {
-                      return (s.id = o), n[a].apply(s, arguments);
-                    }
-                    return (
-                      (e.s = e.s || []).push([o, d, t]),
-                      (s.then = function (n, t, r) {
-                        var i = (e.fh[o] = e.fh[o] || []),
-                          a = (e.eh[o] = e.eh[o] || []),
-                          d = (e.ph[o] = e.ph[o] || []);
-                        return (
-                          n && i.push(n), t && a.push(t), r && d.push(r), s
-                        );
-                      }),
-                      s
-                    );
-                  };
-                  var e = (n[a]._ = {});
-                  function s() {
-                    e.P(d), (e.w = 1), n[a]("_load");
-                  }
-                  (e.fh = {}),
-                    (e.eh = {}),
-                    (e.ph = {}),
-                    (e.l = t
-                      ? t.replace(/^\/\//, ("https:" == o ? o : "http:") + "//")
-                      : t),
-                    (e.p = { 0: +new Date() }),
-                    (e.P = function (n) {
-                      e.p[n] = new Date() - e.p[0];
-                    }),
-                    e.w && s(),
-                    r.addEventListener
-                      ? r.addEventListener(d, s, !1)
-                      : r.attachEvent("onload", s);
-                  var l = function () {
-                    function n() {
-                      return [
-                        "<!DOCTYPE ",
-                        o,
-                        "><",
-                        o,
-                        "><head></head><",
-                        t,
-                        "><",
-                        r,
-                        ' src="',
-                        e.l,
-                        '"></',
-                        r,
-                        "></",
-                        t,
-                        "></",
-                        o,
-                        ">",
-                      ].join("");
-                    }
-                    var t = "body",
-                      r = "script",
-                      o = "html",
-                      d = i[t];
-                    if (!d) return setTimeout(l, 100);
-                    e.P(1);
-                    var c,
-                      s = i.createElement("div"),
-                      h = s.appendChild(i.createElement("div")),
-                      u = i.createElement("iframe");
-                    (s.style.display = "none"),
-                      (d.insertBefore(s, d.firstChild).id = "lightningjs-" + a),
-                      (u.frameBorder = "0"),
-                      (u.id = "lightningjs-frame-" + a),
-                      /MSIE[ ]+6/.test(navigator.userAgent) &&
-                        (u.src = "javascript:false"),
-                      (u.allowTransparency = "true"),
-                      h.appendChild(u);
-                    try {
-                      u.contentWindow.document.open();
-                    } catch (n) {
-                      (e.domain = i.domain),
-                        (c =
-                          "javascript:var d=document.open();d.domain='" +
-                          i.domain +
-                          "';"),
-                        (u.src = c + "void(0);");
-                    }
-                    try {
-                      var p = u.contentWindow.document;
-                      p.write(n()), p.close();
-                    } catch (e) {
-                      u.src =
-                        c +
-                        'd.write("' +
-                        n().replace(/"/g, String.fromCharCode(92) + '"') +
-                        '");d.close();';
-                    }
-                    e.P(2);
-                  };
-                  e.l && l();
-                })()),
-              (n[e].lv = "1"),
-              n[e]
-            );
-          }
-          var r = (window.lightningjs = t(e));
-          (r.require = t), (r.modules = n);
-        })({});
-    </script>
-    <!-- end usabilla live embed code -->
    <div id="root"></div>
  </body>
 </html>
--- a/renovate.json
+++ b/renovate.json
@@ -1,33 +1,9 @@
 {
  "extends": [
-    "config:base",
-    "schedule:weekly",
-    ":automergeLinters",
-    ":automergeMinor",
-    ":automergeTesters",
-    ":enableVulnerabilityAlerts",
-    ":rebaseStalePrs",
-    ":semanticCommits",
-    ":updateNotScheduled"
+    "config:base"
  ],
-  "packageRules": [
-    {
-      "matchDepTypes": [
-        "devDependencies"
-      ],
-      "matchUpdateTypes": [
-        "lockFileMaintenance",
-        "minor",
-        "patch",
-        "pin"
-      ],
-      "automerge": true
-    },
-    {
-      "matchPackagePatterns": ["@edx", "@openedx"],
-      "matchUpdateTypes": ["minor", "patch"],
-      "automerge": true
-    }
-  ],
-  "timezone": "America/New_York"
+  "patch": {
+    "automerge": true
+  },
+  "rebaseStalePrs": true
 }
--- a/src/account-settings/AccountSettingsPage.jsx
+++ b/src/account-settings/AccountSettingsPage.jsx
@@ -1,5 +1,5 @@
 import { AppContext } from '@edx/frontend-platform/react';
-import { getConfig, getQueryParameters } from '@edx/frontend-platform';
+import { getConfig, history, getQueryParameters } from '@edx/frontend-platform';
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
@@ -13,71 +13,48 @@ import {
  getCountryList,
  getLanguageList,
 } from '@edx/frontend-platform/i18n';
-import {
-  Hyperlink, Icon, Alert,
-} from '@openedx/paragon';
-import { CheckCircle, Error, WarningFilled } from '@openedx/paragon/icons';
+import { Hyperlink } from '@edx/paragon';

 import messages from './AccountSettingsPage.messages';
-import {
-  fetchSettings,
-  saveMultipleSettings,
-  saveSettings,
-  updateDraft,
-  beginNameChange,
-} from './data/actions';
+import { fetchSettings, saveSettings, updateDraft } from './data/actions';
 import { accountSettingsPageSelector } from './data/selectors';
 import PageLoading from './PageLoading';
+import Alert from './Alert';
 import JumpNav from './JumpNav';
 import DeleteAccount from './delete-account';
 import EditableField from './EditableField';
-import EditableSelectField from './EditableSelectField';
 import ResetPassword from './reset-password';
-import NameChange from './name-change';
 import ThirdPartyAuth from './third-party-auth';
 import BetaLanguageBanner from './BetaLanguageBanner';
 import EmailField from './EmailField';
-import OneTimeDismissibleAlert from './OneTimeDismissibleAlert';
-import DOBModal from './DOBForm';
 import {
  YEAR_OF_BIRTH_OPTIONS,
  EDUCATION_LEVELS,
  GENDER_OPTIONS,
-  COUNTRY_WITH_STATES,
-  COPPA_COMPLIANCE_YEAR,
-  WORK_EXPERIENCE_OPTIONS,
-  getStatesList,
-  FIELD_LABELS,
 } from './data/constants';
 import { fetchSiteLanguages } from './site-language';
-import { fetchCourseList } from '../notification-preferences/data/thunks';
-import NotificationSettings from '../notification-preferences/NotificationSettings';
-import { withLocation, withNavigate } from './hoc';
+import CoachingToggle from './coaching/CoachingToggle';

 class AccountSettingsPage extends React.Component {
  constructor(props, context) {
    super(props, context);

+    // If there is a "duplicate_provider" query parameter, that's the backend's
+    // way of telling us that the provider account the user tried to link is already linked
+    // to another Open edX account. We use this to display a message to that effect, and remove the
+    // parameter from the URL.
    const duplicateTpaProvider = getQueryParameters().duplicate_provider;
+    if (duplicateTpaProvider !== undefined) {
+      history.replace(history.location.pathname);
+    }
    this.state = {
      duplicateTpaProvider,
    };
-
-    this.navLinkRefs = {
-      '#basic-information': React.createRef(),
-      '#profile-information': React.createRef(),
-      '#social-media': React.createRef(),
-      '#notifications': React.createRef(),
-      '#site-preferences': React.createRef(),
-      '#linked-accounts': React.createRef(),
-      '#delete-account': React.createRef(),
-    };
  }

  componentDidMount() {
-    this.props.fetchCourseList();
    this.props.fetchSettings();
-    this.props.fetchSiteLanguages(this.props.navigate);
+    this.props.fetchSiteLanguages();
    sendTrackingLogEvent('edx.user.settings.viewed', {
      page: 'account',
      visibility: null,
@@ -85,20 +62,6 @@ class AccountSettingsPage extends React.Component {
    });
  }

-  componentDidUpdate(prevProps) {
-    if (prevProps.loading && !prevProps.loaded && this.props.loaded) {
-      const locationHash = global.location.hash;
-      // Check for the locationHash in the URL and then scroll to it if it is in the
-      // NavLinks list
-      if (typeof locationHash !== 'string') {
-        return;
-      }
-      if (Object.keys(this.navLinkRefs).includes(locationHash) && this.navLinkRefs[locationHash].current) {
-        window.scrollTo(0, this.navLinkRefs[locationHash].current.offsetTop);
-      }
-    }
-  }
-
  // NOTE: We need 'locale' for the memoization in getLocalizedTimeZoneOptions.  Don't remove it!
  // eslint-disable-next-line no-unused-vars
  getLocalizedTimeZoneOptions = memoize((timeZoneOptions, countryTimeZoneOptions, locale) => {
@@ -119,23 +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(
-      this.removeDisabledCountries(
-        getCountryList(locale).map(({ code, name }) => ({
-          value: code,
-          label: name,
-          disabled: this.isDisabledCountry(code),
-        })),
-      ),
-    ),
-    stateOptions: [{
-      value: '',
-      label: this.props.intl.formatMessage(messages['account.settings.field.state.options.empty']),
-    }].concat(getStatesList(country)),
+    }].concat(getCountryList(locale).map(({ code, name }) => ({ value: code, label: name }))),
    languageProficiencyOptions: [{
      value: '',
      label: this.props.intl.formatMessage(messages['account.settings.field.language_proficiencies.options.empty']),
@@ -152,83 +103,8 @@ class AccountSettingsPage extends React.Component {
      value: key,
      label: this.props.intl.formatMessage(messages[`account.settings.field.gender.options.${key || 'empty'}`]),
    })),
-    workExperienceOptions: WORK_EXPERIENCE_OPTIONS.map(key => ({
-      value: key,
-      label: key === '' ? this.props.intl.formatMessage(messages['account.settings.field.work.experience.options.empty']) : key,
-    })),
  }));

-  canDeleteAccount = () => {
-    const { committedValues } = this.props;
-    return !getConfig().COUNTRIES_WITH_DELETE_ACCOUNT_DISABLED.includes(committedValues.country);
-  };
-
-  removeDisabledCountries = (countryList) => {
-    const { countriesCodesList, committedValues } = this.props;
-    const committedCountry = committedValues?.country;
-
-    if (!countriesCodesList.length) {
-      return countryList;
-    }
-    return countryList.filter(({ value }) => value === committedCountry || countriesCodesList.find(x => x === value));
-  };
-
-  handleEditableFieldChange = (name, value) => {
-    this.props.updateDraft(name, value);
-  };
-
-  handleSubmit = (formId, values) => {
-    if (formId === FIELD_LABELS.COUNTRY && this.isDisabledCountry(values)) {
-      return;
-    }
-
-    const { formValues } = this.props;
-    let extendedProfileObject = {};
-
-    if ('extended_profile' in formValues && formValues.extended_profile.some((field) => field.field_name === formId)) {
-      extendedProfileObject = {
-        extended_profile: formValues.extended_profile.map(field => (field.field_name === formId
-          ? { ...field, field_value: values }
-          : field)),
-      };
-    }
-    this.props.saveSettings(formId, values, extendedProfileObject);
-  };
-
-  handleSubmitProfileName = (formId, values) => {
-    if (Object.keys(this.props.drafts).includes('useVerifiedNameForCerts')) {
-      this.props.saveMultipleSettings([
-        {
-          formId,
-          commitValues: values,
-        },
-        {
-          formId: 'useVerifiedNameForCerts',
-          commitValues: this.props.formValues.useVerifiedNameForCerts,
-        },
-      ], formId);
-    } else {
-      this.props.saveSettings(formId, values);
-    }
-  };
-
-  handleSubmitVerifiedName = (formId, values) => {
-    if (Object.keys(this.props.drafts).includes('useVerifiedNameForCerts')) {
-      this.props.saveSettings('useVerifiedNameForCerts', this.props.formValues.useVerifiedNameForCerts);
-    }
-    if (values !== this.props.committedValues?.verified_name) {
-      this.props.beginNameChange(formId);
-    } else {
-      this.props.saveSettings(formId, values);
-    }
-  };
-
-  isDisabledCountry = (country) => {
-    const { countriesCodesList } = this.props;
-
-    return countriesCodesList.length > 0 && !countriesCodesList.find(x => x === country);
-  };
-
  isEditable(fieldName) {
    return !this.props.staticFields.includes(fieldName);
  }
@@ -239,27 +115,28 @@ class AccountSettingsPage extends React.Component {
    return Boolean(this.props.profileDataManager);
  }

+  handleEditableFieldChange = (name, value) => {
+    this.props.updateDraft(name, value);
+  };
+
+  handleSubmit = (formId, values) => {
+    this.props.saveSettings(formId, values);
+  };
+
  renderDuplicateTpaProviderMessage() {
    if (!this.state.duplicateTpaProvider) {
      return null;
    }

-    // If there is a "duplicate_provider" query parameter, that's the backend's
-    // way of telling us that the provider account the user tried to link is already linked
-    // to another user account on the platform. We use this to display a message to that effect,
-    // and remove the parameter from the URL.
-    this.props.navigate(this.props.location, { replace: true });
-
    return (
      <div>
-        <Alert variant="danger">
+        <Alert className="alert alert-danger" role="alert">
          <FormattedMessage
            id="account.settings.message.duplicate.tpa.provider"
-            defaultMessage="The {provider} account you selected is already linked to another {siteName} account."
-            description="alert message informing the user that the third-party account they attempted to link is already linked to another account"
+            defaultMessage="The {provider} account you selected is already linked to another edX account."
+            description="alert message informing the user that the third-party account they attempted to link is already linked to another edX account"
            values={{
              provider: <b>{this.state.duplicateTpaProvider}</b>,
-              siteName: getConfig().SITE_NAME,
            }}
          />
        </Alert>
@@ -274,7 +151,7 @@ class AccountSettingsPage extends React.Component {

    return (
      <div>
-        <Alert variant="info">
+        <Alert className="alert alert-primary" role="alert">
          <FormattedMessage
            id="account.settings.message.managed.settings"
            defaultMessage="Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help."
@@ -297,160 +174,6 @@ class AccountSettingsPage extends React.Component {
    );
  }

-  renderFullNameHelpText = (status, proctoredExamId) => {
-    if (!this.props.verifiedNameHistory) {
-      return this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text']);
-    }
-
-    let messageString = 'account.settings.field.full.name.help.text';
-
-    if (status === 'submitted') {
-      messageString += '.submitted';
-      if (proctoredExamId) {
-        messageString += '.proctored';
-      }
-    } else {
-      messageString += '.default';
-    }
-
-    if (!this.props.committedValues.useVerifiedNameForCerts) {
-      messageString += '.certificate';
-    }
-
-    return this.props.intl.formatMessage(messages[messageString]);
-  };
-
-  renderVerifiedNameSuccessMessage = (verifiedName, created) => {
-    const dateValue = new Date(created).valueOf();
-    const id = `dismissedVerifiedNameSuccessMessage-${verifiedName}-${dateValue}`;
-
-    return (
-      <OneTimeDismissibleAlert
-        id={id}
-        variant="success"
-        icon={CheckCircle}
-        header={this.props.intl.formatMessage(messages['account.settings.field.name.verified.success.message.header'])}
-        body={this.props.intl.formatMessage(messages['account.settings.field.name.verified.success.message'])}
-      />
-    );
-  };
-
-  renderVerifiedNameFailureMessage = (verifiedName, created) => {
-    const dateValue = new Date(created).valueOf();
-    const id = `dismissedVerifiedNameFailureMessage-${verifiedName}-${dateValue}`;
-
-    return (
-      <OneTimeDismissibleAlert
-        id={id}
-        variant="danger"
-        icon={Error}
-        header={this.props.intl.formatMessage(messages['account.settings.field.name.verified.failure.message.header'])}
-        body={
-          (
-            <div className="d-flex flex-row">
-              {this.props.intl.formatMessage(messages['account.settings.field.name.verified.failure.message'])}
-            </div>
-          )
-        }
-      />
-    );
-  };
-
-  renderVerifiedNameSubmittedMessage = (willCertNameChange) => (
-    <Alert
-      variant="warning"
-      icon={WarningFilled}
-    >
-      <Alert.Heading>
-        {this.props.intl.formatMessage(messages['account.settings.field.name.verified.submitted.message.header'])}
-      </Alert.Heading>
-      <p>
-        {this.props.intl.formatMessage(messages['account.settings.field.name.verified.submitted.message'])}{' '}
-        {
-          willCertNameChange
-          && this.props.intl.formatMessage(messages['account.settings.field.name.verified.submitted.message.certificate'])
-        }
-      </p>
-    </Alert>
-  );
-
-  renderVerifiedNameMessage = verifiedNameRecord => {
-    const {
-      created,
-      status,
-      profile_name: profileName,
-      verified_name: verifiedName,
-      proctored_exam_attempt_id: proctoredExamId,
-    } = verifiedNameRecord;
-    let willCertNameChange = false;
-
-    if (
-      (
-        // User submitted a profile name change, and uses their profile name on certificates
-        this.props.committedValues.name !== profileName
-        && !this.props.committedValues.useVerifiedNameForCerts
-      )
-      || (
-        // User submitted a verified name change, and uses their verified name on certificates
-        this.props.committedValues.name === profileName
-        && this.props.committedValues.useVerifiedNameForCerts
-      )
-    ) {
-      willCertNameChange = true;
-    }
-
-    if (proctoredExamId) {
-      return null;
-    }
-
-    switch (status) {
-      case 'approved':
-        return this.renderVerifiedNameSuccessMessage(verifiedName, created);
-      case 'denied':
-        return this.renderVerifiedNameFailureMessage(verifiedName, created);
-      case 'submitted':
-        return this.renderVerifiedNameSubmittedMessage(willCertNameChange);
-      default:
-        return null;
-    }
-  };
-
-  renderVerifiedNameIcon = (status) => {
-    switch (status) {
-      case 'approved':
-        return (<Icon src={CheckCircle} className="ml-1" style={{ height: '18px', width: '18px', color: 'green' }} />);
-      case 'submitted':
-        return (<Icon src={WarningFilled} className="ml-1" style={{ height: '18px', width: '18px', color: 'yellow' }} />);
-      default:
-        return null;
-    }
-  };
-
-  renderVerifiedNameHelpText = (status, proctoredExamId) => {
-    let messageStr = 'account.settings.field.name.verified.help.text';
-
-    // add additional string based on status
-    if (status === 'approved') {
-      messageStr += '.verified';
-    } else if (status === 'submitted') {
-      messageStr += '.submitted';
-    } else {
-      return null;
-    }
-
-    // add additional string if verified name came from a proctored exam attempt
-    if (proctoredExamId) {
-      messageStr += '.proctored';
-    }
-
-    // add additional string based on certificate name use
-    if (this.props.committedValues.useVerifiedNameForCerts) {
-      messageStr += '.certificate';
-    }
-
-    return this.props.intl.formatMessage(messages[messageStr]);
-  };
-
  renderEmptyStaticFieldMessage() {
    if (this.isManagedProfile()) {
      return this.props.intl.formatMessage(messages['account.settings.static.field.empty'], {
@@ -460,15 +183,8 @@ class AccountSettingsPage extends React.Component {
    return this.props.intl.formatMessage(messages['account.settings.static.field.empty.no.admin']);
  }

-  renderNameChangeModal() {
-    if (this.props.nameChangeModal && this.props.nameChangeModal.formId) {
-      return <NameChange targetFormId={this.props.nameChangeModal.formId} />;
-    }
-    return null;
-  }
-
  renderSecondaryEmailField(editableFieldProps) {
-    if (!this.props.formValues.secondary_email_enabled) {
+    if (!Boolean(this.props.formValues.secondary_email_enabled)) {
      return null;
    }

@@ -493,20 +209,11 @@ class AccountSettingsPage extends React.Component {
    // Memoized options lists
    const {
      countryOptions,
-      stateOptions,
      languageProficiencyOptions,
      yearOfBirthOptions,
      educationLevelOptions,
      genderOptions,
-      workExperienceOptions,
-    } = this.getLocalizedOptions(this.context.locale, this.props.formValues.country);
-
-    // Show State field only if the country is US (could include Canada later)
-    const { country } = this.props.formValues;
-    const showState = country === COUNTRY_WITH_STATES && !this.isDisabledCountry(country);
-    const { verifiedName } = this.props;
-
-    const hasWorkExperience = !!this.props.formValues?.extended_profile?.find(field => field.field_name === 'work_experience');
+    } = this.getLocalizedOptions(this.context.locale);

    const timeZoneOptions = this.getLocalizedTimeZoneOptions(
      this.props.timeZoneOptions,
@@ -516,193 +223,94 @@ class AccountSettingsPage extends React.Component {

    const hasLinkedTPA = findIndex(this.props.tpaProviders, provider => provider.connected) >= 0;

-    // if user is under 13 and does not have cookie set
-    const shouldUpdateDOB = (
-      getConfig().ENABLE_COPPA_COMPLIANCE
-      && getConfig().ENABLE_DOB_UPDATE
-      && this.props.formValues.year_of_birth.toString() >= COPPA_COMPLIANCE_YEAR.toString()
-      && !localStorage.getItem('submittedDOB')
-    );
    return (
-      <>
-        { shouldUpdateDOB
-          && (
-          <DOBModal
-            {...editableFieldProps}
-          />
-          )}
-        <div className="account-section pt-3 mb-5" id="basic-information" ref={this.navLinkRefs['#basic-information']}>
-          {
-            this.props.mostRecentVerifiedName
-            && this.renderVerifiedNameMessage(this.props.mostRecentVerifiedName)
-          }
-          {localStorage.getItem('submittedDOB')
-            && (
-            <OneTimeDismissibleAlert
-              id="updated-dob"
-              variant="success"
-              icon={CheckCircle}
-              header={this.props.intl.formatMessage(messages['account.settings.field.dob.form.success'])}
-              body=""
-            />
-            )}
-
-          <h2 className="section-heading h4 mb-3">
+      <React.Fragment>
+        <div className="account-section" id="basic-information">
+          <h2 className="section-heading">
            {this.props.intl.formatMessage(messages['account.settings.section.account.information'])}
          </h2>
          <p>{this.props.intl.formatMessage(messages['account.settings.section.account.information.description'])}</p>
          {this.renderManagedProfileMessage()}

-          {this.renderNameChangeModal()}
-
          <EditableField
            name="username"
            type="text"
            value={this.props.formValues.username}
            label={this.props.intl.formatMessage(messages['account.settings.field.username'])}
-            helpText={this.props.intl.formatMessage(
-              messages['account.settings.field.username.help.text'],
-              { siteName: getConfig().SITE_NAME },
-            )}
+            helpText={this.props.intl.formatMessage(messages['account.settings.field.username.help.text'])}
            isEditable={false}
            {...editableFieldProps}
          />
          <EditableField
            name="name"
            type="text"
-            value={
-              verifiedName?.status === 'submitted'
-              && this.props.formValues.pending_name_change
-                ? this.props.formValues.pending_name_change
-                : this.props.formValues.name
-              }
+            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={
-              verifiedName
-                ? this.renderFullNameHelpText(verifiedName.status, verifiedName.proctored_exam_attempt_id)
-                : this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text'])
-            }
-            isEditable={
-              verifiedName
-                ? this.isEditable('verifiedName') && this.isEditable('name')
-                : this.isEditable('name')
-            }
-            isGrayedOut={
-              verifiedName && !this.isEditable('verifiedName')
-            }
-            onChange={this.handleEditableFieldChange}
-            onSubmit={this.handleSubmitProfileName}
+            helpText={this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text'])}
+            isEditable={this.isEditable('name')}
+            {...editableFieldProps}
          />
-          {verifiedName
-            && (
-            <EditableField
-              name="verified_name"
-              type="text"
-              value={this.props.formValues.verified_name}
-              label={
-                (
-                  <div className="d-flex">
-                    {this.props.intl.formatMessage(messages['account.settings.field.name.verified'])}
-                    {
-                      this.renderVerifiedNameIcon(verifiedName.status)
-                    }
-                  </div>
-                )
-              }
-              helpText={this.renderVerifiedNameHelpText(verifiedName.status, verifiedName.proctored_exam_attempt_id)}
-              isEditable={this.isEditable('verifiedName')}
-              isGrayedOut={!this.isEditable('verifiedName')}
-              onChange={this.handleEditableFieldChange}
-              onSubmit={this.handleSubmitVerifiedName}
-            />
-            )}
-
          <EmailField
            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']}
-            helpText={this.props.intl.formatMessage(
-              messages['account.settings.field.email.help.text'],
-              { siteName: getConfig().SITE_NAME },
-            )}
+            helpText={this.props.intl.formatMessage(messages['account.settings.field.email.help.text'])}
            isEditable={this.isEditable('email')}
            {...editableFieldProps}
          />
          {this.renderSecondaryEmailField(editableFieldProps)}
          <ResetPassword email={this.props.formValues.email} />
-          {(!getConfig().ENABLE_COPPA_COMPLIANCE)
-            && (
-            <EditableSelectField
-              name="year_of_birth"
-              type="select"
-              label={this.props.intl.formatMessage(messages['account.settings.field.dob'])}
-              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.dob.empty'])}
-              value={this.props.formValues.year_of_birth}
-              options={yearOfBirthOptions}
-              {...editableFieldProps}
-            />
-            )}
-          <EditableSelectField
+          <EditableField
+            name="year_of_birth"
+            type="select"
+            label={this.props.intl.formatMessage(messages['account.settings.field.dob'])}
+            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.dob.empty'])}
+            value={this.props.formValues.year_of_birth}
+            options={yearOfBirthOptions}
+            {...editableFieldProps}
+          />
+          <EditableField
            name="country"
            type="select"
            value={this.props.formValues.country}
            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
-            && (
-            <EditableSelectField
-              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 pt-3 mb-5" id="profile-information" ref={this.navLinkRefs['#profile-information']}>
-          <h2 className="section-heading h4 mb-3">
+        <div className="account-section" id="profile-information">
+          <h2 className="section-heading">
            {this.props.intl.formatMessage(messages['account.settings.section.profile.information'])}
          </h2>

-          <EditableSelectField
+          <EditableField
            name="level_of_education"
            type="select"
            value={this.props.formValues.level_of_education}
-            options={getConfig().ENABLE_COPPA_COMPLIANCE
-              ? educationLevelOptions.filter(option => option.value !== 'el')
-              : educationLevelOptions}
+            options={educationLevelOptions}
            label={this.props.intl.formatMessage(messages['account.settings.field.education'])}
            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.education.empty'])}
            {...editableFieldProps}
          />
-          <EditableSelectField
+          <EditableField
            name="gender"
            type="select"
            value={this.props.formValues.gender}
@@ -711,19 +319,7 @@ class AccountSettingsPage extends React.Component {
            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.gender.empty'])}
            {...editableFieldProps}
          />
-          {hasWorkExperience
-          && (
-          <EditableSelectField
-            name="work_experience"
-            type="select"
-            value={this.props.formValues?.extended_profile?.find(field => field.field_name === 'work_experience')?.field_value}
-            options={workExperienceOptions}
-            label={this.props.intl.formatMessage(messages['account.settings.field.work.experience'])}
-            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.work.experience.empty'])}
-            {...editableFieldProps}
-          />
-          )}
-          <EditableSelectField
+          <EditableField
            name="language_proficiencies"
            type="select"
            value={this.props.formValues.language_proficiencies}
@@ -732,17 +328,21 @@ 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 &&
+            <CoachingToggle
+              name="coaching"
+              phone_number={this.props.formValues.phone_number}
+              coaching={this.props.formValues.coaching}
+            />
+          }
        </div>
-        <div className="account-section pt-3 mb-6" id="social-media">
-          <h2 className="section-heading h4 mb-3">
+
+        <div className="account-section" id="social-media">
+          <h2 className="section-heading">
            {this.props.intl.formatMessage(messages['account.settings.section.social.media'])}
          </h2>
-          <p>
-            {this.props.intl.formatMessage(
-              messages['account.settings.section.social.media.description'],
-              { siteName: getConfig().SITE_NAME },
-            )}
-          </p>
+          <p>{this.props.intl.formatMessage(messages['account.settings.section.social.media.description'])}</p>

          <EditableField
            name="social_link_linkedin"
@@ -769,17 +369,14 @@ class AccountSettingsPage extends React.Component {
            {...editableFieldProps}
          />
        </div>
-        <div className="border border-light-700" />
-        <div className="mt-6" id="notifications" ref={this.navLinkRefs['#notifications']}>
-          <NotificationSettings />
-        </div>
-        <div className="account-section mb-5" id="site-preferences" ref={this.navLinkRefs['#site-preferences']}>
-          <h2 className="section-heading h4 mb-3">
+
+        <div className="account-section" id="site-preferences">
+          <h2 className="section-heading">
            {this.props.intl.formatMessage(messages['account.settings.section.site.preferences'])}
          </h2>

          <BetaLanguageBanner />
-          <EditableSelectField
+          <EditableField
            name="siteLanguage"
            type="select"
            options={this.props.siteLanguageOptions}
@@ -788,7 +385,7 @@ class AccountSettingsPage extends React.Component {
            helpText={this.props.intl.formatMessage(messages['account.settings.field.site.language.help.text'])}
            {...editableFieldProps}
          />
-          <EditableSelectField
+          <EditableField
            name="time_zone"
            type="select"
            value={this.props.formValues.time_zone}
@@ -804,27 +401,20 @@ class AccountSettingsPage extends React.Component {
          />
        </div>

-        <div className="account-section pt-3 mb-5" id="linked-accounts" ref={this.navLinkRefs['#linked-accounts']}>
-          <h2 className="section-heading h4 mb-3">{this.props.intl.formatMessage(messages['account.settings.section.linked.accounts'])}</h2>
-          <p>
-            {this.props.intl.formatMessage(
-              messages['account.settings.section.linked.accounts.description'],
-              { siteName: getConfig().SITE_NAME },
-            )}
-          </p>
+        <div className="account-section" id="linked-accounts">
+          <h2 className="section-heading">{this.props.intl.formatMessage(messages['account.settings.section.linked.accounts'])}</h2>
+          <p>{this.props.intl.formatMessage(messages['account.settings.section.linked.accounts.description'])}</p>
          <ThirdPartyAuth />
        </div>

-        {getConfig().ENABLE_ACCOUNT_DELETION && (
-          <div className="account-section pt-3 mb-5" id="delete-account" ref={this.navLinkRefs['#delete-account']}>
-            <DeleteAccount
-              isVerifiedAccount={this.props.isActive}
-              hasLinkedTPA={hasLinkedTPA}
-              canDeleteAccount={this.canDeleteAccount()}
-            />
-          </div>
-        )}
-      </>
+        <div className="account-section" id="delete-account">
+          <DeleteAccount
+            isVerifiedAccount={this.props.isActive}
+            hasLinkedTPA={hasLinkedTPA}
+          />
+        </div>
+
+      </React.Fragment>
    );
  }

@@ -859,10 +449,10 @@ class AccountSettingsPage extends React.Component {
        </h1>
        <div>
          <div className="row">
-            <div className="col-md-2">
+            <div className="col-md-3">
              <JumpNav />
            </div>
-            <div className="col-md-10">
+            <div className="col-md-9">
              {loading ? this.renderLoading() : null}
              {loaded ? this.renderContent() : null}
              {loadingError ? this.renderError() : null}
@@ -888,36 +478,22 @@ AccountSettingsPage.propTypes = {
    name: PropTypes.string,
    email: PropTypes.string,
    secondary_email: PropTypes.string,
-    secondary_email_enabled: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
    year_of_birth: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
    country: PropTypes.string,
    level_of_education: PropTypes.string,
    gender: PropTypes.string,
-    extended_profile: PropTypes.arrayOf(PropTypes.shape({
-      field_name: PropTypes.string,
-      field_value: PropTypes.string,
-    })),
    language_proficiencies: PropTypes.string,
-    pending_name_change: PropTypes.string,
    phone_number: PropTypes.string,
    social_link_linkedin: PropTypes.string,
    social_link_facebook: PropTypes.string,
    social_link_twitter: PropTypes.string,
    time_zone: PropTypes.string,
-    state: PropTypes.string,
-    useVerifiedNameForCerts: PropTypes.bool.isRequired,
-    verified_name: PropTypes.string,
+    coaching: PropTypes.objectOf(PropTypes.shape({
+      coaching_consent: PropTypes.string.isRequired,
+      user: PropTypes.number.isRequired,
+      eligible_for_coaching: PropTypes.bool.isRequired,
+    })),
  }).isRequired,
-  committedValues: PropTypes.shape({
-    name: PropTypes.string,
-    useVerifiedNameForCerts: PropTypes.bool,
-    verified_name: PropTypes.string,
-    country: PropTypes.string,
-  }),
-  drafts: PropTypes.shape({}),
-  formErrors: PropTypes.shape({
-    name: PropTypes.string,
-  }),
  siteLanguage: PropTypes.shape({
    previousValue: PropTypes.string,
    draft: PropTypes.string,
@@ -941,58 +517,15 @@ AccountSettingsPage.propTypes = {
  })),
  fetchSiteLanguages: PropTypes.func.isRequired,
  updateDraft: PropTypes.func.isRequired,
-  saveMultipleSettings: PropTypes.func.isRequired,
  saveSettings: PropTypes.func.isRequired,
  fetchSettings: PropTypes.func.isRequired,
-  beginNameChange: PropTypes.func.isRequired,
-  fetchCourseList: PropTypes.func.isRequired,
-  tpaProviders: PropTypes.arrayOf(PropTypes.shape({
-    connected: PropTypes.bool,
-  })),
-  nameChangeModal: PropTypes.oneOfType([
-    PropTypes.shape({
-      formId: PropTypes.string,
-    }),
-    PropTypes.bool,
-  ]),
-  verifiedName: PropTypes.shape({
-    verified_name: PropTypes.string,
-    status: PropTypes.string,
-    proctored_exam_attempt_id: PropTypes.number,
-  }),
-  mostRecentVerifiedName: PropTypes.shape({
-    verified_name: PropTypes.string,
-    status: PropTypes.string,
-    proctored_exam_attempt_id: PropTypes.number,
-  }),
-  verifiedNameHistory: PropTypes.arrayOf(
-    PropTypes.shape({
-      verified_name: PropTypes.string,
-      status: PropTypes.string,
-      proctored_exam_attempt_id: PropTypes.number,
-    }),
-  ),
-  navigate: PropTypes.func.isRequired,
-  location: PropTypes.string.isRequired,
-  countriesCodesList: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.string.isRequired,
-      label: PropTypes.string.isRequired,
-    }),
-  ),
+  tpaProviders: PropTypes.arrayOf(PropTypes.object),
 };

 AccountSettingsPage.defaultProps = {
  loading: false,
  loaded: false,
  loadingError: null,
-  committedValues: {
-    useVerifiedNameForCerts: false,
-    verified_name: null,
-    country: '',
-  },
-  drafts: {},
-  formErrors: {},
  siteLanguage: null,
  siteLanguageOptions: [],
  timeZoneOptions: [],
@@ -1002,19 +535,11 @@ AccountSettingsPage.defaultProps = {
  tpaProviders: [],
  isActive: true,
  secondary_email_enabled: false,
-  nameChangeModal: {} || false,
-  verifiedName: null,
-  mostRecentVerifiedName: {},
-  verifiedNameHistory: [],
-  countriesCodesList: [],
 };

-export default withLocation(withNavigate(connect(accountSettingsPageSelector, {
-  fetchCourseList,
+export default connect(accountSettingsPageSelector, {
  fetchSettings,
  saveSettings,
-  saveMultipleSettings,
  updateDraft,
  fetchSiteLanguages,
-  beginNameChange,
-})(injectIntl(AccountSettingsPage))));
+})(injectIntl(AccountSettingsPage));
--- a/src/account-settings/AccountSettingsPage.messages.jsx
+++ b/src/account-settings/AccountSettingsPage.messages.jsx
@@ -58,7 +58,7 @@ const messages = defineMessages({
  },
  'account.settings.section.linked.accounts.description': {
    id: 'account.settings.section.linked.accounts.description',
-    defaultMessage: 'You can link your identity accounts to simplify signing in to {siteName}.',
+    defaultMessage: 'You can link your identity accounts to simplify signing in to edX.',
    description: 'The linked accounts section heading description.',
  },
  'account.settings.field.username': {
@@ -68,7 +68,7 @@ const messages = defineMessages({
  },
  'account.settings.field.username.help.text': {
    id: 'account.settings.field.username.help.text',
-    defaultMessage: 'The name that identifies you on {siteName}. You cannot change your username.',
+    defaultMessage: 'The name that identifies you on edX. You cannot change your username.',
    description: 'Help text for the account settings username field.',
  },
  'account.settings.field.full.name': {
@@ -86,121 +86,6 @@ const messages = defineMessages({
    defaultMessage: 'The name that is used for ID verification and that appears on your certificates.',
    description: 'Help text for the account settings name field.',
  },
-  'account.settings.field.full.name.help.text.default': {
-    id: 'account.settings.field.full.name.help.text.default',
-    defaultMessage: 'The name that appears on your public profile.',
-    description: 'Help text for the account settings name field.',
-  },
-  'account.settings.field.full.name.help.text.default.certificate': {
-    id: 'account.settings.field.full.name.help.text.default.certificate',
-    defaultMessage: 'This name is selected to appear on your certificates and public-facing records.',
-    description: 'Help text for the account settings name field.',
-  },
-  'account.settings.field.name.verified': {
-    id: 'account.settings.field.name.verified',
-    defaultMessage: 'Verified name',
-    description: 'Label for account settings verified name field.',
-  },
-  'account.settings.field.name.verified.help.text.verified': {
-    id: 'account.settings.field.name.verified.help.text.verified',
-    defaultMessage: 'This name has been verified by photo ID.',
-    description: 'Help text for the account settings verified name field when the name is verified.',
-  },
-  'account.settings.field.name.verified.help.text.verified.proctored': {
-    id: 'account.settings.field.name.verified.help.text.verified.proctored',
-    defaultMessage: 'This name has been verified by proctoring.',
-    description: 'Help text for the account settings verified name field when the name is verified through proctoring.',
-  },
-  'account.settings.field.name.verified.help.text.verified.certificate': {
-    id: 'account.settings.field.name.verified.help.text.verified.certificate',
-    defaultMessage: 'This name has been verified by photo ID, and is selected to appear on your certificates and public-facing records.',
-    description: 'Help text for the account settings verified name field when the name is selected for certificates.',
-  },
-  'account.settings.field.name.verified.help.text.verified.proctored.certificate': {
-    id: 'account.settings.field.name.verified.help.text.verified.proctored.certificate',
-    defaultMessage: 'This name has been verified by proctoring, and is selected to appear on your certificates and public-facing records.',
-    description: 'Help text for the account settings verified name field when the name is selected for certificates, and the name is verified through proctoring.',
-  },
-  'account.settings.field.name.verified.help.text.submitted': {
-    id: 'account.settings.field.name.verified.help.text.submitted',
-    defaultMessage: 'Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.',
-    description: 'Help text for the account settings verified name field when a verified name has been submitted.',
-  },
-  'account.settings.field.name.verified.help.text.submitted.proctored': {
-    id: 'account.settings.field.name.verified.help.text.submitted.proctored',
-    defaultMessage: 'Your proctored exam has been submitted. Verified name cannot be changed at this time. Please check back in 2-5 days.',
-    description: 'Help text for the account settings verified name field when a verified name has been submitted through proctoring.',
-  },
-  'account.settings.field.name.verified.help.text.submitted.certificate': {
-    id: 'account.settings.field.name.verified.help.text.submitted.certificate',
-    defaultMessage: 'When identity verification is successful, this name will appear on your certificates and public-facing records. Verified name cannot be changed at this time.',
-    description: 'Help text for the account settings verified name field when a verified name has been submitted and will appear on certificates.',
-  },
-  'account.settings.field.name.verified.help.text.submitted.proctored.certificate': {
-    id: 'account.settings.field.name.verified.help.text.submitted.proctored.certificate',
-    defaultMessage: 'Once your proctored exam passes review, this name will appear on your certificate and public-facing records. Verified Name cannot be changed at this time.',
-    description: 'Help text for the account settings verified name field when a verified name has been submitted through proctoring and will appear on certificates.',
-  },
-  'account.settings.field.full.name.help.text.submitted': {
-    id: 'account.settings.field.full.name.help.text.submitted',
-    defaultMessage: 'Verification has been submitted. This usually takes 48 hours or less. Full name cannot be changed at this time.',
-    description: 'Help text for the account settings full name field when a verified name has been submitted.',
-  },
-  'account.settings.field.full.name.help.text.submitted.proctored': {
-    id: 'account.settings.field.full.name.help.text.submitted.proctored',
-    defaultMessage: 'Your proctored exam has been submitted. Full name cannot be changed at this time. Please check back in 2-5 days.',
-    description: 'Help text for the account settings full name field when a verified name has been submitted through proctoring.',
-  },
-  'account.settings.field.full.name.help.text.submitted.certificate': {
-    id: 'account.settings.field.full.name.help.text.submitted.certificate',
-    defaultMessage: 'When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.',
-    description: 'Help text for the account settings full name field when a full name has been submitted and will appear on certificates.',
-  },
-  'account.settings.field.full.name.help.text.submitted.proctored.certificate': {
-    id: 'account.settings.field.full.name.help.text.submitted.proctored.certificate',
-    defaultMessage: 'Once your proctored exam passes review, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.',
-    description: 'Help text for the account settings full name field when a full name has been submitted and will appear on certificates.',
-  },
-  'account.settings.field.name.verified.success.message': {
-    id: 'account.settings.field.name.verified.success.message',
-    defaultMessage: 'Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.',
-    description: 'The body of the success alert indicating that a user\'s name has been verified',
-  },
-  'account.settings.field.name.verified.success.message.header': {
-    id: 'account.settings.field.name.verified.success.message.header',
-    defaultMessage: 'Your name change request is complete!',
-    description: 'The header of the success alert indicating that a user\'s name has been verified',
-  },
-  'account.settings.field.name.verified.failure.message': {
-    id: 'account.settings.field.name.verified.failure.message',
-    defaultMessage: 'Your most recent identity verification attempt did not pass. Related account settings have been restored.',
-    description: 'The body of the failure alert indicating that a user\'s name was not able to be verified',
-  },
-  'account.settings.field.name.verified.failure.message.header': {
-    id: 'account.settings.field.name.verified.failure.message.header',
-    defaultMessage: 'We were not able to verify your identity.',
-    description: 'The header of the failure alert indicating that a user\'s name was not able to be verified',
-  },
-  'account.settings.field.name.verified.failure.message.help.link': {
-    id: 'account.settings.field.name.verified.failure.message.help.link',
-    defaultMessage: 'Learn more about ID verification',
-    description: 'The text of the button displayed when a user\'s name was not able to be verified, intended to direct the user to a help article about ID verification.',
-  },
-  'account.settings.field.name.verified.submitted.message': {
-    id: 'account.settings.field.name.verified.submitted.message',
-    defaultMessage: 'Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete.',
-    description: 'The body of the submitted alert indicating that a user\'s name has been submitted for verification',
-  },
-  'account.settings.field.name.verified.submitted.message.certificate': {
-    id: 'account.settings.field.name.verified.submitted.message.certificate',
-    defaultMessage: 'When your request is approved, your updated name will appear on all associated certificates and public-facing records.',
-    description: 'The body of the submitted alert indicating that a user\'s name will be updated on certificates.',
-  },
-  'account.settings.field.name.verified.submitted.message.header': {
-    id: 'account.settings.field.name.verified.submitted.message.header',
-    defaultMessage: 'Your name change request is almost complete!',
-    description: 'The header of the submitted alert indicating that a user\'s name has been submitted for verification',
-  },
  'account.settings.field.email': {
    id: 'account.settings.field.email',
    defaultMessage: 'Email address (Sign in)',
@@ -218,7 +103,7 @@ const messages = defineMessages({
  },
  'account.settings.field.email.help.text': {
    id: 'account.settings.field.email.help.text',
-    defaultMessage: 'You receive messages from {siteName} and course teams at this address.',
+    defaultMessage: 'You receive messages from edX and course teams at this address.',
    description: 'Help text for the account settings email field.',
  },
  'account.settings.field.secondary.email': {
@@ -256,56 +141,6 @@ const messages = defineMessages({
    defaultMessage: 'Select a year of birth',
    description: 'Option for empty value on account settings year of birth field.',
  },
-  'account.settings.field.dob.month': {
-    id: 'account.settings.field.dob.month',
-    defaultMessage: 'Month',
-    description: 'Label for account settings month of birth field.',
-  },
-  'account.settings.field.dob.year': {
-    id: 'account.settings.field.dob.year',
-    defaultMessage: 'Year',
-    description: 'Label for account settings year of birth field.',
-  },
-  'account.settings.field.dob.month.default': {
-    id: 'account.settings.field.month.year.default',
-    defaultMessage: 'Select month',
-    description: 'Default label for account settings month of birth field.',
-  },
-  'account.settings.field.dob.year.default': {
-    id: 'account.settings.field.dob.year.default',
-    defaultMessage: 'Select year',
-    description: 'Default label for account settings year of birth field.',
-  },
-  'account.settings.field.dob.form.button': {
-    id: 'account.settings.field.dob.form.button',
-    defaultMessage: 'Please confirm your date of birth',
-    description: 'Message to prompt user to enter dob',
-  },
-  'account.settings.field.dob.form.title': {
-    id: 'account.settings.field.dob.form.title',
-    defaultMessage: 'Enter your birth month and year',
-    description: 'Title of DOB form',
-  },
-  'account.settings.field.dob.form.help.text': {
-    id: 'account.settings.field.dob.form.help.text',
-    defaultMessage: 'We ask for birth month and year information to help us comply with our legal obligations.',
-    description: 'Help text for DOB form',
-  },
-  'account.settings.field.dob.form.success': {
-    id: 'account.settings.field.dob.form.success',
-    defaultMessage: 'Thank you for entering your information.',
-    description: 'Title of banner when date of birth is successfully entered',
-  },
-  'account.settings.field.month_of_birth.options.empty': {
-    id: 'account.settings.field.month_of_birth.options.empty',
-    defaultMessage: 'Select a month of birth',
-    description: 'Option for empty value on account settings month of birth field.',
-  },
-  'account.settingsfield.dob.error.general': {
-    id: 'account.settingsfield.dob.error.general',
-    defaultMessage: 'A technical error occurred. Please try again.',
-    description: 'Generic error message.',
-  },
  'account.settings.field.country': {
    id: 'account.settings.field.country',
    defaultMessage: 'Country',
@@ -321,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',
@@ -401,8 +221,8 @@ const messages = defineMessages({
    defaultMessage: 'No formal education',
    description: 'Selected by the user to describe their education.',
  },
-  'account.settings.field.education.levels.other': {
-    id: 'account.settings.field.education.levels.other',
+  'account.settings.field.education.levels.o': {
+    id: 'account.settings.field.education.levels.o',
    defaultMessage: 'Other education',
    description: 'Selected by the user if they have a type of education not described by the other choices.',
  },
@@ -439,20 +259,19 @@ const messages = defineMessages({
  },
  'account.settings.field.language.proficiencies': {
    id: 'account.settings.field.language.proficiencies',
-    defaultMessage: 'Spoken language',
-    description: 'Label for account settings spoken language field.',
+    defaultMessage: 'Spoken languages',
+    description: 'Label for account settings spoken languages field.',
  },
  'account.settings.field.language.proficiencies.empty': {
    id: 'account.settings.field.language.proficiencies.empty',
    defaultMessage: 'Add a spoken language',
-    description: 'Placeholder for empty account settings spoken language field.',
+    description: 'Placeholder for empty account settings spoken languages field.',
  },
  'account.settings.field.language_proficiencies.options.empty': {
    id: 'account.settings.field.language_proficiencies.options.empty',
    defaultMessage: 'Select a Language',
-    description: 'Option for an empty value on account settings spoken language field.',
+    description: 'Option for an empty value on account settings spoken languages field.',
  },
-
  'account.settings.field.time.zone': {
    id: 'account.settings.field.time.zone',
    defaultMessage: 'Time zone',
@@ -491,7 +310,7 @@ const messages = defineMessages({
  },
  'account.settings.section.social.media.description': {
    id: 'account.settings.section.social.media.description',
-    defaultMessage: 'Optionally, link your personal accounts to the social media icons on your {siteName} profile.',
+    defaultMessage: 'Optionally, link your personal accounts to the social media icons on your edX profile.',
    description: 'Section subheader for social media links settings',
  },
  'account.settings.field.social.platform.name.linkedin': {
@@ -555,26 +374,6 @@ const messages = defineMessages({
    defaultMessage: 'No value set.',
    description: 'The placeholder for an empty but uneditable field when there is no administrator',
  },
-  'notification.preferences.notifications.label': {
-    id: 'notification.preferences.notifications.label',
-    defaultMessage: 'Notifications',
-    description: 'Label for Notifications',
-  },
-  'account.settings.field.work.experience': {
-    id: 'account.settings.work.experience',
-    defaultMessage: 'Work Experience',
-    description: 'Label for account settings Work experience field.',
-  },
-  'account.settings.field.work.experience.empty': {
-    id: 'account.settings.field.work.experience.empty',
-    defaultMessage: 'Add work experience',
-    description: 'Placeholder for empty account settings work experience field.',
-  },
-  'account.settings.field.work.experience.options.empty': {
-    id: 'account.settings.field.work.experience.options.empty',
-    defaultMessage: 'Select work experience',
-    description: 'Placeholder for the work experience levels dropdown.',
-  },
 });

 export default messages;
--- a/src/account-settings/Alert.jsx
+++ b/src/account-settings/Alert.jsx
@@ -2,16 +2,20 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';

-const Alert = (props) => (
-  <div className={classNames('alert d-flex align-items-start', props.className)}>
-    <div>
-      {props.icon}
+
+function Alert(props) {
+  return (
+    <div className={classNames('alert d-flex align-items-start', props.className)}>
+      <div>
+        {props.icon}
+      </div>
+      <div>
+        {props.children}
+      </div>
    </div>
-    <div>
-      {props.children}
-    </div>
-  </div>
-);
+  );
+}
+

 Alert.propTypes = {
  className: PropTypes.string,
@@ -25,4 +29,5 @@ Alert.defaultProps = {
  children: undefined,
 };

+
 export default Alert;
--- a/src/account-settings/BetaLanguageBanner.jsx
+++ b/src/account-settings/BetaLanguageBanner.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { AppContext } from '@edx/frontend-platform/react';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { connect } from 'react-redux';
-import { Button, Hyperlink } from '@openedx/paragon';
+import { Button, Hyperlink } from '@edx/paragon';

 import { betaLanguageBannerSelector } from './data/selectors';
 import messages from './AccountSettingsPage.messages';
@@ -49,9 +49,6 @@ class BetaLanguageBanner extends React.Component {

  render() {
    const savedLanguage = this.getSiteLanguageEntry(this.context.locale);
-    if (!savedLanguage) {
-      return null;
-    }
    const isSavedLanguageReleased = savedLanguage.released === true;
    const noPreviousLanguageSet = this.props.siteLanguage.previousValue === null;
    if (isSavedLanguageReleased || noPreviousLanguageSet) {
@@ -68,7 +65,7 @@ class BetaLanguageBanner extends React.Component {
            })}
          </p>
          <div>
-            <Button onClick={this.handleRevertLanguage} className="mr-2">
+            <Button onClick={this.handleRevertLanguage} className="btn btn-primary mr-2">
              {this.props.intl.formatMessage(
                messages['account.settings.banner.beta.language.action.switch.back'],
                { previous_language: previousLanguage.name },
--- a/src/account-settings/DOBForm.jsx
+++ b/src/account-settings/DOBForm.jsx
@@ -1,162 +0,0 @@
-import PropTypes from 'prop-types';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import {
-  Form, StatefulButton, ModalDialog, ActionRow, useToggle, Button,
-} from '@openedx/paragon';
-import React, { useCallback, useEffect, useState } from 'react';
-import { connect, useDispatch } from 'react-redux';
-import messages from './AccountSettingsPage.messages';
-import { YEAR_OF_BIRTH_OPTIONS } from './data/constants';
-import { editableFieldSelector } from './data/selectors';
-import { saveSettingsReset } from './data/actions';
-
-const DOBModal = (props) => {
-  const {
-    saveState,
-    error,
-    onSubmit,
-    intl,
-  } = props;
-
-  const dispatch = useDispatch();
-
-  // eslint-disable-next-line no-unused-vars
-  const [isOpen, open, close, toggle] = useToggle(true, {});
-  const [monthValue, setMonthValue] = useState('');
-  const [yearValue, setYearValue] = useState('');
-
-  const handleChange = (e) => {
-    e.preventDefault();
-
-    if (e.target.name === 'month') {
-      setMonthValue(e.target.value);
-    } else if (e.target.name === 'year') {
-      setYearValue(e.target.value);
-    }
-  };
-
-  const handleSubmit = (e) => {
-    e.preventDefault();
-
-    const data = monthValue !== '' && yearValue !== '' ? [{ field_name: 'DOB', field_value: `${yearValue}-${monthValue}` }] : [];
-    onSubmit('extended_profile', data);
-  };
-
-  const handleComplete = useCallback(() => {
-    localStorage.setItem('submittedDOB', 'true');
-    close();
-    dispatch(saveSettingsReset());
-  }, [dispatch, close]);
-
-  const handleClose = useCallback(() => {
-    close();
-    dispatch(saveSettingsReset());
-  }, [dispatch, close]);
-
-  function renderErrors() {
-    if (saveState === 'error' || error) {
-      return (
-        <Form.Control.Feedback type="invalid" key="general-error">
-          {intl.formatMessage(messages['account.settingsfield.dob.error.general'])}
-        </Form.Control.Feedback>
-      );
-    }
-    return null;
-  }
-
-  useEffect(() => {
-    if (saveState === 'complete' && isOpen) {
-      handleComplete();
-    }
-  }, [handleComplete, saveState, isOpen, monthValue, yearValue]);
-
-  return (
-    <>
-      <Button variant="primary" onClick={open}>
-        {intl.formatMessage(messages['account.settings.field.dob.form.button'])}
-      </Button>
-      <ModalDialog
-        title={intl.formatMessage(messages['account.settings.field.dob.form.title'])}
-        isOpen={isOpen}
-        onClose={handleClose}
-        hasCloseButton={false}
-        variant="default"
-      >
-        <form onSubmit={handleSubmit}>
-
-          <ModalDialog.Header>
-            <ModalDialog.Title>
-              {intl.formatMessage(messages['account.settings.field.dob.form.title'])}
-            </ModalDialog.Title>
-          </ModalDialog.Header>
-
-          <ModalDialog.Body className="overflow-hidden" style={{ padding: '1.5rem' }}>
-            <p>{intl.formatMessage(messages['account.settings.field.dob.form.help.text'])}</p>
-            <Form.Group>
-              <Form.Label>
-                {intl.formatMessage(messages['account.settings.field.dob.month'])}
-              </Form.Label>
-              <Form.Control
-                as="select"
-                name="month"
-                onChange={handleChange}
-              >
-                <option value="">{intl.formatMessage(messages['account.settings.field.dob.month.default'])}</option>
-                {[...Array(12).keys()].map(month => (
-                  <option key={month + 1} value={month + 1}>{month + 1}</option>
-                ))}
-              </Form.Control>
-            </Form.Group>
-            <Form.Group>
-              <Form.Label>
-                {intl.formatMessage(messages['account.settings.field.dob.year'])}
-              </Form.Label>
-              <Form.Control
-                as="select"
-                name="year"
-                onChange={handleChange}
-              >
-                <option value="">{intl.formatMessage(messages['account.settings.field.dob.year.default'])}</option>
-                {YEAR_OF_BIRTH_OPTIONS.map(year => (
-                  <option key={year.value} value={year.value}>{year.label}</option>
-                ))}
-              </Form.Control>
-            </Form.Group>
-            {renderErrors()}
-          </ModalDialog.Body>
-
-          <ModalDialog.Footer>
-            <ActionRow>
-              <ModalDialog.CloseButton variant="tertiary">
-                Cancel
-              </ModalDialog.CloseButton>
-              <StatefulButton
-                type="submit"
-                state={!(monthValue && yearValue) ? 'unedited' : saveState}
-                labels={{
-                  default: intl.formatMessage(messages['account.settings.editable.field.action.save']),
-                }}
-                disabledStates={['unedited']}
-              />
-            </ActionRow>
-          </ModalDialog.Footer>
-
-        </form>
-      </ModalDialog>
-    </>
-  );
-};
-
-DOBModal.propTypes = {
-  saveState: PropTypes.oneOf(['default', 'pending', 'complete', 'error']),
-  error: PropTypes.string,
-  onSubmit: PropTypes.func.isRequired,
-  intl: intlShape.isRequired,
-};
-
-DOBModal.defaultProps = {
-  saveState: undefined,
-  error: undefined,
-};
-
-export default connect(editableFieldSelector)(injectIntl(DOBModal));
--- a/src/account-settings/EditableField.jsx
+++ b/src/account-settings/EditableField.jsx
@@ -1,11 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import classNames from 'classnames';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import {
-  Button, Form, StatefulButton,
-} from '@openedx/paragon';
+import { Button, Input, StatefulButton, ValidationFormGroup } from '@edx/paragon';
 import { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

@@ -17,16 +14,16 @@ import {
  closeForm,
 } from './data/actions';
 import { editableFieldSelector } from './data/selectors';
-import CertificatePreference from './certificate-preference/CertificatePreference';

-const EditableField = (props) => {
+
+function EditableField(props) {
  const {
    name,
    label,
    emptyLabel,
    type,
    value,
-    userSuppliedValue,
+    options,
    saveState,
    error,
    confirmationMessageDefinition,
@@ -38,7 +35,6 @@ const EditableField = (props) => {
    onChange,
    isEditing,
    isEditable,
-    isGrayedOut,
    intl,
    ...others
  } = props;
@@ -63,28 +59,26 @@ const EditableField = (props) => {

  const renderEmptyLabel = () => {
    if (isEditable) {
-      return <Button variant="link" onClick={handleEdit} className="p-0">{emptyLabel}</Button>;
+      return <Button onClick={handleEdit} className="btn-link p-0">{emptyLabel}</Button>;
    }
    return <span className="text-muted">{emptyLabel}</span>;
  };

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

-    if (userSuppliedValue) {
-      finalValue += `: ${userSuppliedValue}`;
+    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;
    }

-    return finalValue;
+    return rawValue;
  };

  const renderConfirmationMessage = () => {
-    if (!confirmationMessageDefinition || !confirmationValue) {
-      return null;
-    }
+    if (!confirmationMessageDefinition || !confirmationValue) return null;
    return intl.formatMessage(confirmationMessageDefinition, {
      value: confirmationValue,
    });
@@ -95,83 +89,83 @@ const EditableField = (props) => {
      expression={isEditing ? 'editing' : 'default'}
      cases={{
        editing: (
-          <>
-            <form onSubmit={handleSubmit}>
-              <Form.Group
-                controlId={id}
-                isInvalid={error != null}
+          <form onSubmit={handleSubmit}>
+            <ValidationFormGroup
+              for={id}
+              invalid={error != null}
+              invalidMessage={error}
+              helpText={helpText}
+            >
+              <label className="h6 d-block" htmlFor={id}>{label}</label>
+              <Input
+                name={name}
+                id={id}
+                type={type}
+                value={value}
+                onChange={handleChange}
+                options={options}
+                {...others}
+              />
+            </ValidationFormGroup>
+            <p>
+              <StatefulButton
+                type="submit"
+                className="btn-primary mr-2"
+                state={saveState}
+                labels={{
+                  default: intl.formatMessage(messages['account.settings.editable.field.action.save']),
+                }}
+                onClick={(e) => {
+                  // Swallow clicks if the state is pending.
+                  // We do this instead of disabling the button to prevent
+                  // it from losing focus (disabled elements cannot have focus).
+                  // Disabling it would causes upstream issues in focus management.
+                  // 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();
+                }}
+                disabledStates={[]}
+              />
+              <Button
+                onClick={handleCancel}
+                className="btn-outline-primary"
              >
-                <Form.Label size="sm" className="h6 d-block" htmlFor={id}>{label}</Form.Label>
-                <Form.Control
-                  data-hj-suppress
-                  name={name}
-                  id={id}
-                  type={type}
-                  value={value}
-                  onChange={handleChange}
-                  {...others}
-                />
-                {!!helpText && <Form.Text>{helpText}</Form.Text>}
-                {error != null && <Form.Control.Feedback hasIcon={false}>{error}</Form.Control.Feedback>}
-                {others.children}
-              </Form.Group>
-              <p>
-                <StatefulButton
-                  type="submit"
-                  className="mr-2"
-                  state={saveState}
-                  labels={{
-                    default: intl.formatMessage(messages['account.settings.editable.field.action.save']),
-                  }}
-                  onClick={(e) => {
-                    // Swallow clicks if the state is pending.
-                    // We do this instead of disabling the button to prevent
-                    // it from losing focus (disabled elements cannot have focus).
-                    // Disabling it would causes upstream issues in focus management.
-                    // 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(); }
-                  }}
-                  disabledStates={[]}
-                />
-                <Button
-                  variant="outline-primary"
-                  onClick={handleCancel}
-                >
-                  {intl.formatMessage(messages['account.settings.editable.field.action.cancel'])}
-                </Button>
-              </p>
-            </form>
-            {['name', 'verified_name'].includes(name) && <CertificatePreference fieldName={name} />}
-          </>
+                {intl.formatMessage(messages['account.settings.editable.field.action.cancel'])}
+              </Button>
+            </p>
+          </form>
        ),
        default: (
          <div className="form-group">
            <div className="d-flex align-items-start">
              <h6 aria-level="3">{label}</h6>
              {isEditable ? (
-                <Button variant="link" onClick={handleEdit} className="ml-3">
+                <Button onClick={handleEdit} className="ml-3 btn-link">
                  <FontAwesomeIcon className="mr-1" icon={faPencilAlt} />{intl.formatMessage(messages['account.settings.editable.field.action.edit'])}
                </Button>
              ) : null}
            </div>
-            <p data-hj-suppress className={classNames('text-truncate', { 'grayed-out': isGrayedOut })}>{renderValue(value)}</p>
+            <p>{renderValue(value)}</p>
            <p className="small text-muted mt-n2">{renderConfirmationMessage() || helpText}</p>
          </div>
        ),
      }}
    />
  );
-};
+}
+

 EditableField.propTypes = {
  name: PropTypes.string.isRequired,
-  label: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.node]),
+  label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
  emptyLabel: PropTypes.node,
  type: PropTypes.string.isRequired,
  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  userSuppliedValue: PropTypes.string,
+  options: PropTypes.arrayOf(PropTypes.shape({
+    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  })),
  saveState: PropTypes.oneOf(['default', 'pending', 'complete', 'error']),
  error: PropTypes.string,
  confirmationMessageDefinition: PropTypes.shape({
@@ -187,12 +181,12 @@ EditableField.propTypes = {
  onChange: PropTypes.func.isRequired,
  isEditing: PropTypes.bool,
  isEditable: PropTypes.bool,
-  isGrayedOut: PropTypes.bool,
  intl: intlShape.isRequired,
 };

 EditableField.defaultProps = {
  value: undefined,
+  options: undefined,
  saveState: undefined,
  label: undefined,
  emptyLabel: undefined,
@@ -202,10 +196,9 @@ EditableField.defaultProps = {
  helpText: undefined,
  isEditing: false,
  isEditable: true,
-  isGrayedOut: false,
-  userSuppliedValue: undefined,
 };

+
 export default connect(editableFieldSelector, {
  onEdit: openForm,
  onCancel: closeForm,
--- a/src/account-settings/EditableSelectField.jsx
+++ b/src/account-settings/EditableSelectField.jsx
@@ -1,252 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import {
-  Button, Form, StatefulButton,
-} from '@openedx/paragon';
-import { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-
-import SwitchContent from './SwitchContent';
-import messages from './AccountSettingsPage.messages';
-
-import {
-  openForm,
-  closeForm,
-} from './data/actions';
-import { editableFieldSelector } from './data/selectors';
-import CertificatePreference from './certificate-preference/CertificatePreference';
-
-const EditableSelectField = (props) => {
-  const {
-    name,
-    label,
-    emptyLabel,
-    type,
-    value,
-    userSuppliedValue,
-    options,
-    saveState,
-    error,
-    confirmationMessageDefinition,
-    confirmationValue,
-    helpText,
-    onEdit,
-    onCancel,
-    onSubmit,
-    onChange,
-    isEditing,
-    isEditable,
-    isGrayedOut,
-    intl,
-    ...others
-  } = props;
-  const id = `field-${name}`;
-
-  const handleSubmit = (e) => {
-    e.preventDefault();
-    onSubmit(name, new FormData(e.target).get(name));
-  };
-
-  const handleChange = (e) => {
-    onChange(name, e.target.value);
-  };
-
-  const handleEdit = () => {
-    onEdit(name);
-  };
-
-  const handleCancel = () => {
-    onCancel(name);
-  };
-
-  const renderEmptyLabel = () => {
-    if (isEditable) {
-      return <Button variant="link" onClick={handleEdit} className="p-0">{emptyLabel}</Button>;
-    }
-    return <span className="text-muted">{emptyLabel}</span>;
-  };
-
-  const renderValue = (rawValue) => {
-    if (!rawValue) {
-      return renderEmptyLabel();
-    }
-    let finalValue = rawValue;
-
-    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) {
-        finalValue = selectedOption.label;
-      }
-    }
-
-    if (userSuppliedValue) {
-      finalValue += `: ${userSuppliedValue}`;
-    }
-
-    return finalValue;
-  };
-
-  const renderConfirmationMessage = () => {
-    if (!confirmationMessageDefinition || !confirmationValue) {
-      return null;
-    }
-    return intl.formatMessage(confirmationMessageDefinition, {
-      value: confirmationValue,
-    });
-  };
-  const selectOptions = options.map((option) => {
-    if (option.group) {
-      // If the option has a 'group' property, it represents an element with sub-options.
-      return (
-        <optgroup label={option.label} key={option.label}>
-          {option.group.map((subOption) => (
-            <option
-              value={subOption.value}
-              key={`${subOption.value}-${subOption.label}`}
-              disabled={subOption?.disabled}
-            >
-              {subOption.label}
-            </option>
-          ))}
-        </optgroup>
-      );
-    }
-    return (
-      <option value={option.value} key={`${option.value}-${option.label}`} disabled={option?.disabled}>
-        {option.label}
-      </option>
-    );
-  });
-
-  return (
-    <SwitchContent
-      expression={isEditing ? 'editing' : 'default'}
-      cases={{
-        editing: (
-          <>
-            <form onSubmit={handleSubmit}>
-              <Form.Group
-                controlId={id}
-                isInvalid={error != null}
-              >
-                <Form.Label size="sm" className="h6 d-block" htmlFor={id}>{label}</Form.Label>
-                <Form.Control
-                  data-hj-suppress
-                  name={name}
-                  id={id}
-                  type={type}
-                  as={type}
-                  value={value}
-                  onChange={handleChange}
-                  {...others}
-                >
-                  {options.length > 0 && selectOptions}
-                </Form.Control>
-                {!!helpText && <Form.Text>{helpText}</Form.Text>}
-                {error != null && <Form.Control.Feedback>{error}</Form.Control.Feedback>}
-                {others.children}
-              </Form.Group>
-              <p>
-                <StatefulButton
-                  type="submit"
-                  className="mr-2"
-                  state={saveState}
-                  labels={{
-                    default: intl.formatMessage(messages['account.settings.editable.field.action.save']),
-                  }}
-                  onClick={(e) => {
-                    // Swallow clicks if the state is pending.
-                    // We do this instead of disabling the button to prevent
-                    // it from losing focus (disabled elements cannot have focus).
-                    // Disabling it would causes upstream issues in focus management.
-                    // 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(); }
-                  }}
-                  disabledStates={[]}
-                />
-                <Button
-                  variant="outline-primary"
-                  onClick={handleCancel}
-                >
-                  {intl.formatMessage(messages['account.settings.editable.field.action.cancel'])}
-                </Button>
-              </p>
-            </form>
-            {['name', 'verified_name'].includes(name) && <CertificatePreference fieldName={name} />}
-          </>
-        ),
-        default: (
-          <div className="form-group">
-            <div className="d-flex align-items-start">
-              <h6 aria-level="3">{label}</h6>
-              {isEditable ? (
-                <Button variant="link" onClick={handleEdit} className="ml-3">
-                  <FontAwesomeIcon className="mr-1" icon={faPencilAlt} />{intl.formatMessage(messages['account.settings.editable.field.action.edit'])}
-                </Button>
-              ) : null}
-            </div>
-            <p data-hj-suppress className={isGrayedOut ? 'grayed-out' : null}>{renderValue(value)}</p>
-            <p className="small text-muted mt-n2">{renderConfirmationMessage() || helpText}</p>
-          </div>
-        ),
-      }}
-    />
-  );
-};
-
-EditableSelectField.propTypes = {
-  name: PropTypes.string.isRequired,
-  label: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.node]),
-  emptyLabel: PropTypes.node,
-  type: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  userSuppliedValue: PropTypes.string,
-  options: PropTypes.arrayOf(PropTypes.shape({
-    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  })),
-  saveState: PropTypes.oneOf(['default', 'pending', 'complete', 'error']),
-  error: PropTypes.string,
-  confirmationMessageDefinition: PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    defaultMessage: PropTypes.string.isRequired,
-    description: PropTypes.string,
-  }),
-  confirmationValue: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  helpText: PropTypes.node,
-  onEdit: PropTypes.func.isRequired,
-  onCancel: PropTypes.func.isRequired,
-  onSubmit: PropTypes.func.isRequired,
-  onChange: PropTypes.func.isRequired,
-  isEditing: PropTypes.bool,
-  isEditable: PropTypes.bool,
-  isGrayedOut: PropTypes.bool,
-  intl: intlShape.isRequired,
-};
-
-EditableSelectField.defaultProps = {
-  value: undefined,
-  options: [],
-  saveState: undefined,
-  label: undefined,
-  emptyLabel: undefined,
-  error: undefined,
-  confirmationMessageDefinition: undefined,
-  confirmationValue: undefined,
-  helpText: undefined,
-  isEditing: false,
-  isEditable: true,
-  isGrayedOut: false,
-  userSuppliedValue: undefined,
-};
-
-export default connect(editableFieldSelector, {
-  onEdit: openForm,
-  onCancel: closeForm,
-})(injectIntl(EditableSelectField));
--- a/src/account-settings/EmailField.jsx
+++ b/src/account-settings/EmailField.jsx
@@ -2,9 +2,7 @@ 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, Form,
-} from '@openedx/paragon';
+import { Button, StatefulButton, Input, ValidationFormGroup } from '@edx/paragon';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faExclamationTriangle, faPencilAlt } from '@fortawesome/free-solid-svg-icons';

@@ -18,7 +16,8 @@ import {
 } from './data/actions';
 import { editableFieldSelector } from './data/selectors';

-const EmailField = (props) => {
+
+function EmailField(props) {
  const {
    name,
    label,
@@ -57,9 +56,7 @@ const EmailField = (props) => {
  };

  const renderConfirmationMessage = () => {
-    if (!confirmationMessageDefinition || !confirmationValue) {
-      return null;
-    }
+    if (!confirmationMessageDefinition || !confirmationValue) return null;
    return (
      <Alert
        className="alert-warning mt-n2"
@@ -88,15 +85,13 @@ const EmailField = (props) => {

  const renderEmptyLabel = () => {
    if (isEditable) {
-      return <Button variant="link" onClick={handleEdit} className="p-0">{emptyLabel}</Button>;
+      return <Button onClick={handleEdit} className="btn-link p-0">{emptyLabel}</Button>;
    }
    return <span className="text-muted">{emptyLabel}</span>;
  };

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

@@ -106,26 +101,25 @@ const EmailField = (props) => {
      cases={{
        editing: (
          <form onSubmit={handleSubmit}>
-            <Form.Group
-              controlId={id}
-              isInvalid={error != null}
+            <ValidationFormGroup
+              for={id}
+              invalid={error != null}
+              invalidMessage={error}
+              helpText={helpText}
            >
-              <Form.Label className="h6 d-block" htmlFor={id}>{label}</Form.Label>
-              <Form.Control
-                data-hj-suppress
+              <label className="h6 d-block" htmlFor={id}>{label}</label>
+              <Input
                name={name}
                id={id}
                type="email"
                value={value}
                onChange={handleChange}
              />
-              {!!helpText && <Form.Text>{helpText}</Form.Text>}
-              {error != null && <Form.Control.Feedback hasIcon={false}>{error}</Form.Control.Feedback>}
-            </Form.Group>
+            </ValidationFormGroup>
            <p>
              <StatefulButton
                type="submit"
-                className="mr-2"
+                className="btn-primary mr-2"
                state={saveState}
                labels={{
                  default: intl.formatMessage(messages['account.settings.editable.field.action.save']),
@@ -138,13 +132,13 @@ const 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={[]}
              />
              <Button
-                variant="outline-primary"
                onClick={handleCancel}
+                className="btn-outline-primary"
              >
                {intl.formatMessage(messages['account.settings.editable.field.action.cancel'])}
              </Button>
@@ -156,20 +150,21 @@ const EmailField = (props) => {
            <div className="d-flex align-items-start">
              <h6 aria-level="3">{label}</h6>
              {isEditable ? (
-                <Button variant="link" onClick={handleEdit} className="ml-3">
+                <Button onClick={handleEdit} className="ml-3 btn-link">
                  <FontAwesomeIcon className="mr-1" icon={faPencilAlt} />
                  {intl.formatMessage(messages['account.settings.editable.field.action.edit'])}
                </Button>
              ) : null}
            </div>
-            <p data-hj-suppress>{renderValue()}</p>
+            <p>{renderValue()}</p>
            {renderConfirmationMessage() || <p className="small text-muted mt-n2">{helpText}</p>}
          </div>
        ),
      }}
    />
  );
-};
+}
+

 EmailField.propTypes = {
  name: PropTypes.string.isRequired,
@@ -207,6 +202,7 @@ EmailField.defaultProps = {
  isEditable: true,
 };

+
 export default connect(editableFieldSelector, {
  onEdit: openForm,
  onCancel: closeForm,
--- a/src/account-settings/JumpNav.jsx
+++ b/src/account-settings/JumpNav.jsx
@@ -1,32 +1,25 @@
-import { getConfig } from '@edx/frontend-platform';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { breakpoints, useWindowSize } from '@openedx/paragon';
-import classNames from 'classnames';
 import React from 'react';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { NavHashLink } from 'react-router-hash-link';
 import Scrollspy from 'react-scrollspy';
+
 import messages from './AccountSettingsPage.messages';

-const JumpNav = ({
-  intl,
-}) => {
-  const stickToTop = useWindowSize().width > breakpoints.small.minWidth;

+function JumpNav({ intl }) {
  return (
-    <div className={classNames('jump-nav px-2.25', { 'jump-nav-sm position-sticky pt-3': stickToTop })}>
+    <div className="jump-nav">
      <Scrollspy
        items={[
          'basic-information',
          'profile-information',
          'social-media',
-          'notifications',
          'site-preferences',
          'linked-accounts',
          'delete-account',
        ]}
        className="list-unstyled"
        currentClassName="font-weight-bold"
-        offset={-64}
      >
        <li>
          <NavHashLink to="#basic-information">
@@ -43,11 +36,6 @@ const JumpNav = ({
            {intl.formatMessage(messages['account.settings.section.social.media'])}
          </NavHashLink>
        </li>
-        <li>
-          <NavHashLink to="#notifications">
-            {intl.formatMessage(messages['notification.preferences.notifications.label'])}
-          </NavHashLink>
-        </li>
        <li>
          <NavHashLink to="#site-preferences">
            {intl.formatMessage(messages['account.settings.section.site.preferences'])}
@@ -58,21 +46,20 @@ const JumpNav = ({
            {intl.formatMessage(messages['account.settings.section.linked.accounts'])}
          </NavHashLink>
        </li>
-        {getConfig().ENABLE_ACCOUNT_DELETION
-          && (
-          <li>
-            <NavHashLink to="#delete-account">
-              {intl.formatMessage(messages['account.settings.jump.nav.delete.account'])}
-            </NavHashLink>
-          </li>
-          )}
+        <li>
+          <NavHashLink to="#delete-account">
+            {intl.formatMessage(messages['account.settings.jump.nav.delete.account'])}
+          </NavHashLink>
+        </li>
      </Scrollspy>
    </div>
  );
-};
+}
+

 JumpNav.propTypes = {
  intl: intlShape.isRequired,
 };

+
 export default injectIntl(JumpNav);
--- a/src/account-settings/NotFoundPage.jsx
+++ b/src/account-settings/NotFoundPage.jsx
@@ -1,19 +1,16 @@
 import React from 'react';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';

-const NotFoundPage = () => (
-  <div
-    className="container-fluid d-flex py-5 justify-content-center align-items-start text-center"
-    data-testid="not-found-page"
-  >
-    <p className="my-0 py-5 text-muted" style={{ maxWidth: '32em' }}>
-      <FormattedMessage
-        id="error.notfound.message"
-        defaultMessage="The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again."
-        description="Error message when a page does not exist"
-      />
-    </p>
-  </div>
-);
-
-export default NotFoundPage;
+export default function NotFoundPage() {
+  return (
+    <div className="container-fluid d-flex py-5 justify-content-center align-items-start text-center">
+      <p className="my-0 py-5 text-muted" style={{ maxWidth: '32em' }}>
+        <FormattedMessage
+          id="error.notfound.message"
+          defaultMessage="The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again."
+          description="error message when a page does not exist"
+        />
+      </p>
+    </div>
+  );
+}
--- a/src/account-settings/OneTimeDismissibleAlert.jsx
+++ b/src/account-settings/OneTimeDismissibleAlert.jsx
@@ -1,45 +0,0 @@
-import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-
-import { Alert } from '@openedx/paragon';
-
-const OneTimeDismissibleAlert = (props) => {
-  const [dismissed, setDismissed] = useState(localStorage.getItem(props.id) !== 'true');
-
-  const onClose = () => {
-    localStorage.setItem(props.id, 'true');
-    setDismissed(false);
-  };
-
-  return (
-    <Alert
-      variant={props.variant}
-      dismissible
-      icon={props.icon}
-      onClose={onClose}
-      show={dismissed}
-    >
-      <Alert.Heading>{props.header}</Alert.Heading>
-      <p>
-        {props.body}
-      </p>
-    </Alert>
-  );
-};
-
-OneTimeDismissibleAlert.propTypes = {
-  id: PropTypes.string.isRequired,
-  variant: PropTypes.string,
-  icon: PropTypes.func,
-  header: PropTypes.string,
-  body: PropTypes.string,
-};
-
-OneTimeDismissibleAlert.defaultProps = {
-  variant: 'success',
-  icon: undefined,
-  header: undefined,
-  body: undefined,
-};
-
-export default OneTimeDismissibleAlert;
--- a/src/account-settings/SwitchContent.jsx
+++ b/src/account-settings/SwitchContent.jsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { TransitionReplace } from '@openedx/paragon';
+import { TransitionReplace } from '@edx/paragon';
+

 const onChildExit = (htmlNode) => {
  // If the leaving child has focus, take control and redirect it
@@ -10,9 +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"])');
@@ -22,15 +21,15 @@ const onChildExit = (htmlNode) => {
  }
 };

-const SwitchContent = ({ expression, cases, className }) => {
+
+function SwitchContent({ expression, cases, className }) {
  const getContent = (caseKey) => {
    if (cases[caseKey]) {
      if (typeof cases[caseKey] === 'string') {
        return getContent(cases[caseKey]);
      }
      return React.cloneElement(cases[caseKey], { key: caseKey });
-    }
-    if (cases.default) {
+    } else if (cases.default) {
      if (typeof cases.default === 'string') {
        return getContent(cases.default);
      }
@@ -48,7 +47,8 @@ const SwitchContent = ({ expression, cases, className }) => {
      {getContent(expression)}
    </TransitionReplace>
  );
-};
+}
+

 SwitchContent.propTypes = {
  expression: PropTypes.string,
@@ -61,4 +61,5 @@ SwitchContent.defaultProps = {
  className: null,
 };

+
 export default SwitchContent;
--- a/src/account-settings/_style.scss
+++ b/src/account-settings/_style.scss
@@ -2,11 +2,9 @@
  .form-group {
    margin-bottom: 1.5rem;
  }
-
  h6, .h6 {
    margin-bottom: .25rem;
  }
-
  .btn-link {
    line-height: 1.2;
    border: none;
@@ -14,33 +12,36 @@
    display: inline-block;
  }

-  .jump-nav-sm {
-    top: 1rem;
-  }
-
  .jump-nav {
-
+    @media (min-width: map-get($grid-breakpoints, "sm")) {
+      padding-top: 1rem;
+      position: sticky;
+      top: 1rem;
+    }
    li {
      margin-bottom: .5rem;
-
      a {
        text-decoration: underline;
      }
    }
  }

-
+  .section-heading {
+    @extend .h4;
+    margin-bottom: map-get($spacers, 3);
+  }
+  .account-section {
+    // These properties together will shift the hashlink position
+    margin-bottom: map-get($spacers, 5);
+    padding-top: 1rem;
+  }
+  
  .custom-switch {
    padding: 0;
    max-width: 500px;
-
    .custom-control-label {
      left: 2.25rem;
      line-height: 1.6rem;
    }
  }
-  .grayed-out{
-    opacity: 0.6; /* Real browsers */
-    filter: alpha(opacity = 60); /* MSIE */
-  }
 }
--- a/src/account-settings/certificate-preference/CertificatePreference.jsx
+++ b/src/account-settings/certificate-preference/CertificatePreference.jsx
@@ -1,173 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { connect, useDispatch } from 'react-redux';
-import PropTypes from 'prop-types';
-
-import {
-  ActionRow,
-  Form,
-  ModalDialog,
-  StatefulButton,
-} from '@openedx/paragon';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-
-import {
-  closeForm,
-  resetDrafts,
-  saveSettings,
-  updateDraft,
-} from '../data/actions';
-import { certPreferenceSelector } from '../data/selectors';
-
-import commonMessages from '../AccountSettingsPage.messages';
-import messages from './messages';
-
-const CertificatePreference = ({
-  intl,
-  fieldName,
-  originalFullName,
-  originalVerifiedName,
-  saveState,
-  useVerifiedNameForCerts,
-}) => {
-  const dispatch = useDispatch();
-  const [checked, setChecked] = useState(false);
-  const [modalIsOpen, setModalIsOpen] = useState(false);
-  const formId = 'useVerifiedNameForCerts';
-
-  const handleCheckboxChange = () => {
-    if (!checked) {
-      if (fieldName === 'verified_name') {
-        dispatch(updateDraft(formId, true));
-      } else {
-        dispatch(updateDraft(formId, false));
-      }
-    } else {
-      setModalIsOpen(true);
-    }
-  };
-
-  const handleCancel = () => {
-    setModalIsOpen(false);
-    dispatch(resetDrafts());
-  };
-
-  const handleModalChange = (e) => {
-    if (e.target.value === 'fullName') {
-      dispatch(updateDraft(formId, false));
-    } else {
-      dispatch(updateDraft(formId, true));
-    }
-  };
-
-  const handleSubmit = (e) => {
-    e.preventDefault();
-
-    if (saveState === 'pending') {
-      return;
-    }
-
-    dispatch(saveSettings(formId, useVerifiedNameForCerts));
-  };
-
-  useEffect(() => {
-    if (originalVerifiedName) {
-      if (fieldName === 'verified_name') {
-        setChecked(useVerifiedNameForCerts);
-      } else {
-        setChecked(!useVerifiedNameForCerts);
-      }
-    }
-  }, [originalVerifiedName, fieldName, useVerifiedNameForCerts]);
-
-  useEffect(() => {
-    if (originalVerifiedName) {
-      if (modalIsOpen && saveState === 'complete') {
-        setModalIsOpen(false);
-        dispatch(closeForm(fieldName));
-      }
-    }
-  }, [dispatch, originalVerifiedName, fieldName, modalIsOpen, saveState]);
-
-  // If the user doesn't have an approved verified name, do not display this component
-
-  return originalVerifiedName ? (
-    <>
-      <Form.Checkbox className="mt-1 mb-4" checked={checked} onChange={handleCheckboxChange}>
-        {intl.formatMessage(messages['account.settings.field.name.checkbox.certificate.select'])}
-      </Form.Checkbox>
-
-      <ModalDialog
-        title={intl.formatMessage(messages['account.settings.field.name.modal.certificate.title'])}
-        isOpen={modalIsOpen}
-        onClose={handleCancel}
-        size="lg"
-        hasCloseButton
-        isFullscreenOnMobile
-      >
-        <Form onSubmit={handleSubmit}>
-          <ModalDialog.Header>
-            <ModalDialog.Title>
-              {intl.formatMessage(messages['account.settings.field.name.modal.certificate.title'])}
-            </ModalDialog.Title>
-          </ModalDialog.Header>
-
-          <ModalDialog.Body className="overflow-hidden">
-            <Form.Group className="mb-4">
-              <Form.Label>
-                {intl.formatMessage(messages['account.settings.field.name.modal.certificate.select'])}
-              </Form.Label>
-              <Form.RadioSet
-                name={formId}
-                value={useVerifiedNameForCerts ? 'verifiedName' : 'fullName'}
-                onChange={handleModalChange}
-              >
-                <Form.Radio value="fullName">
-                  {originalFullName}{' '}
-                  ({intl.formatMessage(messages['account.settings.field.name.modal.certificate.option.full'])})
-                </Form.Radio>
-                <Form.Radio value="verifiedName">
-                  {originalVerifiedName}{' '}
-                  ({intl.formatMessage(messages['account.settings.field.name.modal.certificate.option.verified'])})
-                </Form.Radio>
-              </Form.RadioSet>
-            </Form.Group>
-          </ModalDialog.Body>
-
-          <ModalDialog.Footer>
-            <ActionRow>
-              <ModalDialog.CloseButton variant="outline-primary" disabled={saveState === 'pending'}>
-                {intl.formatMessage(commonMessages['account.settings.editable.field.action.cancel'])}
-              </ModalDialog.CloseButton>
-              <StatefulButton
-                type="submit"
-                state={saveState}
-                labels={{
-                  default: intl.formatMessage(messages['account.settings.field.name.modal.certificate.button.choose']),
-                }}
-                disabledStates={[]}
-              />
-            </ActionRow>
-          </ModalDialog.Footer>
-        </Form>
-      </ModalDialog>
-    </>
-  ) : null;
-};
-
-CertificatePreference.propTypes = {
-  intl: intlShape.isRequired,
-  fieldName: PropTypes.string.isRequired,
-  originalFullName: PropTypes.string,
-  originalVerifiedName: PropTypes.string,
-  saveState: PropTypes.string,
-  useVerifiedNameForCerts: PropTypes.bool,
-};
-
-CertificatePreference.defaultProps = {
-  originalFullName: '',
-  originalVerifiedName: '',
-  saveState: null,
-  useVerifiedNameForCerts: false,
-};
-
-export default connect(certPreferenceSelector)(injectIntl(CertificatePreference));
--- a/src/account-settings/certificate-preference/data/service.js
+++ b/src/account-settings/certificate-preference/data/service.js
@@ -1,22 +0,0 @@
-import { getConfig } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-
-import { handleRequestError } from '../../data/utils';
-
-// eslint-disable-next-line import/prefer-default-export
-export async function postVerifiedNameConfig(username, commitValues) {
-  const requestConfig = { headers: { Accept: 'application/json' } };
-  const requestUrl = `${getConfig().LMS_BASE_URL}/api/edx_name_affirmation/v1/verified_name/config`;
-
-  const { useVerifiedNameForCerts } = commitValues;
-  const postValues = {
-    username,
-    use_verified_name_for_certs: useVerifiedNameForCerts,
-  };
-
-  const { data } = await getAuthenticatedHttpClient()
-    .post(requestUrl, postValues, requestConfig)
-    .catch(error => handleRequestError(error));
-
-  return data;
-}
--- a/src/account-settings/certificate-preference/messages.js
+++ b/src/account-settings/certificate-preference/messages.js
@@ -1,36 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  'account.settings.field.name.checkbox.certificate.select': {
-    id: 'account.settings.field.name.certificate.select',
-    defaultMessage: 'If checked, this name will appear on your certificates and public-facing records.',
-    description: 'Label for checkbox describing that the selected name will appear on the user‘s certificates.',
-  },
-  'account.settings.field.name.modal.certificate.title': {
-    id: 'account.settings.field.name.modal.certificate.title',
-    defaultMessage: 'Choose a preferred name for certificates and public-facing records',
-    description: 'Title instructing the user to choose a preferred name.',
-  },
-  'account.settings.field.name.modal.certificate.select': {
-    id: 'account.settings.field.name.modal.certificate.select',
-    defaultMessage: 'Select a name',
-    description: 'Label instructing the user to select a name.',
-  },
-  'account.settings.field.name.modal.certificate.option.full': {
-    id: 'account.settings.field.name.modal.certificate.option.full',
-    defaultMessage: 'Full Name',
-    description: 'Option representing the user’s full name.',
-  },
-  'account.settings.field.name.modal.certificate.option.verified': {
-    id: 'account.settings.field.name.modal.certificate.option.verified',
-    defaultMessage: 'Verified Name',
-    description: 'Option representing the user’s verified name.',
-  },
-  'account.settings.field.name.modal.certificate.button.choose': {
-    id: 'account.settings.field.name.modal.certificate.button.choose',
-    defaultMessage: 'Choose name',
-    description: 'Button to confirm the user’s name choice.',
-  },
-});
-
-export default messages;
--- a/src/account-settings/certificate-preference/test/CertificatePreference.test.jsx
+++ b/src/account-settings/certificate-preference/test/CertificatePreference.test.jsx
@@ -1,173 +0,0 @@
-/* eslint-disable no-import-assign */
-import React from 'react';
-import { Provider } from 'react-redux';
-import { BrowserRouter as Router } from 'react-router-dom';
-import configureStore from 'redux-mock-store';
-import {
-  fireEvent,
-  render,
-  screen,
-} from '@testing-library/react';
-
-import * as auth from '@edx/frontend-platform/auth';
-import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';
-
-// Modal creates a portal.  Overriding createPortal allows portals to be tested in jest.
-jest.mock('react-dom', () => ({
-  ...jest.requireActual('react-dom'),
-  createPortal: jest.fn(node => node), // Mock portal behavior
-}));
-
-import CertificatePreference from '../CertificatePreference'; // eslint-disable-line import/first
-
-const mockDispatch = jest.fn();
-jest.mock('react-redux', () => ({
-  ...jest.requireActual('react-redux'),
-  useDispatch: () => mockDispatch,
-}));
-
-jest.mock('@edx/frontend-platform/auth');
-jest.mock('../../data/selectors', () => jest.fn().mockImplementation(() => ({ certPreferenceSelector: () => ({}) })));
-
-const IntlCertificatePreference = injectIntl(CertificatePreference);
-
-const mockStore = configureStore();
-
-describe('NameChange', () => {
-  let props = {};
-  let store = {};
-  const formId = 'useVerifiedNameForCerts';
-  const updateDraft = 'UPDATE_DRAFT';
-  const labelText = 'If checked, this name will appear on your certificates and public-facing records.';
-
-  const reduxWrapper = children => (
-    <Router>
-      <IntlProvider locale="en">
-        <Provider store={store}>{children}</Provider>
-      </IntlProvider>
-    </Router>
-  );
-
-  beforeEach(() => {
-    store = mockStore();
-    props = {
-      fieldName: 'name',
-      originalFullName: 'Ed X',
-      originalVerifiedName: 'edX Verified',
-      saveState: null,
-      useVerifiedNameForCerts: false,
-      intl: {},
-    };
-
-    auth.getAuthenticatedHttpClient = jest.fn(() => ({
-      patch: async () => ({
-        data: { status: 200 },
-        catch: () => {},
-      }),
-    }));
-    auth.getAuthenticatedUser = jest.fn(() => ({ userId: 3 }));
-  });
-
-  afterEach(() => jest.clearAllMocks());
-
-  it('does not render if there is no verified name', () => {
-    props = {
-      ...props,
-      originalVerifiedName: '',
-    };
-
-    const wrapper = render(reduxWrapper(<IntlCertificatePreference {...props} />));
-
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it('does not trigger modal when checking empty checkbox, and updates draft immediately', () => {
-    props = {
-      ...props,
-      useVerifiedNameForCerts: true,
-    };
-
-    render(reduxWrapper(<IntlCertificatePreference {...props} />));
-
-    const checkbox = screen.getByLabelText(labelText);
-    expect(checkbox.checked).toEqual(false);
-
-    fireEvent.click(checkbox);
-
-    expect(screen.queryByRole('radiogroup')).toBeNull();
-    expect(mockDispatch).toHaveBeenCalledWith({
-      payload: { name: formId, value: false },
-      type: updateDraft,
-    });
-  });
-
-  it('triggers modal when attempting to uncheck checkbox', () => {
-    render(reduxWrapper(<IntlCertificatePreference {...props} />));
-
-    const checkbox = screen.getByLabelText(labelText);
-    expect(checkbox.checked).toEqual(true);
-
-    fireEvent.click(checkbox);
-    expect(mockDispatch).not.toHaveBeenCalled();
-
-    screen.getByRole('radiogroup');
-  });
-
-  it('updates draft when changing radio value', () => {
-    render(reduxWrapper(<IntlCertificatePreference {...props} />));
-
-    const checkbox = screen.getByLabelText(labelText);
-    fireEvent.click(checkbox);
-
-    const fullNameOption = screen.getByLabelText('Ed X (Full Name)');
-    const verifiedNameOption = screen.getByLabelText('edX Verified (Verified Name)');
-    expect(fullNameOption.checked).toEqual(true);
-    expect(verifiedNameOption.checked).toEqual(false);
-
-    fireEvent.click(verifiedNameOption);
-    expect(mockDispatch).toHaveBeenCalledWith({
-      payload: { name: formId, value: true },
-      type: updateDraft,
-    });
-  });
-
-  it('clears draft on cancel', () => {
-    render(reduxWrapper(<IntlCertificatePreference {...props} />));
-
-    const checkbox = screen.getByLabelText(labelText);
-    fireEvent.click(checkbox);
-
-    const cancelButton = screen.getByText('Cancel');
-    fireEvent.click(cancelButton);
-
-    expect(mockDispatch).toHaveBeenCalledWith({ type: 'RESET_DRAFTS' });
-    expect(screen.queryByRole('radiogroup')).toBeNull();
-  });
-
-  it('submits', () => {
-    render(reduxWrapper(<IntlCertificatePreference {...props} />));
-
-    const checkbox = screen.getByLabelText(labelText);
-    fireEvent.click(checkbox);
-
-    const submitButton = screen.getByText('Choose name');
-    fireEvent.click(submitButton);
-    expect(mockDispatch).toHaveBeenCalledWith({
-      payload: { formId, commitValues: false, extendedProfile: {} },
-      type: 'ACCOUNT_SETTINGS__SAVE_SETTINGS',
-    });
-  });
-
-  it('checks box for verified name', () => {
-    props = {
-      ...props,
-      fieldName: 'verified_name',
-      useVerifiedNameForCerts: true,
-    };
-
-    render(reduxWrapper(<IntlCertificatePreference {...props} />));
-
-    const checkbox = screen.getByLabelText(labelText);
-    expect(checkbox.checked).toEqual(true);
-  });
-});
--- a/src/account-settings/certificate-preference/test/snapshots/CertificatePreference.test.jsx.snap
+++ b/src/account-settings/certificate-preference/test/snapshots/CertificatePreference.test.jsx.snap
@@ -1,62 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`NameChange does not render if there is no verified name 1`] = `
-{
-  "asFragment": [Function],
-  "baseElement": <body>
-    <div />
-  </body>,
-  "container": <div />,
-  "debug": [Function],
-  "findAllByAltText": [Function],
-  "findAllByDisplayValue": [Function],
-  "findAllByLabelText": [Function],
-  "findAllByPlaceholderText": [Function],
-  "findAllByRole": [Function],
-  "findAllByTestId": [Function],
-  "findAllByText": [Function],
-  "findAllByTitle": [Function],
-  "findByAltText": [Function],
-  "findByDisplayValue": [Function],
-  "findByLabelText": [Function],
-  "findByPlaceholderText": [Function],
-  "findByRole": [Function],
-  "findByTestId": [Function],
-  "findByText": [Function],
-  "findByTitle": [Function],
-  "getAllByAltText": [Function],
-  "getAllByDisplayValue": [Function],
-  "getAllByLabelText": [Function],
-  "getAllByPlaceholderText": [Function],
-  "getAllByRole": [Function],
-  "getAllByTestId": [Function],
-  "getAllByText": [Function],
-  "getAllByTitle": [Function],
-  "getByAltText": [Function],
-  "getByDisplayValue": [Function],
-  "getByLabelText": [Function],
-  "getByPlaceholderText": [Function],
-  "getByRole": [Function],
-  "getByTestId": [Function],
-  "getByText": [Function],
-  "getByTitle": [Function],
-  "queryAllByAltText": [Function],
-  "queryAllByDisplayValue": [Function],
-  "queryAllByLabelText": [Function],
-  "queryAllByPlaceholderText": [Function],
-  "queryAllByRole": [Function],
-  "queryAllByTestId": [Function],
-  "queryAllByText": [Function],
-  "queryAllByTitle": [Function],
-  "queryByAltText": [Function],
-  "queryByDisplayValue": [Function],
-  "queryByLabelText": [Function],
-  "queryByPlaceholderText": [Function],
-  "queryByRole": [Function],
-  "queryByTestId": [Function],
-  "queryByText": [Function],
-  "queryByTitle": [Function],
-  "rerender": [Function],
-  "unmount": [Function],
-}
-`;
--- a/src/account-settings/coaching/CoachingConsent.jsx
+++ b/src/account-settings/coaching/CoachingConsent.jsx
@@ -0,0 +1,293 @@
+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 } 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.confirmationValues.coaching &&
+      this.props.confirmationValues.name &&
+      this.props.confirmationValues.phone_number
+    ) {
+      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,
+    });
+    // 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;
+
+    // These will overwrite each other's redux states (see componentDidUpdate note)
+    this.props.saveSettings('name', fullName);
+    this.props.saveSettings('phone_number', phoneNumber);
+    this.props.saveSettings('coaching', {
+      ...coachingValues,
+      phone_number: phoneNumber,
+      coaching_consent: true,
+      consent_form_seen: true,
+    });
+  }
+
+  async declineCoaching(e) {
+    e.preventDefault();
+    this.setState({
+      formErrors: {},
+      declineSubmitted: true,
+    });
+    // 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}
+        />);
+      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,
+};
+
+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,
+};
+
+export default connect(coachingConsentPageSelector, {
+  fetchSettings,
+  saveSettings,
+})(injectIntl(CoachingConsent));
--- a/src/account-settings/coaching/CoachingConsent.messages.js
+++ b/src/account-settings/coaching/CoachingConsent.messages.js
@@ -0,0 +1,61 @@
+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',
+  },
+});
+
+export default messages;
--- a/src/account-settings/coaching/CoachingConsentForm.jsx
+++ b/src/account-settings/coaching/CoachingConsentForm.jsx
@@ -0,0 +1,104 @@
+import React from 'react';
+
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { Input, Button, Hyperlink } from '@edx/paragon';
+import PropTypes from 'prop-types';
+
+import messages from './CoachingConsent.messages';
+
+const ErrorMessage = props => (
+  <div className="alert-warning mb-2">{props.message}</div>
+);
+
+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">
+          <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"
+            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,
+};
+
+ErrorMessage.defaultProps = {
+  message: '',
+};
+
+ErrorMessage.propTypes = {
+  message: PropTypes.string,
+};
+
+export default injectIntl(CoachingForm);
--- a/src/account-settings/coaching/CoachingToggle.jsx
+++ b/src/account-settings/coaching/CoachingToggle.jsx
@@ -0,0 +1,76 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+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 } from '../data/actions';
+import EditableField from '../EditableField';
+
+
+const CoachingToggle = props => (
+  <>
+    <EditableField
+      name="phone_number"
+      type="text"
+      value={props.phone_number}
+      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={props.saveSettings}
+    />
+    <ValidationFormGroup
+      for="coachingConsent"
+      helpText={props.intl.formatMessage(messages['account.settings.field.coaching_consent.tooltip'])}
+      invalid={!!props.error}
+      invalidMessage={props.intl.formatMessage(messages['account.settings.field.coaching_consent.error'])}
+      className="custom-control custom-switch"
+    >
+      <Input
+        name={props.name}
+        className="custom-control-input"
+        disabled={props.saveState === 'pending'}
+        type="checkbox"
+        id="coachingConsent"
+        checked={props.coaching.coaching_consent}
+        value={props.coaching.coaching_consent}
+        onChange={async (e) => {
+          const { name } = e.target;
+          const value = {
+            ...props.coaching,
+            phone_number: props.phone_number,
+            coaching_consent: e.target.checked,
+          };
+          props.saveSettings(name, value);
+        }}
+      />
+      <label className="custom-control-label" htmlFor="coachingConsent">{props.intl.formatMessage(messages['account.settings.field.coaching_consent'])}</label>
+    </ValidationFormGroup>
+  </>
+);
+
+CoachingToggle.defaultProps = {
+  phone_number: '',
+  error: '',
+};
+
+CoachingToggle.propTypes = {
+  name: PropTypes.string.isRequired,
+  error: PropTypes.string,
+  coaching: PropTypes.objectOf(PropTypes.shape({
+    coaching_consent: PropTypes.string.isRequired,
+    user: PropTypes.number.isRequired,
+    eligible_for_coaching: PropTypes.bool.isRequired,
+  })).isRequired,
+  saveState: PropTypes.func.isRequired,
+  saveSettings: PropTypes.func.isRequired,
+  updateDraft: PropTypes.func.isRequired,
+  intl: intlShape.isRequired,
+  phone_number: PropTypes.string,
+};
+
+export default connect(editableFieldSelector, {
+  saveSettings,
+  updateDraft,
+})(injectIntl(CoachingToggle));
--- a/src/account-settings/coaching/CoachingToggle.messages.js
+++ b/src/account-settings/coaching/CoachingToggle.messages.js
@@ -0,0 +1,31 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  'account.settings.field.phone_number': {
+    id: 'account.settings.field.phone_number',
+    defaultMessage: 'Phone Number',
+    description: 'The label for a phone numbers setting in the user profile',
+  },
+  'account.settings.field.phone_number.empty': {
+    id: 'account.settings.field.phone_number.empty',
+    defaultMessage: 'Add a phone number',
+    description: 'placeholder for a profiles empty phone number field',
+  },
+  'account.settings.field.coaching_consent': {
+    id: 'account.settings.field.coaching_consent',
+    defaultMessage: 'Coaching consent',
+    description: 'The label for the coaching consent setting in the user profile',
+  },
+  '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 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': {
+    id: 'account.settings.field.coaching_consent.error',
+    defaultMessage: 'A valid US phone number is required to opt into coaching',
+    description: 'An error message that displays when a user attempts to consent to coaching without first providing a phone number in their profile',
+  },
+});
+
+export default messages;
--- a/src/account-settings/coaching/data/service.js
+++ b/src/account-settings/coaching/data/service.js
@@ -0,0 +1,49 @@
+import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
+import { getConfig } from '@edx/frontend-platform';
+
+/**
+ * get all settings related to the coaching plugin. Settings used
+ * by Microbachelors students.
+ * @param {Number} userId users are identified in the api by LMS id
+ */
+export async function getCoachingPreferences(userId) {
+  let data = null;
+  try {
+    ({ data } = await getAuthenticatedHttpClient()
+      .get(`${getConfig().LMS_BASE_URL}/api/coaching/v1/users/${userId}/`));
+  } catch (error) {
+    // Default values so the client doesn't fail if the user doesn't have an entry in the
+    // UserCoaching model yet, with the assumption that they'll be eligible for coaching
+    // when they hit this form.
+    data = {
+      coaching_consent: false,
+      user: userId,
+      eligible_for_coaching: true,
+      consent_form_seen: false,
+    };
+  }
+  return data;
+}
+
+/**
+ * patch all of the settings related to coaching.
+ * @param {Number} userId users are identified in the api by LMS id
+ * @param {Object} commitValues { coaching }
+ */
+export async function patchCoachingPreferences(userId, commitValues) {
+  const requestUrl = `${getConfig().LMS_BASE_URL}/api/coaching/v1/users/${userId}/`;
+  const { coaching } = commitValues;
+  coaching.user = userId;
+
+  await getAuthenticatedHttpClient()
+    .patch(requestUrl, coaching)
+    .catch((error) => {
+      const apiError = Object.create(error);
+      apiError.fieldErrors = JSON.parse(error.customAttributes.httpErrorResponseData);
+      // 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,14 +2,12 @@ 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';
 export const CLOSE_FORM = 'CLOSE_FORM';
 export const UPDATE_DRAFT = 'UPDATE_DRAFT';
 export const RESET_DRAFTS = 'RESET_DRAFTS';
-export const BEGIN_NAME_CHANGE = 'BEGIN_NAME_CHANGE';

 // FETCH SETTINGS ACTIONS

@@ -26,8 +24,6 @@ export const fetchSettingsSuccess = ({
  thirdPartyAuthProviders,
  profileDataManager,
  timeZones,
-  verifiedNameHistory,
-  countriesCodesList,
 }) => ({
  type: FETCH_SETTINGS.SUCCESS,
  payload: {
@@ -35,8 +31,6 @@ export const fetchSettingsSuccess = ({
    thirdPartyAuthProviders,
    profileDataManager,
    timeZones,
-    verifiedNameHistory,
-    countriesCodesList,
  },
 });

@@ -49,6 +43,7 @@ export const fetchSettingsReset = () => ({
  type: FETCH_SETTINGS.RESET,
 });

+
 // FORM STATE ACTIONS

 export const openForm = formId => ({
@@ -73,15 +68,12 @@ export const resetDrafts = () => ({
  type: RESET_DRAFTS,
 });

-export const beginNameChange = (formId) => ({
-  type: BEGIN_NAME_CHANGE,
-  payload: { formId },
-});
+
 // SAVE SETTINGS ACTIONS

-export const saveSettings = (formId, commitValues, extendedProfile = {}) => ({
+export const saveSettings = (formId, commitValues) => ({
  type: SAVE_SETTINGS.BASE,
-  payload: { formId, commitValues, extendedProfile },
+  payload: { formId, commitValues },
 });

 export const saveSettingsBegin = () => ({
@@ -107,25 +99,6 @@ export const savePreviousSiteLanguage = previousSiteLanguage => ({
  payload: { previousSiteLanguage },
 });

-export const saveMultipleSettings = (settingsArray, form = null) => ({
-  type: SAVE_MULTIPLE_SETTINGS.BASE,
-  payload: { settingsArray, form },
-});
-
-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
@@ -1,3 +1,4 @@
+
 export const YEAR_OF_BIRTH_OPTIONS = (() => {
  const currentYear = new Date().getFullYear();
  const years = [];
@@ -10,11 +11,6 @@ export const YEAR_OF_BIRTH_OPTIONS = (() => {
  return years.reverse();
 })();

-export const COPPA_COMPLIANCE_YEAR = (() => {
-  const currentYear = new Date().getFullYear();
-  return currentYear - 13;
-})();
-
 export const EDUCATION_LEVELS = [
  '',
  'p',
@@ -25,7 +21,7 @@ export const EDUCATION_LEVELS = [
  'jhs',
  'el',
  'none',
-  'other',
+  'o',
 ];

 export const GENDER_OPTIONS = [
@@ -34,108 +30,5 @@ export const GENDER_OPTIONS = [
  'm',
  'o',
 ];
-export const WORK_EXPERIENCE_OPTIONS = [
-  '',
-  '0',
-  '1',
-  '2',
-  '3',
-  '4',
-  '5',
-  '6',
-  '7',
-  '8',
-  '9',
-  '10+',
-
-];
-
-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()];
-}
-
-export const FIELD_LABELS = {
-  COUNTRY: 'country',
-};
-
-export const DECLINED = 'declined';
-export const SELF_DESCRIBE = 'self-describe';
-export const OTHER = 'other';
--- a/src/account-settings/data/reducers.js
+++ b/src/account-settings/data/reducers.js
@@ -7,14 +7,11 @@ import {
  SAVE_PREVIOUS_SITE_LANGUAGE,
  UPDATE_DRAFT,
  RESET_DRAFTS,
-  SAVE_MULTIPLE_SETTINGS,
-  BEGIN_NAME_CHANGE,
 } from './actions';

 import { reducer as deleteAccountReducer, DELETE_ACCOUNT } from '../delete-account';
 import { reducer as siteLanguageReducer, FETCH_SITE_LANGUAGES } from '../site-language';
 import { reducer as resetPasswordReducer, RESET_PASSWORD } from '../reset-password';
-import { reducer as nameChangeReducer, REQUEST_NAME_CHANGE } from '../name-change';
 import { reducer as thirdPartyAuthReducer, DISCONNECT_AUTH } from '../third-party-auth';

 export const defaultState = {
@@ -33,16 +30,10 @@ export const defaultState = {
  deleteAccount: deleteAccountReducer(),
  siteLanguage: siteLanguageReducer(),
  resetPassword: resetPasswordReducer(),
-  nameChange: nameChangeReducer(),
  thirdPartyAuth: thirdPartyAuthReducer(),
-  nameChangeModal: false,
-  verifiedName: null,
-  mostRecentVerifiedName: {},
-  verifiedNameHistory: {},
-  countriesCodesList: [],
 };

-const reducer = (state = defaultState, action = {}) => {
+const reducer = (state = defaultState, action) => {
  let dispatcherIsOpenForm;

  switch (action.type) {
@@ -56,16 +47,16 @@ const reducer = (state = defaultState, action = {}) => {
    case FETCH_SETTINGS.SUCCESS:
      return {
        ...state,
-        values: { ...state.values, ...action.payload.values },
+        values: Object.assign({}, state.values, action.payload.values),
        // Dump the providers into thirdPartyAuth.
-        thirdPartyAuth: { ...state.thirdPartyAuth, providers: action.payload.thirdPartyAuthProviders },
+        thirdPartyAuth: Object.assign({}, state.thirdPartyAuth, {
+          providers: action.payload.thirdPartyAuthProviders,
+        }),
        profileDataManager: action.payload.profileDataManager,
        timeZones: action.payload.timeZones,
        loading: false,
        loaded: true,
        loadingError: null,
-        verifiedNameHistory: action.payload.verifiedNameHistory,
-        countriesCodesList: action.payload.countriesCodesList,
      };
    case FETCH_SETTINGS.FAILURE:
      return {
@@ -99,14 +90,15 @@ const reducer = (state = defaultState, action = {}) => {
          saveState: null,
          errors: {},
          drafts: {},
-          nameChangeModal: false,
        };
      }
      return state;
    case UPDATE_DRAFT:
      return {
        ...state,
-        drafts: { ...state.drafts, [action.payload.name]: action.payload.value },
+        drafts: Object.assign({}, state.drafts, {
+          [action.payload.name]: action.payload.value,
+        }),
        saveState: null,
        errors: {},
      };
@@ -117,15 +109,6 @@ const reducer = (state = defaultState, action = {}) => {
        drafts: {},
      };

-    case BEGIN_NAME_CHANGE:
-      return {
-        ...state,
-        saveState: 'error',
-        nameChangeModal: {
-          formId: action.payload.formId,
-        },
-      };
-
    case SAVE_SETTINGS.BEGIN:
      return {
        ...state,
@@ -136,18 +119,19 @@ const reducer = (state = defaultState, action = {}) => {
      return {
        ...state,
        saveState: 'complete',
-        values: { ...state.values, ...action.payload.values },
+        values: Object.assign({}, state.values, action.payload.values),
        errors: {},
-        confirmationValues: {
-          ...state.confirmationValues,
-          ...action.payload.confirmationValues,
-        },
+        confirmationValues: Object.assign(
+          {},
+          state.confirmationValues,
+          action.payload.confirmationValues,
+        ),
      };
    case SAVE_SETTINGS.FAILURE:
      return {
        ...state,
        saveState: 'error',
-        errors: { ...state.errors, ...action.payload.errors },
+        errors: Object.assign({}, state.errors, action.payload.errors),
      };
    case SAVE_SETTINGS.RESET:
      return {
@@ -160,24 +144,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: { ...state.errors, ...action.payload.errors },
-      };

    case FETCH_TIME_ZONES.SUCCESS:
      return {
@@ -211,21 +177,11 @@ const reducer = (state = defaultState, action = {}) => {

    case RESET_PASSWORD.BEGIN:
    case RESET_PASSWORD.SUCCESS:
-    case RESET_PASSWORD.FORBIDDEN:
      return {
        ...state,
        resetPassword: resetPasswordReducer(state.resetPassword, action),
      };

-    case REQUEST_NAME_CHANGE.BEGIN:
-    case REQUEST_NAME_CHANGE.SUCCESS:
-    case REQUEST_NAME_CHANGE.FAILURE:
-    case REQUEST_NAME_CHANGE.RESET:
-      return {
-        ...state,
-        nameChange: nameChangeReducer(state.nameChange, action),
-      };
-
    case DISCONNECT_AUTH.BEGIN:
    case DISCONNECT_AUTH.SUCCESS:
    case DISCONNECT_AUTH.FAILURE:
--- a/src/account-settings/data/sagas.js
+++ b/src/account-settings/data/sagas.js
@@ -1,6 +1,4 @@
-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';
@@ -14,7 +12,6 @@ import {
  fetchSettingsFailure,
  closeForm,
  SAVE_SETTINGS,
-  SAVE_MULTIPLE_SETTINGS,
  saveSettingsBegin,
  saveSettingsSuccess,
  saveSettingsFailure,
@@ -22,16 +19,11 @@ import {
  FETCH_TIME_ZONES,
  fetchTimeZones,
  fetchTimeZonesSuccess,
-  saveMultipleSettingsBegin,
-  saveMultipleSettingsSuccess,
-  saveMultipleSettingsFailure,
-  beginNameChange,
 } from './actions';

 // Sub-modules
 import { saga as deleteAccountSaga } from '../delete-account';
 import { saga as resetPasswordSaga } from '../reset-password';
-import { saga as nameChangeSaga } from '../name-change';
 import {
  saga as siteLanguageSaga,
  patchPreferences,
@@ -40,12 +32,7 @@ import {
 import { saga as thirdPartyAuthSaga } from '../third-party-auth';

 // Services
-import {
-  getSettings,
-  patchSettings,
-  getTimeZones,
-  getVerifiedNameHistory,
-} from './service';
+import { getSettings, patchSettings, getTimeZones } from './service';

 export function* handleFetchSettings() {
  try {
@@ -53,7 +40,7 @@ export function* handleFetchSettings() {
    const { username, userId, roles: userRoles } = getAuthenticatedUser();

    const {
-      thirdPartyAuthProviders, profileDataManager, timeZones, countries, ...values
+      thirdPartyAuthProviders, profileDataManager, timeZones, ...values
    } = yield call(
      getSettings,
      username,
@@ -61,17 +48,13 @@ export function* handleFetchSettings() {
      userId,
    );

-    const verifiedNameHistory = yield call(getVerifiedNameHistory);
-
-    if (values.country) { yield put(fetchTimeZones(values.country)); }
+    if (values.country) yield put(fetchTimeZones(values.country));

    yield put(fetchSettingsSuccess({
      values,
      thirdPartyAuthProviders,
      profileDataManager,
      timeZones,
-      verifiedNameHistory,
-      countriesCodesList: countries,
    }));
  } catch (e) {
    yield put(fetchSettingsFailure(e.message));
@@ -84,8 +67,8 @@ export function* handleSaveSettings(action) {
    yield put(saveSettingsBegin());

    const { username, userId } = getAuthenticatedUser();
-    const { commitValues, formId, extendedProfile } = action.payload;
-    const commitData = Object.keys(extendedProfile).length > 0 ? extendedProfile : { [formId]: commitValues };
+    const { commitValues, formId } = action.payload;
+    const commitData = { [formId]: commitValues };
    let savedValues = null;
    if (formId === 'siteLanguage') {
      const previousSiteLanguage = getLocale();
@@ -104,14 +87,11 @@ 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) {
    if (e.fieldErrors) {
-      if (e.fieldErrors.name?.includes('verification')) {
-        yield put(beginNameChange('name'));
-      }
      yield put(saveSettingsFailure({ fieldErrors: e.fieldErrors }));
    } else {
      yield put(saveSettingsFailure(e.message));
@@ -120,52 +100,20 @@ export function* handleSaveSettings(action) {
  }
 }

-// handles mutiple settings saved at once, in order, and stops executing on first failure.
-export function* handleSaveMultipleSettings(action) {
-  try {
-    yield put(saveMultipleSettingsBegin());
-    const { username, userId } = getAuthenticatedUser();
-    const { settingsArray, form } = action.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(action));
-    if (form) {
-      yield delay(1000);
-      yield put(closeForm(form));
-    }
-  } catch (e) {
-    if (e.fieldErrors) {
-      if (e.fieldErrors.name?.includes('verification')) {
-        yield put(beginNameChange('name'));
-      }
-      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));
 }

+
 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(),
    siteLanguageSaga(),
    resetPasswordSaga(),
-    nameChangeSaga(),
    thirdPartyAuthSaga(),
  ]);
 }
--- a/src/account-settings/data/selectors.js
+++ b/src/account-settings/data/selectors.js
@@ -1,6 +1,6 @@
 import { createSelector, createStructuredSelector } from 'reselect';
-import { siteLanguageListSelector, siteLanguageOptionsSelector } from '../site-language';
-import { compareVerifiedNamesByCreatedDate } from '../../utils';
+
+import { siteLanguageOptionsSelector, siteLanguageListSelector } from '../site-language';

 export const storeName = 'accountSettings';

@@ -8,74 +8,9 @@ export const accountSettingsSelector = state => ({ ...state[storeName] });

 const editableFieldNameSelector = (state, props) => props.name;

-const verifiedNameSettingsSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => ({
-    history: accountSettings.verifiedNameHistory.results,
-    useVerifiedNameForCerts: accountSettings?.verifiedNameHistory.use_verified_name_for_certs,
-  }),
-);
-
-const sortedVerifiedNameHistorySelector = createSelector(
-  verifiedNameSettingsSelector,
-  verifiedNameSettings => {
-    const { history } = verifiedNameSettings;
-
-    if (Array.isArray(history)) {
-      return history.sort(compareVerifiedNamesByCreatedDate);
-    }
-
-    return [];
-  },
-);
-
-const mostRecentVerifiedNameSelector = createSelector(
-  sortedVerifiedNameHistorySelector,
-  sortedHistory => (sortedHistory.length > 0 ? sortedHistory[0] : null),
-);
-
-const mostRecentApprovedVerifiedNameValueSelector = createSelector(
-  sortedVerifiedNameHistorySelector,
-  mostRecentVerifiedNameSelector,
-  (sortedHistory, mostRecentVerifiedName) => {
-    const approvedVerifiedNames = sortedHistory.filter(name => name.status === 'approved');
-    const approvedVerifiedName = approvedVerifiedNames.length > 0 ? approvedVerifiedNames[0] : null;
-
-    let verifiedName = null;
-    switch (mostRecentVerifiedName && mostRecentVerifiedName.status) {
-      case 'approved':
-      case 'denied':
-      case 'pending':
-        verifiedName = approvedVerifiedName;
-        break;
-      case 'submitted':
-        verifiedName = mostRecentVerifiedName;
-        break;
-      default:
-        verifiedName = null;
-    }
-    return verifiedName;
-  },
-);
-
 const valuesSelector = createSelector(
  accountSettingsSelector,
-  mostRecentApprovedVerifiedNameValueSelector,
-  (accountSettings, mostRecentApprovedVerifiedNameValue) => {
-    let useVerifiedNameForCerts = (
-      accountSettings.verifiedNameHistory?.use_verified_name_for_certs || false
-    );
-
-    if (Object.keys(accountSettings.confirmationValues).includes('useVerifiedNameForCerts')) {
-      useVerifiedNameForCerts = accountSettings.confirmationValues.useVerifiedNameForCerts;
-    }
-
-    return {
-      ...accountSettings.values,
-      verified_name: mostRecentApprovedVerifiedNameValue?.verified_name,
-      useVerifiedNameForCerts,
-    };
-  },
+  accountSettings => accountSettings.values,
 );

 const draftsSelector = createSelector(
@@ -88,11 +23,6 @@ const previousSiteLanguageSelector = createSelector(
  accountSettings => accountSettings.previousSiteLanguage,
 );

-const countriesSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => accountSettings.countriesCodesList,
-);
-
 const editableFieldErrorSelector = createSelector(
  editableFieldNameSelector,
  accountSettingsSelector,
@@ -111,16 +41,16 @@ const isEditingSelector = createSelector(
  (name, accountSettings) => accountSettings.openFormId === name,
 );

+const confirmationValuesSelector = createSelector(
+  accountSettingsSelector,
+  accountSettings => accountSettings.confirmationValues,
+);
+
 const errorSelector = createSelector(
  accountSettingsSelector,
  accountSettings => accountSettings.errors,
 );

-const nameChangeModalSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => accountSettings.nameChangeModal,
-);
-
 const saveStateSelector = createSelector(
  accountSettingsSelector,
  accountSettings => accountSettings.saveState,
@@ -140,20 +70,10 @@ export const profileDataManagerSelector = createSelector(

 export const staticFieldsSelector = createSelector(
  accountSettingsSelector,
-  mostRecentVerifiedNameSelector,
-  (accountSettings, verifiedName) => {
-    const staticFields = [];
-    if (accountSettings.profileDataManager) {
-      staticFields.push('name', 'email', 'country');
-    }
-    if (verifiedName && ['submitted'].includes(verifiedName.status)) {
-      staticFields.push('verifiedName');
-    }
-
-    return staticFields;
-  },
+  accountSettings => (accountSettings.profileDataManager ? ['name', 'email', 'country'] : []),
 );

+
 /**
 * If there's no draft present at all (undefined), use the original committed value.
 */
@@ -161,31 +81,13 @@ function chooseFormValue(draft, committed) {
  return draft !== undefined ? draft : committed;
 }

-export const formValuesSelector = createSelector(
+const formValuesSelector = createSelector(
  valuesSelector,
  draftsSelector,
  (values, drafts) => {
    const formValues = {};
    Object.entries(values).forEach(([name, value]) => {
-      if (typeof value === 'boolean') {
-        formValues[name] = chooseFormValue(drafts[name], value);
-      } else if (typeof value === 'object' && name === 'extended_profile' && value !== null) {
-        const extendedProfile = value.slice();
-        const draftsKeys = Object.keys(drafts);
-
-        if (draftsKeys.length !== 0) {
-          const draftFieldName = draftsKeys[0];
-          const index = extendedProfile.findIndex((profile) => profile.field_name === draftFieldName);
-
-          if (index !== -1) {
-            extendedProfile[index] = { field_name: draftFieldName, field_value: drafts[draftFieldName] };
-          }
-        }
-
-        formValues.extended_profile = [...extendedProfile];
-      } else {
-        formValues[name] = chooseFormValue(drafts[name], value) || '';
-      }
+      formValues[name] = chooseFormValue(drafts[name], value) || '';
    });
    return formValues;
  },
@@ -193,7 +95,7 @@ export const formValuesSelector = createSelector(

 const transformTimeZonesToOptions = timeZoneArr => timeZoneArr
  .map(({ time_zone, description }) => ({ // eslint-disable-line camelcase
-    value: time_zone, label: description, // eslint-disable-line camelcase
+    value: time_zone, label: description,
  }));

 const timeZonesSelector = createSelector(
@@ -230,37 +132,21 @@ export const accountSettingsPageSelector = createSelector(
  siteLanguageOptionsSelector,
  siteLanguageSelector,
  formValuesSelector,
-  valuesSelector,
-  draftsSelector,
-  errorSelector,
  profileDataManagerSelector,
  staticFieldsSelector,
  timeZonesSelector,
  countryTimeZonesSelector,
  activeAccountSelector,
-  nameChangeModalSelector,
-  mostRecentApprovedVerifiedNameValueSelector,
-  mostRecentVerifiedNameSelector,
-  sortedVerifiedNameHistorySelector,
-  countriesSelector,
  (
    accountSettings,
    siteLanguageOptions,
    siteLanguage,
    formValues,
-    committedValues,
-    drafts,
-    formErrors,
    profileDataManager,
    staticFields,
    timeZoneOptions,
    countryTimeZoneOptions,
    activeAccount,
-    nameChangeModal,
-    verifiedName,
-    mostRecentVerifiedName,
-    verifiedNameHistory,
-    countriesCodesList,
  ) => ({
    siteLanguageOptions,
    siteLanguage,
@@ -271,46 +157,34 @@ export const accountSettingsPageSelector = createSelector(
    countryTimeZoneOptions,
    isActive: activeAccount,
    formValues,
-    committedValues,
-    drafts,
-    formErrors,
    profileDataManager,
    staticFields,
    tpaProviders: accountSettings.thirdPartyAuth.providers,
-    nameChangeModal,
-    verifiedName,
-    mostRecentVerifiedName,
-    verifiedNameHistory,
-    countriesCodesList,
  }),
 );

-export const certPreferenceSelector = createSelector(
-  valuesSelector,
+export const coachingConsentPageSelector = createSelector(
+  accountSettingsSelector,
  formValuesSelector,
-  mostRecentApprovedVerifiedNameValueSelector,
+  activeAccountSelector,
  saveStateSelector,
+  confirmationValuesSelector,
  errorSelector,
  (
-    committedValues,
+    accountSettings,
    formValues,
-    mostRecentApprovedVerifiedNameValue,
+    activeAccount,
    saveState,
+    confirmationValues,
    errors,
  ) => ({
-    originalFullName: committedValues?.name || '',
-    originalVerifiedName: mostRecentApprovedVerifiedNameValue?.verified_name || '',
-    useVerifiedNameForCerts: formValues.useVerifiedNameForCerts || false,
+    loading: accountSettings.loading,
+    loaded: accountSettings.loaded,
+    loadingError: accountSettings.loadingError,
+    isActive: activeAccount,
+    formValues,
    saveState,
+    confirmationValues,
    formErrors: errors,
  }),
 );
-
-export const nameChangeSelector = createSelector(
-  accountSettingsSelector,
-  formValuesSelector,
-  (accountSettings, formValues) => ({
-    ...accountSettings.nameChange,
-    formValues,
-  }),
-);
--- a/src/account-settings/data/selectors.test.js
+++ b/src/account-settings/data/selectors.test.js
@@ -1,72 +0,0 @@
-import { profileDataManagerSelector, formValuesSelector } from './selectors';
-
-const testValue = 'test VALUE';
-
-describe('profileDataManagerSelector', () => {
-  it('returns the profileDataManager from the state', () => {
-    const state = {
-      accountSettings: {
-        profileDataManager: { testValue },
-      },
-    };
-    const result = profileDataManagerSelector(state);
-
-    expect(result).toEqual(state.accountSettings.profileDataManager);
-  });
-
-  it('should correctly select form values', () => {
-    const state = {
-      accountSettings: {
-        values: {
-          name: 'John Doe',
-          age: 25,
-        },
-        drafts: {
-          age: 26,
-
-        },
-        verifiedNameHistory: 'test',
-        confirmationValues: {},
-      },
-    };
-
-    const result = formValuesSelector(state);
-
-    const expected = {
-      name: 'John Doe',
-      age: 26,
-      verified_name: '',
-      useVerifiedNameForCerts: false,
-    };
-
-    expect(result).toEqual(expected);
-  });
-
-  it('should correctly select form values with extended_profile', () => {
-    // Mock data with extended_profile field in both values and drafts
-    const state = {
-      accountSettings: {
-        values: {
-          extended_profile: [
-            { field_name: 'test_field', field_value: '5' },
-          ],
-        },
-        drafts: { test_field: '6' },
-        verifiedNameHistory: 'test',
-        confirmationValues: {},
-      },
-    };
-
-    const result = formValuesSelector(state);
-
-    const expected = {
-      verified_name: '',
-      useVerifiedNameForCerts: false,
-      extended_profile: [ // Draft value should override the committed value
-        { field_name: 'test_field', field_value: '6' }, // Value from the committed values
-      ],
-    };
-
-    expect(result).toEqual(expected);
-  });
-});
--- a/src/account-settings/data/service.js
+++ b/src/account-settings/data/service.js
@@ -1,14 +1,12 @@
 import { getConfig } from '@edx/frontend-platform';
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import { logError } from '@edx/frontend-platform/logging';
 import pick from 'lodash.pick';
 import omit from 'lodash.omit';
 import isEmpty from 'lodash.isempty';

 import { handleRequestError, unpackFieldErrors } from './utils';
 import { getThirdPartyAuthProviders } from '../third-party-auth';
-import { postVerifiedNameConfig } from '../certificate-preference/data/service';
-import { FIELD_LABELS } from './constants';
+import { getCoachingPreferences, patchCoachingPreferences } from '../coaching/data/service';

 const SOCIAL_PLATFORMS = [
  { id: 'twitter', key: 'social_link_twitter' },
@@ -43,9 +41,7 @@ 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];
@@ -141,11 +137,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;
+        }
      }
    }
  }
@@ -153,107 +150,43 @@ export async function getProfileDataManager(username, userRoles) {
  return null;
 }

-export async function getVerifiedName() {
-  let data;
-  const client = getAuthenticatedHttpClient();
-  try {
-    const requestUrl = `${getConfig().LMS_BASE_URL}/api/edx_name_affirmation/v1/verified_name`;
-    ({ data } = await client.get(requestUrl));
-  } catch (error) {
-    return {};
-  }
-
-  return data;
-}
-
-export async function getVerifiedNameHistory() {
-  let data;
-  const client = getAuthenticatedHttpClient();
-  try {
-    const requestUrl = `${getConfig().LMS_BASE_URL}/api/edx_name_affirmation/v1/verified_name/history`;
-    ({ data } = await client.get(requestUrl));
-  } catch (error) {
-    return {};
-  }
-
-  return data;
-}
-
-export async function postVerifiedName(data) {
-  const requestConfig = { headers: { Accept: 'application/json' } };
-  const requestUrl = `${getConfig().LMS_BASE_URL}/api/edx_name_affirmation/v1/verified_name`;
-
-  await getAuthenticatedHttpClient()
-    .post(requestUrl, data, requestConfig)
-    .catch(error => handleRequestError(error));
-}
-
-function extractCountryList(data) {
-  return data?.fields
-    .find(({ name }) => name === FIELD_LABELS.COUNTRY)
-    ?.options?.map(({ value }) => (value)) || [];
-}
-
-export async function getCountryList() {
-  const url = `${getConfig().LMS_BASE_URL}/user_api/v1/account/registration/`;
-
-  try {
-    const { data } = await getAuthenticatedHttpClient().get(url);
-    return extractCountryList(data);
-  } catch (e) {
-    logError(e);
-    return [];
-  }
-}
-
 /**
- * A single function to GET everything considered a setting. Currently encapsulates Account, Preferences, and
- * ThirdPartyAuth.
+ * A single function to GET everything considered a setting.
+ * Currently encapsulates Account, Preferences, Coaching, and ThirdPartyAuth
 */
-export async function getSettings(username, userRoles) {
-  const [
-    account,
-    preferences,
-    thirdPartyAuthProviders,
-    profileDataManager,
-    timeZones,
-    countries,
-  ] = await Promise.all([
+export async function getSettings(username, userRoles, userId) {
+  const results = await Promise.all([
    getAccount(username),
    getPreferences(username),
    getThirdPartyAuthProviders(),
    getProfileDataManager(username, userRoles),
    getTimeZones(),
-    getCountryList(),
+    getConfig().COACHING_ENABLED && getCoachingPreferences(userId),
  ]);

  return {
-    ...account,
-    ...preferences,
-    thirdPartyAuthProviders,
-    profileDataManager,
-    timeZones,
-    countries,
+    ...results[0],
+    ...results[1],
+    thirdPartyAuthProviders: results[2],
+    profileDataManager: results[3],
+    timeZones: results[4],
+    coaching: results[5],
  };
 }

 /**
 * A single function to PATCH everything considered a setting.
- * Currently encapsulates Account, Preferences, ThirdPartyAuth
+ * Currently encapsulates Account, Preferences, coaching and ThirdPartyAuth
 */
-export async function patchSettings(username, commitValues) {
+export async function patchSettings(username, commitValues, userId) {
  // Note: time_zone exists in the return value from user/v1/accounts
  // but it is always null and won't update. It also exists in
  // user/v1/preferences where it does update. This is the one we use.
  const preferenceKeys = ['time_zone'];
-  const certificateKeys = ['useVerifiedNameForCerts'];
-  const accountCommitValues = omit(
-    commitValues,
-    preferenceKeys,
-    certificateKeys,
-  );
+  const coachingKeys = ['coaching'];
+  const accountCommitValues = omit(commitValues, preferenceKeys);
  const preferenceCommitValues = pick(commitValues, preferenceKeys);
-  const certCommitValues = pick(commitValues, certificateKeys);
+  const coachingCommitValues = pick(commitValues, coachingKeys);
  const patchRequests = [];

  if (!isEmpty(accountCommitValues)) {
@@ -262,8 +195,8 @@ export async function patchSettings(username, commitValues) {
  if (!isEmpty(preferenceCommitValues)) {
    patchRequests.push(patchPreferences(username, preferenceCommitValues));
  }
-  if (!isEmpty(certCommitValues)) {
-    patchRequests.push(postVerifiedNameConfig(username, certCommitValues));
+  if (!isEmpty(coachingCommitValues)) {
+    patchRequests.push(patchCoachingPreferences(userId, coachingCommitValues));
  }

  const results = await Promise.all(patchRequests);
--- a/src/account-settings/data/utils/dataUtils.js
+++ b/src/account-settings/data/utils/dataUtils.js
@@ -0,0 +1,38 @@
+import camelCase from 'lodash.camelcase';
+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))
+  ) {
+    return object;
+  }
+
+  if (Array.isArray(object)) {
+    return object.map(value => modifyObjectKeys(value, modify));
+  }
+
+  // Otherwise, process all its keys.
+  const result = {};
+  Object.entries(object).forEach(([key, value]) => {
+    result[modify(key)] = modifyObjectKeys(value, modify);
+  });
+  return result;
+}
+
+export function camelCaseObject(object) {
+  return modifyObjectKeys(object, camelCase);
+}
+
+export function snakeCaseObject(object) {
+  return modifyObjectKeys(object, snakeCase);
+}
+
+export function convertKeyNames(object, nameMap) {
+  const transformer = key => (nameMap[key] === undefined ? key : nameMap[key]);
+
+  return modifyObjectKeys(object, transformer);
+}
--- a/src/account-settings/data/utils/dataUtils.test.js
+++ b/src/account-settings/data/utils/dataUtils.test.js
@@ -0,0 +1,90 @@
+import {
+  modifyObjectKeys,
+  camelCaseObject,
+  snakeCaseObject,
+  convertKeyNames,
+} from './dataUtils';
+
+describe('modifyObjectKeys', () => {
+  it('should use the provided modify function to change all keys in and object and its children', () => {
+    function meowKeys(key) {
+      return `${key}Meow`;
+    }
+
+    const result = modifyObjectKeys(
+      {
+        one: undefined,
+        two: null,
+        three: '',
+        four: 0,
+        five: NaN,
+        six: [1, 2, { seven: 'woof' }],
+        eight: { nine: { ten: 'bark' }, eleven: true },
+      },
+      meowKeys,
+    );
+
+    expect(result).toEqual({
+      oneMeow: undefined,
+      twoMeow: null,
+      threeMeow: '',
+      fourMeow: 0,
+      fiveMeow: NaN,
+      sixMeow: [1, 2, { sevenMeow: 'woof' }],
+      eightMeow: { nineMeow: { tenMeow: 'bark' }, elevenMeow: true },
+    });
+  });
+});
+
+describe('camelCaseObject', () => {
+  it('should make everything camelCase', () => {
+    const result = camelCaseObject({
+      what_now: 'brown cow',
+      but_who: { says_you_people: 'okay then', but_how: { will_we_even_know: 'the song is over' } },
+      'dot.dot.dot': 123,
+    });
+
+    expect(result).toEqual({
+      whatNow: 'brown cow',
+      butWho: { saysYouPeople: 'okay then', butHow: { willWeEvenKnow: 'the song is over' } },
+      dotDotDot: 123,
+    });
+  });
+});
+
+describe('snakeCaseObject', () => {
+  it('should make everything snake_case', () => {
+    const result = snakeCaseObject({
+      whatNow: 'brown cow',
+      butWho: { saysYouPeople: 'okay then', butHow: { willWeEvenKnow: 'the song is over' } },
+      'dot.dot.dot': 123,
+    });
+
+    expect(result).toEqual({
+      what_now: 'brown cow',
+      but_who: { says_you_people: 'okay then', but_how: { will_we_even_know: 'the song is over' } },
+      dot_dot_dot: 123,
+    });
+  });
+});
+
+describe('convertKeyNames', () => {
+  it('should replace the specified keynames', () => {
+    const result = convertKeyNames(
+      {
+        one: { two: { three: 'four' } },
+        five: 'six',
+      },
+      {
+        two: 'blue',
+        five: 'alive',
+        seven: 'heaven',
+      },
+    );
+
+    expect(result).toEqual({
+      one: { blue: { three: 'four' } },
+      alive: 'six',
+    });
+  });
+});
--- a/src/account-settings/data/utils/index.js
+++ b/src/account-settings/data/utils/index.js
@@ -1,3 +1,9 @@
+export {
+  camelCaseObject,
+  convertKeyNames,
+  modifyObjectKeys,
+  snakeCaseObject,
+} from './dataUtils';
 export {
  AsyncActionType,
  getModuleState,
--- 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/data/utils/sagaUtils.js
+++ b/src/account-settings/data/utils/sagaUtils.js
@@ -1,7 +1,8 @@
 import { put } from 'redux-saga/effects';
 import { logError } from '@edx/frontend-platform/logging';
+import { history } from '@edx/frontend-platform';

-export default function* handleFailure(error, navigate, failureAction = null, failureRedirectPath = null) {
+export default function* handleFailure(error, failureAction = null, failureRedirectPath = null) {
  if (error.fieldErrors && failureAction !== null) {
    yield put(failureAction({ fieldErrors: error.fieldErrors }));
  }
@@ -10,6 +11,6 @@ export default function* handleFailure(error, navigate, failureAction = null, fa
    yield put(failureAction(error.message));
  }
  if (failureRedirectPath !== null) {
-    navigate(failureRedirectPath);
+    history.push(failureRedirectPath);
  }
 }
--- a/src/account-settings/delete-account/BeforeProceedingBanner.jsx
+++ b/src/account-settings/delete-account/BeforeProceedingBanner.jsx
@@ -3,10 +3,9 @@ import PropTypes from 'prop-types';
 import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { Hyperlink } from '@openedx/paragon';
+import { Hyperlink } from '@edx/paragon';

 // Messages
-import { getConfig } from '@edx/frontend-platform';
 import messages from './messages';

 // Components
@@ -23,16 +22,13 @@ const BeforeProceedingBanner = (props) => {
      <FormattedMessage
        id="account.settings.delete.account.before.proceeding"
        defaultMessage="Before proceeding, please {actionLink}."
-        description="Error that appears if you are trying to delete your account, but something about your account needs attention first.  The actionLink will be instructions, such as 'unlink your Facebook account'."
+        description="Error that appears if you are trying to delete your edX account, but something about your account needs attention first.  The actionLink will be instructions, such as 'unlink your Facebook account'."
        values={{
-          actionLink: supportArticleUrl ? (
+          actionLink: (
            <Hyperlink destination={supportArticleUrl}>
              {intl.formatMessage(messages[instructionMessageId])}
            </Hyperlink>
-          ) : (
-            intl.formatMessage(messages[instructionMessageId])
          ),
-          siteName: getConfig().SITE_NAME,
        }}
      />
    </Alert>
--- a/src/account-settings/delete-account/BeforeProceedingBanner.test.jsx
+++ b/src/account-settings/delete-account/BeforeProceedingBanner.test.jsx
@@ -1,50 +0,0 @@
-import React from 'react';
-import renderer from 'react-test-renderer';
-import { IntlProvider, injectIntl, createIntl } from '@edx/frontend-platform/i18n';
-
-jest.mock('react-dom', () => ({
-  ...jest.requireActual('react-dom'),
-  createPortal: jest.fn(node => node), // Mock portal behavior
-}));
-
-import BeforeProceedingBanner from './BeforeProceedingBanner'; // eslint-disable-line import/first
-
-const IntlBeforeProceedingBanner = injectIntl(BeforeProceedingBanner);
-
-describe('BeforeProceedingBanner', () => {
-  it('should match the snapshot if SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT does not have a support link', () => {
-    const props = {
-      instructionMessageId: 'account.settings.delete.account.please.unlink',
-      intl: createIntl({ locale: 'en' }),
-      supportArticleUrl: '',
-    };
-    const tree = renderer
-      .create((
-        <IntlProvider locale="en">
-          <IntlBeforeProceedingBanner
-            {...props}
-          />
-        </IntlProvider>
-      ))
-      .toJSON();
-    expect(tree).toMatchSnapshot();
-  });
-
-  it('should match the snapshot when SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT has a support link', () => {
-    const props = {
-      instructionMessageId: 'account.settings.delete.account.please.unlink',
-      intl: createIntl({ locale: 'en' }),
-      supportArticleUrl: 'http://test-support.edx',
-    };
-    const tree = renderer
-      .create((
-        <IntlProvider locale="en">
-          <IntlBeforeProceedingBanner
-            {...props}
-          />
-        </IntlProvider>
-      ))
-      .toJSON();
-    expect(tree).toMatchSnapshot();
-  });
-});
--- a/src/account-settings/delete-account/ConfirmationModal.jsx
+++ b/src/account-settings/delete-account/ConfirmationModal.jsx
@@ -1,14 +1,11 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';

-import {
-  AlertModal,
-  Button, Input, ValidationFormGroup, ActionRow,
-} from '@openedx/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';
-import { getConfig } from '@edx/frontend-platform';
+
 import messages from './messages';
 import Alert from '../Alert';
 import PrintingInstructions from './PrintingInstructions';
@@ -22,8 +19,6 @@ export class ConfirmationModal extends Component {
    switch (reason) {
      case 'empty-password':
        return 'account.settings.delete.account.error.no.password';
-      case 'invalid-password':
-        return 'account.settings.delete.account.error.invalid.password';
      default:
        return 'account.settings.delete.account.error.unable.to.delete';
    }
@@ -36,9 +31,10 @@ 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,66 +62,52 @@ export class ConfirmationModal extends Component {
    const open = ['confirming', 'pending', 'failed'].includes(status);
    const passwordFieldId = 'passwordFieldId';
    const invalidMessage = messages[this.getShortErrorMessageId(errorType)];
-
-    // TODO: We lack a good way of providing custom language for a particular site.  This is a hack
-    // to allow edx.org to fulfill its business requirements.
-    const deleteAccountModalText2MessageKey = getConfig().SITE_NAME === 'edX'
-      ? 'account.settings.delete.account.modal.text.2.edX'
-      : 'account.settings.delete.account.modal.text.2';
-
    return (
-      <AlertModal
-        isOpen={open}
+      <Modal
+        open={open}
        title={intl.formatMessage(messages['account.settings.delete.account.modal.header'])}
+        body={
+          <div>
+            {this.renderError()}
+            <Alert
+              className="alert-warning mt-n2"
+              icon={<FontAwesomeIcon className="mr-2" icon={faExclamationTriangle} />}
+            >
+              <h6>
+                {intl.formatMessage(messages['account.settings.delete.account.modal.text.1'])}
+              </h6>
+              <p>{intl.formatMessage(messages['account.settings.delete.account.modal.text.2'])}</p>
+              <p>
+                <PrintingInstructions />
+              </p>
+            </Alert>
+            <ValidationFormGroup
+              for={passwordFieldId}
+              invalid={errorType !== null}
+              invalidMessage={intl.formatMessage(invalidMessage)}
+            >
+              <label className="d-block" htmlFor={passwordFieldId}>
+                {intl.formatMessage(messages['account.settings.delete.account.modal.enter.password'])}
+              </label>
+              <Input
+                name="password"
+                id={passwordFieldId}
+                type="password"
+                value={password}
+                onChange={onChange}
+              />
+            </ValidationFormGroup>
+          </div>
+        }
+        buttons={[
+          <Button className="btn-danger" onClick={onSubmit}>
+            {intl.formatMessage(messages['account.settings.delete.account.modal.confirm.delete'])}
+          </Button>,
+        ]}
+        closeText={intl.formatMessage(messages['account.settings.delete.account.modal.confirm.cancel'])}
+        renderHeaderCloseButton={false}
        onClose={onCancel}
-        footerNode={(
-          <ActionRow>
-            <Button variant="link" onClick={onCancel}>Cancel</Button>
-            <Button variant="danger" onClick={onSubmit}>Yes, Delete</Button>
-          </ActionRow>
-        )}
-      >
-        <div className="p-3">
-          {this.renderError()}
-          <Alert
-            className="alert-warning mt-n2"
-            icon={<FontAwesomeIcon className="mr-2" icon={faExclamationTriangle} />}
-          >
-            <h6>
-              {intl.formatMessage(
-                messages['account.settings.delete.account.modal.text.1'],
-                { siteName: getConfig().SITE_NAME },
-              )}
-            </h6>
-            <p>
-              {intl.formatMessage(
-                messages[deleteAccountModalText2MessageKey],
-                { siteName: getConfig().SITE_NAME },
-              )}
-            </p>
-            <p>
-              <PrintingInstructions />
-            </p>
-          </Alert>
-          <ValidationFormGroup
-            for={passwordFieldId}
-            invalid={errorType !== null}
-            invalidMessage={intl.formatMessage(invalidMessage)}
-          >
-            <label className="d-block" htmlFor={passwordFieldId}>
-              {intl.formatMessage(messages['account.settings.delete.account.modal.enter.password'])}
-            </label>
-            <Input
-              name="password"
-              id={passwordFieldId}
-              type="password"
-              value={password}
-              onChange={onChange}
-            />
-          </ValidationFormGroup>
-        </div>
-
-      </AlertModal>
+      />
    );
  }
 }
--- a/src/account-settings/delete-account/ConfirmationModal.test.jsx
+++ b/src/account-settings/delete-account/ConfirmationModal.test.jsx
@@ -1,12 +1,10 @@
 import React from 'react';
+import ReactDOM from 'react-dom';
 import renderer from 'react-test-renderer';
 import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';

-// Modal creates a portal.  Overriding createPortal allows portals to be tested in jest.
-jest.mock('react-dom', () => ({
-  ...jest.requireActual('react-dom'),
-  createPortal: jest.fn(node => node), // Mock portal behavior
-}));
+// Modal creates a portal.  Overriding ReactDOM.createPortal allows portals to be tested in jest.
+ReactDOM.createPortal = node => node;

 import { ConfirmationModal } from './ConfirmationModal'; // eslint-disable-line import/first

--- a/src/account-settings/delete-account/DeleteAccount.jsx
+++ b/src/account-settings/delete-account/DeleteAccount.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { getConfig } from '@edx/frontend-platform';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Button, Hyperlink } from '@openedx/paragon';
+import { Button, Hyperlink } from '@edx/paragon';

 // Actions
 import {
@@ -24,13 +24,9 @@ import ConnectedSuccessModal from './SuccessModal';
 import BeforeProceedingBanner from './BeforeProceedingBanner';

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

  handleSubmit = () => {
    if (this.state.password === '') {
@@ -59,91 +55,60 @@ export class DeleteAccount extends React.Component {
      hasLinkedTPA, isVerifiedAccount, status, errorType, intl,
    } = this.props;
    const canDelete = isVerifiedAccount && !hasLinkedTPA;
-    const supportArticleUrl = process.env.SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT;
-
-    // TODO: We lack a good way of providing custom language for a particular site.  This is a hack
-    // to allow edx.org to fulfill its business requirements.
-    const deleteAccountText2MessageKey = getConfig().SITE_NAME === 'edX'
-      ? 'account.settings.delete.account.text.2.edX'
-      : 'account.settings.delete.account.text.2';
-
-    const optInInstructionMessageId = getConfig().MARKETING_EMAILS_OPT_IN
-      ? 'account.settings.delete.account.please.confirm'
-      : 'account.settings.delete.account.please.activate';

    return (
      <div>
-        <h2 className="section-heading h4 mb-3">
+        <h2 className="section-heading">
          {intl.formatMessage(messages['account.settings.delete.account.header'])}
        </h2>
-        {
-          this.props.canDeleteAccount ? (
-            <>
-              <p>{intl.formatMessage(messages['account.settings.delete.account.subheader'])}</p>
-              <p>
-                {intl.formatMessage(
-                  messages['account.settings.delete.account.text.1'],
-                  { siteName: getConfig().SITE_NAME },
-                )}
-              </p>
-              <p>
-                {intl.formatMessage(
-                  messages[deleteAccountText2MessageKey],
-                  { siteName: getConfig().SITE_NAME },
-                )}
-              </p>
-              <p>
-                <PrintingInstructions />
-              </p>
-              <p className="text-danger h6">
-                {intl.formatMessage(
-                  messages['account.settings.delete.account.text.warning'],
-                  { siteName: getConfig().SITE_NAME },
-                )}
-              </p>
-              <p>
-                <Hyperlink destination="https://help.edx.org/edxlearner/s/topic/0TOQq0000001UdZOAU/account-basics">
-                  {intl.formatMessage(messages['account.settings.delete.account.text.change.instead'])}
-                </Hyperlink>
-              </p>
-              <p>
-                <Button
-                  variant="outline-danger"
-                  onClick={canDelete ? this.props.deleteAccountConfirmation : null}
-                  disabled={!canDelete}
-                >
-                  {intl.formatMessage(messages['account.settings.delete.account.button'])}
-                </Button>
-              </p>
-              {isVerifiedAccount ? null : (
-                <BeforeProceedingBanner
-                  instructionMessageId={optInInstructionMessageId}
-                  supportArticleUrl="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-confirm-my-email"
-                />
-              )}
-              {hasLinkedTPA ? (
-                <BeforeProceedingBanner
-                  instructionMessageId="account.settings.delete.account.please.unlink"
-                  supportArticleUrl={supportArticleUrl}
-                />
-              ) : null}
+        <p>{intl.formatMessage(messages['account.settings.delete.account.subheader'])}</p>
+        <p>{intl.formatMessage(messages['account.settings.delete.account.text.1'])}</p>
+        <p>{intl.formatMessage(messages['account.settings.delete.account.text.2'])}</p>
+        <p>
+          <PrintingInstructions />
+        </p>
+        <p className="text-danger h6">
+          {intl.formatMessage(messages['account.settings.delete.account.text.warning'])}
+        </p>
+        <p>
+          <Hyperlink destination="https://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings">
+            {intl.formatMessage(messages['account.settings.delete.account.text.change.instead'])}
+          </Hyperlink>
+        </p>
+        <p>
+          <Button
+            className="btn-outline-danger"
+            onClick={canDelete ? this.props.deleteAccountConfirmation : null}
+            disabled={!canDelete}
+          >
+            {intl.formatMessage(messages['account.settings.delete.account.button'])}
+          </Button>
+        </p>

-              <ConnectedConfirmationModal
-                status={status}
-                errorType={errorType}
-                onSubmit={this.handleSubmit}
-                onCancel={this.handleCancel}
-                onChange={this.handlePasswordChange}
-                password={this.state.password}
-              />
+        {isVerifiedAccount ? null : (
+          <BeforeProceedingBanner
+            instructionMessageId="account.settings.delete.account.please.activate"
+            supportArticleUrl="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-activate-my-account-"
+          />
+        )}

-              <ConnectedSuccessModal status={status} onClose={this.handleFinalClose} />
-            </>
-          ) : (
-            <p>{intl.formatMessage(messages['account.settings.cannot.delete.account.text'])}</p>
-          )
-        }
+        {hasLinkedTPA ? (
+          <BeforeProceedingBanner
+            instructionMessageId="account.settings.delete.account.please.unlink"
+            supportArticleUrl="https://support.edx.org/hc/en-us/articles/207206067"
+          />
+        ) : null}

+        <ConnectedConfirmationModal
+          status={status}
+          errorType={errorType}
+          onSubmit={this.handleSubmit}
+          onCancel={this.handleCancel}
+          onChange={this.handlePasswordChange}
+          password={this.state.password}
+        />
+
+        <ConnectedSuccessModal status={status} onClose={this.handleFinalClose} />
      </div>
    );
  }
@@ -159,7 +124,6 @@ DeleteAccount.propTypes = {
  errorType: PropTypes.oneOf(['empty-password', 'server']),
  hasLinkedTPA: PropTypes.bool,
  isVerifiedAccount: PropTypes.bool,
-  canDeleteAccount: PropTypes.bool,
  intl: intlShape.isRequired,
 };

@@ -168,7 +132,6 @@ DeleteAccount.defaultProps = {
  isVerifiedAccount: true,
  status: null,
  errorType: null,
-  canDeleteAccount: true,
 };

 // Assume we're part of the accountSettings state.
--- a/src/account-settings/delete-account/DeleteAccount.test.jsx
+++ b/src/account-settings/delete-account/DeleteAccount.test.jsx
@@ -1,15 +1,10 @@
-/* eslint-disable react/jsx-no-useless-fragment */
 import React from 'react';
 import renderer from 'react-test-renderer';
 import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';

 // Testing the modals separately, they just clutter up the snapshots if included here.
-jest.mock('./ConfirmationModal', () => function ConfirmationModalMock() {
-  return <></>;
-});
-jest.mock('./SuccessModal', () => function SuccessModalMock() {
-  return <></>;
-});
+jest.mock('./ConfirmationModal');
+jest.mock('./SuccessModal');

 import { DeleteAccount } from './DeleteAccount'; // eslint-disable-line import/first

@@ -42,7 +37,6 @@ describe('DeleteAccount', () => {
        </IntlProvider>
      ))
      .toJSON();
-
    expect(tree).toMatchSnapshot();
  });

--- a/src/account-settings/delete-account/PrintingInstructions.jsx
+++ b/src/account-settings/delete-account/PrintingInstructions.jsx
@@ -1,40 +1,23 @@
 import React from 'react';
 import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Hyperlink } from '@openedx/paragon';
+import { Hyperlink } from '@edx/paragon';

-import { getConfig } from '@edx/frontend-platform';
 import messages from './messages';

 const PrintingInstructions = (props) => {
  const actionLink = (
    <Hyperlink
-      // TODO: What would a generic version of this link look like?  Should
-      // CERTIFICATE_SHARING_HELP_URL really be a configuration variable?  In the meantime,
-      // We've removed the link from the default message.
-      destination="https://help.edx.org/edxlearner/s/topic/0TOQq0000001UVVOA2/certificates"
+      destination="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
    >
      {props.intl.formatMessage(messages['account.settings.delete.account.text.3.link'])}
    </Hyperlink>
  );

-  // TODO: We lack a good way of providing custom language for a particular site.  This is a hack
-  // to allow edx.org to mention MicroMasters certificates to fulfill its business requirements.
-  if (getConfig().SITE_NAME === 'edX') {
-    return (
-      <FormattedMessage
-        id="account.settings.delete.account.text.3.edX"
-        defaultMessage="You may also lose access to verified certificates and other program credentials like MicroMasters certificates. You can make a copy of these for your records before proceeding with deletion. {actionLink}."
-        description="A message in the user account deletion area warning users that deleting their account will prevent them from accessing their certificates. 'actionLink' is a HTML link with a full sentence that describes how to print a certificate."
-        values={{ actionLink }}
-      />
-    );
-  }
-
  return (
    <FormattedMessage
      id="account.settings.delete.account.text.3"
-      defaultMessage="You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion."
-      description="A message in the user account deletion area warning users that deleting their account will prevent them from accessing their certificates."
+      defaultMessage="You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, {actionLink}."
+      description="A message in the user account deletion area"
      values={{ actionLink }}
    />
  );
--- a/src/account-settings/delete-account/SuccessModal.jsx
+++ b/src/account-settings/delete-account/SuccessModal.jsx
@@ -1,31 +1,27 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { ModalLayer, ModalCloseButton } from '@openedx/paragon';
+import { Modal } from '@edx/paragon';

 import messages from './messages';

 export const SuccessModal = (props) => {
  const { status, intl, onClose } = props;
  return (
-
-    <ModalLayer isOpen={status === 'deleted'} onClose={onClose}>
-      <div className="mw-sm p-5 bg-white mx-auto my-3">
-        <h3>
-          {intl.formatMessage(messages['account.settings.delete.account.modal.after.header'])}
-        </h3>
-        <div className="p-3">
+    <Modal
+      open={status === 'deleted'}
+      title={intl.formatMessage(messages['account.settings.delete.account.modal.after.header'])}
+      body={
+        <div>
          <p className="h6">
            {intl.formatMessage(messages['account.settings.delete.account.modal.after.text'])}
          </p>
        </div>
-        <p>
-          <ModalCloseButton className="float-right" variant="link">Close</ModalCloseButton>
-        </p>
-      </div>
-
-    </ModalLayer>
-
+      }
+      closeText={intl.formatMessage(messages['account.settings.delete.account.modal.after.button'])}
+      renderHeaderCloseButton={false}
+      onClose={onClose}
+    />
  );
 };

--- a/src/account-settings/delete-account/SuccessModal.test.jsx
+++ b/src/account-settings/delete-account/SuccessModal.test.jsx
@@ -1,14 +1,12 @@
 import React from 'react';
+import ReactDOM from 'react-dom';
 import renderer from 'react-test-renderer';
 import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';
-import { waitFor } from '@testing-library/react';
-import { SuccessModal } from './SuccessModal';

-// Modal creates a portal.  Overriding createPortal allows portals to be tested in jest.
-jest.mock('react-dom', () => ({
-  ...jest.requireActual('react-dom'),
-  createPortal: jest.fn(node => node), // Mock portal behavior
-}));
+// Modal creates a portal.  Overriding ReactDOM.createPortal allows portals to be tested in jest.
+ReactDOM.createPortal = node => node;
+
+import { SuccessModal } from './SuccessModal'; // eslint-disable-line import/first

 const IntlSuccessModal = injectIntl(SuccessModal);

@@ -22,40 +20,39 @@ describe('SuccessModal', () => {
    };
  });

-  it('should match default closed success modal snapshot', async () => {
-    await waitFor(() => {
-      const tree = renderer.create((
-        <IntlProvider locale="en"><IntlSuccessModal {...props} /></IntlProvider>)).toJSON();
-      expect(tree).toMatchSnapshot();
-    });
-    await waitFor(() => {
-      const tree = renderer.create((
-        <IntlProvider locale="en"><IntlSuccessModal {...props} status="confirming" /></IntlProvider>)).toJSON();
-      expect(tree).toMatchSnapshot();
-    });
-    await waitFor(() => {
-      const tree = renderer.create((
-        <IntlProvider locale="en"><IntlSuccessModal {...props} status="pending" /></IntlProvider>)).toJSON();
-      expect(tree).toMatchSnapshot();
-    });
-    await waitFor(() => {
-      const tree = renderer.create((
-        <IntlProvider locale="en"><IntlSuccessModal {...props} status="failed" /></IntlProvider>)).toJSON();
-      expect(tree).toMatchSnapshot();
-    });
+  it('should match default closed success modal snapshot', () => {
+    let tree = renderer.create((
+      <IntlProvider locale="en"><IntlSuccessModal {...props} /></IntlProvider>))
+      .toJSON();
+    expect(tree).toMatchSnapshot();
+
+    tree = renderer.create((
+      <IntlProvider locale="en"><IntlSuccessModal {...props} status="confirming" /></IntlProvider>))
+      .toJSON();
+    expect(tree).toMatchSnapshot();
+
+    tree = renderer.create((
+      <IntlProvider locale="en"><IntlSuccessModal {...props} status="pending" /></IntlProvider>))
+      .toJSON();
+    expect(tree).toMatchSnapshot();
+
+    tree = renderer.create((
+      <IntlProvider locale="en"><IntlSuccessModal {...props} status="failed" /></IntlProvider>))
+      .toJSON();
+    expect(tree).toMatchSnapshot();
  });

-  it('should match open success modal snapshot', async () => {
-    await waitFor(() => {
-      const tree = renderer.create(
+  it('should match open success modal snapshot', () => {
+    const tree = renderer
+      .create((
        <IntlProvider locale="en">
          <IntlSuccessModal
            {...props}
-            status="deleted"
+            status="deleted" // This will cause 'modal-backdrop' and 'show' to appear on the modal as CSS classes.
          />
-        </IntlProvider>,
-      ).toJSON();
-      expect(tree).toMatchSnapshot();
-    });
+        </IntlProvider>
+      ))
+      .toJSON();
+    expect(tree).toMatchSnapshot();
  });
 });
--- a/src/account-settings/delete-account/snapshots/BeforeProceedingBanner.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/BeforeProceedingBanner.test.jsx.snap
@@ -1,67 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`BeforeProceedingBanner should match the snapshot if SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT does not have a support link 1`] = `
-<div
-  className="alert d-flex align-items-start alert-warning mt-n2"
->
-  <div>
-    <svg
-      aria-hidden="true"
-      className="svg-inline--fa fa-triangle-exclamation mr-2"
-      data-icon="triangle-exclamation"
-      data-prefix="fas"
-      focusable="false"
-      role="img"
-      style={{}}
-      viewBox="0 0 512 512"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M256 32c14.2 0 27.3 7.5 34.5 19.8l216 368c7.3 12.4 7.3 27.7 .2 40.1S486.3 480 472 480L40 480c-14.3 0-27.6-7.7-34.7-20.1s-7-27.8 .2-40.1l216-368C228.7 39.5 241.8 32 256 32zm0 128c-13.3 0-24 10.7-24 24l0 112c0 13.3 10.7 24 24 24s24-10.7 24-24l0-112c0-13.3-10.7-24-24-24zm32 224a32 32 0 1 0 -64 0 32 32 0 1 0 64 0z"
-        fill="currentColor"
-        style={{}}
-      />
-    </svg>
-  </div>
-  <div>
-    Before proceeding, please unlink all social media accounts.
-  </div>
-</div>
-`;
-
-exports[`BeforeProceedingBanner should match the snapshot when SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT has a support link 1`] = `
-<div
-  className="alert d-flex align-items-start alert-warning mt-n2"
->
-  <div>
-    <svg
-      aria-hidden="true"
-      className="svg-inline--fa fa-triangle-exclamation mr-2"
-      data-icon="triangle-exclamation"
-      data-prefix="fas"
-      focusable="false"
-      role="img"
-      style={{}}
-      viewBox="0 0 512 512"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M256 32c14.2 0 27.3 7.5 34.5 19.8l216 368c7.3 12.4 7.3 27.7 .2 40.1S486.3 480 472 480L40 480c-14.3 0-27.6-7.7-34.7-20.1s-7-27.8 .2-40.1l216-368C228.7 39.5 241.8 32 256 32zm0 128c-13.3 0-24 10.7-24 24l0 112c0 13.3 10.7 24 24 24s24-10.7 24-24l0-112c0-13.3-10.7-24-24-24zm32 224a32 32 0 1 0 -64 0 32 32 0 1 0 64 0z"
-        fill="currentColor"
-        style={{}}
-      />
-    </svg>
-  </div>
-  <div>
-    Before proceeding, please 
-    <a
-      className="pgn__hyperlink default-link standalone-link"
-      href="http://test-support.edx"
-      target="_self"
-    >
-      unlink all social media accounts
-    </a>
-    .
-  </div>
-</div>
-`;
--- a/src/account-settings/delete-account/snapshots/ConfirmationModal.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/ConfirmationModal.test.jsx.snap
@@ -1,374 +1,439 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`ConfirmationModal should match default closed confirmation modal snapshot 1`] = `null`;
-
-exports[`ConfirmationModal should match empty password confirmation modal snapshot 1`] = `
-[
+exports[`ConfirmationModal should match default closed confirmation modal snapshot 1`] = `
+<div>
  <div
-    data-focus-guard={true}
-    style={
-      {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={0}
-  />,
+    className="fade"
+    role="presentation"
+  />
  <div
-    className="pgn__modal-layer"
-    data-focus-lock-disabled={false}
-    onBlur={[Function]}
-    onFocus={[Function]}
+    className="modal js-close-modal-on-click fade"
    onMouseDown={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onTouchStart={[Function]}
-    onWheelCapture={[Function]}
+    role="presentation"
  >
    <div
-      className="pgn__modal-content-container"
+      aria-labelledby="id2"
+      aria-modal={true}
+      className=""
+      role="dialog"
+      tabIndex="-1"
    >
      <div
-        className="pgn__modal-backdrop"
-        data-testid="modal-backdrop"
-        onClick={[MockFunction]}
-        onKeyDown={[MockFunction]}
-      />
-      <div
-        aria-label="Are you sure?"
-        className="pgn__modal pgn__modal-md pgn__modal-default pgn__alert-modal"
-        role="dialog"
+        className="modal-content"
      >
        <div
-          className="pgn__modal-header"
+          className="modal-header"
        >
          <h2
-            className="pgn__modal-title"
+            className="modal-title"
+            id="id2"
          >
            Are you sure?
          </h2>
        </div>
        <div
-          className="pgn__modal-body pgn__modal-body-scroll-top pgn__modal-body-scroll-bottom"
+          className="modal-body"
        >
-          <div />
-          <div
-            className="pgn__modal-body-content"
-          >
+          <div>
            <div
-              className="p-3"
+              className="alert d-flex align-items-start alert-warning mt-n2"
            >
-              <div
-                className="alert d-flex align-items-start alert-danger mt-n2"
-              >
-                <div>
-                  <svg
-                    aria-hidden="true"
-                    className="svg-inline--fa fa-circle-exclamation mr-2"
-                    data-icon="circle-exclamation"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    style={{}}
-                    viewBox="0 0 512 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zm0-384c13.3 0 24 10.7 24 24l0 112c0 13.3-10.7 24-24 24s-24-10.7-24-24l0-112c0-13.3 10.7-24 24-24zM224 352a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"
-                      fill="currentColor"
-                      style={{}}
-                    />
-                  </svg>
-                </div>
-                <div>
-                  <h6>
-                    A password is required
-                  </h6>
-                  <p
-                    className="text-danger"
-                  >
-                    Sorry, there was an error trying to process your request. Please try again later.
-                  </p>
-                </div>
-              </div>
-              <div
-                className="alert d-flex align-items-start alert-warning mt-n2"
-              >
-                <div>
-                  <svg
-                    aria-hidden="true"
-                    className="svg-inline--fa fa-triangle-exclamation mr-2"
-                    data-icon="triangle-exclamation"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    style={{}}
-                    viewBox="0 0 512 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M256 32c14.2 0 27.3 7.5 34.5 19.8l216 368c7.3 12.4 7.3 27.7 .2 40.1S486.3 480 472 480L40 480c-14.3 0-27.6-7.7-34.7-20.1s-7-27.8 .2-40.1l216-368C228.7 39.5 241.8 32 256 32zm0 128c-13.3 0-24 10.7-24 24l0 112c0 13.3 10.7 24 24 24s24-10.7 24-24l0-112c0-13.3-10.7-24-24-24zm32 224a32 32 0 1 0 -64 0 32 32 0 1 0 64 0z"
-                      fill="currentColor"
-                      style={{}}
-                    />
-                  </svg>
-                </div>
-                <div>
-                  <h6>
-                    You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. localhost will not be able to recover your account or the data that is deleted.
-                  </h6>
-                  <p>
-                    If you proceed, you will be unable to use this account to take courses on localhost.
-                  </p>
-                  <p>
-                    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
-                  </p>
-                </div>
-              </div>
-              <div
-                className="form-group"
-                data-testid="validation-form-group"
-              >
-                <label
-                  className="d-block"
-                  htmlFor="passwordFieldId"
+              <div>
+                <svg
+                  aria-hidden="true"
+                  className="svg-inline--fa fa-exclamation-triangle fa-w-18 mr-2"
+                  data-icon="exclamation-triangle"
+                  data-prefix="fas"
+                  focusable="false"
+                  role="img"
+                  style={Object {}}
+                  viewBox="0 0 576 512"
+                  xmlns="http://www.w3.org/2000/svg"
                >
-                  If you still wish to continue and delete your account, please enter your account password:
-                </label>
-                <input
-                  aria-describedby="passwordFieldId-invalid-feedback"
-                  className="form-control is-invalid"
-                  id="passwordFieldId"
-                  name="password"
-                  onChange={[MockFunction]}
-                  type="password"
-                  value="fluffy bunnies"
-                />
-                <strong
-                  className="invalid-feedback"
-                  id="passwordFieldId-invalid-feedback"
-                >
-                  A password is required
-                </strong>
+                  <path
+                    d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"
+                    fill="currentColor"
+                    style={Object {}}
+                  />
+                </svg>
+              </div>
+              <div>
+                <h6>
+                  You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.
+                </h6>
+                <p>
+                  If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.
+                </p>
+                <p>
+                  <span>
+                    You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, 
+                    <a
+                      href="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
+                      onClick={[Function]}
+                      target="_self"
+                    >
+                      follow the instructions for printing or downloading a certificate
+                    </a>
+                    .
+                  </span>
+                </p>
              </div>
            </div>
+            <div
+              className="form-group"
+            >
+              <label
+                className="d-block"
+                htmlFor="passwordFieldId"
+              >
+                If you still wish to continue and delete your account, please enter your account password:
+              </label>
+              <input
+                aria-describedby=""
+                className="form-control"
+                id="passwordFieldId"
+                name="password"
+                onChange={[MockFunction]}
+                type="password"
+                value="fluffy bunnies"
+              />
+              <strong
+                className="invalid-feedback"
+                id="passwordFieldId-invalid-feedback"
+              >
+                Unable to delete account
+              </strong>
+            </div>
          </div>
-          <div />
        </div>
        <div
-          className="pgn__modal-footer"
+          className="modal-footer"
        >
-          <div
-            className="pgn__action-row"
+          <button
+            className="btn btn-danger"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            type="button"
          >
-            <button
-              className="btn btn-link"
-              disabled={false}
-              onClick={[MockFunction]}
-              type="button"
-            >
-              Cancel
-            </button>
-            <button
-              className="btn btn-danger"
-              disabled={false}
-              onClick={[MockFunction]}
-              type="button"
-            >
-              Yes, Delete
-            </button>
-          </div>
+            Yes, Delete
+          </button>
+          <button
+            className="btn js-close-modal-on-click btn-secondary"
+            id="paragonCloseModalButton1"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            type="button"
+          >
+            Cancel
+          </button>
        </div>
      </div>
    </div>
-  </div>,
+  </div>
+</div>
+`;
+
+exports[`ConfirmationModal should match empty password confirmation modal snapshot 1`] = `
+<div>
  <div
-    data-focus-guard={true}
-    style={
-      {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={0}
-  />,
-]
+    className="modal-backdrop show"
+    role="presentation"
+  />
+  <div
+    className="modal js-close-modal-on-click show d-block"
+    onMouseDown={[Function]}
+    role="presentation"
+  >
+    <div
+      aria-labelledby="id6"
+      aria-modal={true}
+      className="modal-dialog"
+      role="dialog"
+      tabIndex="-1"
+    >
+      <div
+        className="modal-content"
+      >
+        <div
+          className="modal-header"
+        >
+          <h2
+            className="modal-title"
+            id="id6"
+          >
+            Are you sure?
+          </h2>
+        </div>
+        <div
+          className="modal-body"
+        >
+          <div>
+            <div
+              className="alert d-flex align-items-start alert-danger mt-n2"
+            >
+              <div>
+                <svg
+                  aria-hidden="true"
+                  className="svg-inline--fa fa-exclamation-circle fa-w-16 mr-2"
+                  data-icon="exclamation-circle"
+                  data-prefix="fas"
+                  focusable="false"
+                  role="img"
+                  style={Object {}}
+                  viewBox="0 0 512 512"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M504 256c0 136.997-111.043 248-248 248S8 392.997 8 256C8 119.083 119.043 8 256 8s248 111.083 248 248zm-248 50c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"
+                    fill="currentColor"
+                    style={Object {}}
+                  />
+                </svg>
+              </div>
+              <div>
+                <h6>
+                  A password is required
+                </h6>
+                <p
+                  className="text-danger"
+                >
+                  Sorry, there was an error trying to process your request. Please try again later.
+                </p>
+              </div>
+            </div>
+            <div
+              className="alert d-flex align-items-start alert-warning mt-n2"
+            >
+              <div>
+                <svg
+                  aria-hidden="true"
+                  className="svg-inline--fa fa-exclamation-triangle fa-w-18 mr-2"
+                  data-icon="exclamation-triangle"
+                  data-prefix="fas"
+                  focusable="false"
+                  role="img"
+                  style={Object {}}
+                  viewBox="0 0 576 512"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"
+                    fill="currentColor"
+                    style={Object {}}
+                  />
+                </svg>
+              </div>
+              <div>
+                <h6>
+                  You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.
+                </h6>
+                <p>
+                  If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.
+                </p>
+                <p>
+                  <span>
+                    You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, 
+                    <a
+                      href="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
+                      onClick={[Function]}
+                      target="_self"
+                    >
+                      follow the instructions for printing or downloading a certificate
+                    </a>
+                    .
+                  </span>
+                </p>
+              </div>
+            </div>
+            <div
+              className="form-group"
+            >
+              <label
+                className="d-block"
+                htmlFor="passwordFieldId"
+              >
+                If you still wish to continue and delete your account, please enter your account password:
+              </label>
+              <input
+                aria-describedby="passwordFieldId-invalid-feedback"
+                className="form-control is-invalid"
+                id="passwordFieldId"
+                name="password"
+                onChange={[MockFunction]}
+                type="password"
+                value="fluffy bunnies"
+              />
+              <strong
+                className="invalid-feedback"
+                id="passwordFieldId-invalid-feedback"
+              >
+                A password is required
+              </strong>
+            </div>
+          </div>
+        </div>
+        <div
+          className="modal-footer"
+        >
+          <button
+            className="btn btn-danger"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            type="button"
+          >
+            Yes, Delete
+          </button>
+          <button
+            className="btn js-close-modal-on-click btn-secondary"
+            id="paragonCloseModalButton5"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            type="button"
+          >
+            Cancel
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 `;

 exports[`ConfirmationModal should match open confirmation modal snapshot 1`] = `
-[
+<div>
  <div
-    data-focus-guard={true}
-    style={
-      {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={-1}
-  />,
+    className="modal-backdrop show"
+    role="presentation"
+  />
  <div
-    className="pgn__modal-layer"
-    data-focus-lock-disabled="disabled"
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onWheelCapture={[Function]}
+    className="modal js-close-modal-on-click show d-block"
+    onMouseDown={[Function]}
+    role="presentation"
  >
    <div
-      className="pgn__modal-content-container"
+      aria-labelledby="id4"
+      aria-modal={true}
+      className="modal-dialog"
+      role="dialog"
+      tabIndex="-1"
    >
      <div
-        className="pgn__modal-backdrop"
-        data-testid="modal-backdrop"
-        onClick={[MockFunction]}
-        onKeyDown={[MockFunction]}
-      />
-      <div
-        aria-label="Are you sure?"
-        className="pgn__modal pgn__modal-md pgn__modal-default pgn__alert-modal"
-        role="dialog"
+        className="modal-content"
      >
        <div
-          className="pgn__modal-header"
+          className="modal-header"
        >
          <h2
-            className="pgn__modal-title"
+            className="modal-title"
+            id="id4"
          >
            Are you sure?
          </h2>
        </div>
        <div
-          className="pgn__modal-body pgn__modal-body-scroll-top pgn__modal-body-scroll-bottom"
+          className="modal-body"
        >
-          <div />
-          <div
-            className="pgn__modal-body-content"
-          >
+          <div>
            <div
-              className="p-3"
+              className="alert d-flex align-items-start alert-warning mt-n2"
            >
-              <div
-                className="alert d-flex align-items-start alert-warning mt-n2"
-              >
-                <div>
-                  <svg
-                    aria-hidden="true"
-                    className="svg-inline--fa fa-triangle-exclamation mr-2"
-                    data-icon="triangle-exclamation"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    style={{}}
-                    viewBox="0 0 512 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M256 32c14.2 0 27.3 7.5 34.5 19.8l216 368c7.3 12.4 7.3 27.7 .2 40.1S486.3 480 472 480L40 480c-14.3 0-27.6-7.7-34.7-20.1s-7-27.8 .2-40.1l216-368C228.7 39.5 241.8 32 256 32zm0 128c-13.3 0-24 10.7-24 24l0 112c0 13.3 10.7 24 24 24s24-10.7 24-24l0-112c0-13.3-10.7-24-24-24zm32 224a32 32 0 1 0 -64 0 32 32 0 1 0 64 0z"
-                      fill="currentColor"
-                      style={{}}
-                    />
-                  </svg>
-                </div>
-                <div>
-                  <h6>
-                    You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. localhost will not be able to recover your account or the data that is deleted.
-                  </h6>
-                  <p>
-                    If you proceed, you will be unable to use this account to take courses on localhost.
-                  </p>
-                  <p>
-                    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
-                  </p>
-                </div>
+              <div>
+                <svg
+                  aria-hidden="true"
+                  className="svg-inline--fa fa-exclamation-triangle fa-w-18 mr-2"
+                  data-icon="exclamation-triangle"
+                  data-prefix="fas"
+                  focusable="false"
+                  role="img"
+                  style={Object {}}
+                  viewBox="0 0 576 512"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"
+                    fill="currentColor"
+                    style={Object {}}
+                  />
+                </svg>
              </div>
-              <div
-                className="form-group"
-                data-testid="validation-form-group"
-              >
-                <label
-                  className="d-block"
-                  htmlFor="passwordFieldId"
-                >
-                  If you still wish to continue and delete your account, please enter your account password:
-                </label>
-                <input
-                  aria-describedby=""
-                  className="form-control"
-                  id="passwordFieldId"
-                  name="password"
-                  onChange={[MockFunction]}
-                  type="password"
-                  value="fluffy bunnies"
-                />
-                <strong
-                  className="invalid-feedback"
-                  id="passwordFieldId-invalid-feedback"
-                >
-                  Unable to delete account
-                </strong>
+              <div>
+                <h6>
+                  You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.
+                </h6>
+                <p>
+                  If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.
+                </p>
+                <p>
+                  <span>
+                    You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, 
+                    <a
+                      href="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
+                      onClick={[Function]}
+                      target="_self"
+                    >
+                      follow the instructions for printing or downloading a certificate
+                    </a>
+                    .
+                  </span>
+                </p>
              </div>
            </div>
+            <div
+              className="form-group"
+            >
+              <label
+                className="d-block"
+                htmlFor="passwordFieldId"
+              >
+                If you still wish to continue and delete your account, please enter your account password:
+              </label>
+              <input
+                aria-describedby=""
+                className="form-control"
+                id="passwordFieldId"
+                name="password"
+                onChange={[MockFunction]}
+                type="password"
+                value="fluffy bunnies"
+              />
+              <strong
+                className="invalid-feedback"
+                id="passwordFieldId-invalid-feedback"
+              >
+                Unable to delete account
+              </strong>
+            </div>
          </div>
-          <div />
        </div>
        <div
-          className="pgn__modal-footer"
+          className="modal-footer"
        >
-          <div
-            className="pgn__action-row"
+          <button
+            className="btn btn-danger"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            type="button"
          >
-            <button
-              className="btn btn-link"
-              disabled={false}
-              onClick={[MockFunction]}
-              type="button"
-            >
-              Cancel
-            </button>
-            <button
-              className="btn btn-danger"
-              disabled={false}
-              onClick={[MockFunction]}
-              type="button"
-            >
-              Yes, Delete
-            </button>
-          </div>
+            Yes, Delete
+          </button>
+          <button
+            className="btn js-close-modal-on-click btn-secondary"
+            id="paragonCloseModalButton3"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            type="button"
+          >
+            Cancel
+          </button>
        </div>
      </div>
    </div>
-  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={-1}
-  />,
-]
+  </div>
+</div>
 `;
--- a/src/account-settings/delete-account/snapshots/DeleteAccount.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/DeleteAccount.test.jsx.snap
@@ -3,7 +3,7 @@
 exports[`DeleteAccount should match default section snapshot 1`] = `
 <div>
  <h2
-    className="section-heading h4 mb-3"
+    className="section-heading"
  >
    Delete My Account
  </h2>
@@ -11,23 +11,33 @@ exports[`DeleteAccount should match default section snapshot 1`] = `
    We're sorry to see you go!
  </p>
  <p>
-    Please note: Deletion of your account and personal data is permanent and cannot be undone. localhost will not be able to recover your account or the data that is deleted.
+    Please note: Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.
  </p>
  <p>
-    Once your account is deleted, you cannot use it to take courses on localhost.
+    Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.
  </p>
  <p>
-    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
+    <span>
+      You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, 
+      <a
+        href="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
+        onClick={[Function]}
+        target="_self"
+      >
+        follow the instructions for printing or downloading a certificate
+      </a>
+      .
+    </span>
  </p>
  <p
    className="text-danger h6"
  >
-    Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on localhost.
+    Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on edX.
  </p>
  <p>
    <a
-      className="pgn__hyperlink default-link standalone-link"
-      href="https://help.edx.org/edxlearner/s/topic/0TOQq0000001UdZOAU/account-basics"
+      href="https://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings"
+      onClick={[Function]}
      target="_self"
    >
      Want to change your email, name, or password instead?
@@ -37,7 +47,9 @@ exports[`DeleteAccount should match default section snapshot 1`] = `
    <button
      className="btn btn-outline-danger"
      disabled={false}
-      onClick={[MockFunction]}
+      onBlur={[Function]}
+      onClick={[Function]}
+      onKeyDown={[Function]}
      type="button"
    >
      Delete My Account
@@ -49,7 +61,7 @@ exports[`DeleteAccount should match default section snapshot 1`] = `
 exports[`DeleteAccount should match unverified account section snapshot 1`] = `
 <div>
  <h2
-    className="section-heading h4 mb-3"
+    className="section-heading"
  >
    Delete My Account
  </h2>
@@ -57,23 +69,33 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
    We're sorry to see you go!
  </p>
  <p>
-    Please note: Deletion of your account and personal data is permanent and cannot be undone. localhost will not be able to recover your account or the data that is deleted.
+    Please note: Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.
  </p>
  <p>
-    Once your account is deleted, you cannot use it to take courses on localhost.
+    Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.
  </p>
  <p>
-    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
+    <span>
+      You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, 
+      <a
+        href="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
+        onClick={[Function]}
+        target="_self"
+      >
+        follow the instructions for printing or downloading a certificate
+      </a>
+      .
+    </span>
  </p>
  <p
    className="text-danger h6"
  >
-    Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on localhost.
+    Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on edX.
  </p>
  <p>
    <a
-      className="pgn__hyperlink default-link standalone-link"
-      href="https://help.edx.org/edxlearner/s/topic/0TOQq0000001UdZOAU/account-basics"
+      href="https://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings"
+      onClick={[Function]}
      target="_self"
    >
      Want to change your email, name, or password instead?
@@ -83,7 +105,9 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
    <button
      className="btn btn-outline-danger"
      disabled={true}
-      onClick={null}
+      onBlur={[Function]}
+      onClick={[Function]}
+      onKeyDown={[Function]}
      type="button"
    >
      Delete My Account
@@ -95,32 +119,34 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
    <div>
      <svg
        aria-hidden="true"
-        className="svg-inline--fa fa-triangle-exclamation mr-2"
-        data-icon="triangle-exclamation"
+        className="svg-inline--fa fa-exclamation-triangle fa-w-18 mr-2"
+        data-icon="exclamation-triangle"
        data-prefix="fas"
        focusable="false"
        role="img"
-        style={{}}
-        viewBox="0 0 512 512"
+        style={Object {}}
+        viewBox="0 0 576 512"
        xmlns="http://www.w3.org/2000/svg"
      >
        <path
-          d="M256 32c14.2 0 27.3 7.5 34.5 19.8l216 368c7.3 12.4 7.3 27.7 .2 40.1S486.3 480 472 480L40 480c-14.3 0-27.6-7.7-34.7-20.1s-7-27.8 .2-40.1l216-368C228.7 39.5 241.8 32 256 32zm0 128c-13.3 0-24 10.7-24 24l0 112c0 13.3 10.7 24 24 24s24-10.7 24-24l0-112c0-13.3-10.7-24-24-24zm32 224a32 32 0 1 0 -64 0 32 32 0 1 0 64 0z"
+          d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"
          fill="currentColor"
-          style={{}}
+          style={Object {}}
        />
      </svg>
    </div>
    <div>
-      Before proceeding, please 
-      <a
-        className="pgn__hyperlink default-link standalone-link"
-        href="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-confirm-my-email"
-        target="_self"
-      >
-        activate your account
-      </a>
-      .
+      <span>
+        Before proceeding, please 
+        <a
+          href="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-activate-my-account-"
+          onClick={[Function]}
+          target="_self"
+        >
+          activate your account
+        </a>
+        .
+      </span>
    </div>
  </div>
 </div>
@@ -129,7 +155,7 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
 exports[`DeleteAccount should match unverified account section snapshot 2`] = `
 <div>
  <h2
-    className="section-heading h4 mb-3"
+    className="section-heading"
  >
    Delete My Account
  </h2>
@@ -137,23 +163,33 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
    We're sorry to see you go!
  </p>
  <p>
-    Please note: Deletion of your account and personal data is permanent and cannot be undone. localhost will not be able to recover your account or the data that is deleted.
+    Please note: Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.
  </p>
  <p>
-    Once your account is deleted, you cannot use it to take courses on localhost.
+    Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.
  </p>
  <p>
-    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
+    <span>
+      You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, 
+      <a
+        href="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
+        onClick={[Function]}
+        target="_self"
+      >
+        follow the instructions for printing or downloading a certificate
+      </a>
+      .
+    </span>
  </p>
  <p
    className="text-danger h6"
  >
-    Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on localhost.
+    Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on edX.
  </p>
  <p>
    <a
-      className="pgn__hyperlink default-link standalone-link"
-      href="https://help.edx.org/edxlearner/s/topic/0TOQq0000001UdZOAU/account-basics"
+      href="https://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings"
+      onClick={[Function]}
      target="_self"
    >
      Want to change your email, name, or password instead?
@@ -163,7 +199,9 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
    <button
      className="btn btn-outline-danger"
      disabled={true}
-      onClick={null}
+      onBlur={[Function]}
+      onClick={[Function]}
+      onKeyDown={[Function]}
      type="button"
    >
      Delete My Account
@@ -175,32 +213,34 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
    <div>
      <svg
        aria-hidden="true"
-        className="svg-inline--fa fa-triangle-exclamation mr-2"
-        data-icon="triangle-exclamation"
+        className="svg-inline--fa fa-exclamation-triangle fa-w-18 mr-2"
+        data-icon="exclamation-triangle"
        data-prefix="fas"
        focusable="false"
        role="img"
-        style={{}}
-        viewBox="0 0 512 512"
+        style={Object {}}
+        viewBox="0 0 576 512"
        xmlns="http://www.w3.org/2000/svg"
      >
        <path
-          d="M256 32c14.2 0 27.3 7.5 34.5 19.8l216 368c7.3 12.4 7.3 27.7 .2 40.1S486.3 480 472 480L40 480c-14.3 0-27.6-7.7-34.7-20.1s-7-27.8 .2-40.1l216-368C228.7 39.5 241.8 32 256 32zm0 128c-13.3 0-24 10.7-24 24l0 112c0 13.3 10.7 24 24 24s24-10.7 24-24l0-112c0-13.3-10.7-24-24-24zm32 224a32 32 0 1 0 -64 0 32 32 0 1 0 64 0z"
+          d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"
          fill="currentColor"
-          style={{}}
+          style={Object {}}
        />
      </svg>
    </div>
    <div>
-      Before proceeding, please 
-      <a
-        className="pgn__hyperlink default-link standalone-link"
-        href="https://help.edx.org/edxlearner/s/article/How-do-I-link-or-unlink-my-edX-account-to-a-social-media-account"
-        target="_self"
-      >
-        unlink all social media accounts
-      </a>
-      .
+      <span>
+        Before proceeding, please 
+        <a
+          href="https://support.edx.org/hc/en-us/articles/207206067"
+          onClick={[Function]}
+          target="_self"
+        >
+          unlink all social media accounts
+        </a>
+        .
+      </span>
    </div>
  </div>
 </div>
--- a/src/account-settings/delete-account/snapshots/SuccessModal.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/SuccessModal.test.jsx.snap
@@ -1,90 +1,311 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`SuccessModal should match default closed success modal snapshot 1`] = `null`;
-
-exports[`SuccessModal should match default closed success modal snapshot 2`] = `null`;
-
-exports[`SuccessModal should match default closed success modal snapshot 3`] = `null`;
-
-exports[`SuccessModal should match default closed success modal snapshot 4`] = `null`;
-
-exports[`SuccessModal should match open success modal snapshot 1`] = `
-[
+exports[`SuccessModal should match default closed success modal snapshot 1`] = `
+<div>
  <div
-    data-focus-guard={true}
-    style={
-      {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={-1}
-  />,
+    className="fade"
+    role="presentation"
+  />
  <div
-    className="pgn__modal-layer"
-    data-focus-lock-disabled="disabled"
-    onBlur={[Function]}
-    onFocus={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onWheelCapture={[Function]}
+    className="modal js-close-modal-on-click fade"
+    onMouseDown={[Function]}
+    role="presentation"
  >
    <div
-      className="pgn__modal-content-container"
+      aria-labelledby="id2"
+      aria-modal={true}
+      className=""
+      role="dialog"
+      tabIndex="-1"
    >
      <div
-        className="pgn__modal-backdrop"
-        data-testid="modal-backdrop"
-        onClick={[MockFunction]}
-        onKeyDown={[MockFunction]}
-      />
-      <div
-        className="mw-sm p-5 bg-white mx-auto my-3"
+        className="modal-content"
      >
-        <h3>
-          We're sorry to see you go!  Your account will be deleted shortly.
-        </h3>
        <div
-          className="p-3"
+          className="modal-header"
        >
-          <p
-            className="h6"
+          <h2
+            className="modal-title"
+            id="id2"
          >
-            Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
-          </p>
+            We're sorry to see you go!  Your account will be deleted shortly.
+          </h2>
        </div>
-        <p>
+        <div
+          className="modal-body"
+        >
+          <div>
+            <p
+              className="h6"
+            >
+              Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
+            </p>
+          </div>
+        </div>
+        <div
+          className="modal-footer"
+        >
          <button
-            className="pgn__modal-close-button float-right btn btn-link"
-            disabled={false}
+            className="btn js-close-modal-on-click btn-secondary"
+            id="paragonCloseModalButton1"
+            onBlur={[Function]}
            onClick={[Function]}
+            onKeyDown={[Function]}
            type="button"
          >
            Close
          </button>
-        </p>
+        </div>
      </div>
    </div>
-  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={-1}
-  />,
-]
+  </div>
+</div>
+`;
+
+exports[`SuccessModal should match default closed success modal snapshot 2`] = `
+<div>
+  <div
+    className="fade"
+    role="presentation"
+  />
+  <div
+    className="modal js-close-modal-on-click fade"
+    onMouseDown={[Function]}
+    role="presentation"
+  >
+    <div
+      aria-labelledby="id4"
+      aria-modal={true}
+      className=""
+      role="dialog"
+      tabIndex="-1"
+    >
+      <div
+        className="modal-content"
+      >
+        <div
+          className="modal-header"
+        >
+          <h2
+            className="modal-title"
+            id="id4"
+          >
+            We're sorry to see you go!  Your account will be deleted shortly.
+          </h2>
+        </div>
+        <div
+          className="modal-body"
+        >
+          <div>
+            <p
+              className="h6"
+            >
+              Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
+            </p>
+          </div>
+        </div>
+        <div
+          className="modal-footer"
+        >
+          <button
+            className="btn js-close-modal-on-click btn-secondary"
+            id="paragonCloseModalButton3"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            type="button"
+          >
+            Close
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SuccessModal should match default closed success modal snapshot 3`] = `
+<div>
+  <div
+    className="fade"
+    role="presentation"
+  />
+  <div
+    className="modal js-close-modal-on-click fade"
+    onMouseDown={[Function]}
+    role="presentation"
+  >
+    <div
+      aria-labelledby="id6"
+      aria-modal={true}
+      className=""
+      role="dialog"
+      tabIndex="-1"
+    >
+      <div
+        className="modal-content"
+      >
+        <div
+          className="modal-header"
+        >
+          <h2
+            className="modal-title"
+            id="id6"
+          >
+            We're sorry to see you go!  Your account will be deleted shortly.
+          </h2>
+        </div>
+        <div
+          className="modal-body"
+        >
+          <div>
+            <p
+              className="h6"
+            >
+              Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
+            </p>
+          </div>
+        </div>
+        <div
+          className="modal-footer"
+        >
+          <button
+            className="btn js-close-modal-on-click btn-secondary"
+            id="paragonCloseModalButton5"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            type="button"
+          >
+            Close
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SuccessModal should match default closed success modal snapshot 4`] = `
+<div>
+  <div
+    className="fade"
+    role="presentation"
+  />
+  <div
+    className="modal js-close-modal-on-click fade"
+    onMouseDown={[Function]}
+    role="presentation"
+  >
+    <div
+      aria-labelledby="id8"
+      aria-modal={true}
+      className=""
+      role="dialog"
+      tabIndex="-1"
+    >
+      <div
+        className="modal-content"
+      >
+        <div
+          className="modal-header"
+        >
+          <h2
+            className="modal-title"
+            id="id8"
+          >
+            We're sorry to see you go!  Your account will be deleted shortly.
+          </h2>
+        </div>
+        <div
+          className="modal-body"
+        >
+          <div>
+            <p
+              className="h6"
+            >
+              Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
+            </p>
+          </div>
+        </div>
+        <div
+          className="modal-footer"
+        >
+          <button
+            className="btn js-close-modal-on-click btn-secondary"
+            id="paragonCloseModalButton7"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            type="button"
+          >
+            Close
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`SuccessModal should match open success modal snapshot 1`] = `
+<div>
+  <div
+    className="modal-backdrop show"
+    role="presentation"
+  />
+  <div
+    className="modal js-close-modal-on-click show d-block"
+    onMouseDown={[Function]}
+    role="presentation"
+  >
+    <div
+      aria-labelledby="id10"
+      aria-modal={true}
+      className="modal-dialog"
+      role="dialog"
+      tabIndex="-1"
+    >
+      <div
+        className="modal-content"
+      >
+        <div
+          className="modal-header"
+        >
+          <h2
+            className="modal-title"
+            id="id10"
+          >
+            We're sorry to see you go!  Your account will be deleted shortly.
+          </h2>
+        </div>
+        <div
+          className="modal-body"
+        >
+          <div>
+            <p
+              className="h6"
+            >
+              Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
+            </p>
+          </div>
+        </div>
+        <div
+          className="modal-footer"
+        >
+          <button
+            className="btn js-close-modal-on-click btn-secondary"
+            id="paragonCloseModalButton9"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            type="button"
+          >
+            Close
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 `;
--- a/src/account-settings/delete-account/data/sagas.js
+++ b/src/account-settings/delete-account/data/sagas.js
@@ -15,9 +15,7 @@ export function* handleDeleteAccount(action) {
    const response = yield call(postDeleteAccount, action.payload.password);
    yield put(deleteAccountSuccess(response));
  } catch (e) {
-    if (e.response.status === 403) {
-      yield put(deleteAccountFailure('invalid-password'));
-    } else if (typeof e.response.data === 'string') {
+    if (typeof e.response.data === 'string') {
      yield put(deleteAccountFailure());
    } else {
      throw e;
--- a/src/account-settings/delete-account/index.js
+++ b/src/account-settings/delete-account/index.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-restricted-exports
 export { default } from './DeleteAccount';
 export { default as reducer } from './data/reducers';
 export { default as saga } from './data/sagas';
--- a/src/account-settings/delete-account/messages.js
+++ b/src/account-settings/delete-account/messages.js
@@ -1,11 +1,6 @@
 import { defineMessages } from '@edx/frontend-platform/i18n';

 const messages = defineMessages({
-  'account.settings.cannot.delete.account.text': {
-    id: 'account.settings.cannot.delete.account.text',
-    defaultMessage: 'Please note that, for legal and regulatory compliance purposes, account deletion is currently unavailable.',
-    description: 'This text is visible when user is not allowed to delete account',
-  },
  'account.settings.delete.account.header': {
    id: 'account.settings.delete.account.header',
    defaultMessage: 'Delete My Account',
@@ -18,27 +13,22 @@ const messages = defineMessages({
  },
  'account.settings.delete.account.text.1': {
    id: 'account.settings.delete.account.text.1',
-    defaultMessage: 'Please note: Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.',
+    defaultMessage: 'Please note: Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.',
    description: 'A message in the user account deletion area',
  },
  'account.settings.delete.account.text.2': {
    id: 'account.settings.delete.account.text.2',
-    defaultMessage: 'Once your account is deleted, you cannot use it to take courses on {siteName}.',
-    description: 'A message in the user account deletion area',
-  },
-  'account.settings.delete.account.text.2.edX': {
-    id: 'account.settings.delete.account.text.2.edX',
    defaultMessage: 'Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.',
    description: 'A message in the user account deletion area',
  },
  'account.settings.delete.account.text.3.link': {
    id: 'account.settings.delete.account.text.3.link',
-    defaultMessage: 'Follow these instructions for printing or downloading a certificate',
-    description: 'This text is a link to a technical support page where users can learn how to print or download their certificates.',
+    defaultMessage: 'follow the instructions for printing or downloading a certificate',
+    description: 'This text will be a link to a technical support page; it will go in the phrase If you want to make a copy of these for your records, ______ .',
  },
  'account.settings.delete.account.text.warning': {
    id: 'account.settings.delete.account.text.warning',
-    defaultMessage: 'Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on {siteName}.',
+    defaultMessage: 'Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on edX.',
    description: 'A message in the user account deletion area',
  },
  'account.settings.delete.account.text.change.instead': {
@@ -49,18 +39,13 @@ const messages = defineMessages({
  'account.settings.delete.account.button': {
    id: 'account.settings.delete.account.button',
    defaultMessage: 'Delete My Account',
-    description: 'Button label to permanently delete your platform account',
+    description: 'Button label to permanently delete your edX account',
  },
  'account.settings.delete.account.please.activate': {
    id: 'account.settings.delete.account.please.activate',
    defaultMessage: 'activate your account',
    description: 'This is the text on a link that goes to the support page.  It is part of this sentence: Before proceeding, please activate your account.',
  },
-  'account.settings.delete.account.please.confirm': {
-    id: 'account.settings.delete.account.please.confirm',
-    defaultMessage: 'confirm your account',
-    description: 'This is the text on a link that goes to the support page.  It is part of this sentence: Before proceeding, please confirm your account.',
-  },
  'account.settings.delete.account.please.unlink': {
    id: 'account.settings.delete.account.please.unlink',
    defaultMessage: 'unlink all social media accounts',
@@ -73,16 +58,11 @@ const messages = defineMessages({
  },
  'account.settings.delete.account.modal.text.1': {
    id: 'account.settings.delete.account.modal.text.1',
-    defaultMessage: 'You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.',
+    defaultMessage: 'You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.',
    description: 'Messaging in the dialog asking user to confirm that they want to delete their entire account',
  },
  'account.settings.delete.account.modal.text.2': {
    id: 'account.settings.delete.account.modal.text.2',
-    defaultMessage: 'If you proceed, you will be unable to use this account to take courses on {siteName}.',
-    description: 'Messaging in the dialog asking user to confirm that they want to delete their entire account',
-  },
-  'account.settings.delete.account.modal.text.2.edX': {
-    id: 'account.settings.delete.account.modal.text.2.edX',
    defaultMessage: 'If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer\'s or university\'s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.',
    description: 'Messaging in the dialog asking user to confirm that they want to delete their entire account',
  },
@@ -111,11 +91,6 @@ const messages = defineMessages({
    defaultMessage: 'A password is required',
    description: 'Error message when user has not entered their password',
  },
-  'account.settings.delete.account.error.invalid.password': {
-    id: 'account.settings.delete.account.error.invalid.password',
-    defaultMessage: 'Password is incorrect',
-    description: 'Error message when user has entered incorrect password',
-  },
  'account.settings.delete.account.error.unable.to.delete.details': {
    id: 'account.settings.delete.account.error.unable.to.delete.details',
    defaultMessage: 'Sorry, there was an error trying to process your request. Please try again later.',
--- a/src/account-settings/hoc.jsx
+++ b/src/account-settings/hoc.jsx
@@ -1,19 +0,0 @@
-import React from 'react';
-
-import { useLocation, useNavigate } from 'react-router-dom';
-
-export const withNavigate = Component => {
-  const WrappedComponent = props => {
-    const navigate = useNavigate();
-    return <Component {...props} navigate={navigate} />;
-  };
-  return WrappedComponent;
-};
-
-export const withLocation = Component => {
-  const WrappedComponent = props => {
-    const location = useLocation();
-    return <Component {...props} location={location.pathname} />;
-  };
-  return WrappedComponent;
-};
--- a/src/account-settings/hoc.test.jsx
+++ b/src/account-settings/hoc.test.jsx
@@ -1,38 +0,0 @@
-import React from 'react';
-
-import { fireEvent, render, screen } from '@testing-library/react';
-import { withLocation, withNavigate } from './hoc';
-
-const mockedNavigator = jest.fn();
-
-jest.mock('react-router-dom', () => ({
-  useNavigate: () => mockedNavigator,
-  useLocation: () => ({
-    pathname: '/current-location',
-  }),
-}));
-
-// eslint-disable-next-line react/prop-types
-const MockComponent = ({ navigate, location }) => (
-  // eslint-disable-next-line react/button-has-type, react/prop-types
-  <button data-testid="btn" onClick={() => navigate('/some-route')}>{location}</button>
-);
-const WrappedComponent = withNavigate(withLocation(MockComponent));
-
-test('Provide Navigation to Component', () => {
-  render(
-    <WrappedComponent />,
-  );
-  const btn = screen.getByTestId('btn');
-  fireEvent.click(btn);
-
-  expect(mockedNavigator).toHaveBeenCalledWith('/some-route');
-});
-
-test('Provide Location Pathname to Component', () => {
-  render(
-    <WrappedComponent />,
-  );
-
-  expect(screen.getByTestId('btn').textContent).toContain('/current-location');
-});
--- a/src/account-settings/index.js
+++ b/src/account-settings/index.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-restricted-exports
 export { default } from './AccountSettingsPage';
 export { default as reducer } from './data/reducers';
 export { default as saga } from './data/sagas';
--- a/src/account-settings/name-change/NameChange.jsx
+++ b/src/account-settings/name-change/NameChange.jsx
@@ -1,203 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react';
-import { connect, useDispatch } from 'react-redux';
-import { useNavigate } from 'react-router-dom';
-import PropTypes from 'prop-types';
-
-import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import {
-  ActionRow,
-  Alert,
-  Button,
-  Col,
-  Form,
-  ModalDialog,
-  StatefulButton,
-} from '@openedx/paragon';
-
-import { closeForm, saveSettingsReset } from '../data/actions';
-import { nameChangeSelector } from '../data/selectors';
-
-import { requestNameChange, requestNameChangeFailure, requestNameChangeReset } from './data/actions';
-import messages from './messages';
-
-const NameChangeModal = ({
-  targetFormId,
-  errors,
-  formValues,
-  intl,
-  saveState,
-}) => {
-  const dispatch = useDispatch();
-  const navigate = useNavigate();
-  const { username } = getAuthenticatedUser();
-  const [verifiedNameInput, setVerifiedNameInput] = useState(formValues.verified_name || '');
-  const [confirmedWarning, setConfirmedWarning] = useState(false);
-
-  const resetLocalState = useCallback(() => {
-    setConfirmedWarning(false);
-    dispatch(requestNameChangeReset());
-  }, [dispatch]);
-
-  const handleChange = (e) => {
-    setVerifiedNameInput(e.target.value);
-  };
-
-  const handleClose = useCallback(() => {
-    resetLocalState();
-    dispatch(closeForm(targetFormId));
-    dispatch(saveSettingsReset());
-  }, [dispatch, resetLocalState, targetFormId]);
-
-  const handleSubmit = (e) => {
-    e.preventDefault();
-
-    if (saveState === 'pending') {
-      return;
-    }
-
-    if (!verifiedNameInput) {
-      dispatch(requestNameChangeFailure({
-        verified_name: intl.formatMessage(messages['account.settings.name.change.error.valid.name']),
-      }));
-    } else {
-      const draftProfileName = targetFormId === 'name' ? formValues.name : null;
-      dispatch(requestNameChange(username, draftProfileName, verifiedNameInput));
-    }
-  };
-
-  useEffect(() => {
-    if (saveState === 'complete') {
-      handleClose();
-      navigate(`/id-verification?next=${encodeURIComponent('account/settings')}`);
-    }
-  }, [handleClose, navigate, saveState]);
-
-  function renderErrors() {
-    if (Object.keys(errors).length > 0) {
-      return (
-        <>
-          {Object.entries(errors).map(([key, value]) => (
-            <Form.Control.Feedback type="invalid" key={key}>
-              {
-                key === 'general_error'
-                  ? intl.formatMessage(messages['account.settings.name.change.error.general'])
-                  : value
-              }
-            </Form.Control.Feedback>
-          ))}
-        </>
-      );
-    }
-    return null;
-  }
-
-  function renderTitle() {
-    if (!confirmedWarning) {
-      return intl.formatMessage(messages['account.settings.name.change.title.id']);
-    }
-
-    return intl.formatMessage(messages['account.settings.name.change.title.begin']);
-  }
-
-  function renderBody() {
-    if (!confirmedWarning) {
-      return (
-        <Alert variant="warning">
-          <p>
-            {intl.formatMessage(messages['account.settings.name.change.warning.one'])}
-          </p>
-          <p>
-            {intl.formatMessage(messages['account.settings.name.change.warning.two'])}
-          </p>
-        </Alert>
-      );
-    }
-
-    return (
-      <Form.Group as={Col} isInvalid={Object.keys(errors).length > 0}>
-        <Form.Label>
-          {intl.formatMessage(messages['account.settings.name.change.id.name.label'])}
-        </Form.Label>
-        <Form.Control
-          type="text"
-          name="verifiedName"
-          placeholder={intl.formatMessage(messages['account.settings.name.change.id.name.placeholder'])}
-          value={verifiedNameInput}
-          onChange={handleChange}
-        />
-        {renderErrors()}
-      </Form.Group>
-    );
-  }
-
-  function renderContinueButton() {
-    if (!confirmedWarning) {
-      return (
-        <Button variant="primary" onClick={() => setConfirmedWarning(true)}>
-          {intl.formatMessage(messages['account.settings.name.change.continue'])}
-        </Button>
-      );
-    }
-
-    return (
-      <StatefulButton
-        type="submit"
-        state={saveState}
-        labels={{
-          default: intl.formatMessage(messages['account.settings.name.change.continue']),
-        }}
-        disabledStates={[]}
-      />
-    );
-  }
-
-  return (
-    <ModalDialog
-      title={renderTitle()}
-      isOpen
-      hasCloseButton={false}
-      onClose={handleClose}
-    >
-
-      <Form onSubmit={handleSubmit}>
-        <ModalDialog.Header>
-          <ModalDialog.Title>
-            {renderTitle()}
-          </ModalDialog.Title>
-        </ModalDialog.Header>
-
-        <ModalDialog.Body className="mb-3 overflow-hidden">
-          {renderBody()}
-        </ModalDialog.Body>
-
-        <ModalDialog.Footer>
-          <ActionRow>
-            <ModalDialog.CloseButton variant="tertiary">
-              {intl.formatMessage(messages['account.settings.name.change.cancel'])}
-            </ModalDialog.CloseButton>
-            {renderContinueButton()}
-          </ActionRow>
-        </ModalDialog.Footer>
-      </Form>
-
-    </ModalDialog>
-  );
-};
-
-NameChangeModal.propTypes = {
-  targetFormId: PropTypes.string.isRequired,
-  errors: PropTypes.shape({}).isRequired,
-  formValues: PropTypes.shape({
-    name: PropTypes.string,
-    verified_name: PropTypes.string,
-  }).isRequired,
-  saveState: PropTypes.string,
-  intl: intlShape.isRequired,
-};
-
-NameChangeModal.defaultProps = {
-  saveState: null,
-};
-
-export default connect(nameChangeSelector)(injectIntl(NameChangeModal));
--- a/src/account-settings/name-change/data/actions.js
+++ b/src/account-settings/name-change/data/actions.js
@@ -1,25 +0,0 @@
-import { AsyncActionType } from '../../data/utils';
-
-export const REQUEST_NAME_CHANGE = new AsyncActionType('ACCOUNT_SETTINGS', 'REQUEST_NAME_CHANGE');
-
-export const requestNameChange = (username, profileName, verifiedName) => ({
-  type: REQUEST_NAME_CHANGE.BASE,
-  payload: { username, profileName, verifiedName },
-});
-
-export const requestNameChangeBegin = () => ({
-  type: REQUEST_NAME_CHANGE.BEGIN,
-});
-
-export const requestNameChangeSuccess = () => ({
-  type: REQUEST_NAME_CHANGE.SUCCESS,
-});
-
-export const requestNameChangeFailure = errors => ({
-  type: REQUEST_NAME_CHANGE.FAILURE,
-  payload: { errors },
-});
-
-export const requestNameChangeReset = () => ({
-  type: REQUEST_NAME_CHANGE.RESET,
-});
--- a/src/account-settings/name-change/data/reducers.js
+++ b/src/account-settings/name-change/data/reducers.js
@@ -1,44 +0,0 @@
-import { REQUEST_NAME_CHANGE } from './actions';
-
-export const defaultState = {
-  saveState: null,
-  errors: {},
-};
-
-const reducer = (state = defaultState, action = null) => {
-  if (action !== null) {
-    switch (action.type) {
-      case REQUEST_NAME_CHANGE.BEGIN:
-        return {
-          ...state,
-          saveState: 'pending',
-          errors: {},
-        };
-
-      case REQUEST_NAME_CHANGE.SUCCESS:
-        return {
-          ...state,
-          saveState: 'complete',
-        };
-
-      case REQUEST_NAME_CHANGE.FAILURE:
-        return {
-          ...state,
-          saveState: 'error',
-          errors: action.payload.errors || { general_error: 'A technical error occurred. Please try again.' },
-        };
-
-      case REQUEST_NAME_CHANGE.RESET:
-        return {
-          ...state,
-          saveState: null,
-          errors: {},
-        };
-
-      default:
-    }
-  }
-  return state;
-};
-
-export default reducer;
--- a/src/account-settings/name-change/data/sagas.js
+++ b/src/account-settings/name-change/data/sagas.js
@@ -1,40 +0,0 @@
-import { put, call, takeEvery } from 'redux-saga/effects';
-
-import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-
-import { postVerifiedName } from '../../data/service';
-
-import {
-  REQUEST_NAME_CHANGE,
-  requestNameChangeBegin,
-  requestNameChangeSuccess,
-  requestNameChangeFailure,
-} from './actions';
-import { postNameChange } from './service';
-
-export function* handleRequestNameChange(action) {
-  let { name: profileName } = getAuthenticatedUser();
-  try {
-    yield put(requestNameChangeBegin());
-    if (action.payload.profileName) {
-      yield call(postNameChange, action.payload.profileName);
-      profileName = action.payload.profileName;
-    }
-    yield call(postVerifiedName, {
-      username: action.payload.username,
-      verified_name: action.payload.verifiedName,
-      profile_name: profileName,
-    });
-    yield put(requestNameChangeSuccess());
-  } catch (err) {
-    if (err.customAttributes?.httpErrorResponseData) {
-      yield put(requestNameChangeFailure(JSON.parse(err.customAttributes.httpErrorResponseData)));
-    } else {
-      yield put(requestNameChangeFailure());
-    }
-  }
-}
-
-export default function* saga() {
-  yield takeEvery(REQUEST_NAME_CHANGE.BASE, handleRequestNameChange);
-}
--- a/src/account-settings/name-change/data/service.js
+++ b/src/account-settings/name-change/data/service.js
@@ -1,17 +0,0 @@
-import { getConfig } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-
-import { handleRequestError } from '../../data/utils';
-
-// eslint-disable-next-line import/prefer-default-export
-export async function postNameChange(name) {
-  // Requests a pending name change, rather than saving the account name immediately
-  const requestConfig = { headers: { Accept: 'application/json' } };
-  const requestUrl = `${getConfig().LMS_BASE_URL}/api/user/v1/accounts/name_change/`;
-
-  const { data } = await getAuthenticatedHttpClient()
-    .post(requestUrl, { name }, requestConfig)
-    .catch(error => handleRequestError(error));
-
-  return data;
-}
--- a/src/account-settings/name-change/index.js
+++ b/src/account-settings/name-change/index.js
@@ -1,5 +0,0 @@
-// eslint-disable-next-line no-restricted-exports
-export { default } from './NameChange';
-export { default as reducer } from './data/reducers';
-export { default as saga } from './data/sagas';
-export { REQUEST_NAME_CHANGE } from './data/actions';
--- a/src/account-settings/name-change/messages.js
+++ b/src/account-settings/name-change/messages.js
@@ -1,56 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  'account.settings.name.change.title.id': {
-    id: 'account.settings.name.change.title.id',
-    defaultMessage: 'This name change requires identity verification',
-    description: 'Inform the user that changing their name requires identity verification',
-  },
-  'account.settings.name.change.title.begin': {
-    id: 'account.settings.name.change.title.begin',
-    defaultMessage: 'Before we begin',
-    description: 'Title before beginning the ID verification process',
-  },
-  'account.settings.name.change.warning.one': {
-    id: 'account.settings.name.change.warning.one',
-    defaultMessage: 'Warning: This action updates the name that appears on all certificates that have been earned on this account in the past and any certificates you are currently earning or will earn in the future.',
-    description: 'Warning informing the user that a name change will update the name on all of their certificates.',
-  },
-  'account.settings.name.change.warning.two': {
-    id: 'account.settings.name.change.warning.two',
-    defaultMessage: 'This action cannot be undone without verifying your identity.',
-    description: 'Warning informing the user that a name change cannot be undone without ID verification.',
-  },
-  'account.settings.name.change.id.name.label': {
-    id: 'account.settings.name.change.id.name.label',
-    defaultMessage: 'Enter your name as it appears on your identification card.',
-    description: 'Form label instructing the user to enter the name on their ID.',
-  },
-  'account.settings.name.change.id.name.placeholder': {
-    id: 'account.settings.name.change.id.name.placeholder',
-    defaultMessage: 'Enter the name on your photo ID',
-    description: 'Form label instructing the user to enter the name on their ID.',
-  },
-  'account.settings.name.change.error.valid.name': {
-    id: 'account.settings.name.change.error.valid.name',
-    defaultMessage: 'Please enter a valid name.',
-    description: 'Error that appears when the user doesn’t enter a valid name.',
-  },
-  'account.settings.name.change.error.general': {
-    id: 'account.settings.name.change.error.general',
-    defaultMessage: 'A technical error occurred. Please try again.',
-    description: 'Generic error message.',
-  },
-  'account.settings.name.change.continue': {
-    id: 'account.settings.name.change.continue',
-    defaultMessage: 'Continue',
-    description: 'Continue button.',
-  },
-  'account.settings.name.change.cancel': {
-    id: 'account.settings.name.change.cancel',
-    defaultMessage: 'Cancel',
-    description: 'Cancel button.',
-  },
-});
-
-export default messages;
--- a/src/account-settings/name-change/test/NameChange.test.jsx
+++ b/src/account-settings/name-change/test/NameChange.test.jsx
@@ -1,172 +0,0 @@
-/* eslint-disable no-import-assign */
-import React from 'react';
-import { Provider } from 'react-redux';
-import { BrowserRouter as Router } from 'react-router-dom';
-import configureStore from 'redux-mock-store';
-import {
-  fireEvent,
-  render,
-  screen,
-} from '@testing-library/react';
-
-import * as auth from '@edx/frontend-platform/auth';
-import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';
-
-// Modal creates a portal.  Overriding createPortal allows portals to be tested in jest.
-jest.mock('react-dom', () => ({
-  ...jest.requireActual('react-dom'),
-  createPortal: jest.fn(node => node), // Mock portal behavior
-}));
-
-import NameChange from '../NameChange'; // eslint-disable-line import/first
-
-const mockDispatch = jest.fn();
-jest.mock('react-redux', () => ({
-  ...jest.requireActual('react-redux'),
-  useDispatch: () => mockDispatch,
-}));
-
-jest.mock('@edx/frontend-platform/auth');
-jest.mock('../../data/selectors', () => jest.fn().mockImplementation(() => ({ nameChangeSelector: () => ({}) })));
-
-const IntlNameChange = injectIntl(NameChange);
-
-const mockStore = configureStore();
-
-describe('NameChange', () => {
-  let props = {};
-  let store = {};
-
-  const reduxWrapper = children => (
-    <Router>
-      <IntlProvider locale="en">
-        <Provider store={store}>{children}</Provider>
-      </IntlProvider>
-    </Router>
-  );
-
-  beforeEach(() => {
-    store = mockStore();
-    props = {
-      targetFormId: 'test_form',
-      errors: {},
-      formValues: {
-        name: 'edx edx',
-        verified_name: 'edX Verified',
-      },
-      saveState: null,
-      intl: {},
-    };
-
-    auth.getAuthenticatedHttpClient = jest.fn(() => ({
-      patch: async () => ({
-        data: { status: 200 },
-        catch: () => {},
-      }),
-    }));
-    auth.getAuthenticatedUser = jest.fn(() => ({ userId: 3, username: 'edx' }));
-  });
-
-  afterEach(() => jest.clearAllMocks());
-
-  it('renders populated input after clicking continue if verified_name in form data', async () => {
-    const getInput = () => screen.queryByPlaceholderText('Enter the name on your photo ID');
-
-    render(reduxWrapper(<IntlNameChange {...props} />));
-    expect(getInput()).toBeNull();
-
-    const continueButton = screen.getByText('Continue');
-    fireEvent.click(continueButton);
-
-    expect(getInput().value).toBe('edX Verified');
-  });
-
-  it('renders empty input after clicking continue if verified_name not in form data', async () => {
-    const getInput = () => screen.queryByPlaceholderText('Enter the name on your photo ID');
-    const formProps = {
-      ...props,
-      formValues: {
-        name: 'edx edx',
-      },
-    };
-    render(reduxWrapper(<IntlNameChange {...formProps} />));
-
-    const continueButton = screen.getByText('Continue');
-    fireEvent.click(continueButton);
-
-    expect(getInput().value).toBe('');
-  });
-
-  it('dispatches verifiedName on submit if targetForm is not "name"', async () => {
-    const dispatchData = {
-      payload: {
-        profileName: null,
-        username: 'edx',
-        verifiedName: 'Verified Name',
-      },
-      type: 'ACCOUNT_SETTINGS__REQUEST_NAME_CHANGE',
-    };
-
-    render(reduxWrapper(<IntlNameChange {...props} />));
-
-    const continueButton = screen.getByText('Continue');
-    fireEvent.click(continueButton);
-
-    const input = screen.getByPlaceholderText('Enter the name on your photo ID');
-    fireEvent.change(input, { target: { value: 'Verified Name' } });
-
-    const submitButton = screen.getByText('Continue');
-    fireEvent.click(submitButton);
-    expect(mockDispatch).toHaveBeenCalledWith(dispatchData);
-  });
-
-  it('dispatches both profileName and verifiedName on submit if the targetForm is "name"', async () => {
-    const dispatchData = {
-      payload: {
-        profileName: 'edx edx',
-        username: 'edx',
-        verifiedName: 'Verified Name',
-      },
-      type: 'ACCOUNT_SETTINGS__REQUEST_NAME_CHANGE',
-    };
-    const formProps = {
-      ...props,
-      targetFormId: 'name',
-    };
-
-    render(reduxWrapper(<IntlNameChange {...formProps} />));
-
-    const continueButton = screen.getByText('Continue');
-    fireEvent.click(continueButton);
-
-    const input = screen.getByPlaceholderText('Enter the name on your photo ID');
-    fireEvent.change(input, { target: { value: 'Verified Name' } });
-
-    const submitButton = screen.getByText('Continue');
-    fireEvent.click(submitButton);
-    expect(mockDispatch).toHaveBeenCalledWith(dispatchData);
-  });
-
-  it('does not dispatch action while pending', async () => {
-    props.saveState = 'pending';
-
-    render(reduxWrapper(<IntlNameChange {...props} />));
-
-    const continueButton = screen.getByText('Continue');
-    fireEvent.click(continueButton);
-
-    const input = screen.getByPlaceholderText('Enter the name on your photo ID');
-    fireEvent.change(input, { target: { value: 'Verified Name' } });
-
-    const submitButton = screen.getByText('Continue');
-    fireEvent.click(submitButton);
-    expect(mockDispatch).not.toHaveBeenCalled();
-  });
-
-  it('routes to IDV when name change request is successful', async () => {
-    props.saveState = 'complete';
-
-    render(reduxWrapper(<IntlNameChange {...props} />));
-    expect(window.location.pathname).toEqual('/id-verification');
-  });
-});
--- a/src/account-settings/reset-password/ConfirmationAlert.jsx
+++ b/src/account-settings/reset-password/ConfirmationAlert.jsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { getConfig } from '@edx/frontend-platform';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
-import { Hyperlink } from '@openedx/paragon';
+import { Hyperlink } from '@edx/paragon';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';

@@ -13,7 +12,7 @@ const ConfirmationAlert = (props) => {

  const technicalSupportLink = (
    <Hyperlink
-      destination={getConfig().PASSWORD_RESET_SUPPORT_LINK}
+      destination="https://support.edx.org/hc/en-us/articles/206212088-What-if-I-did-not-receive-a-password-reset-message-"
    >
      <FormattedMessage
        id="account.settings.editable.field.password.reset.button.confirmation.support.link"
--- a/src/account-settings/reset-password/RequestInProgressAlert.jsx
+++ b/src/account-settings/reset-password/RequestInProgressAlert.jsx
@@ -1,21 +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 = () => (
-  <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
@@ -2,12 +2,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
-import { StatefulButton } from '@openedx/paragon';
+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;
@@ -22,7 +21,7 @@ const ResetPassword = (props) => {
      </h6>
      <p>
        <StatefulButton
-          variant="link"
+          className="btn-link"
          state={status}
          onClick={(e) => {
            // Swallow clicks if the state is pending.
@@ -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,22 +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/reset-password/index.js
+++ b/src/account-settings/reset-password/index.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-restricted-exports
 export { default } from './ResetPassword';
 export { default as reducer } from './data/reducers';
 export { RESET_PASSWORD } from './data/actions';
--- a/src/account-settings/site-language/actions.js
+++ b/src/account-settings/site-language/actions.js
@@ -2,9 +2,8 @@ import { AsyncActionType } from '../data/utils';

 export const FETCH_SITE_LANGUAGES = new AsyncActionType('SITE_LANGUAGE', 'FETCH_SITE_LANGUAGES');

-export const fetchSiteLanguages = handleNavigation => ({
+export const fetchSiteLanguages = () => ({
  type: FETCH_SITE_LANGUAGES.BASE,
-  payload: { handleNavigation },
 });

 export const fetchSiteLanguagesBegin = () => ({
--- a/src/account-settings/site-language/constants.js
+++ b/src/account-settings/site-language/constants.js
@@ -19,11 +19,6 @@ const siteLanguageList = [
    name: 'Español (Latinoamérica)',
    released: true,
  },
-  {
-    code: 'fa-ir',
-    name: 'فارسی',
-    released: true,
-  },
  {
    code: 'fr',
    name: 'Français',
@@ -74,61 +69,6 @@ const siteLanguageList = [
    name: '中文 (简体)',
    released: true,
  },
-  {
-    code: 'pt-pt',
-    name: 'Português',
-    released: true,
-  },
-  {
-    code: 'it-it',
-    name: 'Italian',
-    released: true,
-  },
-  {
-    code: 'de-de',
-    name: 'German',
-    released: true,
-  },
-  {
-    code: 'hi',
-    name: 'Hindi',
-    released: true,
-  },
-  {
-    code: 'fr-ca',
-    name: 'French (CA)',
-    released: true,
-  },
-  {
-    code: 'te',
-    name: 'తెలుగు',
-    released: true,
-  },
-  {
-    code: 'da',
-    name: 'dansk',
-    released: true,
-  },
-  {
-    code: 'el',
-    name: 'Ελληνικά',
-    released: true,
-  },
-  {
-    code: 'es-es',
-    name: 'Español (España)',
-    released: true,
-  },
-  {
-    code: 'sw',
-    name: 'Kiswahili',
-    released: true,
-  },
-  {
-    code: 'tr-tr',
-    name: 'Türkçe (Türkiye)',
-    released: true,
-  },
 ];

 export default siteLanguageList;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kyle McCormick	de2a751e36	Fix logout URL	2020-04-15 11:43:01 -04:00
Kyle McCormick	0375ebecda	Use devstack frontend-build branch; add dev-build command	2020-04-15 11:43:00 -04:00
Kyle McCormick	f088e2783b	Update .env.development for devstack	2020-04-15 11:43:00 -04:00
Kyle McCormick	abc29bbcee	Make React routes relative	2020-04-15 11:43:00 -04:00