Using hooks in DeleteAccount - goodnight, redux!

2019-07-09 17:10:13 -04:00
252 changed files with 24796 additions and 41890 deletions
--- a/.babelrc
+++ b/.babelrc
@@ -0,0 +1,41 @@
+{
+  "presets": [
+    [
+      "env",
+      {
+        "targets": {
+          "browsers": ["last 2 versions", "ie 11"]
+        }
+      }
+    ],
+    "babel-preset-react"
+  ],
+  "plugins": [
+    "transform-object-rest-spread",
+    "transform-class-properties",
+    ["transform-imports", {
+      "@fortawesome/free-brands-svg-icons": {
+        "transform": "@fortawesome/free-brands-svg-icons/${member}",
+        "skipDefaultConversion": true
+      },
+      "@fortawesome/free-regular-svg-icons": {
+        "transform": "@fortawesome/free-regular-svg-icons/${member}",
+        "skipDefaultConversion": true
+      },
+      "@fortawesome/free-solid-svg-icons": {
+        "transform": "@fortawesome/free-solid-svg-icons/${member}",
+        "skipDefaultConversion": true
+      }
+    }]
+  ],
+  "env": {
+    "i18n": {
+      "plugins": [
+        ["react-intl", {
+          "messagesDir": "./temp/babel-plugin-react-intl",
+          "moduleSourceName": "@edx/frontend-i18n"
+        }]
+      ]
+    }
+  }
+}
--- a/.env
+++ b/.env
@@ -1,35 +0,0 @@
-ACCESS_TOKEN_COOKIE_NAME=''
-BASE_URL=''
-CREDENTIALS_BASE_URL=''
-CSRF_TOKEN_API_PATH=''
-DEMOGRAPHICS_BASE_URL=''
-DISCOVERY_API_BASE_URL=''
-ECOMMERCE_BASE_URL=''
-ENABLE_DEMOGRAPHICS_COLLECTION=''
-FAVICON_URL=''
-LANGUAGE_PREFERENCE_COOKIE_NAME=''
-LMS_BASE_URL=''
-LOGIN_URL=''
-LOGO_TRADEMARK_URL=''
-LOGO_URL=''
-LOGO_WHITE_URL=''
-LOGOUT_URL=''
-MARKETING_SITE_BASE_URL=''
-NODE_ENV=''
-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://support.edx.org/hc/en-us/articles/207206067'
--- a/.env.development
+++ b/.env.development
@@ -1,36 +0,0 @@
-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'
-DEMOGRAPHICS_BASE_URL='http://localhost:18360'
-DISCOVERY_API_BASE_URL=''
-ECOMMERCE_BASE_URL='http://localhost:18130'
-ENABLE_DEMOGRAPHICS_COLLECTION=''
-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='development'
-ORDER_HISTORY_URL='http://localhost:1996/orders'
-PORT=1997
-PUBLISHER_BASE_URL=''
-REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
-SEGMENT_KEY=''
-SITE_NAME=localhost
-STUDIO_BASE_URL=''
-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=''
-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://support.edx.org/hc/en-us/articles/207206067'
--- a/.env.test
+++ b/.env.test
@@ -1,34 +0,0 @@
-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'
-DEMOGRAPHICS_BASE_URL='http://localhost:18360'
-DISCOVERY_API_BASE_URL=''
-ECOMMERCE_BASE_URL='http://localhost:18130'
-ENABLE_DEMOGRAPHICS_COLLECTION=''
-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=''
-REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
-SEGMENT_KEY=''
-SITE_NAME=localhost
-STUDIO_BASE_URL=''
-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=''
-APP_ID=
-MFE_CONFIG_API_URL=
-LEARNER_FEEDBACK_URL=''
-SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT='https://support.edx.org/hc/en-us/articles/207206067'
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,4 +2,3 @@ coverage/*
 dist/
 node_modules/
 __mocks__/
-__snapshots__/
--- a/.eslintrc
+++ b/.eslintrc
@@ -0,0 +1,34 @@
+{
+  "extends": "eslint-config-edx",
+  "parser": "babel-eslint",
+  "rules": {
+    "import/no-extraneous-dependencies": [
+      "error",
+      {
+        "devDependencies": [
+          "webpack/*.js",
+          "**/*.test.jsx",
+          "**/*.test.js"
+        ]
+      }
+    ],
+    // https://github.com/evcohen/eslint-plugin-jsx-a11y/issues/340#issuecomment-338424908
+    "jsx-a11y/anchor-is-valid": [ "error", {
+      "components": [ "Link" ],
+      "specialLink": [ "to" ]
+    }],
+    "jsx-a11y/label-has-for": [ 2, {
+      "components": [ "label" ],
+      "required": {
+        "some": [ "nesting", "id" ]
+      },
+      "allowChildren": false
+    }]
+  },
+  "env": {
+    "jest": true
+  },
+  "globals": {
+    "newrelic": false
+  }
+}
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,4 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-const { createConfig } = require('@openedx/frontend-build');
-
-module.exports = createConfig('eslint');
--- 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
-    - name: Setup Nodejs Env
-      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
-    - uses: actions/setup-node@v2
-      with:
-        node-version: ${{ env.NODE_VER }}
-    - run: make requirements
-    - run: make test NPM_TESTS=build
-    - run: make test NPM_TESTS=${{ matrix.npm-test }}
-    - name: upload coverage
-      uses: codecov/codecov-action@v3
-      with:
-        fail_ci_if_error: false
--- 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,14 +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/lockfile-check.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,4 +16,3 @@ temp/babel-plugin-react-intl
 *~
 /temp
 /.vscode
-/module.config.js
--- a/.npmignore
+++ b/.npmignore
@@ -1,15 +1,13 @@
-.tx
+.eslintignore
+.eslintrc.json
+.gitignore
+.travis.yml
+docker-compose.yml
+Dockerfile
+Makefile
+npm-debug.log
+
+webpack
 coverage
-dist
 node_modules
 public
-src
-.dockerignore
-.eslintignore
-.eslintrc
-.gitignore
-.releaserc
-.travis.yml
-babel.config.js
-Makefile
-renovate.json
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +0,0 @@
-18
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,23 @@
+language: node_js
+node_js:
+  - lts/*
+cache:
+  directories:
+    - "~/.npm"
+before_install:
+  - npm install -g npm@latest
+  - npm install -g greenkeeper-lockfile@1.14.0
+install:
+  - npm ci
+before_script: greenkeeper-lockfile-update
+after_script: greenkeeper-lockfile-upload
+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:
+  - npm run coveralls
+  - codecov
--- a/.tx/config
+++ b/.tx/config
@@ -1,9 +1,8 @@
 [main]
 host = https://www.transifex.com

-[o:open-edx:p:edx-platform:r:frontend-app-account]
+[edx-platform.frontend-app-account]
 file_filter = src/i18n/messages/<lang>.json
 source_file = src/i18n/transifex_input.json
 source_lang = en
-type        = KEYVALUEJSON
-
+type = KEYVALUEJSON
--- a/149
+++ b/149
@@ -1,21 +1,23 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

                            Preamble

-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.

  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
+the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.

  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -24,34 +26,44 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.

-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.

-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.

-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.

-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.

  The precise terms and conditions for copying, distribution and
 modification follow.
@@ -60,7 +72,7 @@ modification follow.

  0. Definitions.

-  "This License" refers to version 3 of the GNU Affero General Public License.
+  "This License" refers to version 3 of the GNU General Public License.

  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -537,45 +549,35 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.

-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
+  13. Use with the GNU Affero General Public License.

  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
+under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.

  14. Revised Versions of this License.

  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.

  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
+Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
+GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.

  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
+versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.

@@ -633,29 +635,40 @@ the "copyright" line and a pointer to where the full notice is found.
    Copyright (C) <year>  <name of author>

    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
+    GNU General Public License for more details.

-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".

  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/47
+++ b/47
@@ -1,28 +1,17 @@
-export TRANSIFEX_RESOURCE = frontend-app-account
 transifex_resource = frontend-app-account
-transifex_langs = "ar,de,es_419,fa_IR,fr,fr_CA,hi,it,pt,ru,uk,zh_CN,it_IT,pt_PT,de_DE"
+transifex_langs = "ar,fr,es_419,zh_CN"

-intl_imports = ./node_modules/.bin/intl-imports.js
 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
-requirements:  ## install ci requirements
-	npm ci
+requirements:
+	npm install

 i18n.extract:
 	# Pulling display strings from .jsx files into .json files...
@@ -45,31 +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)

-ifeq ($(OPENEDX_ATLAS_PULL),)
 # Pulls translations from Transifex.
 pull_translations:
-	tx pull -t -f --mode reviewed --languages=$(transifex_langs)
-else
-# Experimental: OEP-58 Pulls translations using atlas
-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
-endif
+	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,232 +1,42 @@
-####################
+|Build Status| |Coveralls| |npm_version| |npm_downloads| |license|
+
 frontend-app-account
-####################
-
-|ci-badge| |Codecov| |npm_version| |npm_downloads| |license| |semantic-release|
-
-
-********
-Purpose
-********
-
-This is a micro-frontend application responsible for the display and updating of a user's account information.
-
-What is the domain of this MFE?
-
-In this MFE: Private user settings UIs. Public facing profile is in a `separate MFE (Profile) <https://github.com/openedx/frontend-app-profile>`_
-
- Account settings page
-
- Demographics collection
-
- IDV (Identity Verification)
-
-***************
-Getting Started
-***************
-
-Prerequisites
-=============
-
-The `devstack`_ is currently recommended as a development environment for your
-new MFE.  If you start it with ``make dev.up.lms`` that should give you
-everything you need as a companion to this frontend.
-
-Note that it is also possible to use `Tutor`_ to develop an MFE.  You can refer
-to the `relevant tutor-mfe documentation`_ to get started using it.
-
-.. _Devstack: https://github.com/openedx/devstack
-
-.. _Tutor: https://github.com/overhangio/tutor
-
-.. _relevant tutor-mfe documentation: https://github.com/overhangio/tutor-mfe#mfe-development
-
-Installation
-============
-
-This MFE is bundled with `Devstack <https://github.com/openedx/devstack>`_, see the `Getting Started <https://github.com/openedx/devstack#getting-started>`_ section for setup instructions.
-
-1. Install Devstack using the `Getting Started <https://github.com/openedx/devstack#getting-started>`_ instructions.
-
-2. Start up Devstack, if it's not already started.
-
-3. Log in to Devstack (http://localhost:18000/login )
-
-4. Within this project, install requirements and start the development server:
-
-   .. code-block::
-
-      npm install
-      npm start # The server will run on port 1997
-
-5. Once the dev server is up, visit http://localhost:1997 to access the MFE
-
-   .. image:: ./docs/images/localhost_preview.png
-
-Environment Variables/Setup Notes
-=================================
-
-This MFE is configured via environment variables supplied at build time.  All micro-frontends have a shared set of required environment variables, as documented in the Open edX Developer Guide under `Required Environment Variables <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.
-
-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.
-
-edX-specific Environment Variables
-==================================
-
-Furthermore, there are several edX-specific environment variables that enable integrations with closed-source services private to the edX organization, and are unsupported in Open edX.  Enabling these environment variables will result in undefined behavior in Open edX installations:
-
-``ENABLE_DEMOGRAPHICS_COLLECTION``
-
-Example: ``true`` | ``''`` (empty strings are falsy)
-
-Enables support for a section of the account settings page where a user can enter demographics information.  Integrates with a private demographics service and is only used by edx.org.
-
-``DEMOGRAPHICS_BASE_URL``
-
-Example: ``https://demographics.example.com``
-
-Required only if ``ENABLE_DEMOGRAPHICS_COLLECTION`` is true.  The fully-qualified URL to the private demographics service in the target environment.
-
-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: `Micro-frontend applications in Open
-edX <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.
-
-Cloning and Startup
-===================
-
-.. code-block::
-
-
-  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``
-
-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.
-In the future, it's possible that demographics could be modeled as a plugin rather than being hard-coded into this MFE.
-
-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/
-
-Reporting Security Issues
 =========================

-Please do not report security issues in public. Please email security@openedx.org.
+Please tag **@edx/arch-team** on any PRs or issues.

-==============================
+Introduction
+------------

-.. |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
-.. |Codecov| image:: https://img.shields.io/codecov/c/github/edx/frontend-app-account
-   :target: https://codecov.io/gh/edx/frontend-app-account
+React app for account settings.
+
+Get Started
+-----------
+
+1. Start up your local devstack
+2. If you don't have node installed. Install Node
+3. In the project directory: npm install
+4. Then run npm start
+5. Open your browser to http://localhost:1997/account-settings
+
+Important Note
+--------------
+
+The production Webpack configuration for this repo uses `Purgecss <https://www.purgecss.com/>`_ 
+to remove unused CSS from the production css file. In webpack/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 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. 
+
+
+.. |Build Status| image:: https://api.travis-ci.org/edx/frontend-app-account.svg?branch=master
+   :target: https://travis-ci.org/edx/frontend-app-account
+.. |Coveralls| image:: https://img.shields.io/coveralls/edx/frontend-app-account.svg?branch=master
+   :target: https://coveralls.io/github/edx/frontend-app-account
 .. |npm_version| image:: https://img.shields.io/npm/v/@edx/frontend-app-account.svg
   :target: @edx/frontend-app-account
 .. |npm_downloads| image:: https://img.shields.io/npm/dt/@edx/frontend-app-account.svg
   :target: @edx/frontend-app-account
 .. |license| image:: https://img.shields.io/npm/l/@edx/frontend-app-account.svg
   :target: @edx/frontend-app-account
-.. |semantic-release| image:: https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg
-   :target: https://github.com/semantic-release/semantic-release
--- a/docs/decisions/0002-coaching-addition.rst
+++ b/docs/decisions/0002-coaching-addition.rst
@@ -1,30 +0,0 @@
-1. Add Coaching Consent
--------------------------------
-
-Status
------
-
-Accepted
-
-Context
-------
-
-We need to provide users who are eligible for coaching with both an always available
-coaching toggle and a one-time form they can view to signup for coaching.
-
-Decision
--------
-
-While the coaching functionality is currently both limited, closed source, and the form
-exists outside of the standard design of this MFE, it was decided to add it here as a
-temporary measure due to it being at it's core, an account setting.
-
-The longer term solutions include either:
-  - using the frontend plugins feature when they become available to inject our coaching
-    work into the account MFE
-  - roll it into it's own MFE if enough additional coaching frontend work is required
-
-Consequences
------------
-
-Code will exist inside this Open edX MFE that integrates with a closed source app.
--- a/docs/images/localhost_preview.png
+++ b/docs/images/localhost_preview.png
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,7 +0,0 @@
-const { createConfig } = require('@openedx/frontend-build');
-
-module.exports = createConfig('jest', {
-  setupFilesAfterEnv: [
-    '<rootDir>/src/setupTest.js',
-  ],
-});
--- a/openedx.yaml
+++ b/openedx.yaml
@@ -3,4 +3,4 @@

 nick: acct
 oeps: {}
-openedx-release: {ref: master}
+owner: edx/arch-team
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,93 +1,154 @@
 {
  "name": "@edx/frontend-app-account",
-  "version": "1.0.0-semantically-released",
-  "description": "User account micro-frontend for Open edX",
-  "author": "edX",
-  "license": "AGPL-3.0",
+  "version": "0.1.0",
+  "description": "User account React app",
  "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 .",
-    "snapshot": "fedx-scripts jest --updateSnapshot",
-    "start": "fedx-scripts webpack-dev-server --progress",
-    "test": "TZ=UTC fedx-scripts jest --coverage --passWithNoTests"
+    "build": "NODE_ENV=production BABEL_ENV=production webpack --config=webpack/webpack.prod.config.js",
+    "coveralls": "cat ./coverage/lcov.info | coveralls",
+    "i18n_extract": "BABEL_ENV=i18n babel src --quiet > /dev/null",
+    "is-es5": "es-check es5 ./dist/*.js",
+    "lint": "eslint --ext .js --ext .jsx .",
+    "precommit": "npm run lint",
+    "start": "NODE_ENV=development BABEL_ENV=development webpack-dev-server --config=webpack/webpack.dev.config.js --progress",
+    "test": "jest --coverage --passWithNoTests",
+    "travis-deploy-once": "travis-deploy-once"
  },
-  "bugs": {
-    "url": "https://github.com/openedx/frontend-app-account/issues"
-  },
-  "homepage": "https://github.com/openedx/frontend-app-account#readme",
+  "author": "edX",
+  "license": "AGPL-3.0",
+  "homepage": "https://github.com/edx/frontend-app-account#readme",
  "publishConfig": {
    "access": "public"
  },
-  "browserslist": [
-    "extends @edx/browserslist-config"
-  ],
  "dependencies": {
-    "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
-    "@edx/frontend-component-footer": "13.0.2",
-    "@edx/frontend-component-header": "5.0.2",
-    "@edx/frontend-platform": "7.1.0",
-    "@edx/openedx-atlas": "^0.6.0",
-    "@fortawesome/fontawesome-svg-core": "1.2.36",
-    "@fortawesome/free-brands-svg-icons": "5.15.4",
-    "@fortawesome/free-regular-svg-icons": "5.15.4",
-    "@fortawesome/free-solid-svg-icons": "5.15.4",
-    "@fortawesome/react-fontawesome": "0.2.0",
-    "@openedx/paragon": "22.0.0",
-    "@tensorflow-models/blazeface": "0.0.7",
-    "@tensorflow/tfjs-converter": "3.21.0",
-    "@tensorflow/tfjs-core": "3.21.0",
-    "bowser": "2.11.0",
-    "classnames": "2.5.1",
-    "core-js": "3.35.1",
-    "font-awesome": "4.7.0",
-    "form-urlencoded": "6.1.4",
-    "formdata-polyfill": "4.0.10",
-    "jslib-html5-camera-photo": "3.3.4",
-    "lodash.camelcase": "4.3.0",
-    "lodash.debounce": "4.0.8",
-    "lodash.findindex": "4.6.0",
-    "lodash.get": "4.4.2",
-    "lodash.isempty": "4.4.0",
-    "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.2.3",
-    "memoize-one": "5.2.1",
-    "prop-types": "15.8.1",
-    "qs": "6.11.2",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
-    "react-helmet": "6.1.0",
-    "react-redux": "7.2.9",
-    "react-router": "6.22.0",
-    "react-router-dom": "6.22.0",
-    "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",
-    "redux-logger": "3.0.6",
-    "redux-saga": "1.3.0",
-    "redux-thunk": "2.4.2",
-    "regenerator-runtime": "0.14.1",
-    "reselect": "4.1.8",
-    "universal-cookie": "4.0.4"
+    "@cospired/i18n-iso-languages": "^2.0.2",
+    "@edx/edx-bootstrap": "^2.2.1",
+    "@edx/frontend-analytics": "^2.0.0",
+    "@edx/frontend-auth": "^5.3.4",
+    "@edx/frontend-component-footer": "^6.0.2",
+    "@edx/frontend-component-site-header": "^2.4.0",
+    "@edx/frontend-i18n": "^2.1.0",
+    "@edx/frontend-logging": "^2.0.2",
+    "@edx/paragon": "^4.2.6",
+    "@fortawesome/fontawesome-svg-core": "^1.2.18",
+    "@fortawesome/free-brands-svg-icons": "^5.8.2",
+    "@fortawesome/free-regular-svg-icons": "^5.7.1",
+    "@fortawesome/free-solid-svg-icons": "^5.8.1",
+    "@fortawesome/react-fontawesome": "^0.1.4",
+    "babel-polyfill": "^6.26.0",
+    "classnames": "^2.2.6",
+    "connected-react-router": "^5.0.1",
+    "email-prop-type": "^1.1.5",
+    "font-awesome": "^4.7.0",
+    "form-urlencoded": "^3.0.0",
+    "formdata-polyfill": "^3.0.18",
+    "glob": "^7.1.3",
+    "history": "^4.7.2",
+    "i18n-iso-countries": "^3.7.8",
+    "iso-countries-languages": "^0.2.1",
+    "lodash.camelcase": "^4.3.0",
+    "lodash.findindex": "^4.6.0",
+    "lodash.get": "^4.4.2",
+    "lodash.isempty": "^4.4.0",
+    "lodash.omit": "^4.5.0",
+    "lodash.pick": "^4.4.0",
+    "lodash.snakecase": "^4.1.1",
+    "memoize-one": "^5.0.4",
+    "newrelic": "^5.5.0",
+    "prop-types": "^15.5.10",
+    "react": "^16.8.3",
+    "react-dom": "^16.8.3",
+    "react-redux": "^5.1.1",
+    "react-router": "^4.2.0",
+    "react-router-dom": "^4.2.2",
+    "react-router-hash-link": "^1.2.1",
+    "react-scrollspy": "^3.4.0",
+    "react-transition-group": "^2.5.3",
+    "redux": "^4.0.1",
+    "redux-devtools-extension": "^2.13.2",
+    "redux-logger": "^3.0.6",
+    "redux-saga": "^1.0.1",
+    "redux-thunk": "^2.2.0",
+    "reselect": "^4.0.0",
+    "universal-cookie": "^3.1.0",
+    "url-polyfill": "^1.1.5"
  },
  "devDependencies": {
-    "@edx/browserslist-config": "1.2.0",
-    "@edx/reactifex": "1.1.0",
-    "@openedx/frontend-build": "13.0.27",
-    "@testing-library/jest-dom": "5.17.0",
-    "@testing-library/react": "12.1.5",
-    "react-test-renderer": "17.0.2",
+    "@svgr/webpack": "^4.2.0",
+    "autoprefixer": "^9.4.2",
+    "axios-mock-adapter": "^1.15.0",
+    "babel-cli": "^6.26.0",
+    "babel-eslint": "^8.2.2",
+    "babel-jest": "^22.4.0",
+    "babel-loader": "^7.1.2",
+    "babel-plugin-react-intl": "^3.0.1",
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-plugin-transform-imports": "^1.5.1",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
+    "babel-preset-react": "^6.24.1",
+    "clean-webpack-plugin": "^0.1.19",
+    "codecov": "^3.0.0",
+    "copy-webpack-plugin": "^4.6.0",
+    "css-loader": "^0.28.9",
+    "enzyme": "^3.3.0",
+    "enzyme-adapter-react-16": "^1.1.1",
+    "es-check": "^5.0.0",
+    "eslint-config-edx": "^4.0.3",
+    "fetch-mock": "^6.3.0",
+    "file-loader": "^1.1.9",
+    "html-webpack-harddisk-plugin": "^0.2.0",
+    "html-webpack-new-relic-plugin": "^1.1.0",
+    "html-webpack-plugin": "^3.0.3",
+    "husky": "^0.14.3",
+    "identity-obj-proxy": "^3.0.0",
+    "image-webpack-loader": "^4.2.0",
+    "jest": "^22.4.0",
+    "mini-css-extract-plugin": "^0.4.0",
+    "new-relic-source-map-webpack-plugin": "1.1.0",
+    "node-sass": "^4.7.2",
+    "postcss-loader": "^3.0.0",
+    "postcss-rtl": "^1.3.3",
+    "purgecss-webpack-plugin": "^1.5.0",
+    "react-dev-utils": "^5.0.0",
+    "react-test-renderer": "^16.8.6",
    "reactifex": "1.1.1",
-    "redux-mock-store": "1.5.4"
+    "redux-mock-store": "^1.5.3",
+    "sass-loader": "^6.0.6",
+    "source-map-loader": "^0.2.4",
+    "style-loader": "^0.20.2",
+    "travis-deploy-once": "^5.0.9",
+    "url-loader": "^1.1.2",
+    "webpack": "^4.25.1",
+    "webpack-bundle-analyzer": "^3.3.2",
+    "webpack-cli": "^3.1.2",
+    "webpack-dev-server": "^3.1.0",
+    "webpack-merge": "^4.1.1"
+  },
+  "jest": {
+    "testURL": "http://localhost/",
+    "setupFiles": [
+      "./src/setupTest.js"
+    ],
+    "moduleNameMapper": {
+      "\\.svg": "<rootDir>/__mocks__/svgrMock.js",
+      "\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
+      "\\.(css|scss)$": "identity-obj-proxy"
+    },
+    "collectCoverageFrom": [
+      "src/**/*.{js,jsx}"
+    ],
+    "coveragePathIgnorePatterns": [
+      "/node_modules/",
+      "src/setupTest.js",
+      "src/index.js",
+      "/tests/"
+    ],
+    "transformIgnorePatterns": [
+      "/node_modules/(?!(@edx/paragon)/).*/"
+    ]
  }
 }
--- a/public/index.html
+++ b/public/index.html
@@ -1,148 +1,11 @@
-<!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">
  </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 +0,0 @@
-{
-  "extends": [
-    "config:base",
-    "schedule:weekly",
-    ":automergeLinters",
-    ":automergeMinor",
-    ":automergeTesters",
-    ":enableVulnerabilityAlerts",
-    ":rebaseStalePrs",
-    ":semanticCommits",
-    ":updateNotScheduled"
-  ],
-  "packageRules": [
-    {
-      "matchDepTypes": [
-        "devDependencies"
-      ],
-      "matchUpdateTypes": [
-        "lockFileMaintenance",
-        "minor",
-        "patch",
-        "pin"
-      ],
-      "automerge": true
-    },
-    {
-      "matchPackagePatterns": ["@edx", "@openedx"],
-      "matchUpdateTypes": ["minor", "patch"],
-      "automerge": true
-    }
-  ],
-  "timezone": "America/New_York"
-}
--- a/src/account-settings/AccountSettingsPage.jsx
+++ b/src/account-settings/AccountSettingsPage.jsx
@@ -1,106 +1,66 @@
-import { AppContext } from '@edx/frontend-platform/react';
-import { getConfig, getQueryParameters } from '@edx/frontend-platform';
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import memoize from 'memoize-one';
 import findIndex from 'lodash.findindex';
-import { sendTrackingLogEvent } from '@edx/frontend-platform/analytics';
 import {
  injectIntl,
  intlShape,
  FormattedMessage,
-  getCountryList,
-  getLanguageList,
-} from '@edx/frontend-platform/i18n';
-import {
-  Button, Hyperlink, Icon, Alert,
-} from '@openedx/paragon';
-import { CheckCircle, Error, WarningFilled } from '@openedx/paragon/icons';
+} from '@edx/frontend-i18n';
+import { Hyperlink } from '@edx/paragon';

 import messages from './AccountSettingsPage.messages';
-import {
-  fetchSettings,
-  saveMultipleSettings,
-  saveSettings,
-  updateDraft,
-  beginNameChange,
-} from './data/actions';
-import { accountSettingsPageSelector } from './data/selectors';
-import PageLoading from './PageLoading';
+
+import { fetchSettings, saveSettings, updateDraft } from './actions';
+import { accountSettingsPageSelector } from './selectors';
+
+import { Alert, PageLoading } from '../common';
 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,
-} from './data/constants';
+} from './constants';
 import { fetchSiteLanguages } from './site-language';
-import DemographicsSection from './demographics/DemographicsSection';
-import { fetchCourseList } from '../notification-preferences/data/thunks';
-import { withLocation, withNavigate } from './hoc';

 class AccountSettingsPage extends React.Component {
-  constructor(props, context) {
-    super(props, context);
-
-    const duplicateTpaProvider = getQueryParameters().duplicate_provider;
-    this.state = {
-      duplicateTpaProvider,
-    };
-
-    this.navLinkRefs = {
-      '#basic-information': React.createRef(),
-      '#profile-information': React.createRef(),
-      '#demographics-information': React.createRef(),
-      '#social-media': React.createRef(),
-      '#site-preferences': React.createRef(),
-      '#linked-accounts': React.createRef(),
-      '#delete-account': React.createRef(),
-    };
+  constructor(props) {
+    super(props);
+    this.educationLevels = EDUCATION_LEVELS.map(key => ({
+      value: key,
+      label: props.intl.formatMessage(messages[`account.settings.field.education.levels.${key || 'empty'}`]),
+    }));
+    this.genderOptions = GENDER_OPTIONS.map(key => ({
+      value: key,
+      label: props.intl.formatMessage(messages[`account.settings.field.gender.options.${key || 'empty'}`]),
+    }));
+    this.languageProficiencyOptions = [{
+      value: '',
+      label: props.intl.formatMessage(messages['account.settings.field.language_proficiencies.options.empty']),
+    }].concat(props.languageProficiencyOptions);
+    this.yearOfBirthOptions = [{
+      value: '',
+      label: props.intl.formatMessage(messages['account.settings.field.year_of_birth.options.empty']),
+    }].concat(YEAR_OF_BIRTH_OPTIONS);
+    this.countryOptions = [{
+      value: '',
+      label: props.intl.formatMessage(messages['account.settings.field.country.options.empty']),
+    }].concat(props.countryOptions);
  }

  componentDidMount() {
-    this.props.fetchCourseList();
    this.props.fetchSettings();
-    this.props.fetchSiteLanguages(this.props.navigate);
-    sendTrackingLogEvent('edx.user.settings.viewed', {
-      page: 'account',
-      visibility: null,
-      user_id: this.context.authenticatedUser.userId,
-    });
+    this.props.fetchSiteLanguages();
  }

-  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) => {
+  getTimeZoneOptions = memoize((timeZoneOptions, countryTimeZoneOptions) => {
    const concatTimeZoneOptions = [{
      label: this.props.intl.formatMessage(messages['account.settings.field.time.zone.default']),
      value: '',
@@ -118,83 +78,6 @@ class AccountSettingsPage extends React.Component {
    return concatTimeZoneOptions;
  });

-  getLocalizedOptions = memoize((locale, country) => ({
-    countryOptions: [{
-      value: '',
-      label: this.props.intl.formatMessage(messages['account.settings.field.country.options.empty']),
-    }].concat(getCountryList(locale).map(({ code, name }) => ({ value: code, label: name }))),
-    stateOptions: [{
-      value: '',
-      label: this.props.intl.formatMessage(messages['account.settings.field.state.options.empty']),
-    }].concat(getStatesList(country)),
-    languageProficiencyOptions: [{
-      value: '',
-      label: this.props.intl.formatMessage(messages['account.settings.field.language_proficiencies.options.empty']),
-    }].concat(getLanguageList(locale).map(({ code, name }) => ({ value: code, label: name }))),
-    yearOfBirthOptions: [{
-      value: '',
-      label: this.props.intl.formatMessage(messages['account.settings.field.year_of_birth.options.empty']),
-    }].concat(YEAR_OF_BIRTH_OPTIONS),
-    educationLevelOptions: EDUCATION_LEVELS.map(key => ({
-      value: key,
-      label: this.props.intl.formatMessage(messages[`account.settings.field.education.levels.${key || 'empty'}`]),
-    })),
-    genderOptions: GENDER_OPTIONS.map(key => ({
-      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,
-    })),
-  }));
-
-  handleEditableFieldChange = (name, value) => {
-    this.props.updateDraft(name, value);
-  };
-
-  handleSubmit = (formId, values) => {
-    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);
-    }
-  };
-
  isEditable(fieldName) {
    return !this.props.staticFields.includes(fieldName);
  }
@@ -205,27 +88,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) {
+    if (!this.props.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,
+              provider: <b>{this.props.duplicateTpaProvider}</b>,
            }}
          />
        </Alert>
@@ -240,7 +124,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."
@@ -248,7 +132,7 @@ class AccountSettingsPage extends React.Component {
            values={{
              managerTitle: <b>{this.props.profileDataManager}</b>,
              support: (
-                <Hyperlink destination={getConfig().SUPPORT_URL} target="_blank">
+                <Hyperlink destination={this.props.supportUrl} target="_blank">
                  <FormattedMessage
                    id="account.settings.message.managed.settings.support"
                    defaultMessage="support"
@@ -263,170 +147,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>
-              <div className="d-flex flex-row-reverse mt-3">
-                <Button
-                  variant="primary"
-                  href="https://support.edx.org/hc/en-us/articles/360004381594-Why-was-my-ID-verification-denied"
-                >
-                  {this.props.intl.formatMessage(messages['account.settings.field.name.verified.failure.message.help.link'])}
-                </Button>{' '}
-              </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'], {
@@ -436,15 +156,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 (this.props.hiddenFields.includes('secondary_email')) {
      return null;
    }

@@ -460,275 +173,131 @@ class AccountSettingsPage extends React.Component {
    );
  }

-  renderDemographicsSection() {
-    // check the result of an LMS API call to determine if we should render the DemographicsSection component
-    if (this.props.formValues.shouldDisplayDemographicsSection) {
-      return (
-        <DemographicsSection forwardRef={this.navLinkRefs['#demographics-information']} />
-      );
-    }
-    return null;
-  }
-
  renderContent() {
    const editableFieldProps = {
      onChange: this.handleEditableFieldChange,
      onSubmit: this.handleSubmit,
    };

-    // 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 showState = this.props.formValues.country === COUNTRY_WITH_STATES;
-    const { verifiedName } = this.props;
-
-    const hasWorkExperience = !!this.props.formValues?.extended_profile?.find(field => field.field_name === 'work_experience');
-
-    const timeZoneOptions = this.getLocalizedTimeZoneOptions(
+    const timeZoneOptions = this.getTimeZoneOptions(
      this.props.timeZoneOptions,
      this.props.countryTimeZoneOptions,
-      this.context.locale,
    );

    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={this.yearOfBirthOptions}
+            {...editableFieldProps}
+          />
+          <EditableField
            name="country"
            type="select"
            value={this.props.formValues.country}
-            options={countryOptions}
+            options={this.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={this.educationLevels}
            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}
-            options={genderOptions}
+            options={this.genderOptions}
            label={this.props.intl.formatMessage(messages['account.settings.field.gender'])}
            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}
-            options={languageProficiencyOptions}
+            options={this.languageProficiencyOptions}
            label={this.props.intl.formatMessage(messages['account.settings.field.language.proficiencies'])}
            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.language.proficiencies.empty'])}
            {...editableFieldProps}
          />
        </div>
-        {getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && this.renderDemographicsSection()}
-        <div className="account-section pt-3 mb-5" 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"
@@ -756,25 +325,25 @@ class AccountSettingsPage extends React.Component {
          />
        </div>

-        <div className="account-section pt-3 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}
-            value={this.props.siteLanguage.draft !== undefined ? this.props.siteLanguage.draft : this.context.locale}
+            value={this.props.siteLanguage.draftOrSavedValue}
            label={this.props.intl.formatMessage(messages['account.settings.field.site.language'])}
            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}
+            value={this.props.formValues.time_zone || ''}
            options={timeZoneOptions}
            label={this.props.intl.formatMessage(messages['account.settings.field.time.zone'])}
            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.time.zone.empty'])}
@@ -787,28 +356,21 @@ 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}
-            />
-          </div>
-          )}
+        <div className="account-section" id="delete-account">
+          <DeleteAccount
+            isVerifiedAccount={this.props.isActive}
+            hasLinkedTPA={hasLinkedTPA}
+            logoutUrl={this.props.logoutUrl}
+          />
+        </div>

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

@@ -843,12 +405,10 @@ class AccountSettingsPage extends React.Component {
        </h1>
        <div>
          <div className="row">
-            <div className="col-md-2">
-              <JumpNav
-                displayDemographicsLink={this.props.formValues.shouldDisplayDemographicsSection}
-              />
+            <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}
@@ -860,8 +420,6 @@ class AccountSettingsPage extends React.Component {
  }
 }

-AccountSettingsPage.contextType = AppContext;
-
 AccountSettingsPage.propTypes = {
  intl: intlShape.isRequired,
  loading: PropTypes.bool,
@@ -874,45 +432,37 @@ AccountSettingsPage.propTypes = {
    name: PropTypes.string,
    email: PropTypes.string,
    secondary_email: PropTypes.string,
-    secondary_email_enabled: 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.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,
-    shouldDisplayDemographicsSection: PropTypes.bool,
-    useVerifiedNameForCerts: PropTypes.bool.isRequired,
-    verified_name: PropTypes.string,
  }).isRequired,
-  committedValues: PropTypes.shape({
-    name: PropTypes.string,
-    useVerifiedNameForCerts: PropTypes.bool,
-    verified_name: PropTypes.string,
-  }),
-  drafts: PropTypes.shape({}),
-  formErrors: PropTypes.shape({
-    name: PropTypes.string,
-  }),
  siteLanguage: PropTypes.shape({
    previousValue: PropTypes.string,
-    draft: PropTypes.string,
+    draftOrSavedValue: PropTypes.string,
+    savedValue: PropTypes.string,
  }),
  siteLanguageOptions: PropTypes.arrayOf(PropTypes.shape({
    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
  })),
+  countryOptions: PropTypes.arrayOf(PropTypes.shape({
+    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  })),
+  languageProficiencyOptions: PropTypes.arrayOf(PropTypes.shape({
+    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  })),
  profileDataManager: PropTypes.string,
  staticFields: PropTypes.arrayOf(PropTypes.string),
+  hiddenFields: PropTypes.arrayOf(PropTypes.string),
  isActive: PropTypes.bool,
-  secondary_email_enabled: PropTypes.bool,

  timeZoneOptions: PropTypes.arrayOf(PropTypes.shape({
    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
@@ -924,69 +474,35 @@ 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.shape({
-    formId: PropTypes.string,
-  }),
-  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,
+  duplicateTpaProvider: PropTypes.string,
+  tpaProviders: PropTypes.arrayOf(PropTypes.object),
+  supportUrl: PropTypes.string.isRequired,
+  logoutUrl: PropTypes.string.isRequired,
 };

 AccountSettingsPage.defaultProps = {
  loading: false,
  loaded: false,
  loadingError: null,
-  committedValues: {
-    useVerifiedNameForCerts: false,
-    verified_name: null,
-  },
-  drafts: {},
-  formErrors: {},
  siteLanguage: null,
  siteLanguageOptions: [],
+  countryOptions: [],
  timeZoneOptions: [],
  countryTimeZoneOptions: [],
+  languageProficiencyOptions: [],
  profileDataManager: null,
  staticFields: [],
+  hiddenFields: ['secondary_email'],
+  duplicateTpaProvider: null,
  tpaProviders: [],
  isActive: true,
-  secondary_email_enabled: false,
-  nameChangeModal: {},
-  verifiedName: null,
-  mostRecentVerifiedName: {},
-  verifiedNameHistory: [],
 };

-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
@@ -1,4 +1,4 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
+import { defineMessages } from '@edx/frontend-i18n';

 const messages = defineMessages({
  'account.settings.page.heading': {
@@ -46,11 +46,6 @@ const messages = defineMessages({
    defaultMessage: 'Profile Information',
    description: 'The profile information section heading.',
  },
-  'account.settings.section.demographics.information': {
-    id: 'account.settings.section.demographics.information',
-    defaultMessage: 'Optional Information',
-    description: 'The optional information section heading.',
-  },
  'account.settings.section.site.preferences': {
    id: 'account.settings.section.site.preferences',
    defaultMessage: 'Site Preferences',
@@ -63,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': {
@@ -73,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': {
@@ -91,126 +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.name.verified.verification.alert': {
-    id: 'account.settings.field.name.verified.verification.help',
-    defaultMessage: 'Enter your name as it appears on your unexpired student, work, or government-issued identification card.',
-    description: 'Form label instructing the user to enter the name on their ID.',
-  },
-  '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)',
@@ -228,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': {
@@ -266,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',
@@ -331,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',
@@ -411,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.',
  },
@@ -449,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',
@@ -501,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': {
@@ -565,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/BetaLanguageBanner.jsx
+++ b/src/account-settings/BetaLanguageBanner.jsx
@@ -1,15 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { AppContext } from '@edx/frontend-platform/react';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-i18n';
 import { connect } from 'react-redux';
-import { Button, Hyperlink } from '@openedx/paragon';
+import { Button, Hyperlink } from '@edx/paragon';

-import { betaLanguageBannerSelector } from './data/selectors';
+import { betaLanguageBannerSelector } from './selectors';
 import messages from './AccountSettingsPage.messages';
-import { saveSettings } from './data/actions';
-import { TRANSIFEX_LANGUAGE_BASE_URL } from './data/constants';
-import Alert from './Alert';
+import { saveSettings } from './actions';
+import { TRANSIFEX_LANGUAGE_BASE_URL } from './constants';
+import { Alert } from '../common';

 class BetaLanguageBanner extends React.Component {
  getSiteLanguageEntry(languageCode) {
@@ -48,10 +47,7 @@ class BetaLanguageBanner extends React.Component {
  };

  render() {
-    const savedLanguage = this.getSiteLanguageEntry(this.context.locale);
-    if (!savedLanguage) {
-      return null;
-    }
+    const savedLanguage = this.getSiteLanguageEntry(this.props.siteLanguage.savedValue);
    const isSavedLanguageReleased = savedLanguage.released === true;
    const noPreviousLanguageSet = this.props.siteLanguage.previousValue === null;
    if (isSavedLanguageReleased || noPreviousLanguageSet) {
@@ -68,7 +64,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 },
@@ -91,13 +87,12 @@ class BetaLanguageBanner extends React.Component {
  }
 }

-BetaLanguageBanner.contextType = AppContext;
-
 BetaLanguageBanner.propTypes = {
  intl: intlShape.isRequired,
  siteLanguage: PropTypes.shape({
    previousValue: PropTypes.string,
-    draft: PropTypes.string,
+    draftOrSavedValue: PropTypes.string,
+    savedValue: PropTypes.string,
  }),
  siteLanguageList: PropTypes.arrayOf(PropTypes.shape({
    name: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
--- 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,32 +1,29 @@
 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 { injectIntl, intlShape } from '@edx/frontend-i18n';
+import { Button, Input, StatefulButton, ValidationFormGroup } from '@edx/paragon';
 import { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

-import SwitchContent from './SwitchContent';
+import { SwitchContent } from '../common';
 import messages from './AccountSettingsPage.messages';

 import {
  openForm,
  closeForm,
-} from './data/actions';
-import { editableFieldSelector } from './data/selectors';
-import CertificatePreference from './certificate-preference/CertificatePreference';
+} from './actions';
+import { editableFieldSelector } from './selectors';

-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,251 +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}`}
-            >
-              {subOption.label}
-            </option>
-          ))}
-        </optgroup>
-      );
-    }
-    return (
-      <option value={option.value} key={`${option.value}-${option.label}`}>
-        {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
@@ -1,24 +1,22 @@
 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 { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-i18n';
+import { Button, StatefulButton, Input, ValidationFormGroup } from '@edx/paragon';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faExclamationTriangle, faPencilAlt } from '@fortawesome/free-solid-svg-icons';

-import Alert from './Alert';
-import SwitchContent from './SwitchContent';
+import { Alert, SwitchContent } from '../common';
 import messages from './AccountSettingsPage.messages';

 import {
  openForm,
  closeForm,
-} from './data/actions';
-import { editableFieldSelector } from './data/selectors';
+} from './actions';
+import { editableFieldSelector } from './selectors';

-const EmailField = (props) => {
+
+function EmailField(props) {
  const {
    name,
    label,
@@ -57,9 +55,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 +84,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 +100,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 +131,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 +149,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 +201,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,31 +1,18 @@
-import { getConfig } from '@edx/frontend-platform';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { breakpoints, useWindowSize, Icon } from '@openedx/paragon';
-import { OpenInNew } from '@openedx/paragon/icons';
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
 import React from 'react';
-import { useSelector } from 'react-redux';
+import { injectIntl, intlShape } from '@edx/frontend-i18n'; // eslint-disable-line
 import { NavHashLink } from 'react-router-hash-link';
 import Scrollspy from 'react-scrollspy';
-import { Link } from 'react-router-dom';
+
 import messages from './AccountSettingsPage.messages';
-import { selectShowPreferences } from '../notification-preferences/data/selectors';

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

+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',
-          'demographics-information',
          'social-media',
          'site-preferences',
          'linked-accounts',
@@ -44,14 +31,6 @@ const JumpNav = ({
            {intl.formatMessage(messages['account.settings.section.profile.information'])}
          </NavHashLink>
        </li>
-        {getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && displayDemographicsLink
-          && (
-          <li>
-            <NavHashLink to="#demographics-information">
-              {intl.formatMessage(messages['account.settings.section.demographics.information'])}
-            </NavHashLink>
-          </li>
-          )}
        <li>
          <NavHashLink to="#social-media">
            {intl.formatMessage(messages['account.settings.section.social.media'])}
@@ -67,37 +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>
-      {showPreferences && (
-        <>
-          <hr />
-          <Scrollspy
-            className="list-unstyled"
-          >
-            <li>
-              <Link to="/notifications" target="_blank" rel="noopener noreferrer">
-                <span>{intl.formatMessage(messages['notification.preferences.notifications.label'])}</span>
-                <Icon className="d-inline-block align-bottom ml-1" src={OpenInNew} />
-              </Link>
-            </li>
-          </Scrollspy>
-        </>
-      )}
    </div>
  );
-};
+}
+

 JumpNav.propTypes = {
  intl: intlShape.isRequired,
-  displayDemographicsLink: PropTypes.bool.isRequired,
 };

+
 export default injectIntl(JumpNav);
--- a/src/account-settings/NotFoundPage.jsx
+++ b/src/account-settings/NotFoundPage.jsx
@@ -1,19 +0,0 @@
-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;
--- 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/_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,24 @@
    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;
-      }
    }
  }

-
-  .custom-switch {
-    padding: 0;
-    max-width: 500px;
-
-    .custom-control-label {
-      left: 2.25rem;
-      line-height: 1.6rem;
-    }
+  .section-heading {
+    @extend .h4;
+    margin-bottom: map-get($spacers, 3);
  }
-  .grayed-out{
-    opacity: 0.6; /* Real browsers */
-    filter: alpha(opacity = 60); /* MSIE */
+  .account-section {
+    // These properties together will shift the hashlink position
+    margin-bottom: map-get($spacers, 5); 
+    padding-top: 1rem;
  }
 }
--- a/src/account-settings/data/actions.js
+++ b/src/account-settings/data/actions.js
@@ -1,15 +1,15 @@
-import { AsyncActionType } from './utils';
+import { utils } from '../common';
+
+const { AsyncActionType } = 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,7 +26,6 @@ export const fetchSettingsSuccess = ({
  thirdPartyAuthProviders,
  profileDataManager,
  timeZones,
-  verifiedNameHistory,
 }) => ({
  type: FETCH_SETTINGS.SUCCESS,
  payload: {
@@ -34,7 +33,6 @@ export const fetchSettingsSuccess = ({
    thirdPartyAuthProviders,
    profileDataManager,
    timeZones,
-    verifiedNameHistory,
  },
 });

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

+
 // FORM STATE ACTIONS

 export const openForm = formId => ({
@@ -71,15 +70,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 = () => ({
@@ -105,25 +101,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/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,171 +0,0 @@
-/* eslint-disable no-import-assign */
-import React from 'react';
-import ReactDOM from 'react-dom';
-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 ReactDOM.createPortal allows portals to be tested in jest.
-ReactDOM.createPortal = node => node;
-
-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`] = `
-Object {
-  "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/constants.js
+++ b/src/account-settings/constants.js
@@ -0,0 +1,34 @@
+
+export const YEAR_OF_BIRTH_OPTIONS = (() => {
+  const currentYear = new Date().getFullYear();
+  const years = [];
+  let startYear = currentYear - 120;
+  while (startYear < currentYear) {
+    startYear += 1;
+
+    years.push({ value: startYear, label: startYear });
+  }
+  return years.reverse();
+})();
+
+export const EDUCATION_LEVELS = [
+  '',
+  'p',
+  'm',
+  'b',
+  'a',
+  'hs',
+  'jhs',
+  'el',
+  'none',
+  'o',
+];
+
+export const GENDER_OPTIONS = [
+  '',
+  'f',
+  'm',
+  'o',
+];
+
+export const TRANSIFEX_LANGUAGE_BASE_URL = 'https://www.transifex.com/open-edx/edx-platform/language/';
--- a/src/account-settings/data/constants.js
+++ b/src/account-settings/data/constants.js
@@ -1,137 +0,0 @@
-export const YEAR_OF_BIRTH_OPTIONS = (() => {
-  const currentYear = new Date().getFullYear();
-  const years = [];
-  let startYear = currentYear - 120;
-  while (startYear < currentYear) {
-    startYear += 1;
-
-    years.push({ value: startYear, label: startYear });
-  }
-  return years.reverse();
-})();
-
-export const COPPA_COMPLIANCE_YEAR = (() => {
-  const currentYear = new Date().getFullYear();
-  return currentYear - 13;
-})();
-
-export const EDUCATION_LEVELS = [
-  '',
-  'p',
-  'm',
-  'b',
-  'a',
-  'hs',
-  'jhs',
-  'el',
-  'none',
-  'other',
-];
-
-export const GENDER_OPTIONS = [
-  '',
-  'f',
-  '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 DECLINED = 'declined';
-export const SELF_DESCRIBE = 'self-describe';
-export const OTHER = 'other';
--- a/src/account-settings/data/sagas.js
+++ b/src/account-settings/data/sagas.js
@@ -1,170 +0,0 @@
-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';
-import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-
-// Actions
-import {
-  FETCH_SETTINGS,
-  fetchSettingsBegin,
-  fetchSettingsSuccess,
-  fetchSettingsFailure,
-  closeForm,
-  SAVE_SETTINGS,
-  SAVE_MULTIPLE_SETTINGS,
-  saveSettingsBegin,
-  saveSettingsSuccess,
-  saveSettingsFailure,
-  savePreviousSiteLanguage,
-  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,
-  postSetLang,
-} from '../site-language';
-import { saga as thirdPartyAuthSaga } from '../third-party-auth';
-
-// Services
-import {
-  getSettings,
-  patchSettings,
-  getTimeZones,
-  getVerifiedNameHistory,
-} from './service';
-
-export function* handleFetchSettings() {
-  try {
-    yield put(fetchSettingsBegin());
-    const { username, userId, roles: userRoles } = getAuthenticatedUser();
-
-    const {
-      thirdPartyAuthProviders, profileDataManager, timeZones, ...values
-    } = yield call(
-      getSettings,
-      username,
-      userRoles,
-      userId,
-    );
-
-    const verifiedNameHistory = yield call(getVerifiedNameHistory);
-
-    if (values.country) { yield put(fetchTimeZones(values.country)); }
-
-    yield put(fetchSettingsSuccess({
-      values,
-      thirdPartyAuthProviders,
-      profileDataManager,
-      timeZones,
-      verifiedNameHistory,
-    }));
-  } catch (e) {
-    yield put(fetchSettingsFailure(e.message));
-    throw e;
-  }
-}
-
-export function* handleSaveSettings(action) {
-  try {
-    yield put(saveSettingsBegin());
-
-    const { username, userId } = getAuthenticatedUser();
-    const { commitValues, formId, extendedProfile } = action.payload;
-    const commitData = Object.keys(extendedProfile).length > 0 ? extendedProfile : { [formId]: commitValues };
-    let savedValues = null;
-    if (formId === 'siteLanguage') {
-      const previousSiteLanguage = getLocale();
-      // The following two requests need to be done sequentially, with patching preferences before
-      // the post to setlang.  They used to be done in parallel, but this might create ambiguous
-      // behavior.
-      yield call(patchPreferences, username, { prefLang: commitValues });
-      yield call(postSetLang, commitValues);
-
-      yield put(savePreviousSiteLanguage(previousSiteLanguage));
-
-      publish(LOCALE_CHANGED, getLocale());
-      handleRtl();
-      savedValues = commitData;
-    } else {
-      savedValues = yield call(patchSettings, username, commitData, userId);
-    }
-    yield put(saveSettingsSuccess(savedValues, commitData));
-    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));
-      throw e;
-    }
-  }
-}
-
-// 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,323 +0,0 @@
-import { createSelector, createStructuredSelector } from 'reselect';
-import { siteLanguageListSelector, siteLanguageOptionsSelector } from '../site-language';
-import { compareVerifiedNamesByCreatedDate } from '../../utils';
-
-export const storeName = 'accountSettings';
-
-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,
-    };
-  },
-);
-
-const draftsSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => accountSettings.drafts,
-);
-
-const previousSiteLanguageSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => accountSettings.previousSiteLanguage,
-);
-
-const editableFieldErrorSelector = createSelector(
-  editableFieldNameSelector,
-  accountSettingsSelector,
-  (name, accountSettings) => accountSettings.errors[name],
-);
-
-const editableFieldConfirmationValuesSelector = createSelector(
-  editableFieldNameSelector,
-  accountSettingsSelector,
-  (name, accountSettings) => accountSettings.confirmationValues[name],
-);
-
-const isEditingSelector = createSelector(
-  editableFieldNameSelector,
-  accountSettingsSelector,
-  (name, accountSettings) => accountSettings.openFormId === name,
-);
-
-const errorSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => accountSettings.errors,
-);
-
-const nameChangeModalSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => accountSettings.nameChangeModal,
-);
-
-const saveStateSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => accountSettings.saveState,
-);
-
-export const editableFieldSelector = createStructuredSelector({
-  error: editableFieldErrorSelector,
-  confirmationValue: editableFieldConfirmationValuesSelector,
-  saveState: saveStateSelector,
-  isEditing: isEditingSelector,
-});
-
-export const profileDataManagerSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => accountSettings.profileDataManager,
-);
-
-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;
-  },
-);
-
-/**
- * If there's no draft present at all (undefined), use the original committed value.
- */
-function chooseFormValue(draft, committed) {
-  return draft !== undefined ? draft : committed;
-}
-
-export 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) || '';
-      }
-    });
-    return formValues;
-  },
-);
-
-const transformTimeZonesToOptions = timeZoneArr => timeZoneArr
-  .map(({ time_zone, description }) => ({ // eslint-disable-line camelcase
-    value: time_zone, label: description, // eslint-disable-line camelcase
-  }));
-
-const timeZonesSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => transformTimeZonesToOptions(accountSettings.timeZones),
-);
-
-const countryTimeZonesSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => transformTimeZonesToOptions(accountSettings.countryTimeZones),
-);
-
-const activeAccountSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => accountSettings.values.is_active,
-);
-
-export const siteLanguageSelector = createSelector(
-  previousSiteLanguageSelector,
-  draftsSelector,
-  (previousValue, drafts) => ({
-    previousValue,
-    draft: drafts.siteLanguage,
-  }),
-);
-
-export const betaLanguageBannerSelector = createStructuredSelector({
-  siteLanguageList: siteLanguageListSelector,
-  siteLanguage: siteLanguageSelector,
-});
-
-export const accountSettingsPageSelector = createSelector(
-  accountSettingsSelector,
-  siteLanguageOptionsSelector,
-  siteLanguageSelector,
-  formValuesSelector,
-  valuesSelector,
-  draftsSelector,
-  errorSelector,
-  profileDataManagerSelector,
-  staticFieldsSelector,
-  timeZonesSelector,
-  countryTimeZonesSelector,
-  activeAccountSelector,
-  nameChangeModalSelector,
-  mostRecentApprovedVerifiedNameValueSelector,
-  mostRecentVerifiedNameSelector,
-  sortedVerifiedNameHistorySelector,
-  (
-    accountSettings,
-    siteLanguageOptions,
-    siteLanguage,
-    formValues,
-    committedValues,
-    drafts,
-    formErrors,
-    profileDataManager,
-    staticFields,
-    timeZoneOptions,
-    countryTimeZoneOptions,
-    activeAccount,
-    nameChangeModal,
-    verifiedName,
-    mostRecentVerifiedName,
-    verifiedNameHistory,
-  ) => ({
-    siteLanguageOptions,
-    siteLanguage,
-    loading: accountSettings.loading,
-    loaded: accountSettings.loaded,
-    loadingError: accountSettings.loadingError,
-    timeZoneOptions,
-    countryTimeZoneOptions,
-    isActive: activeAccount,
-    formValues,
-    committedValues,
-    drafts,
-    formErrors,
-    profileDataManager,
-    staticFields,
-    tpaProviders: accountSettings.thirdPartyAuth.providers,
-    nameChangeModal,
-    verifiedName,
-    mostRecentVerifiedName,
-    verifiedNameHistory,
-  }),
-);
-
-export const certPreferenceSelector = createSelector(
-  valuesSelector,
-  formValuesSelector,
-  mostRecentApprovedVerifiedNameValueSelector,
-  saveStateSelector,
-  errorSelector,
-  (
-    committedValues,
-    formValues,
-    mostRecentApprovedVerifiedNameValue,
-    saveState,
-    errors,
-  ) => ({
-    originalFullName: committedValues?.name || '',
-    originalVerifiedName: mostRecentApprovedVerifiedNameValue?.verified_name || '',
-    useVerifiedNameForCerts: formValues.useVerifiedNameForCerts || false,
-    saveState,
-    formErrors: errors,
-  }),
-);
-
-export const demographicsSectionSelector = createSelector(
-  formValuesSelector,
-  draftsSelector,
-  errorSelector,
-  (
-    formValues,
-    drafts,
-    errors,
-  ) => ({
-    formValues,
-    drafts,
-    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,292 +0,0 @@
-import { getConfig } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import pick from 'lodash.pick';
-import pickBy from 'lodash.pickby';
-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 { getDemographics, getDemographicsOptions, patchDemographics } from '../demographics/data/service';
-import { DEMOGRAPHICS_FIELDS } from '../demographics/data/utils';
-
-const SOCIAL_PLATFORMS = [
-  { id: 'twitter', key: 'social_link_twitter' },
-  { id: 'facebook', key: 'social_link_facebook' },
-  { id: 'linkedin', key: 'social_link_linkedin' },
-];
-
-function unpackAccountResponseData(data) {
-  const unpackedData = data;
-
-  // This is handled by preferences
-  delete unpackedData.time_zone;
-
-  SOCIAL_PLATFORMS.forEach(({ id, key }) => {
-    const platformData = data.social_links.find(({ platform }) => platform === id);
-    unpackedData[key] = typeof platformData === 'object' ? platformData.social_link : '';
-  });
-
-  if (Array.isArray(data.language_proficiencies)) {
-    if (data.language_proficiencies.length) {
-      unpackedData.language_proficiencies = data.language_proficiencies[0].code;
-    } else {
-      unpackedData.language_proficiencies = '';
-    }
-  }
-
-  return unpackedData;
-}
-
-function packAccountCommitData(commitData) {
-  const packedData = commitData;
-
-  SOCIAL_PLATFORMS.forEach(({ id, key }) => {
-    // Skip missing values. Empty strings are valid values and should be preserved.
-    if (commitData[key] === undefined) {
-      return;
-    }
-
-    packedData.social_links = [{ platform: id, social_link: commitData[key] }];
-    delete packedData[key];
-  });
-
-  if (commitData.language_proficiencies !== undefined) {
-    if (commitData.language_proficiencies) {
-      packedData.language_proficiencies = [{ code: commitData.language_proficiencies }];
-    } else {
-      // An empty string should be sent as an array.
-      packedData.language_proficiencies = [];
-    }
-  }
-
-  if (commitData.year_of_birth !== undefined) {
-    if (commitData.year_of_birth) {
-      packedData.year_of_birth = commitData.year_of_birth;
-    } else {
-      // An empty string should be sent as null.
-      packedData.year_of_birth = null;
-    }
-  }
-  return packedData;
-}
-
-export async function getAccount(username) {
-  const { data } = await getAuthenticatedHttpClient()
-    .get(`${getConfig().LMS_BASE_URL}/api/user/v1/accounts/${username}`);
-  return unpackAccountResponseData(data);
-}
-
-export async function patchAccount(username, commitValues) {
-  const requestConfig = {
-    headers: { 'Content-Type': 'application/merge-patch+json' },
-  };
-
-  const { data } = await getAuthenticatedHttpClient()
-    .patch(
-      `${getConfig().LMS_BASE_URL}/api/user/v1/accounts/${username}`,
-      packAccountCommitData(commitValues),
-      requestConfig,
-    )
-    .catch((error) => {
-      const unpackFunction = (fieldErrors) => {
-        const unpackedFieldErrors = fieldErrors;
-        if (fieldErrors.social_links) {
-          SOCIAL_PLATFORMS.forEach(({ key }) => {
-            unpackedFieldErrors[key] = fieldErrors.social_links;
-          });
-        }
-        return unpackFieldErrors(unpackedFieldErrors);
-      };
-      handleRequestError(error, unpackFunction);
-    });
-
-  return unpackAccountResponseData(data);
-}
-
-export async function getPreferences(username) {
-  const { data } = await getAuthenticatedHttpClient()
-    .get(`${getConfig().LMS_BASE_URL}/api/user/v1/preferences/${username}`);
-  return data;
-}
-
-export async function patchPreferences(username, commitValues) {
-  const requestConfig = { headers: { 'Content-Type': 'application/merge-patch+json' } };
-  const requestUrl = `${getConfig().LMS_BASE_URL}/api/user/v1/preferences/${username}`;
-
-  // Ignore the success response, the API does not currently return any data.
-  await getAuthenticatedHttpClient()
-    .patch(requestUrl, commitValues, requestConfig).catch(handleRequestError);
-
-  return commitValues;
-}
-
-export async function getTimeZones(forCountry) {
-  const { data } = await getAuthenticatedHttpClient()
-    .get(`${getConfig().LMS_BASE_URL}/user_api/v1/preferences/time_zones/`, {
-      params: { country_code: forCountry },
-    })
-    .catch(handleRequestError);
-
-  return data;
-}
-
-/**
- * Determine if the user's profile data is managed by a third-party identity provider.
- */
-export async function getProfileDataManager(username, userRoles) {
-  const userRoleNames = userRoles.map(role => role.split(':')[0]);
-
-  if (userRoleNames.includes('enterprise_learner')) {
-    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;
-      }
-    }
-  }
-
-  return null;
-}
-
-/**
- * A function to determine if the Demographics questions should be displayed to the user. For the
- * MVP release of Demographics we are limiting the Demographics question visibility only to
- * MicroBachelors learners.
- */
-export async function shouldDisplayDemographicsQuestions() {
-  const requestUrl = `${getConfig().LMS_BASE_URL}/api/demographics/v1/demographics/status/`;
-  let data = {};
-
-  try {
-    ({ data } = await getAuthenticatedHttpClient().get(requestUrl));
-    if (data.display) {
-      return data.display;
-    }
-  } catch (error) {
-    // if there was an error then we just hide the section
-    return false;
-  }
-
-  return false;
-}
-
-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));
-}
-
-/**
- * A single function to GET everything considered a setting.
- * Currently encapsulates Account, Preferences, ThirdPartyAuth, and Demographics
- */
-export async function getSettings(username, userRoles, userId) {
-  const [
-    account,
-    preferences,
-    thirdPartyAuthProviders,
-    profileDataManager,
-    timeZones,
-    shouldDisplayDemographicsQuestionsResponse,
-    demographics,
-    demographicsOptions,
-  ] = await Promise.all([
-    getAccount(username),
-    getPreferences(username),
-    getThirdPartyAuthProviders(),
-    getProfileDataManager(username, userRoles),
-    getTimeZones(),
-    getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && shouldDisplayDemographicsQuestions(),
-    getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && getDemographics(userId),
-    getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && getDemographicsOptions(),
-  ]);
-
-  return {
-    ...account,
-    ...preferences,
-    thirdPartyAuthProviders,
-    profileDataManager,
-    timeZones,
-    shouldDisplayDemographicsSection: shouldDisplayDemographicsQuestionsResponse,
-    ...demographics,
-    demographicsOptions,
-  };
-}
-
-/**
- * A single function to PATCH everything considered a setting.
- * Currently encapsulates Account, Preferences, ThirdPartyAuth
- */
-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 demographicsKeys = DEMOGRAPHICS_FIELDS;
-  const certificateKeys = ['useVerifiedNameForCerts'];
-  const isDemographicsKey = (value, key) => key.includes('demographics');
-  const accountCommitValues = omit(
-    commitValues,
-    preferenceKeys,
-    demographicsKeys,
-    certificateKeys,
-  );
-  const preferenceCommitValues = pick(commitValues, preferenceKeys);
-  const demographicsCommitValues = pickBy(commitValues, isDemographicsKey);
-  const certCommitValues = pick(commitValues, certificateKeys);
-  const patchRequests = [];
-
-  if (!isEmpty(accountCommitValues)) {
-    patchRequests.push(patchAccount(username, accountCommitValues));
-  }
-  if (!isEmpty(preferenceCommitValues)) {
-    patchRequests.push(patchPreferences(username, preferenceCommitValues));
-  }
-  if (!isEmpty(demographicsCommitValues)) {
-    patchRequests.push(patchDemographics(userId, demographicsCommitValues));
-  }
-  if (!isEmpty(certCommitValues)) {
-    patchRequests.push(postVerifiedNameConfig(username, certCommitValues));
-  }
-
-  const results = await Promise.all(patchRequests);
-  // Assigns in order of requests. Preference keys
-  // will override account keys. Notably time_zone.
-  const combinedResults = Object.assign({}, ...results);
-  return combinedResults;
-}
--- a/src/account-settings/data/utils/snapshots/reduxUtils.test.js.snap
+++ b/src/account-settings/data/utils/snapshots/reduxUtils.test.js.snap
@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`getModuleState should throw an exception on a bad path 1`] = `"Unexpected state key uhoh given to getModuleState. Is your state path set up correctly?"`;
--- a/src/account-settings/data/utils/index.js
+++ b/src/account-settings/data/utils/index.js
@@ -1,6 +0,0 @@
-export {
-  AsyncActionType,
-  getModuleState,
-} from './reduxUtils';
-export { default as handleFailure } from './sagaUtils';
-export { unpackFieldErrors, handleRequestError } from './serviceUtils';
--- a/src/account-settings/data/utils/reduxUtils.test.js
+++ b/src/account-settings/data/utils/reduxUtils.test.js
@@ -1,52 +0,0 @@
-import {
-  AsyncActionType,
-  getModuleState,
-} from './reduxUtils';
-
-describe('AsyncActionType', () => {
-  it('should return well formatted action strings', () => {
-    const actionType = new AsyncActionType('HOUSE_CATS', 'START_THE_RACE');
-
-    expect(actionType.BASE).toBe('HOUSE_CATS__START_THE_RACE');
-    expect(actionType.BEGIN).toBe('HOUSE_CATS__START_THE_RACE__BEGIN');
-    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');
-  });
-});
-
-describe('getModuleState', () => {
-  const state = {
-    first: { red: { awesome: 'sauce' }, blue: { weak: 'sauce' } },
-    second: { other: 'data' },
-  };
-
-  it('should return everything if given an empty path', () => {
-    expect(getModuleState(state, [])).toEqual(state);
-  });
-
-  it('should resolve paths correctly', () => {
-    expect(getModuleState(
-      state,
-      ['first'],
-    )).toEqual({ red: { awesome: 'sauce' }, blue: { weak: 'sauce' } });
-
-    expect(getModuleState(
-      state,
-      ['first', 'red'],
-    )).toEqual({ awesome: 'sauce' });
-
-    expect(getModuleState(state, ['second'])).toEqual({ other: 'data' });
-  });
-
-  it('should throw an exception on a bad path', () => {
-    expect(() => {
-      getModuleState(state, ['uhoh']);
-    }).toThrowErrorMatchingSnapshot();
-  });
-
-  it('should return non-objects correctly', () => {
-    expect(getModuleState(state, ['first', 'red', 'awesome'])).toEqual('sauce');
-  });
-});
--- a/src/account-settings/delete-account/BeforeProceedingBanner.jsx
+++ b/src/account-settings/delete-account/BeforeProceedingBanner.jsx
@@ -1,19 +1,18 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-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
-import Alert from '../Alert';
+import { Alert } from '../../common';

 const BeforeProceedingBanner = (props) => {
-  const { instructionMessageId, intl, supportArticleUrl } = props;
+  const { instructionMessageId, intl, supportUrl } = props;

  return (
    <Alert
@@ -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 ? (
-            <Hyperlink destination={supportArticleUrl}>
+          actionLink: (
+            <Hyperlink destination={supportUrl}>
              {intl.formatMessage(messages[instructionMessageId])}
            </Hyperlink>
-          ) : (
-            intl.formatMessage(messages[instructionMessageId])
          ),
-          siteName: getConfig().SITE_NAME,
        }}
      />
    </Alert>
@@ -42,7 +38,7 @@ const BeforeProceedingBanner = (props) => {
 BeforeProceedingBanner.propTypes = {
  instructionMessageId: PropTypes.string.isRequired,
  intl: intlShape.isRequired,
-  supportArticleUrl: PropTypes.string.isRequired,
+  supportUrl: PropTypes.string.isRequired,
 };

 export default injectIntl(BeforeProceedingBanner);
--- a/src/account-settings/delete-account/BeforeProceedingBanner.test.jsx
+++ b/src/account-settings/delete-account/BeforeProceedingBanner.test.jsx
@@ -1,48 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import renderer from 'react-test-renderer';
-import { IntlProvider, injectIntl, createIntl } from '@edx/frontend-platform/i18n';
-
-ReactDOM.createPortal = node => node;
-
-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,16 +1,13 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';

-import {
-  AlertModal,
-  Button, Input, ValidationFormGroup, ActionRow,
-} from '@openedx/paragon';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { Button, Input, Modal, ValidationFormGroup } from '@edx/paragon';
+import { injectIntl, intlShape } from '@edx/frontend-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 { Alert } from '../../common';
 import PrintingInstructions from './PrintingInstructions';

 export class ConfirmationModal extends Component {
@@ -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
@@ -55,7 +51,7 @@ export class ConfirmationModal extends Component {

  render() {
    const {
-      status,
+      open,
      errorType,
      intl,
      onCancel,
@@ -63,75 +59,60 @@ export class ConfirmationModal extends Component {
      onSubmit,
      password,
    } = this.props;
-    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>
+      />
    );
  }
 }

 ConfirmationModal.propTypes = {
-  status: PropTypes.oneOf(['confirming', 'pending', 'deleted', 'failed']),
+  open: PropTypes.bool,
  errorType: PropTypes.oneOf(['empty-password', 'server']),
  intl: intlShape.isRequired,
  onCancel: PropTypes.func.isRequired,
@@ -141,7 +122,7 @@ ConfirmationModal.propTypes = {
 };

 ConfirmationModal.defaultProps = {
-  status: null,
+  open: false,
  errorType: null,
 };

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

 // Modal creates a portal.  Overriding ReactDOM.createPortal allows portals to be tested in jest.
 ReactDOM.createPortal = node => node;
@@ -18,9 +18,10 @@ describe('ConfirmationModal', () => {
      onCancel: jest.fn(),
      onChange: jest.fn(),
      onSubmit: jest.fn(),
-      status: null,
+      open: false,
      errorType: null,
      password: 'fluffy bunnies',
+      logoutUrl: 'http://localhost/logout',
    };
  });

@@ -43,7 +44,8 @@ describe('ConfirmationModal', () => {
        <IntlProvider locale="en">
          <IntlConfirmationModal
            {...props}
-            status="pending" // This will cause 'modal-backdrop' and 'show' to appear on the modal as CSS classes.
+            // This will cause 'modal-backdrop' and 'show' to appear on the modal as CSS classes.
+            open
          />
        </IntlProvider>
      ))
@@ -58,7 +60,8 @@ describe('ConfirmationModal', () => {
          <IntlConfirmationModal
            {...props}
            errorType="empty-password"
-            status="pending" // This will cause 'modal-backdrop' and 'show' to appear on the modal as CSS classes.
+            // This will cause 'modal-backdrop' and 'show' to appear on the modal as CSS classes.
+            open
          />
        </IntlProvider>
      ))
--- a/src/account-settings/delete-account/DeleteAccount.jsx
+++ b/src/account-settings/delete-account/DeleteAccount.jsx
@@ -1,18 +1,7 @@
-import React from 'react';
+import React, { useState, useCallback } from 'react';
 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';
-
-// Actions
-import {
-  deleteAccount,
-  deleteAccountConfirmation,
-  deleteAccountFailure,
-  deleteAccountReset,
-  deleteAccountCancel,
-} from './data/actions';
+import { injectIntl, intlShape } from '@edx/frontend-i18n';
+import { Button, Hyperlink } from '@edx/paragon';

 // Messages
 import messages from './messages';
@@ -22,156 +11,125 @@ import ConnectedConfirmationModal from './ConfirmationModal';
 import PrintingInstructions from './PrintingInstructions';
 import ConnectedSuccessModal from './SuccessModal';
 import BeforeProceedingBanner from './BeforeProceedingBanner';
+import { postDeleteAccount } from './data/service';
+import useAction from '../../common/hooks';

-export class DeleteAccount extends React.Component {
-  constructor(props) {
-    super(props);
+function DeleteAccount(props) {
+  const {
+    logoutUrl, hasLinkedTPA, isVerifiedAccount, intl,
+  } = props;

-    this.state = {
-      password: '',
-    };
-  }
+  const [password, setPassword] = useState('');
+  const [confirmationDialogOpen, setConfirmationDialogOpen] = useState(false);

-  handleSubmit = () => {
-    if (this.state.password === '') {
-      this.props.deleteAccountFailure('empty-password');
-    } else {
-      this.props.deleteAccount(this.state.password);
+  const [validationError, setValidationError] = useState(null);
+  const [
+    deleteAccountState,
+    performDeleteAccount,
+    resetDeleteAccount,
+  ] = useAction(postDeleteAccount);
+
+  const canDelete = isVerifiedAccount && !hasLinkedTPA;
+  const successDialogOpen = deleteAccountState.loaded;
+  const error = deleteAccountState.error !== null ? 'server' : validationError;
+
+  // Event handlers
+  const handleDeleteAccountClick = useCallback(() => {
+    if (canDelete) {
+      setConfirmationDialogOpen(true);
    }
-  };
+  });

-  handleCancel = () => {
-    this.setState({ password: '' });
-    this.props.deleteAccountCancel();
-  };
+  const handleSubmit = useCallback(() => {
+    if (password === '') {
+      setValidationError('empty-password');
+    } else {
+      performDeleteAccount(password);
+    }
+  });

-  handlePasswordChange = (e) => {
-    this.setState({ password: e.target.value.trim() });
-    this.props.deleteAccountReset();
-  };
+  const handleCancel = useCallback(() => {
+    setPassword('');
+    setConfirmationDialogOpen(false);
+    resetDeleteAccount();
+  });

-  handleFinalClose = () => {
-    global.location = getConfig().LOGOUT_URL;
-  };
+  const handlePasswordChange = useCallback((e) => {
+    setPassword(e.target.value.trim());
+    setValidationError(null);
+  });

-  render() {
-    const {
-      hasLinkedTPA, isVerifiedAccount, status, errorType, intl,
-    } = this.props;
-    const canDelete = isVerifiedAccount && !hasLinkedTPA;
-    const supportArticleUrl = process.env.SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT;
+  const handleFinalClose = useCallback(() => {
+    global.location = logoutUrl;
+  });

-    // 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';
+  return (
+    <div>
+      <h2 className="section-heading">
+        {intl.formatMessage(messages['account.settings.delete.account.header'])}
+      </h2>
+      <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={handleDeleteAccountClick}
+          disabled={!canDelete}
+        >
+          {intl.formatMessage(messages['account.settings.delete.account.button'])}
+        </Button>
+      </p>

-    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">
-          {intl.formatMessage(messages['account.settings.delete.account.header'])}
-        </h2>
-        <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://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
-            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}
-
-        <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"
+          supportUrl="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-activate-my-account-"
        />
+      )}

-        <ConnectedSuccessModal status={status} onClose={this.handleFinalClose} />
-      </div>
-    );
-  }
+      {hasLinkedTPA ? (
+        <BeforeProceedingBanner
+          instructionMessageId="account.settings.delete.account.please.unlink"
+          supportUrl="https://support.edx.org/hc/en-us/articles/207206067"
+        />
+      ) : null}
+
+      <ConnectedConfirmationModal
+        open={confirmationDialogOpen}
+        errorType={error}
+        onSubmit={handleSubmit}
+        onCancel={handleCancel}
+        onChange={handlePasswordChange}
+        password={password}
+      />
+
+      <ConnectedSuccessModal open={successDialogOpen} onClose={handleFinalClose} />
+    </div>
+  );
 }

 DeleteAccount.propTypes = {
-  deleteAccount: PropTypes.func.isRequired,
-  deleteAccountConfirmation: PropTypes.func.isRequired,
-  deleteAccountFailure: PropTypes.func.isRequired,
-  deleteAccountReset: PropTypes.func.isRequired,
-  deleteAccountCancel: PropTypes.func.isRequired,
-  status: PropTypes.oneOf(['confirming', 'pending', 'deleted', 'failed']),
-  errorType: PropTypes.oneOf(['empty-password', 'server']),
  hasLinkedTPA: PropTypes.bool,
  isVerifiedAccount: PropTypes.bool,
+  logoutUrl: PropTypes.string.isRequired,
  intl: intlShape.isRequired,
 };

 DeleteAccount.defaultProps = {
  hasLinkedTPA: false,
  isVerifiedAccount: true,
-  status: null,
-  errorType: null,
 };

-// Assume we're part of the accountSettings state.
-const mapStateToProps = state => state.accountSettings.deleteAccount;
-
-export default connect(
-  mapStateToProps,
-  {
-    deleteAccount,
-    deleteAccountConfirmation,
-    deleteAccountFailure,
-    deleteAccountReset,
-    deleteAccountCancel,
-  },
-)(injectIntl(DeleteAccount));
+export default injectIntl(DeleteAccount);
--- a/src/account-settings/delete-account/DeleteAccount.test.jsx
+++ b/src/account-settings/delete-account/DeleteAccount.test.jsx
@@ -1,34 +1,21 @@
-/* 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';
+import { IntlProvider } from '@edx/frontend-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
-
-const IntlDeleteAccount = injectIntl(DeleteAccount);
+import DeleteAccount from './DeleteAccount'; // eslint-disable-line import/first

 describe('DeleteAccount', () => {
  let props = {};

  beforeEach(() => {
    props = {
-      deleteAccount: jest.fn(),
-      deleteAccountConfirmation: jest.fn(),
-      deleteAccountFailure: jest.fn(),
-      deleteAccountReset: jest.fn(),
-      deleteAccountCancel: jest.fn(),
-      status: null,
-      errorType: null,
      hasLinkedTPA: false,
      isVerifiedAccount: true,
+      logoutUrl: 'http://localhost/logout',
    };
  });

@@ -36,13 +23,12 @@ describe('DeleteAccount', () => {
    const tree = renderer
      .create((
        <IntlProvider locale="en">
-          <IntlDeleteAccount
+          <DeleteAccount
            {...props}
          />
        </IntlProvider>
      ))
      .toJSON();
-
    expect(tree).toMatchSnapshot();
  });

@@ -50,7 +36,7 @@ describe('DeleteAccount', () => {
    const tree = renderer
      .create((
        <IntlProvider locale="en">
-          <IntlDeleteAccount
+          <DeleteAccount
            {...props}
            isVerifiedAccount={false}
          />
@@ -64,7 +50,7 @@ describe('DeleteAccount', () => {
    const tree = renderer
      .create((
        <IntlProvider locale="en">
-          <IntlDeleteAccount
+          <DeleteAccount
            {...props}
            hasLinkedTPA
          />
--- 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 { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-i18n';
+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://support.edx.org/hc/en-us/sections/115004173027-Receive-and-Share-edX-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,42 +1,38 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { ModalLayer, ModalCloseButton } from '@openedx/paragon';
+import { injectIntl, intlShape } from '@edx/frontend-i18n';
+import { Modal } from '@edx/paragon';

 import messages from './messages';

 export const SuccessModal = (props) => {
-  const { status, intl, onClose } = props;
+  const { open, 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={open}
+      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}
+    />
  );
 };

 SuccessModal.propTypes = {
-  status: PropTypes.oneOf(['confirming', 'pending', 'deleted', 'failed']),
+  open: PropTypes.bool,
  intl: intlShape.isRequired,
  onClose: PropTypes.func.isRequired,
 };

 SuccessModal.defaultProps = {
-  status: null,
+  open: false,
 };

 export default injectIntl(SuccessModal);
--- a/src/account-settings/delete-account/SuccessModal.test.jsx
+++ b/src/account-settings/delete-account/SuccessModal.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import renderer from 'react-test-renderer';
-import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';
+import { IntlProvider, injectIntl } from '@edx/frontend-i18n';

 // Modal creates a portal.  Overriding ReactDOM.createPortal allows portals to be tested in jest.
 ReactDOM.createPortal = node => node;
@@ -16,30 +16,15 @@ describe('SuccessModal', () => {
  beforeEach(() => {
    props = {
      onClose: jest.fn(),
-      status: null,
+      open: false,
    };
  });

  it('should match default closed success modal snapshot', () => {
-    let tree = renderer.create((
+    const 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', () => {
@@ -48,7 +33,8 @@ describe('SuccessModal', () => {
        <IntlProvider locale="en">
          <IntlSuccessModal
            {...props}
-            status="deleted" // This will cause 'modal-backdrop' and 'show' to appear on the modal as CSS classes.
+            // This will cause 'modal-backdrop' and 'show' to appear on the modal as CSS classes.
+            open
          />
        </IntlProvider>
      ))
--- a/src/account-settings/delete-account/snapshots/BeforeProceedingBanner.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/BeforeProceedingBanner.test.jsx.snap
@@ -1,68 +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-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>
-    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-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>
-    Before proceeding, please 
-    <a
-      className="pgn__hyperlink default-link standalone-link"
-      href="http://test-support.edx"
-      onClick={[Function]}
-      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,436 @@
 // 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`] = `
-Array [
+exports[`ConfirmationModal should match default closed confirmation modal snapshot 1`] = `
+<div>
  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "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]}
-    onMouseDown={[Function]}
-    onScrollCapture={[Function]}
-    onTouchMoveCapture={[Function]}
-    onTouchStart={[Function]}
-    onWheelCapture={[Function]}
+    className="modal js-close-modal-on-click fade"
+    onClick={[Function]}
+    role="presentation"
  >
    <div
-      className="pgn__modal-content-container"
+      aria-labelledby="id3"
+      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="id3"
          >
            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-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. 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"
+            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={
-      Object {
-        "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"
+    onClick={[Function]}
+    role="presentation"
+  >
+    <div
+      aria-labelledby="id5"
+      aria-modal={true}
+      className="modal-dialog"
+      role="dialog"
+      tabIndex="-1"
+    >
+      <div
+        className="modal-content"
+      >
+        <div
+          className="modal-header"
+        >
+          <h2
+            className="modal-title"
+            id="id5"
+          >
+            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"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            type="button"
+          >
+            Cancel
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 `;

 exports[`ConfirmationModal should match open confirmation modal snapshot 1`] = `
-Array [
+<div>
  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "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"
+    onClick={[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-exclamation-triangle fa-w-18 mr-2"
-                    data-icon="exclamation-triangle"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
+              <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 {}}
-                    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. 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>
+                  />
+                </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"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            type="button"
+          >
+            Cancel
+          </button>
        </div>
      </div>
    </div>
-  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "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,22 +11,31 @@ 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://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings"
      onClick={[Function]}
      target="_self"
@@ -38,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
@@ -50,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>
@@ -58,22 +69,31 @@ 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://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings"
      onClick={[Function]}
      target="_self"
@@ -85,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
@@ -114,16 +136,17 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
      </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-"
-        onClick={[Function]}
-        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>
@@ -132,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>
@@ -140,22 +163,31 @@ 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://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings"
      onClick={[Function]}
      target="_self"
@@ -167,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
@@ -196,16 +230,17 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
      </svg>
    </div>
    <div>
-      Before proceeding, please 
-      <a
-        className="pgn__hyperlink default-link standalone-link"
-        href="https://support.edx.org/hc/en-us/articles/207206067"
-        onClick={[Function]}
-        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,123 @@
 // 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`] = `
-Array [
+exports[`SuccessModal should match default closed success modal snapshot 1`] = `
+<div>
  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "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"
+    onClick={[Function]}
+    role="presentation"
  >
    <div
-      className="pgn__modal-content-container"
+      aria-labelledby="id3"
+      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="id3"
          >
-            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"
+            onBlur={[Function]}
            onClick={[Function]}
+            onKeyDown={[Function]}
            type="button"
          >
            Close
          </button>
-        </p>
+        </div>
      </div>
    </div>
-  </div>,
-  <div
-    data-focus-guard={true}
-    style={
-      Object {
-        "height": "0px",
-        "left": "1px",
-        "overflow": "hidden",
-        "padding": 0,
-        "position": "fixed",
-        "top": "1px",
-        "width": "1px",
-      }
-    }
-    tabIndex={-1}
-  />,
-]
+  </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"
+    onClick={[Function]}
+    role="presentation"
+  >
+    <div
+      aria-labelledby="id4"
+      aria-modal={true}
+      className="modal-dialog"
+      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"
+            onBlur={[Function]}
+            onClick={[Function]}
+            onKeyDown={[Function]}
+            type="button"
+          >
+            Close
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 `;
--- a/src/account-settings/delete-account/data/actions.js
+++ b/src/account-settings/delete-account/data/actions.js
@@ -1,37 +0,0 @@
-import { AsyncActionType } from '../../data/utils';
-
-export const DELETE_ACCOUNT = new AsyncActionType('ACCOUNT_SETTINGS', 'DELETE_ACCOUNT');
-DELETE_ACCOUNT.CONFIRMATION = 'ACCOUNT_SETTINGS__DELETE_ACCOUNT__CONFIRMATION';
-DELETE_ACCOUNT.CANCEL = 'ACCOUNT_SETTINGS__DELETE_ACCOUNT__CANCEL';
-
-export const deleteAccount = password => ({
-  type: DELETE_ACCOUNT.BASE,
-  payload: { password },
-});
-
-export const deleteAccountConfirmation = () => ({
-  type: DELETE_ACCOUNT.CONFIRMATION,
-});
-
-export const deleteAccountBegin = () => ({
-  type: DELETE_ACCOUNT.BEGIN,
-});
-
-export const deleteAccountSuccess = () => ({
-  type: DELETE_ACCOUNT.SUCCESS,
-});
-
-export const deleteAccountFailure = reason => ({
-  type: DELETE_ACCOUNT.FAILURE,
-  payload: { reason },
-});
-
-// to clear errors from the confirmation modal
-export const deleteAccountReset = () => ({
-  type: DELETE_ACCOUNT.RESET,
-});
-
-// to close the modal
-export const deleteAccountCancel = () => ({
-  type: DELETE_ACCOUNT.CANCEL,
-});
--- a/src/account-settings/delete-account/data/reducers.js
+++ b/src/account-settings/delete-account/data/reducers.js
@@ -1,60 +0,0 @@
-import { DELETE_ACCOUNT } from './actions';
-
-export const defaultState = {
-  status: null,
-  errorType: null,
-};
-
-const reducer = (state = defaultState, action = null) => {
-  if (action !== null) {
-    switch (action.type) {
-      case DELETE_ACCOUNT.CONFIRMATION:
-        return {
-          ...state,
-          status: 'confirming',
-        };
-
-      case DELETE_ACCOUNT.BEGIN:
-        return {
-          ...state,
-          status: 'pending',
-        };
-
-      case DELETE_ACCOUNT.SUCCESS:
-        return {
-          ...state,
-          status: 'deleted',
-        };
-
-      case DELETE_ACCOUNT.FAILURE:
-        return {
-          ...state,
-          status: 'failed',
-          errorType: action.payload.reason || 'server',
-        };
-
-      case DELETE_ACCOUNT.RESET: {
-        const oldStatus = state.status;
-
-        return {
-          ...state,
-          // clear the error state if applicable, otherwise don't change state
-          status: oldStatus === 'failed' ? 'confirming' : oldStatus,
-          errorType: null,
-        };
-      }
-
-      case DELETE_ACCOUNT.CANCEL:
-        return {
-          ...state,
-          status: null,
-          errorType: null,
-        };
-
-      default:
-    }
-  }
-  return state;
-};
-
-export default reducer;
--- a/src/account-settings/delete-account/data/reducers.test.js
+++ b/src/account-settings/delete-account/data/reducers.test.js
@@ -1,107 +0,0 @@
-import reducer from './reducers';
-import {
-  deleteAccountConfirmation,
-  deleteAccountBegin,
-  deleteAccountSuccess,
-  deleteAccountFailure,
-  deleteAccountReset,
-  deleteAccountCancel,
-} from './actions';
-
-describe('delete-account reducer', () => {
-  let state = null;
-
-  beforeEach(() => {
-    state = reducer();
-  });
-
-  it('should process DELETE_ACCOUNT.CONFIRMATION', () => {
-    const result = reducer(state, deleteAccountConfirmation());
-    expect(result).toEqual({
-      errorType: null,
-      status: 'confirming',
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.BEGIN', () => {
-    const result = reducer(state, deleteAccountBegin());
-    expect(result).toEqual({
-      errorType: null,
-      status: 'pending',
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.SUCCESS', () => {
-    const result = reducer(state, deleteAccountSuccess());
-    expect(result).toEqual({
-      errorType: null,
-      status: 'deleted',
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.FAILURE no reason', () => {
-    const result = reducer(state, deleteAccountFailure());
-    expect(result).toEqual({
-      errorType: 'server',
-      status: 'failed',
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.FAILURE with reason', () => {
-    const result = reducer(state, deleteAccountFailure('carnivorous buns'));
-    expect(result).toEqual({
-      errorType: 'carnivorous buns',
-      status: 'failed',
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.RESET no status', () => {
-    const result = reducer(state, deleteAccountReset());
-    expect(result).toEqual({
-      errorType: null,
-      status: null,
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.RESET with failed old status', () => {
-    const result = reducer(
-      {
-        errorType: 'carnivorous buns',
-        status: 'failed',
-      },
-      deleteAccountReset(),
-    );
-    expect(result).toEqual({
-      errorType: null,
-      status: 'confirming',
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.RESET with pending old status', () => {
-    const result = reducer(
-      {
-        errorType: 'carnivorous buns',
-        status: 'pending',
-      },
-      deleteAccountReset(),
-    );
-    expect(result).toEqual({
-      errorType: null,
-      status: 'pending',
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.CANCEL', () => {
-    const result = reducer(
-      {
-        errorType: 'carnivorous buns',
-        status: 'failed',
-      },
-      deleteAccountCancel(),
-    );
-    expect(result).toEqual({
-      errorType: null,
-      status: null,
-    });
-  });
-});
--- a/src/account-settings/delete-account/data/sagas.js
+++ b/src/account-settings/delete-account/data/sagas.js
@@ -1,30 +0,0 @@
-import { put, call, takeEvery } from 'redux-saga/effects';
-
-import {
-  DELETE_ACCOUNT,
-  deleteAccountBegin,
-  deleteAccountSuccess,
-  deleteAccountFailure,
-} from './actions';
-
-import { postDeleteAccount } from './service';
-
-export function* handleDeleteAccount(action) {
-  try {
-    yield put(deleteAccountBegin());
-    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') {
-      yield put(deleteAccountFailure());
-    } else {
-      throw e;
-    }
-  }
-}
-
-export default function* saga() {
-  yield takeEvery(DELETE_ACCOUNT.BASE, handleDeleteAccount);
-}
--- a/src/account-settings/delete-account/data/service.js
+++ b/src/account-settings/delete-account/data/service.js
@@ -1,16 +1,24 @@
-import { getConfig } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import formurlencoded from 'form-urlencoded';
-import { handleRequestError } from '../../data/utils';
+import { applyConfiguration, handleRequestError } from '../../../common/serviceUtils';
+
+let config = {
+  DELETE_ACCOUNT_URL: null,
+};
+
+let apiClient = null;
+
+export function configureService(newConfig, newApiClient) {
+  config = applyConfiguration(config, newConfig);
+  apiClient = newApiClient;
+}

 /**
 * Request deletion of the user's account.
 */
-// eslint-disable-next-line import/prefer-default-export
 export async function postDeleteAccount(password) {
-  const { data } = await getAuthenticatedHttpClient()
+  const { data } = await apiClient
    .post(
-      `${getConfig().LMS_BASE_URL}/api/user/v1/accounts/deactivate_logout/`,
+      config.DELETE_ACCOUNT_URL,
      formurlencoded({ password }),
      {
        headers: {
--- a/src/account-settings/delete-account/index.js
+++ b/src/account-settings/delete-account/index.js
@@ -1,5 +1,2 @@
-// 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';
-export { DELETE_ACCOUNT } from './data/actions';
+export { configureService } from './data/service';
--- a/src/account-settings/delete-account/messages.js
+++ b/src/account-settings/delete-account/messages.js
@@ -1,4 +1,4 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
+import { defineMessages } from '@edx/frontend-i18n';

 const messages = defineMessages({
  'account.settings.delete.account.header': {
@@ -13,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': {
@@ -44,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',
@@ -68,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',
  },
@@ -106,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/demographics/Checkboxes.jsx
+++ b/src/account-settings/demographics/Checkboxes.jsx
@@ -1,80 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import PropTypes from 'prop-types';
-import { Form } from '@openedx/paragon';
-import { DECLINED } from '../data/constants';
-
-const Checkboxes = (props) => {
-  const {
-    id,
-    options,
-    values,
-    onChange,
-  } = props;
-
-  const [selected, setSelected] = useState(values);
-  useEffect(() => {
-    onChange(id, selected);
-  }, [id, onChange, selected]);
-
-  const handleToggle = (value, option) => {
-    // If the user checked 'declined', uncheck all other options
-    if (value && option === DECLINED) {
-      setSelected([DECLINED]);
-      return;
-    }
-
-    // If option checked, make sure this option is in `selected` (and remove 'declined')
-    if (value && !selected.includes(option)) {
-      const newSelected = selected.filter(i => i !== DECLINED).concat(option);
-      setSelected(newSelected);
-    }
-
-    // If unchecked, make sure this option is NOT in `selected`
-    if (!value) {
-      setSelected(selected.filter(i => i !== option));
-    }
-  };
-
-  const renderCheckboxes = () => options.map((option, index) => {
-    const isFirst = index === 0;
-    const isChecked = selected.includes(option.value);
-    return (
-      <div key={option.value} className="checkboxOption">
-        <Form.Checkbox
-          type="checkbox"
-          id={option.value}
-          name={option.value}
-          value={option.value}
-          checked={isChecked}
-          autoFocus={isFirst}
-          onChange={(event) => handleToggle(event.target.checked, option.value)}
-        >
-          {option.label}
-        </Form.Checkbox>
-      </div>
-    );
-  });
-
-  return (
-    <div role="group">
-      {renderCheckboxes()}
-    </div>
-  );
-};
-
-Checkboxes.propTypes = {
-  id: PropTypes.string.isRequired,
-  options: PropTypes.arrayOf(PropTypes.shape({
-    value: PropTypes.string,
-    label: PropTypes.string,
-  })),
-  values: PropTypes.arrayOf(PropTypes.string),
-  onChange: PropTypes.func.isRequired,
-};
-
-Checkboxes.defaultProps = {
-  options: [],
-  values: [],
-};
-
-export default Checkboxes;
--- a/src/account-settings/demographics/DemographicsSection.jsx
+++ b/src/account-settings/demographics/DemographicsSection.jsx
@@ -1,357 +0,0 @@
-import { getConfig } from '@edx/frontend-platform';
-import {
-  FormattedMessage,
-  injectIntl,
-  intlShape,
-} from '@edx/frontend-platform/i18n';
-
-import { Hyperlink, Form } from '@openedx/paragon';
-import PropTypes from 'prop-types';
-import React from 'react';
-import { connect } from 'react-redux';
-import get from 'lodash.get';
-import isEmpty from 'lodash.isempty';
-import memoize from 'memoize-one';
-import { demographicsSectionSelector } from '../data/selectors';
-import EditableSelectField from '../EditableSelectField';
-import Checkboxes from './Checkboxes';
-import Alert from '../Alert';
-import { saveMultipleSettings, updateDraft } from '../data/actions';
-import {
-  OTHER,
-  SELF_DESCRIBE,
-} from '../data/constants';
-import messages from './DemographicsSection.messages';
-
-class DemographicsSection extends React.Component {
-  // We check the `demographicsOptions` prop to see if it is empty before we attempt to extract and
-  // format the available options for each question from the API response.
-  getApiOptions = memoize((demographicsOptions) => (this.hasRetrievedDemographicsOptions() && {
-    demographicsGenderOptions: this.addDefaultOption('account.settings.field.demographics.gender.options.empty')
-      .concat(demographicsOptions.actions.POST.gender.choices.map(key => ({
-        value: key.value,
-        label: key.display_name,
-      }))),
-    /* Ethnicity options don't need the blank/default option */
-    demographicsEthnicityOptions: demographicsOptions.actions.POST.user_ethnicity.child.children.ethnicity.choices.map(
-      key => ({
-        value: key.value,
-        label: key.display_name,
-      }),
-    ),
-    demographicsIncomeOptions: this.addDefaultOption('account.settings.field.demographics.income.options.empty')
-      .concat(demographicsOptions.actions.POST.income.choices.map(key => ({
-        value: key.value,
-        label: key.display_name,
-      }))),
-    demographicsMilitaryHistoryOptions: this.addDefaultOption('account.settings.field.demographics.military_history.options.empty')
-      .concat(demographicsOptions.actions.POST.military_history.choices.map(key => ({
-        value: key.value,
-        label: key.display_name,
-      }))),
-    demographicsEducationLevelOptions: this.addDefaultOption('account.settings.field.demographics.education_level.options.empty')
-      .concat(demographicsOptions.actions.POST.learner_education_level.choices.map(key => ({
-        value: key.value,
-        label: key.display_name,
-      }))),
-    demographicsWorkStatusOptions: this.addDefaultOption('account.settings.field.demographics.work_status.options.empty')
-      .concat(demographicsOptions.actions.POST.work_status.choices.map(key => ({
-        value: key.value,
-        label: key.display_name,
-      }))),
-    demographicsWorkSectorOptions: this.addDefaultOption('account.settings.field.demographics.work_sector.options.empty')
-      .concat(demographicsOptions.actions.POST.current_work_sector.choices.map(key => ({
-        value: key.value,
-        label: key.display_name,
-      }))),
-  }));
-
-  ethnicityFieldDisplay = (demographicsEthnicityOptions) => {
-    let ethnicities = [];
-    if (get(this, 'props.formValues.demographics_user_ethnicity')) {
-      ethnicities = this.props.formValues.demographics_user_ethnicity;
-    }
-    return ethnicities.map((e) => {
-      const matchingOption = demographicsEthnicityOptions.filter(option => option.value === e)[0];
-      return matchingOption && matchingOption.label;
-    }).join(', ');
-  };
-
-  handleEditableFieldChange = (name, value) => {
-    this.props.updateDraft(name, value);
-  };
-
-  handleSubmit = (formId) => {
-    // We have some custom fields in this section. Instead of relying on the
-    // submitted values, submit the values stored in 'drafts'.
-    const { drafts } = this.props;
-    const settingsArray = Object.entries(drafts).map(([field, value]) => ({
-      formId: field,
-      commitValues: value,
-    }));
-
-    this.props.saveMultipleSettings(settingsArray, formId);
-  };
-
-  /**
-   * Utility method that adds the specified message as a default option to the list of available
-   * choices.
-   *
-   * @param {*} messageId id of message matching desired default label text
-   */
-  addDefaultOption(messageId) {
-    return [{
-      value: '',
-      label: this.props.intl.formatMessage(messages[messageId]),
-    }];
-  }
-
-  /**
-   * Utility method that helps determine if we were able to retrieve the available options for
-   * the Demographics questions. Returns true if the `demographicsOptions` prop is _not_ empty,
-   * otherwise false. This prop being empty is indicative of a failure communicating with the
-   * Demographics IDA's API.
-   */
-  hasRetrievedDemographicsOptions() {
-    return !isEmpty(this.props.formValues.demographicsOptions);
-  }
-
-  /**
-   * If an error is encountered when trying to communicate with the Demographics IDA then we will
-   * display an Alert letting the user know that their info will not be displayed and temporarily
-   * cannot be updated.
-   */
-  renderDemographicsServiceIssueWarning() {
-    if (!isEmpty(this.props.formErrors.demographicsError)
-        || !this.hasRetrievedDemographicsOptions()) {
-      return (
-        <div
-          tabIndex="-1"
-          ref={this.alertRef}
-        >
-          <Alert className="alert alert-danger" role="alert">
-            <FormattedMessage
-              id="account.settings.message.demographics.service.issue"
-              defaultMessage="An error occurred attempting to retrieve or save your account information. Please try again later."
-              description="alert message informing the user that the there is a problem retrieving or updating information from the Demographics microservice"
-            />
-          </Alert>
-        </div>
-      );
-    }
-    return null;
-  }
-
-  render() {
-    const editableFieldProps = {
-      onChange: this.handleEditableFieldChange,
-      onSubmit: this.handleSubmit,
-    };
-
-    const {
-      demographicsGenderOptions,
-      demographicsEthnicityOptions,
-      demographicsIncomeOptions,
-      demographicsMilitaryHistoryOptions,
-      demographicsEducationLevelOptions,
-      demographicsWorkStatusOptions,
-      demographicsWorkSectorOptions,
-    } = this.getApiOptions(this.props.formValues.demographicsOptions);
-
-    const showSelfDescribe = this.props.formValues.demographics_gender === SELF_DESCRIBE;
-    const showWorkStatusDescribe = this.props.formValues.demographics_work_status === OTHER;
-
-    return (
-      <div className="account-section pt-3 mb-5" id="demographics-information" ref={this.props.forwardRef}>
-        <h2 className="section-heading h4 mb-3">
-          {this.props.intl.formatMessage(messages['account.settings.section.demographics.information'])}
-        </h2>
-        <p>
-          <Hyperlink
-            destination={`${getConfig().MARKETING_SITE_BASE_URL}/demographics`}
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            {this.props.intl.formatMessage(
-              messages['account.settings.section.demographics.why'],
-              {
-                siteName: getConfig().SITE_NAME,
-              },
-            )}
-          </Hyperlink>
-        </p>
-        {this.renderDemographicsServiceIssueWarning()}
-        {/*
-          If the demographicsOptions props are empty then there is no need to display the fields as
-          the user will not have any choices available to select, nor will they be able to update
-          their answers.
-        */}
-        {this.hasRetrievedDemographicsOptions() && (
-          <div id="demographics-fields">
-            <EditableSelectField
-              name="demographics_gender"
-              type="select"
-              value={this.props.formValues.demographics_gender}
-              userSuppliedValue={showSelfDescribe ? this.props.formValues.demographics_gender_description : null}
-              options={demographicsGenderOptions}
-              label={this.props.intl.formatMessage(messages['account.settings.field.demographics.gender'])}
-              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.gender.empty'])}
-              {...editableFieldProps}
-            >
-              {showSelfDescribe && (
-                <Form.Control
-                  name="demographics_gender_description"
-                  id="field-demographics_gender_description"
-                  type="text"
-                  placeholder={this.props.intl.formatMessage(messages['account.settings.field.demographics.gender_description.empty'])}
-                  value={this.props.formValues.demographics_gender_description}
-                  onChange={(e) => this.handleEditableFieldChange('demographics_gender_description', e.target.value)}
-                  aria-label={this.props.intl.formatMessage(messages['account.settings.field.demographics.gender_description'])}
-                  className="mt-1"
-                />
-              )}
-            </EditableSelectField>
-            <EditableSelectField
-              name="demographics_user_ethnicity"
-              type="select"
-              hidden
-              value={this.ethnicityFieldDisplay(demographicsEthnicityOptions)}
-              label={this.props.intl.formatMessage(messages['account.settings.field.demographics.ethnicity'])}
-              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.ethnicity.empty'])}
-              {...editableFieldProps}
-            >
-              <Checkboxes
-                id="demographics_user_ethnicity"
-                options={demographicsEthnicityOptions}
-                values={this.props.formValues.demographics_user_ethnicity}
-                {...editableFieldProps}
-              />
-            </EditableSelectField>
-            <EditableSelectField
-              name="demographics_income"
-              type="select"
-              value={this.props.formValues.demographics_income}
-              options={demographicsIncomeOptions}
-              label={this.props.intl.formatMessage(messages['account.settings.field.demographics.income'])}
-              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.income.empty'])}
-              {...editableFieldProps}
-            />
-            <EditableSelectField
-              name="demographics_military_history"
-              type="select"
-              value={this.props.formValues.demographics_military_history}
-              options={demographicsMilitaryHistoryOptions}
-              label={this.props.intl.formatMessage(messages['account.settings.field.demographics.military_history'])}
-              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.military_history.empty'])}
-              {...editableFieldProps}
-            />
-            <EditableSelectField
-              name="demographics_learner_education_level"
-              type="select"
-              value={this.props.formValues.demographics_learner_education_level}
-              options={demographicsEducationLevelOptions}
-              label={this.props.intl.formatMessage(messages['account.settings.field.demographics.learner_education_level'])}
-              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.learner_education_level.empty'])}
-              {...editableFieldProps}
-            />
-            <EditableSelectField
-              name="demographics_parent_education_level"
-              type="select"
-              value={this.props.formValues.demographics_parent_education_level}
-              options={demographicsEducationLevelOptions}
-              label={this.props.intl.formatMessage(messages['account.settings.field.demographics.parent_education_level'])}
-              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.parent_education_level.empty'])}
-              {...editableFieldProps}
-            />
-            <EditableSelectField
-              name="demographics_work_status"
-              type="select"
-              value={this.props.formValues.demographics_work_status}
-              userSuppliedValue={showWorkStatusDescribe
-                ? this.props.formValues.demographics_work_status_description
-                : null}
-              options={demographicsWorkStatusOptions}
-              label={this.props.intl.formatMessage(messages['account.settings.field.demographics.work_status'])}
-              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.work_status.empty'])}
-              {...editableFieldProps}
-            >
-              {showWorkStatusDescribe && (
-                <Form.Control
-                  name="demographics_work_status_description"
-                  id="field-demographics_work_status_description"
-                  type="text"
-                  placeholder={this.props.intl.formatMessage(messages['account.settings.field.demographics.work_status_description.empty'])}
-                  value={this.props.formValues.demographics_work_status_description}
-                  onChange={(e) => this.handleEditableFieldChange('demographics_work_status_description', e.target.value)}
-                  aria-label={this.props.intl.formatMessage(messages['account.settings.field.demographics.work_status_description'])}
-                  className="mt-1"
-                />
-              )}
-            </EditableSelectField>
-            <EditableSelectField
-              name="demographics_current_work_sector"
-              type="select"
-              value={this.props.formValues.demographics_current_work_sector}
-              options={demographicsWorkSectorOptions}
-              label={this.props.intl.formatMessage(messages['account.settings.field.demographics.current_work_sector'])}
-              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.current_work_sector.empty'])}
-              {...editableFieldProps}
-            />
-            <EditableSelectField
-              name="demographics_future_work_sector"
-              type="select"
-              value={this.props.formValues.demographics_future_work_sector}
-              options={demographicsWorkSectorOptions}
-              label={this.props.intl.formatMessage(messages['account.settings.field.demographics.future_work_sector'])}
-              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.future_work_sector.empty'])}
-              {...editableFieldProps}
-            />
-          </div>
-        )}
-      </div>
-    );
-  }
-}
-
-DemographicsSection.propTypes = {
-  intl: intlShape.isRequired,
-  formValues: PropTypes.shape({
-    demographics_gender: PropTypes.string,
-    demographics_user_ethnicity: PropTypes.shape([]),
-    demographics_income: PropTypes.string,
-    demographics_military_history: PropTypes.string,
-    demographics_learner_education_level: PropTypes.string,
-    demographics_parent_education_level: PropTypes.string,
-    demographics_work_status: PropTypes.string,
-    demographics_current_work_sector: PropTypes.string,
-    demographics_future_work_sector: PropTypes.string,
-    demographics_work_status_description: PropTypes.string,
-    demographics_gender_description: PropTypes.string,
-    demographicsOptions: PropTypes.shape({}),
-  }).isRequired,
-  drafts: PropTypes.shape({
-    demographics_gender: PropTypes.string,
-    demographics_user_ethnicity: PropTypes.shape([]),
-    demographics_income: PropTypes.string,
-    demographics_military_history: PropTypes.string,
-    demographics_learner_education_level: PropTypes.string,
-    demographics_parent_education_level: PropTypes.string,
-    demographics_work_status: PropTypes.string,
-    demographics_current_work_sector: PropTypes.string,
-    demographics_future_work_sector: PropTypes.string,
-    demographics_work_status_description: PropTypes.string,
-    demographics_gender_description: PropTypes.string,
-    demographicsOptions: PropTypes.shape({}),
-  }).isRequired,
-  formErrors: PropTypes.shape({
-    demographicsError: PropTypes.string,
-  }).isRequired,
-  forwardRef: PropTypes.func.isRequired,
-  updateDraft: PropTypes.func.isRequired,
-  saveMultipleSettings: PropTypes.func.isRequired,
-};
-
-export default connect(demographicsSectionSelector, {
-  saveMultipleSettings,
-  updateDraft,
-})(injectIntl(DemographicsSection));
--- a/src/account-settings/demographics/DemographicsSection.messages.jsx
+++ b/src/account-settings/demographics/DemographicsSection.messages.jsx
@@ -1,170 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  /* Demographics section heading */
-  'account.settings.section.demographics.information': {
-    id: 'account.settings.section.demographics.information',
-    defaultMessage: 'Optional Information',
-    description: 'The optional information section heading.',
-  },
-  /* Gender identity */
-  'account.settings.field.demographics.gender': {
-    id: 'account.settings.field.demographics.gender',
-    defaultMessage: 'Gender identity',
-    description: 'Label for account settings gender identity field.',
-  },
-  'account.settings.field.demographics.gender.empty': {
-    id: 'account.settings.field.demographics.gender.empty',
-    defaultMessage: 'Add gender identity',
-    description: 'Placeholder for empty account settings gender identity field.',
-  },
-  'account.settings.field.demographics.gender.options.empty': {
-    id: 'account.settings.field.demographics.gender.options.empty',
-    defaultMessage: 'Select a gender identity',
-    description: 'Placeholder for the gender identity options dropdown.',
-  },
-  'account.settings.field.demographics.gender_description': {
-    id: 'account.settings.field.demographics.gender_description',
-    defaultMessage: 'Gender identity description',
-    description: 'Label for account settings gender identity description field.',
-  },
-  'account.settings.field.demographics.gender_description.empty': {
-    id: 'account.settings.field.demographics.gender_description.empty',
-    defaultMessage: 'Enter description',
-    description: 'Placeholder for empty account settings gender identity field.',
-  },
-  /* Ethnicity */
-  'account.settings.field.demographics.ethnicity': {
-    id: 'account.settings.field.demographics.ethnicity',
-    defaultMessage: 'Race/Ethnicity identity',
-    description: 'Label for account settings ethnic background field.',
-  },
-  'account.settings.field.demographics.ethnicity.empty': {
-    id: 'account.settings.field.demographics.ethnicity.empty',
-    defaultMessage: 'Add race/ethnicity identity',
-    description: 'Placeholder for empty account settings ethnic background field.',
-  },
-  'account.settings.field.demographics.ethnicity.options.empty': {
-    id: 'account.settings.field.demographics.ethnicity.options.empty',
-    defaultMessage: 'Select all that apply', // TODO: Is this the desired text?
-    description: 'Placeholder for the ethnic background options field.',
-  },
-  /* Income */
-  'account.settings.field.demographics.income': {
-    id: 'account.settings.field.demographics.income',
-    defaultMessage: 'Family income',
-    description: 'Label for account settings household income field.',
-  },
-  'account.settings.field.demographics.income.empty': {
-    id: 'account.settings.field.demographics.income.empty',
-    defaultMessage: 'Add family income',
-    description: 'Placeholder for empty account settings household income field.',
-  },
-  'account.settings.field.demographics.income.options.empty': {
-    id: 'account.settings.field.demographics.income.options.empty',
-    defaultMessage: 'Select a family income range',
-    description: 'Placeholder for the household income dropdown.',
-  },
-  /* Military history */
-  'account.settings.field.demographics.military_history': {
-    id: 'account.settings.field.demographics.military_history',
-    defaultMessage: 'U.S. Military status',
-    description: 'Label for account settings military history field.',
-  },
-  'account.settings.field.demographics.military_history.empty': {
-    id: 'account.settings.field.demographics.military_history.empty',
-    defaultMessage: 'Add military status',
-    description: 'Placeholder for empty account settings military history field.',
-  },
-  'account.settings.field.demographics.military_history.options.empty': {
-    id: 'account.settings.field.demographics.military_history.options.empty',
-    defaultMessage: 'Select military status',
-    description: 'Placeholder for the military history dropdown.',
-  },
-  /* Learner and family education level */
-  'account.settings.field.demographics.learner_education_level': {
-    id: 'account.settings.field.demographics.learner_education_level',
-    defaultMessage: 'Your education level',
-    description: 'Label for account settings learner education level field.',
-  },
-  'account.settings.field.demographics.learner_education_level.empty': {
-    id: 'account.settings.field.demographics.learner_education_level.empty',
-    defaultMessage: 'Add education level',
-    description: 'Placeholder for empty account settings learner education level field.',
-  },
-  'account.settings.field.demographics.parent_education_level': {
-    id: 'account.settings.field.demographics.parent_education_level',
-    defaultMessage: 'Parents/Guardians education level',
-    description: 'Label for account settings parent education level field.',
-  },
-  'account.settings.field.demographics.parent_education_level.empty': {
-    id: 'account.settings.field.demographics.parent_education_level.empty',
-    defaultMessage: 'Add education level',
-    description: 'Placeholder for empty account settings parent education level field.',
-  },
-  'account.settings.field.demographics.education_level.options.empty': {
-    id: 'account.settings.field.demographics.education_level.options.empty',
-    defaultMessage: 'Select education level',
-    description: 'Placeholder for the education level options dropdown.',
-  },
-  /* Work status */
-  'account.settings.field.demographics.work_status': {
-    id: 'account.settings.field.demographics.work_status',
-    defaultMessage: 'Employment status',
-    description: 'Label for account settings work status field.',
-  },
-  'account.settings.field.demographics.work_status.empty': {
-    id: 'account.settings.field.demographics.work_status.empty',
-    defaultMessage: 'Add employment status',
-    description: 'Placeholder for empty account settings work status field.',
-  },
-  'account.settings.field.demographics.work_status.options.empty': {
-    id: 'account.settings.field.demographics.work_status.options.empty',
-    defaultMessage: 'Select employment status',
-    description: 'Placeholder for the work status options dropdown.',
-  },
-  'account.settings.field.demographics.work_status_description': {
-    id: 'account.settings.field.demographics.work_status_description',
-    defaultMessage: 'Employment status description',
-    description: 'Label for account settings work status description field.',
-  },
-  'account.settings.field.demographics.work_status_description.empty': {
-    id: 'account.settings.field.demographics.work_status_description.empty',
-    defaultMessage: 'Enter description',
-    description: 'Placeholder for empty account settings work status description field.',
-  },
-  /* Work sector */
-  'account.settings.field.demographics.current_work_sector': {
-    id: 'account.settings.field.demographics.current_work_sector',
-    defaultMessage: 'Current work industry',
-    description: 'Label for account settings current work sector field.',
-  },
-  'account.settings.field.demographics.current_work_sector.empty': {
-    id: 'account.settings.field.demographics.current_work_sector.empty',
-    defaultMessage: 'Add work industry',
-    description: 'Placeholder for empty account settings current work sector field.',
-  },
-  'account.settings.field.demographics.future_work_sector': {
-    id: 'account.settings.field.demographics.future_work_sector',
-    defaultMessage: 'Future work industry',
-    description: 'Label for account settings future work sector field.',
-  },
-  'account.settings.field.demographics.future_work_sector.empty': {
-    id: 'account.settings.field.demographics.future_work_sector.empty',
-    defaultMessage: 'Add work industry',
-    description: 'Placeholder for empty account settings future work sector field.',
-  },
-  'account.settings.field.demographics.work_sector.options.empty': {
-    id: 'account.settings.field.demographics.work_sector.options.empty',
-    defaultMessage: 'Select work industry',
-    description: 'Placeholder for the work sector options dropdown.',
-  },
-  /* Legal copy link text */
-  'account.settings.section.demographics.why': {
-    id: 'account.settings.section.demographics.why',
-    defaultMessage: 'Why does {siteName} collect this information?',
-    description: 'Link text for a link to external legal text',
-  },
-});
-
-export default messages;
--- a/src/account-settings/demographics/data/service.js
+++ b/src/account-settings/demographics/data/service.js
@@ -1,140 +0,0 @@
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import { getConfig } from '@edx/frontend-platform';
-import get from 'lodash.get';
-import { convertData, TO, FROM } from './utils';
-
-/**
- * Utility method that attempts to extract errors from the response of a PATCH request in order to
- * display a warning or otherwise meaningful message to the user.
- *
- * @param {Error} error
- */
-export function createDemographicsError(error) {
-  const apiError = Object.create(error);
-  // If the error received has the `httpResponseData` field in it, then we should have reason to
-  // believe the Demographics service is alive and responding. Extract errors from fields where
-  // appropriate so we can display them to the user.
-  if (get(error, 'customAttributes.httpErrorResponseData')) {
-    apiError.fieldErrors = JSON.parse(error.customAttributes.httpErrorResponseData);
-    if (get(apiError, 'fieldErrors.gender_description')) {
-      // eslint-disable-next-line prefer-destructuring
-      apiError.fieldErrors.demographics_gender = apiError.fieldErrors.gender_description[0];
-      delete apiError.fieldErrors.gender_description;
-    } else if (get(apiError, 'fieldErrors.work_status_description')) {
-      // eslint-disable-next-line prefer-destructuring
-      apiError.fieldErrors.demographics_work_status = apiError.fieldErrors.work_status_description[0];
-      delete apiError.fieldErrors.work_status_description;
-    }
-  // Otherwise, when the service is down, the error response will not contain a
-  // `httpErrorResponseData` field. Add a generic 'demographicsError' field to the fieldErrors that
-  // will trigger showing an Alert to the user to them them know the update was unsuccessful.
-  } else {
-    apiError.fieldErrors = {
-      demographicsError: error.customAttributes.httpErrorType,
-    };
-  }
-
-  return apiError;
-}
-
-/**
- * post all of the data related to demographics.
- * @param {Number} userId users are identified in the api by LMS id
- * @param {Object} commitValues { demographics }
- */
-export async function postDemographics(userId) {
-  const requestConfig = { headers: { 'Content-Type': 'application/json' } };
-  const requestUrl = `${getConfig().DEMOGRAPHICS_BASE_URL}/demographics/api/v1/demographics/`;
-  const commitValues = { user: userId };
-  let data = {};
-
-  ({ data } = await getAuthenticatedHttpClient()
-    .post(requestUrl, commitValues, requestConfig)
-    .catch((error) => {
-      const apiError = createDemographicsError(error);
-      throw apiError;
-    }));
-
-  return convertData(data, FROM);
-}
-
-/**
- * get all data related to the demographics.
- * @param {Number} userId users are identified in the api by LMS id
- */
-export async function getDemographics(userId) {
-  const requestUrl = `${getConfig().DEMOGRAPHICS_BASE_URL}/demographics/api/v1/demographics/${userId}/`;
-  let data = {};
-
-  try {
-    ({ data } = await getAuthenticatedHttpClient()
-      .get(requestUrl));
-
-    data = convertData(data, FROM);
-  } catch (error) {
-    const apiError = Object.create(error);
-    // if the API called resulted in this user receiving a 404 then follow up with a POST call to
-    // try and create the demographics entity on the backend
-    if (apiError.customAttributes.httpErrorStatus) {
-      if (apiError.customAttributes.httpErrorStatus === 404) {
-        data = await postDemographics(userId);
-      }
-    } else {
-      data = {
-        user: userId,
-        demographics_gender: '',
-        demographics_gender_description: '',
-        demographics_income: '',
-        demographics_learner_education_level: '',
-        demographics_parent_education_level: '',
-        demographics_military_history: '',
-        demographics_work_status: '',
-        demographics_work_status_description: '',
-        demographics_current_work_sector: '',
-        demographics_future_work_sector: '',
-        demographics_user_ethnicity: [],
-      };
-    }
-  }
-
-  return data;
-}
-
-/**
- * patch all of the data related to demographics.
- * @param {Number} userId users are identified in the api by LMS id
- * @param {Object} commitValues { demographics }
- */
-export async function patchDemographics(userId, commitValues) {
-  const requestUrl = `${getConfig().DEMOGRAPHICS_BASE_URL}/demographics/api/v1/demographics/${userId}/`;
-  const convertedCommitValues = convertData(commitValues, TO);
-  let data = {};
-
-  ({ data } = await getAuthenticatedHttpClient()
-    .patch(requestUrl, convertedCommitValues)
-    .catch((error) => {
-      const apiError = createDemographicsError(error);
-      throw apiError;
-    }));
-
-  return convertData(data, FROM);
-}
-
-/**
- * retrieve the options for each field from the Demographics API
- */
-export async function getDemographicsOptions() {
-  const requestUrl = `${getConfig().DEMOGRAPHICS_BASE_URL}/demographics/api/v1/demographics/`;
-  let data = {};
-
-  try {
-    ({ data } = await getAuthenticatedHttpClient().options(requestUrl));
-  } catch (error) {
-    // We are catching and suppressing errors here on purpose. If an error occurs during the
-    // getDemographicsOptions call we will pass back an empty `data` object. Downstream we make
-    // the assumption that if the demographicsOptions object is empty that there was an issue or
-    // error communicating with the service/API.
-  }
-
-  return data;
-}
--- a/src/account-settings/demographics/data/utils.js
+++ b/src/account-settings/demographics/data/utils.js
@@ -1,63 +0,0 @@
-export const TO = 'to';
-export const FROM = 'from';
-export const DEMOGRAPHICS_FIELDS = [
-  'demographics_gender',
-  'demographics_gender_description',
-  'demographics_income',
-  'demographics_learner_education_level',
-  'demographics_parent_education_level',
-  'demographics_military_history',
-  'demographics_work_status',
-  'demographics_work_status_description',
-  'demographics_current_work_sector',
-  'demographics_future_work_sector',
-  'demographics_user_ethnicity',
-];
-
-// Frontend wants (example):
-//    demographics_user_ethnicity: ["asian", "white", "other"]
-//
-// Demographics wants (example):
-//    user_ethnicity: [
-//      { ethnicity: "asian" },
-//      { ethnicity: "white" },
-//      { ethnicity: "other" }
-//    ]
-function convertEthnicity(ethnicityData, direction) {
-  if (direction === FROM) {
-    return ethnicityData.map(e => e.ethnicity);
-  }
-
-  if (direction === TO) {
-    return ethnicityData.map(e => ({ ethnicity: e }));
-  }
-
-  return ethnicityData;
-}
-
-// Handles conversion of data to/from Demographics IDA to/from format needed for
-// frontend
-//  * handles ethnicity field
-//  * adds/removes 'demographics' to/from key
-//  * replace `null` with empty string or empty string with null
-export function convertData(dataObject, direction) {
-  const converted = {};
-
-  Object.entries(dataObject).forEach(([key, value]) => {
-    let newValue = value;
-
-    if (key.includes('ethnicity')) {
-      newValue = convertEthnicity(value, direction);
-    }
-
-    if (direction === TO) {
-      converted[key.replace('demographics_', '')] = newValue || null;
-    }
-
-    if (direction === FROM) {
-      converted[`demographics_${key}`] = newValue || '';
-    }
-  });
-
-  return converted;
-}
--- a/src/account-settings/demographics/test/DemographicsSection.test.jsx
+++ b/src/account-settings/demographics/test/DemographicsSection.test.jsx
@@ -1,584 +0,0 @@
-/* eslint-disable no-import-assign */
-import * as auth from '@edx/frontend-platform/auth';
-
-import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';
-
-import { Provider } from 'react-redux';
-import React from 'react';
-import configureStore from 'redux-mock-store';
-import renderer from 'react-test-renderer';
-import DemographicsSection from '../DemographicsSection';
-
-jest.mock('@edx/frontend-platform/auth');
-
-const IntlDemographicsSection = injectIntl(DemographicsSection);
-
-jest.mock('../../data/selectors', () => jest.fn().mockImplementation(() => ({ demographicsSectionSelector: () => ({}) })));
-
-const mockStore = configureStore();
-
-describe('DemographicsSection', () => {
-  let props = {};
-  let store = {};
-
-  const reduxWrapper = children => (
-    <IntlProvider locale="en">
-      <Provider store={store}>{children}</Provider>
-    </IntlProvider>
-  );
-
-  beforeEach(() => {
-    store = mockStore();
-    props = {
-      updateDraft: jest.fn(),
-      formValues: {
-        demographics_gender: 'declined',
-        demographics_gender_description: '',
-        demographics_user_ethnicity: [],
-        demographics_income: 'declined',
-        demographics_military_history: 'declined',
-        demographics_learner_education_level: 'declined',
-        demographics_parent_education_level: 'declined',
-        demographics_work_status: 'declined',
-        demographics_work_status_description: '',
-        demographics_current_work_sector: 'declined',
-        demographics_future_work_sector: 'declined',
-        demographics_user: 1,
-        demographicsOptions: {
-          actions: {
-            POST: {
-              gender: {
-                choices: [
-                  {
-                    value: 'woman',
-                    display_name: 'Woman',
-                  },
-                  {
-                    value: 'man',
-                    display_name: 'Man',
-                  },
-                  {
-                    value: 'non-binary',
-                    display_name: 'Non-binary',
-                  },
-                  {
-                    value: 'self-describe',
-                    display_name: 'Prefer to self describe',
-                  },
-                  {
-                    value: 'declined',
-                    display_name: 'Prefer not to respond',
-                  },
-                ],
-              },
-              income: {
-                choices: [
-                  {
-                    value: 'less-than-10k',
-                    display_name: 'Less than US $10,000',
-                  },
-                  {
-                    value: '10k-25k',
-                    display_name: 'US $10,000 - $25,000',
-                  },
-                  {
-                    value: '25k-50k',
-                    display_name: 'US $25,000 - $50,000',
-                  },
-                  {
-                    value: '50k-75k',
-                    display_name: 'US $50,000 - $75,000',
-                  },
-                  {
-                    value: '75k-100k',
-                    display_name: 'US $75,000 - $100,000',
-                  },
-                  {
-                    value: 'over-100k',
-                    display_name: 'Over US $100,000',
-                  },
-                  {
-                    value: 'unsure',
-                    display_name: "I don't know",
-                  },
-                  {
-                    value: 'declined',
-                    display_name: 'Prefer not to respond',
-                  },
-                ],
-              },
-              learner_education_level: {
-                choices: [
-                  {
-                    value: 'no-high-school',
-                    display_name: 'No High School',
-                  },
-                  {
-                    value: 'some-high-school',
-                    display_name: 'Some High School',
-                  },
-                  {
-                    value: 'high-school-ged-equivalent',
-                    display_name: 'High School diploma, GED, or equivalent',
-                  },
-                  {
-                    value: 'some-college',
-                    display_name: 'Some college, but no degree',
-                  },
-                  {
-                    value: 'associates',
-                    display_name: 'Associates degree',
-                  },
-                  {
-                    value: 'bachelors',
-                    display_name: 'Bachelors degree',
-                  },
-                  {
-                    value: 'masters',
-                    display_name: 'Masters degree',
-                  },
-                  {
-                    value: 'professional',
-                    display_name: 'Professional degree',
-                  },
-                  {
-                    value: 'doctorate',
-                    display_name: 'Doctorate degree',
-                  },
-                  {
-                    value: 'declined',
-                    display_name: 'Prefer not to respond',
-                  },
-                ],
-              },
-              parent_education_level: {
-                choices: [
-                  {
-                    value: 'no-high-school',
-                    display_name: 'No High School',
-                  },
-                  {
-                    value: 'some-high-school',
-                    display_name: 'Some High School',
-                  },
-                  {
-                    value: 'high-school-ged-equivalent',
-                    display_name: 'High School diploma, GED, or equivalent',
-                  },
-                  {
-                    value: 'some-college',
-                    display_name: 'Some college, but no degree',
-                  },
-                  {
-                    value: 'associates',
-                    display_name: 'Associates degree',
-                  },
-                  {
-                    value: 'bachelors',
-                    display_name: 'Bachelors degree',
-                  },
-                  {
-                    value: 'masters',
-                    display_name: 'Masters degree',
-                  },
-                  {
-                    value: 'professional',
-                    display_name: 'Professional degree',
-                  },
-                  {
-                    value: 'doctorate',
-                    display_name: 'Doctorate degree',
-                  },
-                  {
-                    value: 'declined',
-                    display_name: 'Prefer not to respond',
-                  },
-                ],
-              },
-              military_history: {
-                choices: [
-                  {
-                    value: 'never-served',
-                    display_name: 'Never served in the military',
-                  },
-                  {
-                    value: 'training',
-                    display_name: 'Only on active duty for training',
-                  },
-                  {
-                    value: 'active',
-                    display_name: 'Now on active duty',
-                  },
-                  {
-                    value: 'previously-active',
-                    display_name: 'On active duty in the past, but not now',
-                  },
-                  {
-                    value: 'declined',
-                    display_name: 'Prefer not to respond',
-                  },
-                ],
-              },
-              work_status: {
-                choices: [
-                  {
-                    value: 'full-time',
-                    display_name: 'Employed, working full-time',
-                  },
-                  {
-                    value: 'part-time',
-                    display_name: 'Employed, working part-time',
-                  },
-                  {
-                    value: 'self-employed',
-                    display_name: 'Self-Employed',
-                  },
-                  {
-                    value: 'not-employed-looking',
-                    display_name: 'Not employed, looking for work',
-                  },
-                  {
-                    value: 'not-employed-not-looking',
-                    display_name: 'Not employed, not looking for work',
-                  },
-                  {
-                    value: 'unable',
-                    display_name: 'Unable to work',
-                  },
-                  {
-                    value: 'retired',
-                    display_name: 'Retired',
-                  },
-                  {
-                    value: 'other',
-                    display_name: 'Other',
-                  },
-                  {
-                    value: 'declined',
-                    display_name: 'Prefer not to respond',
-                  },
-                ],
-              },
-              current_work_sector: {
-                choices: [
-                  {
-                    value: 'accommodation-food',
-                    display_name: 'Accommodation and Food Services',
-                  },
-                  {
-                    value: 'administrative-support-waste-remediation',
-                    display_name: 'Administrative and Support and Waste Management and Remediation Services',
-                  },
-                  {
-                    value: 'agriculture-forestry-fishing-hunting',
-                    display_name: 'Agriculture, Forestry, Fishing and Hunting',
-                  },
-                  {
-                    value: 'arts-entertainment-recreation',
-                    display_name: 'Arts, Entertainment, and Recreation',
-                  },
-                  {
-                    value: 'construction',
-                    display_name: 'Construction',
-                  },
-                  {
-                    value: 'educational',
-                    display_name: 'Education Services',
-                  },
-                  {
-                    value: 'finance-insurance',
-                    display_name: 'Finance and Insurance',
-                  },
-                  {
-                    value: 'healthcare-social',
-                    display_name: 'Health Care and Social Assistance',
-                  },
-                  {
-                    value: 'information',
-                    display_name: 'Information',
-                  },
-                  {
-                    value: 'management',
-                    display_name: 'Management of Companies and Enterprises',
-                  },
-                  {
-                    value: 'manufacturing',
-                    display_name: 'Manufacturing',
-                  },
-                  {
-                    value: 'mining-quarry-oil-gas',
-                    display_name: 'Mining, Quarrying, and Oil and Gas Extraction',
-                  },
-                  {
-                    value: 'professional-scientific-technical',
-                    display_name: 'Professional, Scientific, and Technical Services',
-                  },
-                  {
-                    value: 'public-admin',
-                    display_name: 'Public Administration',
-                  },
-                  {
-                    value: 'real-estate',
-                    display_name: 'Real Estate and Rental and Leasing',
-                  },
-                  {
-                    value: 'retail',
-                    display_name: 'Retail Trade',
-                  },
-                  {
-                    value: 'transport-warehousing',
-                    display_name: 'Transportation and Warehousing',
-                  },
-                  {
-                    value: 'utilities',
-                    display_name: 'Utilities',
-                  },
-                  {
-                    value: 'trade',
-                    display_name: 'Wholesale Trade',
-                  },
-                  {
-                    value: 'other',
-                    display_name: 'Other',
-                  },
-                  {
-                    value: 'declined',
-                    display_name: 'Prefer not to respond',
-                  },
-                ],
-              },
-              future_work_sector: {
-                choices: [
-                  {
-                    value: 'accommodation-food',
-                    display_name: 'Accommodation and Food Services',
-                  },
-                  {
-                    value: 'administrative-support-waste-remediation',
-                    display_name: 'Administrative and Support and Waste Management and Remediation Services',
-                  },
-                  {
-                    value: 'agriculture-forestry-fishing-hunting',
-                    display_name: 'Agriculture, Forestry, Fishing and Hunting',
-                  },
-                  {
-                    value: 'arts-entertainment-recreation',
-                    display_name: 'Arts, Entertainment, and Recreation',
-                  },
-                  {
-                    value: 'construction',
-                    display_name: 'Construction',
-                  },
-                  {
-                    value: 'educational',
-                    display_name: 'Education Services',
-                  },
-                  {
-                    value: 'finance-insurance',
-                    display_name: 'Finance and Insurance',
-                  },
-                  {
-                    value: 'healthcare-social',
-                    display_name: 'Health Care and Social Assistance',
-                  },
-                  {
-                    value: 'information',
-                    display_name: 'Information',
-                  },
-                  {
-                    value: 'management',
-                    display_name: 'Management of Companies and Enterprises',
-                  },
-                  {
-                    value: 'manufacturing',
-                    display_name: 'Manufacturing',
-                  },
-                  {
-                    value: 'mining-quarry-oil-gas',
-                    display_name: 'Mining, Quarrying, and Oil and Gas Extraction',
-                  },
-                  {
-                    value: 'professional-scientific-technical',
-                    display_name: 'Professional, Scientific, and Technical Services',
-                  },
-                  {
-                    value: 'public-admin',
-                    display_name: 'Public Administration',
-                  },
-                  {
-                    value: 'real-estate',
-                    display_name: 'Real Estate and Rental and Leasing',
-                  },
-                  {
-                    value: 'retail',
-                    display_name: 'Retail Trade',
-                  },
-                  {
-                    value: 'transport-warehousing',
-                    display_name: 'Transportation and Warehousing',
-                  },
-                  {
-                    value: 'utilities',
-                    display_name: 'Utilities',
-                  },
-                  {
-                    value: 'trade',
-                    display_name: 'Wholesale Trade',
-                  },
-                  {
-                    value: 'other',
-                    display_name: 'Other',
-                  },
-                  {
-                    value: 'declined',
-                    display_name: 'Prefer not to respond',
-                  },
-                ],
-              },
-              user_ethnicity: {
-                child: {
-                  children: {
-                    ethnicity: {
-                      choices: [
-                        {
-                          value: 'american-indian-or-alaska-native',
-                          display_name: 'American Indian or Alaska Native',
-                        },
-                        {
-                          value: 'asian',
-                          display_name: 'Asian',
-                        },
-                        {
-                          value: 'black-or-african-american',
-                          display_name: 'Black or African American',
-                        },
-                        {
-                          value: 'hispanic-latin-spanish',
-                          display_name: 'Hispanic, Latin, or Spanish origin',
-                        },
-                        {
-                          value: 'middle-eastern-or-north-african',
-                          display_name: 'Middle Eastern or North African',
-                        },
-                        {
-                          value: 'native-hawaiian-or-pacific-islander',
-                          display_name: 'Native Hawaiian or Other Pacific Islander',
-                        },
-                        {
-                          value: 'white',
-                          display_name: 'White',
-                        },
-                        {
-                          value: 'other',
-                          display_name: 'Some other race, ethnicity, or origin',
-                        },
-                        {
-                          value: 'declined',
-                          display_name: 'Prefer not to respond',
-                        },
-                      ],
-                    },
-                  },
-                },
-              },
-            },
-          },
-        },
-      },
-      formErrors: {},
-      intl: {},
-      forwardRef: () => {},
-      drafts: {},
-    };
-    auth.getAuthenticatedHttpClient = jest.fn(() => ({
-      patch: async () => ({
-        data: { status: 200 },
-        catch: () => {},
-      }),
-    }));
-    auth.getAuthenticatedUser = jest.fn(() => ({ userId: 1 }));
-  });
-
-  it('should render', () => {
-    const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it('should render an Alert if an error occurs', () => {
-    props = {
-      ...props,
-      formErrors: {
-        demographicsError: 'api-error',
-      },
-    };
-
-    const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it('should set user input correctly when user provides gender self-description', () => {
-    props = {
-      ...props,
-      formValues: {
-        ...props.formValues,
-        demographics_gender: 'self-describe',
-        demographics_gender_description: 'test',
-      },
-    };
-
-    const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it('should set user input correctly when user provides answers to work_status question', () => {
-    props = {
-      ...props,
-      formValues: {
-        ...props.formValues,
-        demographics_work_status: 'other',
-        demographics_work_status_description: 'test',
-      },
-    };
-
-    const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it('should render ethnicity text correctly', () => {
-    props = {
-      ...props,
-      formValues: {
-        ...props.formValues,
-        demographics_user_ethnicity: ['asian'],
-      },
-    };
-
-    const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it('should render ethnicity correctly when multiple options are selected', () => {
-    props = {
-      ...props,
-      formValues: {
-        ...props.formValues,
-        demographics_user_ethnicity: ['hispanic-latin-spanish', 'white'],
-      },
-    };
-
-    const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it('should render an Alert when demographicsOptions props are empty', () => {
-    props = {
-      ...props,
-      formValues: {
-        demographicsOptions: null,
-      },
-    };
-
-    const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
-    expect(wrapper).toMatchSnapshot();
-  });
-});
--- a/src/account-settings/demographics/test/snapshots/DemographicsSection.test.jsx.snap
+++ b/src/account-settings/demographics/test/snapshots/DemographicsSection.test.jsx.snap
@@ -1,3953 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`DemographicsSection should render 1`] = `
-<div
-  className="account-section pt-3 mb-5"
-  id="demographics-information"
->
-  <h2
-    className="section-heading h4 mb-3"
-  >
-    Optional Information
-  </h2>
-  <p>
-    <a
-      className="pgn__hyperlink default-link standalone-link"
-      href="http://localhost:5335/demographics"
-      onClick={[Function]}
-      rel="noopener noreferrer"
-      target="_blank"
-    >
-      Why does localhost collect this information?
-      <span
-        className="pgn__hyperlink__external-icon"
-        title="Opens in a new tab"
-      >
-        <span
-          className="pgn__icon"
-          data-testid="hyperlink-icon"
-          style={
-            Object {
-              "height": "1em",
-              "width": "1em",
-            }
-          }
-        >
-          <svg
-            aria-hidden={true}
-            fill="none"
-            focusable={false}
-            height={24}
-            role="img"
-            viewBox="0 0 24 24"
-            width={24}
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M19 19H5V5h7V3H3v18h18v-9h-2v7ZM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7Z"
-              fill="currentColor"
-            />
-          </svg>
-          <span
-            className="sr-only"
-          >
-            in a new tab
-          </span>
-        </span>
-      </span>
-    </a>
-  </p>
-  <div
-    id="demographics-fields"
-  >
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Gender identity
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Race/Ethnicity identity
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            <button
-              className="p-0 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              Add race/ethnicity identity
-            </button>
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Family income
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              U.S. Military status
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Your education level
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Parents/Guardians education level
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Employment status
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Current work industry
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Future work industry
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
-<div
-  className="account-section pt-3 mb-5"
-  id="demographics-information"
->
-  <h2
-    className="section-heading h4 mb-3"
-  >
-    Optional Information
-  </h2>
-  <p>
-    <a
-      className="pgn__hyperlink default-link standalone-link"
-      href="http://localhost:5335/demographics"
-      onClick={[Function]}
-      rel="noopener noreferrer"
-      target="_blank"
-    >
-      Why does localhost collect this information?
-      <span
-        className="pgn__hyperlink__external-icon"
-        title="Opens in a new tab"
-      >
-        <span
-          className="pgn__icon"
-          data-testid="hyperlink-icon"
-          style={
-            Object {
-              "height": "1em",
-              "width": "1em",
-            }
-          }
-        >
-          <svg
-            aria-hidden={true}
-            fill="none"
-            focusable={false}
-            height={24}
-            role="img"
-            viewBox="0 0 24 24"
-            width={24}
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M19 19H5V5h7V3H3v18h18v-9h-2v7ZM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7Z"
-              fill="currentColor"
-            />
-          </svg>
-          <span
-            className="sr-only"
-          >
-            in a new tab
-          </span>
-        </span>
-      </span>
-    </a>
-  </p>
-  <div
-    tabIndex="-1"
-  >
-    <div
-      className="alert d-flex align-items-start alert alert-danger"
-    >
-      <div />
-      <div>
-        An error occurred attempting to retrieve or save your account information. Please try again later.
-      </div>
-    </div>
-  </div>
-  <div
-    id="demographics-fields"
-  >
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Gender identity
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Race/Ethnicity identity
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            <button
-              className="p-0 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              Add race/ethnicity identity
-            </button>
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Family income
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              U.S. Military status
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Your education level
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Parents/Guardians education level
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Employment status
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Current work industry
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Future work industry
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`DemographicsSection should render an Alert when demographicsOptions props are empty 1`] = `
-<div
-  className="account-section pt-3 mb-5"
-  id="demographics-information"
->
-  <h2
-    className="section-heading h4 mb-3"
-  >
-    Optional Information
-  </h2>
-  <p>
-    <a
-      className="pgn__hyperlink default-link standalone-link"
-      href="http://localhost:5335/demographics"
-      onClick={[Function]}
-      rel="noopener noreferrer"
-      target="_blank"
-    >
-      Why does localhost collect this information?
-      <span
-        className="pgn__hyperlink__external-icon"
-        title="Opens in a new tab"
-      >
-        <span
-          className="pgn__icon"
-          data-testid="hyperlink-icon"
-          style={
-            Object {
-              "height": "1em",
-              "width": "1em",
-            }
-          }
-        >
-          <svg
-            aria-hidden={true}
-            fill="none"
-            focusable={false}
-            height={24}
-            role="img"
-            viewBox="0 0 24 24"
-            width={24}
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M19 19H5V5h7V3H3v18h18v-9h-2v7ZM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7Z"
-              fill="currentColor"
-            />
-          </svg>
-          <span
-            className="sr-only"
-          >
-            in a new tab
-          </span>
-        </span>
-      </span>
-    </a>
-  </p>
-  <div
-    tabIndex="-1"
-  >
-    <div
-      className="alert d-flex align-items-start alert alert-danger"
-    >
-      <div />
-      <div>
-        An error occurred attempting to retrieve or save your account information. Please try again later.
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`DemographicsSection should render ethnicity correctly when multiple options are selected 1`] = `
-<div
-  className="account-section pt-3 mb-5"
-  id="demographics-information"
->
-  <h2
-    className="section-heading h4 mb-3"
-  >
-    Optional Information
-  </h2>
-  <p>
-    <a
-      className="pgn__hyperlink default-link standalone-link"
-      href="http://localhost:5335/demographics"
-      onClick={[Function]}
-      rel="noopener noreferrer"
-      target="_blank"
-    >
-      Why does localhost collect this information?
-      <span
-        className="pgn__hyperlink__external-icon"
-        title="Opens in a new tab"
-      >
-        <span
-          className="pgn__icon"
-          data-testid="hyperlink-icon"
-          style={
-            Object {
-              "height": "1em",
-              "width": "1em",
-            }
-          }
-        >
-          <svg
-            aria-hidden={true}
-            fill="none"
-            focusable={false}
-            height={24}
-            role="img"
-            viewBox="0 0 24 24"
-            width={24}
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M19 19H5V5h7V3H3v18h18v-9h-2v7ZM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7Z"
-              fill="currentColor"
-            />
-          </svg>
-          <span
-            className="sr-only"
-          >
-            in a new tab
-          </span>
-        </span>
-      </span>
-    </a>
-  </p>
-  <div
-    id="demographics-fields"
-  >
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Gender identity
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Race/Ethnicity identity
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Hispanic, Latin, or Spanish origin, White
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Family income
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              U.S. Military status
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Your education level
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Parents/Guardians education level
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Employment status
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Current work industry
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Future work industry
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`DemographicsSection should render ethnicity text correctly 1`] = `
-<div
-  className="account-section pt-3 mb-5"
-  id="demographics-information"
->
-  <h2
-    className="section-heading h4 mb-3"
-  >
-    Optional Information
-  </h2>
-  <p>
-    <a
-      className="pgn__hyperlink default-link standalone-link"
-      href="http://localhost:5335/demographics"
-      onClick={[Function]}
-      rel="noopener noreferrer"
-      target="_blank"
-    >
-      Why does localhost collect this information?
-      <span
-        className="pgn__hyperlink__external-icon"
-        title="Opens in a new tab"
-      >
-        <span
-          className="pgn__icon"
-          data-testid="hyperlink-icon"
-          style={
-            Object {
-              "height": "1em",
-              "width": "1em",
-            }
-          }
-        >
-          <svg
-            aria-hidden={true}
-            fill="none"
-            focusable={false}
-            height={24}
-            role="img"
-            viewBox="0 0 24 24"
-            width={24}
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M19 19H5V5h7V3H3v18h18v-9h-2v7ZM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7Z"
-              fill="currentColor"
-            />
-          </svg>
-          <span
-            className="sr-only"
-          >
-            in a new tab
-          </span>
-        </span>
-      </span>
-    </a>
-  </p>
-  <div
-    id="demographics-fields"
-  >
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Gender identity
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Race/Ethnicity identity
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Asian
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Family income
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              U.S. Military status
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Your education level
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Parents/Guardians education level
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Employment status
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Current work industry
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Future work industry
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`DemographicsSection should set user input correctly when user provides answers to work_status question 1`] = `
-<div
-  className="account-section pt-3 mb-5"
-  id="demographics-information"
->
-  <h2
-    className="section-heading h4 mb-3"
-  >
-    Optional Information
-  </h2>
-  <p>
-    <a
-      className="pgn__hyperlink default-link standalone-link"
-      href="http://localhost:5335/demographics"
-      onClick={[Function]}
-      rel="noopener noreferrer"
-      target="_blank"
-    >
-      Why does localhost collect this information?
-      <span
-        className="pgn__hyperlink__external-icon"
-        title="Opens in a new tab"
-      >
-        <span
-          className="pgn__icon"
-          data-testid="hyperlink-icon"
-          style={
-            Object {
-              "height": "1em",
-              "width": "1em",
-            }
-          }
-        >
-          <svg
-            aria-hidden={true}
-            fill="none"
-            focusable={false}
-            height={24}
-            role="img"
-            viewBox="0 0 24 24"
-            width={24}
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M19 19H5V5h7V3H3v18h18v-9h-2v7ZM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7Z"
-              fill="currentColor"
-            />
-          </svg>
-          <span
-            className="sr-only"
-          >
-            in a new tab
-          </span>
-        </span>
-      </span>
-    </a>
-  </p>
-  <div
-    id="demographics-fields"
-  >
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Gender identity
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Race/Ethnicity identity
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            <button
-              className="p-0 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              Add race/ethnicity identity
-            </button>
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Family income
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              U.S. Military status
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Your education level
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Parents/Guardians education level
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Employment status
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Other: test
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Current work industry
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Future work industry
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`DemographicsSection should set user input correctly when user provides gender self-description 1`] = `
-<div
-  className="account-section pt-3 mb-5"
-  id="demographics-information"
->
-  <h2
-    className="section-heading h4 mb-3"
-  >
-    Optional Information
-  </h2>
-  <p>
-    <a
-      className="pgn__hyperlink default-link standalone-link"
-      href="http://localhost:5335/demographics"
-      onClick={[Function]}
-      rel="noopener noreferrer"
-      target="_blank"
-    >
-      Why does localhost collect this information?
-      <span
-        className="pgn__hyperlink__external-icon"
-        title="Opens in a new tab"
-      >
-        <span
-          className="pgn__icon"
-          data-testid="hyperlink-icon"
-          style={
-            Object {
-              "height": "1em",
-              "width": "1em",
-            }
-          }
-        >
-          <svg
-            aria-hidden={true}
-            fill="none"
-            focusable={false}
-            height={24}
-            role="img"
-            viewBox="0 0 24 24"
-            width={24}
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M19 19H5V5h7V3H3v18h18v-9h-2v7ZM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7Z"
-              fill="currentColor"
-            />
-          </svg>
-          <span
-            className="sr-only"
-          >
-            in a new tab
-          </span>
-        </span>
-      </span>
-    </a>
-  </p>
-  <div
-    id="demographics-fields"
-  >
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Gender identity
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer to self describe: test
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Race/Ethnicity identity
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            <button
-              className="p-0 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              Add race/ethnicity identity
-            </button>
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Family income
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              U.S. Military status
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Your education level
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Parents/Guardians education level
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Employment status
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Current work industry
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      className="pgn-transition-replace-group position-relative"
-      style={
-        Object {
-          "height": null,
-        }
-      }
-    >
-      <div
-        style={
-          Object {
-            "padding": ".1px 0",
-          }
-        }
-      >
-        <div
-          className="form-group"
-        >
-          <div
-            className="d-flex align-items-start"
-          >
-            <h6
-              aria-level="3"
-            >
-              Future work industry
-            </h6>
-            <button
-              className="ml-3 btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                className="svg-inline--fa fa-pencil-alt fa-w-16 mr-1"
-                data-icon="pencil-alt"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                style={Object {}}
-                viewBox="0 0 512 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M497.9 142.1l-46.1 46.1c-4.7 4.7-12.3 4.7-17 0l-111-111c-4.7-4.7-4.7-12.3 0-17l46.1-46.1c18.7-18.7 49.1-18.7 67.9 0l60.1 60.1c18.8 18.7 18.8 49.1 0 67.9zM284.2 99.8L21.6 362.4.4 483.9c-2.9 16.4 11.4 30.6 27.8 27.8l121.5-21.3 262.6-262.6c4.7-4.7 4.7-12.3 0-17l-111-111c-4.8-4.7-12.4-4.7-17.1 0zM124.1 339.9c-5.5-5.5-5.5-14.3 0-19.8l154-154c5.5-5.5 14.3-5.5 19.8 0s5.5 14.3 0 19.8l-154 154c-5.5 5.5-14.3 5.5-19.8 0zM88 424h48v36.3l-64.5 11.3-31.1-31.1L51.7 376H88v48z"
-                  fill="currentColor"
-                  style={Object {}}
-                />
-              </svg>
-              Edit
-            </button>
-          </div>
-          <p
-            className={null}
-            data-hj-suppress={true}
-          >
-            Prefer not to respond
-          </p>
-          <p
-            className="small text-muted mt-n2"
-          />
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
--- 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,6 +1,13 @@
-// 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';
-export { storeName } from './data/selectors';
-export { default as NotFoundPage } from './NotFoundPage';
+import ConnectedAccountSettingsPage from './AccountSettingsPage';
+import reducer from './reducers';
+import saga from './sagas';
+import { configureService } from './service';
+import { storeName } from './selectors';
+
+export {
+  configureService,
+  ConnectedAccountSettingsPage,
+  reducer,
+  saga,
+  storeName,
+};
--- 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 unexpired student, work, or government-issued 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,170 +0,0 @@
-/* eslint-disable no-import-assign */
-import React from 'react';
-import ReactDOM from 'react-dom';
-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 ReactDOM.createPortal allows portals to be tested in jest.
-ReactDOM.createPortal = node => node;
-
-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/data/reducers.js
+++ b/src/account-settings/data/reducers.js
@@ -7,15 +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';
+import { reducer as siteLanguageReducer, FETCH_SITE_LANGUAGES } from './site-language';
+import { reducer as resetPasswordReducer, RESET_PASSWORD } from './reset-password';
+import { reducer as thirdPartyAuthReducer, DISCONNECT_AUTH } from './third-party-auth';

 export const defaultState = {
  loading: false,
@@ -30,18 +26,12 @@ export const defaultState = {
  timeZones: [],
  countryTimeZones: [],
  previousSiteLanguage: null,
-  deleteAccount: deleteAccountReducer(),
  siteLanguage: siteLanguageReducer(),
  resetPassword: resetPasswordReducer(),
-  nameChange: nameChangeReducer(),
  thirdPartyAuth: thirdPartyAuthReducer(),
-  nameChangeModal: false,
-  verifiedName: null,
-  mostRecentVerifiedName: {},
-  verifiedNameHistory: {},
 };

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

  switch (action.type) {
@@ -55,15 +45,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,
      };
    case FETCH_SETTINGS.FAILURE:
      return {
@@ -97,14 +88,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: {},
      };
@@ -115,15 +107,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,
@@ -134,18 +117,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 {
@@ -158,24 +142,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 {
@@ -183,20 +149,8 @@ const reducer = (state = defaultState, action = {}) => {
        countryTimeZones: action.payload.timeZones,
      };

-      // TODO: Once all the above cases have been converted into sub-reducers, we can use
-      // combineReducers in this file to greatly simplify it.
-
-    // Delete My Account
-    case DELETE_ACCOUNT.CONFIRMATION:
-    case DELETE_ACCOUNT.BEGIN:
-    case DELETE_ACCOUNT.SUCCESS:
-    case DELETE_ACCOUNT.FAILURE:
-    case DELETE_ACCOUNT.RESET:
-    case DELETE_ACCOUNT.CANCEL:
-      return {
-        ...state,
-        deleteAccount: deleteAccountReducer(state.deleteAccount, action),
-      };
+    // TODO: Once all the above cases have been converted into sub-reducers, we can use
+    // combineReducers in this file to greatly simplify it.

    case FETCH_SITE_LANGUAGES.BEGIN:
    case FETCH_SITE_LANGUAGES.SUCCESS:
@@ -209,21 +163,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/reset-password/ConfirmationAlert.jsx
+++ b/src/account-settings/reset-password/ConfirmationAlert.jsx
@@ -1,19 +1,18 @@
 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 { FormattedMessage } from '@edx/frontend-i18n';
+import { Hyperlink } from '@edx/paragon';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';

-import Alert from '../Alert';
+import { Alert } from '../../common';

 const ConfirmationAlert = (props) => {
  const { email } = 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
@@ -1,13 +1,12 @@
 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 { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-i18n';
+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
@@ -1,4 +1,6 @@
-import { AsyncActionType } from '../../data/utils';
+import { utils } from '../../../common';
+
+const { AsyncActionType } = utils;

 export const RESET_PASSWORD = new AsyncActionType('ACCOUNT_SETTINGS', 'RESET_PASSWORD');

@@ -18,7 +20,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/Show More
+++ b/Show More