feat: deprecated bable-plugin-react-intl in favour of babel-plugin-formatjs

Co-authored-by: Jenkins <sre+jenkins@edx.org>

.env

@@ -1,25 +1,36 @@
-ACCESS_TOKEN_COOKIE_NAME=null
-BASE_URL=null
-CREDENTIALS_BASE_URL=null
-CSRF_TOKEN_API_PATH=null
-ECOMMERCE_BASE_URL=null
-LANGUAGE_PREFERENCE_COOKIE_NAME=null
-LMS_BASE_URL=null
-DEMOGRAPHICS_BASE_URL=null
-LOGIN_URL=null
-LOGOUT_URL=null
-MARKETING_SITE_BASE_URL=null
-NODE_ENV=null
-ORDER_HISTORY_URL=null
-REFRESH_ACCESS_TOKEN_ENDPOINT=null
-SEGMENT_KEY=null
-SITE_NAME=null
-SUPPORT_URL=null
-USER_INFO_COOKIE_NAME=null
-LOGO_URL=''
-LOGO_TRADEMARK_URL=''
-LOGO_WHITE_URL=''
+ACCESS_TOKEN_COOKIE_NAME=''
+BASE_URL=''
+COACHING_ENABLED=''
+CREDENTIALS_BASE_URL=''
+CSRF_TOKEN_API_PATH=''
+DEMOGRAPHICS_BASE_URL=''
+DISCOVERY_API_BASE_URL=''
+ECOMMERCE_BASE_URL=''
+ENABLE_DEMOGRAPHICS_COLLECTION=''
 FAVICON_URL=''
-PUBLISHER_BASE_URL=
-STUDIO_BASE_URL=
-DISCOVERY_API_BASE_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'

.env.development

@@ -1,29 +1,37 @@
 ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
 BASE_URL='localhost:1997'
+COACHING_ENABLED=''
 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'
-DEMOGRAPHICS_BASE_URL='http://localhost:18360'
 NODE_ENV='development'
-ORDER_HISTORY_URL='localhost:1996/orders'
+ORDER_HISTORY_URL='http://localhost:1996/orders'
 PORT=1997
+PUBLISHER_BASE_URL=''
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
-SEGMENT_KEY=null
-SITE_NAME='edX'
+SEGMENT_KEY=''
+SITE_NAME=localhost
+STUDIO_BASE_URL=''
 SUPPORT_URL='http://localhost:18000/support'
 USER_INFO_COOKIE_NAME='edx-user-info'
-# Temporary, Remove this once we are ready to release the feature.
-COACHING_ENABLED=true
-ENABLE_DEMOGRAPHICS_COLLECTION=true
-LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
-LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
-LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
-FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
-PUBLISHER_BASE_URL=
-STUDIO_BASE_URL=
-DISCOVERY_API_BASE_URL=
+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'

.env.test

@@ -1,27 +1,35 @@
 ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
 BASE_URL='localhost:1997'
+COACHING_ENABLED=''
 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'
-DEMOGRAPHICS_BASE_URL='http://localhost:18360'
-NODE_ENV=null
-ORDER_HISTORY_URL='localhost:1996/orders'
+NODE_ENV=''
+ORDER_HISTORY_URL='http://localhost:1996/orders'
+PUBLISHER_BASE_URL=''
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
-SEGMENT_KEY=null
-SITE_NAME='edX'
+SEGMENT_KEY=''
+SITE_NAME=localhost
+STUDIO_BASE_URL=''
 SUPPORT_URL='http://localhost:18000/support'
 USER_INFO_COOKIE_NAME='edx-user-info'
-COACHING_ENABLED=''
-ENABLE_DEMOGRAPHICS_COLLECTION=''
-LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
-LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
-LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
-FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
-PUBLISHER_BASE_URL=
-STUDIO_BASE_URL=
-DISCOVERY_API_BASE_URL=
+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'

.eslintrc.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 const { createConfig } = require('@edx/frontend-build');
 
 module.exports = createConfig('eslint');

.github/workflows/add-depr-ticket-to-depr-board.yml

@@ -0,0 +1,19 @@
+# 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 }}

.github/workflows/add-remove-label-on-comment.yml

@@ -0,0 +1,20 @@
+# 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
+

.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+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@v2
+    - 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

.github/workflows/commitlint.yml

@@ -0,0 +1,10 @@
+# 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

.github/workflows/lockfileversion-check.yml

@@ -0,0 +1,14 @@
+#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
+    

.github/workflows/self-assign-issue.yml

@@ -0,0 +1,12 @@
+# 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

.github/workflows/update-browserslist-db.yml

@@ -0,0 +1,12 @@
+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 }}

.nvmrc

@@ -0,0 +1 @@
+18

.travis.yml

@@ -1,15 +0,0 @@
-language: node_js
-node_js: 12
-before_install:
-- npm install -g npm@6
-install:
-- npm ci
-script:
-- make validate-no-uncommitted-package-lock-changes
-- npm run i18n_extract
-- npm run lint
-- npm run test
-- npm run build
-- npm run is-es5
-after_success:
-- codecov

.tx/config

@@ -1,8 +1,9 @@
 [main]
 host = https://www.transifex.com
 
-[edx-platform.frontend-app-account]
+[o:open-edx:p:edx-platform:r:frontend-app-account]
 file_filter = src/i18n/messages/<lang>.json
 source_file = src/i18n/transifex_input.json
 source_lang = en
-type = KEYVALUEJSON
+type        = KEYVALUEJSON
+

Makefile

@@ -1,17 +1,28 @@
+export TRANSIFEX_RESOURCE = frontend-app-account
 transifex_resource = frontend-app-account
-transifex_langs = "ar,fr,es_419,zh_CN"
+transifex_langs = "ar,de,es_419,fa_IR,fr,fr_CA,hi,it,pt,ru,uk,zh_CN,it_IT,pt_PT,de_DE"
 
+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-react-intl
+transifex_temp = ./temp/babel-plugin-formatjs
 
-requirements:
-	npm install
+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
 
 i18n.extract:
 	# Pulling display strings from .jsx files into .json files...
@@ -34,15 +45,30 @@ push_translations:
 	# Pushing strings to Transifex...
 	tx push -s
 	# Fetching hashes from Transifex...
-	./node_modules/reactifex/bash_scripts/get_hashed_strings.sh $(tx_url1)
+	./node_modules/@edx/reactifex/bash_scripts/get_hashed_strings_v3.sh
 	# Writing out comments to file...
-	$(transifex_utils) $(transifex_temp) --comments
+	$(transifex_utils) $(transifex_temp) --comments --v3-scripts-path
 	# Pushing comments to Transifex...
-	./node_modules/reactifex/bash_scripts/put_comments.sh $(tx_url2)
+	./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
 
+ifeq ($(OPENEDX_ATLAS_PULL),)
 # Pulls translations from Transifex.
 pull_translations:
-	tx pull -f --mode reviewed --language=$(transifex_langs)
+	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 --filter=$(transifex_langs) \
+               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) paragon frontend-component-header frontend-component-footer frontend-app-account
+endif
 
 # This target is used by Travis.
 validate-no-uncommitted-package-lock-changes:

README.rst

@@ -1,48 +1,125 @@
-|Build Status| |Codecov| |npm_version| |npm_downloads| |license| |semantic-release|
+|ci-badge| |Codecov| |npm_version| |npm_downloads| |license| |semantic-release|
 
 frontend-app-account
 ====================
 
-This is a micro-frontend application responsible for the display and updating of a user's account information.  Please tag **@edx/arch-team** on any PRs or issues.
+Introduction
+------------
 
-Development
------------
+This is a micro-frontend application responsible for the display and updating of a user's account information.
 
-Start Devstack
-^^^^^^^^^^^^^^
+What is the domain of this MFE?
 
-To use this application `devstack <https://github.com/edx/devstack>`__ must be running and you must be logged into it.
+In this MFE: Private user settings UIs. Public facing profile is in a `separate MFE (Profile) <https://github.com/openedx/frontend-app-profile>`_
 
--  Start devstack
--  Log in (http://localhost:18000/login)
+- Account settings page
 
-Start the development server
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Demographics collection
 
-In this project, install requirements and start the development server by running:
+- IDV (Identity Verification)
 
-.. code:: bash
+Installation
+------------
 
-   npm install
-   npm start # The server will run on port 1997
+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.
 
-Once the dev server is up visit http://localhost:1997.
+1. Install Devstack using the `Getting Started <https://github.com/openedx/devstack#getting-started>`_ instructions.
 
-Configuration and Deployment
-----------------------------
+2. Start up Devstack, if it's not already started.
 
-This MFE is configured via node environment variables supplied at build time. See the .env file for the list of required environment variables. Example build syntax with a single environment variable:
+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:
+
+``COACHING_ENABLED``
+
+Example: ``true`` | ``''`` (empty strings are falsy)
+
+Enables support for a section of the micro-frontend that helps users arrange for coaching sessions.  Integrates with a private coaching plugin and is only used by edx.org.
+
+``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://github.com/edx/edx-developer-docs/blob/5191e800bf16cf42f25c58c58f983bdaf7f9305d/docs/micro-frontends-in-open-edx.rst>`__.
+edX <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.
 
-.. |Build Status| image:: https://api.travis-ci.com/edx/frontend-app-account.svg?branch=master
-   :target: https://travis-ci.com/edx/frontend-app-account
+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.
+
+
+==============================
+
+.. |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
 .. |npm_version| image:: https://img.shields.io/npm/v/@edx/frontend-app-account.svg

jest.config.js

@@ -1,7 +1,7 @@
 const { createConfig } = require('@edx/frontend-build');
 
 module.exports = createConfig('jest', {
-  setupFiles: [
+  setupFilesAfterEnv: [
     '<rootDir>/src/setupTest.js',
   ],
 });

openedx.yaml

@@ -3,5 +3,4 @@
 
 nick: acct
 oeps: {}
-owner: edx/arch-team
 openedx-release: {ref: master}

package.json

@@ -6,50 +6,48 @@
   "license": "AGPL-3.0",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/edx/frontend-app-account.git"
+    "url": "git+https://github.com/openedx/frontend-app-account.git"
   },
   "scripts": {
     "build": "fedx-scripts webpack",
-    "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
-    "is-es5": "es-check es5 ./dist/*.js",
+    "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": "fedx-scripts jest --coverage --passWithNoTests"
+    "test": "TZ=UTC fedx-scripts jest --coverage --passWithNoTests"
   },
   "bugs": {
-    "url": "https://github.com/edx/frontend-app-account/issues"
+    "url": "https://github.com/openedx/frontend-app-account/issues"
   },
-  "homepage": "https://github.com/edx/frontend-app-account#readme",
+  "homepage": "https://github.com/openedx/frontend-app-account#readme",
   "publishConfig": {
     "access": "public"
   },
   "browserslist": [
-    "last 2 versions",
-    "ie 11"
+    "extends @edx/browserslist-config"
   ],
   "dependencies": {
-    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
-    "@edx/frontend-component-footer": "10.1.4",
-    "@edx/frontend-component-header": "2.2.4",
-    "@edx/frontend-platform": "1.8.4",
-    "@edx/paragon": "13.1.2",
-    "@fortawesome/fontawesome-svg-core": "1.2.34",
-    "@fortawesome/free-brands-svg-icons": "5.8.2",
-    "@fortawesome/free-regular-svg-icons": "5.7.2",
-    "@fortawesome/free-solid-svg-icons": "5.8.2",
-    "@fortawesome/react-fontawesome": "0.1.14",
+    "@edx/brand": "npm:@edx/brand-openedx@1.2.0",
+    "@edx/frontend-component-footer": "12.2.1",
+    "@edx/frontend-component-header": "4.6.1",
+    "@edx/frontend-platform": "5.4.0",
+    "@edx/paragon": "20.46.2",
+    "@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",
     "@tensorflow-models/blazeface": "0.0.7",
-    "@tensorflow/tfjs-converter": "1.6.1",
-    "@tensorflow/tfjs-core": "1.6.1",
-    "babel-polyfill": "6.26.0",
-    "bowser": "2.10.0",
-    "classnames": "2.2.6",
+    "@tensorflow/tfjs-converter": "3.21.0",
+    "@tensorflow/tfjs-core": "3.21.0",
+    "bowser": "2.11.0",
+    "classnames": "2.3.2",
+    "core-js": "3.33.0",
     "font-awesome": "4.7.0",
-    "form-urlencoded": "4.0.1",
-    "formdata-polyfill": "3.0.20",
-    "history": "4.10.1",
-    "jslib-html5-camera-photo": "3.1.6",
+    "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",
@@ -58,36 +56,38 @@
     "lodash.omit": "4.5.0",
     "lodash.pick": "4.4.0",
     "lodash.pickby": "4.6.0",
-    "memoize-one": "5.1.1",
-    "newrelic": "5.13.1",
-    "prop-types": "15.7.2",
-    "qs": "6.9.6",
-    "react": "16.10.2",
-    "react-dom": "16.10.2",
-    "react-redux": "7.1.3",
-    "react-router": "5.1.2",
-    "react-router-dom": "5.1.2",
-    "react-router-hash-link": "1.2.2",
+    "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.14.2",
+    "react-router-dom": "6.14.2",
+    "react-router-hash-link": "2.4.3",
     "react-scrollspy": "3.4.3",
-    "react-transition-group": "4.3.0",
-    "redux": "4.0.5",
-    "redux-devtools-extension": "2.13.8",
+    "react-transition-group": "4.4.5",
+    "redux": "4.2.1",
+    "redux-devtools-extension": "2.13.9",
     "redux-logger": "3.0.6",
-    "redux-saga": "1.1.3",
-    "redux-thunk": "2.3.0",
-    "reselect": "4.0.0",
+    "redux-saga": "1.2.3",
+    "redux-thunk": "2.4.2",
+    "regenerator-runtime": "0.14.0",
+    "reselect": "4.1.8",
     "universal-cookie": "4.0.4"
   },
   "devDependencies": {
-    "@edx/frontend-build": "5.6.9",
-    "@testing-library/jest-dom": "5.11.9",
-    "@testing-library/react": "10.4.9",
-    "codecov": "3.7.2",
-    "enzyme": "3.10.0",
-    "enzyme-adapter-react-16": "1.15.6",
-    "es-check": "5.0.0",
-    "husky": "3.0.9",
-    "react-test-renderer": "16.8.6",
+    "@edx/browserslist-config": "1.2.0",
+    "@edx/frontend-build": "13.0.0",
+    "@edx/reactifex": "1.1.0",
+    "@testing-library/jest-dom": "5.17.0",
+    "@testing-library/react": "12.1.5",
+    "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
+    "enzyme": "3.11.0",
+    "react-test-renderer": "17.0.2",
     "reactifex": "1.1.1",
     "redux-mock-store": "1.5.4"
   }

public/index.html

@@ -1,17 +1,148 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en-us">
   <head>
-      <title>Account | edX</title>
-      <meta charset="utf-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <link rel="shortcut icon" href="<%=webpackConfig.output.publicPath%>favicon.ico" 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 | <%= 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>
+    <% } %>
   </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>

renovate.json

@@ -1,17 +1,33 @@
 {
   "extends": [
-    "config:base"
+    "config:base",
+    "schedule:weekly",
+    ":automergeLinters",
+    ":automergeMinor",
+    ":automergeTesters",
+    ":enableVulnerabilityAlerts",
+    ":rebaseStalePrs",
+    ":semanticCommits",
+    ":updateNotScheduled"
   ],
-  "patch": {
-    "automerge": true
-  },
-  "rebaseStalePrs": true,
   "packageRules": [
     {
-      "matchPackagePatterns": ["^@edx/paragon"],
-      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
-      "automerge": true,
-      "stabilityDays": 3
+      "matchDepTypes": [
+        "devDependencies"
+      ],
+      "matchUpdateTypes": [
+        "lockFileMaintenance",
+        "minor",
+        "patch",
+        "pin"
+      ],
+      "automerge": true
+    },
+    {
+      "matchPackagePatterns": ["@edx", "@openedx"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true
     }
-  ]
+  ],
+  "timezone": "America/New_York"
 }

src/account-settings/AccountSettingsPage.jsx

@@ -1,5 +1,5 @@
 import { AppContext } from '@edx/frontend-platform/react';
-import { getConfig, history, getQueryParameters } from '@edx/frontend-platform';
+import { getConfig, getQueryParameters } from '@edx/frontend-platform';
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
@@ -13,43 +13,51 @@ import {
   getCountryList,
   getLanguageList,
 } from '@edx/frontend-platform/i18n';
-import { Hyperlink } from '@edx/paragon';
+import {
+  Button, Hyperlink, Icon, Alert,
+} from '@edx/paragon';
+import { CheckCircle, Error, WarningFilled } from '@edx/paragon/icons';
 
 import messages from './AccountSettingsPage.messages';
-import { fetchSettings, saveSettings, updateDraft } from './data/actions';
+import {
+  fetchSettings,
+  saveMultipleSettings,
+  saveSettings,
+  updateDraft,
+  beginNameChange,
+} from './data/actions';
 import { accountSettingsPageSelector } from './data/selectors';
 import PageLoading from './PageLoading';
-import Alert from './Alert';
 import JumpNav from './JumpNav';
 import DeleteAccount from './delete-account';
 import EditableField from './EditableField';
+import EditableSelectField from './EditableSelectField';
 import ResetPassword from './reset-password';
+import NameChange from './name-change';
 import ThirdPartyAuth from './third-party-auth';
 import BetaLanguageBanner from './BetaLanguageBanner';
 import EmailField from './EmailField';
+import OneTimeDismissibleAlert from './OneTimeDismissibleAlert';
+import DOBModal from './DOBForm';
 import {
   YEAR_OF_BIRTH_OPTIONS,
   EDUCATION_LEVELS,
   GENDER_OPTIONS,
   COUNTRY_WITH_STATES,
+  COPPA_COMPLIANCE_YEAR,
   getStatesList,
 } from './data/constants';
 import { fetchSiteLanguages } from './site-language';
 import CoachingToggle from './coaching/CoachingToggle';
 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);
 
-    // If there is a "duplicate_provider" query parameter, that's the backend's
-    // way of telling us that the provider account the user tried to link is already linked
-    // to another Open edX account. We use this to display a message to that effect, and remove the
-    // parameter from the URL.
     const duplicateTpaProvider = getQueryParameters().duplicate_provider;
-    if (duplicateTpaProvider !== undefined) {
-      history.replace(history.location.pathname);
-    }
     this.state = {
       duplicateTpaProvider,
     };
@@ -66,8 +74,9 @@ class AccountSettingsPage extends React.Component {
   }
 
   componentDidMount() {
+    this.props.fetchCourseList();
     this.props.fetchSettings();
-    this.props.fetchSiteLanguages();
+    this.props.fetchSiteLanguages(this.props.navigate);
     sendTrackingLogEvent('edx.user.settings.viewed', {
       page: 'account',
       visibility: null,
@@ -144,6 +153,34 @@ class AccountSettingsPage extends React.Component {
     this.props.saveSettings(formId, values);
   };
 
+  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);
   }
@@ -159,15 +196,22 @@ class AccountSettingsPage extends React.Component {
       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 className="alert alert-danger" role="alert">
+        <Alert variant="danger">
           <FormattedMessage
             id="account.settings.message.duplicate.tpa.provider"
-            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"
+            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"
             values={{
               provider: <b>{this.state.duplicateTpaProvider}</b>,
+              siteName: getConfig().SITE_NAME,
             }}
           />
         </Alert>
@@ -182,7 +226,7 @@ class AccountSettingsPage extends React.Component {
 
     return (
       <div>
-        <Alert className="alert alert-primary" role="alert">
+        <Alert variant="info">
           <FormattedMessage
             id="account.settings.message.managed.settings"
             defaultMessage="Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help."
@@ -205,6 +249,170 @@ 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'], {
@@ -214,6 +422,13 @@ 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) {
       return null;
@@ -260,6 +475,8 @@ class AccountSettingsPage extends React.Component {
     // 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 timeZoneOptions = this.getLocalizedTimeZoneOptions(
       this.props.timeZoneOptions,
       this.props.countryTimeZoneOptions,
@@ -268,38 +485,112 @@ class AccountSettingsPage extends React.Component {
 
     const hasLinkedTPA = findIndex(this.props.tpaProviders, provider => provider.connected) >= 0;
 
+    // if user is under 13 and does not have cookie set
+    const shouldUpdateDOB = (
+      getConfig().ENABLE_COPPA_COMPLIANCE
+      && getConfig().ENABLE_DOB_UPDATE
+      && this.props.formValues.year_of_birth.toString() >= COPPA_COMPLIANCE_YEAR.toString()
+      && !localStorage.getItem('submittedDOB')
+    );
     return (
       <>
-        <div className="account-section" id="basic-information" ref={this.navLinkRefs['#basic-information']}>
-          <h2 className="section-heading">
+        { 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">
             {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'])}
+            helpText={this.props.intl.formatMessage(
+              messages['account.settings.field.username.help.text'],
+              { siteName: getConfig().SITE_NAME },
+            )}
             isEditable={false}
             {...editableFieldProps}
           />
           <EditableField
             name="name"
             type="text"
-            value={this.props.formValues.name}
+            value={
+              verifiedName?.status === 'submitted'
+              && this.props.formValues.pending_name_change
+                ? this.props.formValues.pending_name_change
+                : 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()
             }
-            helpText={this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text'])}
-            isEditable={this.isEditable('name')}
-            {...editableFieldProps}
+            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}
           />
+          {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'])}
@@ -310,22 +601,28 @@ class AccountSettingsPage extends React.Component {
             }
             value={this.props.formValues.email}
             confirmationMessageDefinition={messages['account.settings.field.email.confirmation']}
-            helpText={this.props.intl.formatMessage(messages['account.settings.field.email.help.text'])}
+            helpText={this.props.intl.formatMessage(
+              messages['account.settings.field.email.help.text'],
+              { siteName: getConfig().SITE_NAME },
+            )}
             isEditable={this.isEditable('email')}
             {...editableFieldProps}
           />
           {this.renderSecondaryEmailField(editableFieldProps)}
           <ResetPassword email={this.props.formValues.email} />
-          <EditableField
-            name="year_of_birth"
-            type="select"
-            label={this.props.intl.formatMessage(messages['account.settings.field.dob'])}
-            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.dob.empty'])}
-            value={this.props.formValues.year_of_birth}
-            options={yearOfBirthOptions}
-            {...editableFieldProps}
-          />
-          <EditableField
+          {(!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
             name="country"
             type="select"
             value={this.props.formValues.country}
@@ -341,7 +638,7 @@ class AccountSettingsPage extends React.Component {
           />
           {showState
             && (
-            <EditableField
+            <EditableSelectField
               name="state"
               type="select"
               value={this.props.formValues.state}
@@ -358,21 +655,23 @@ class AccountSettingsPage extends React.Component {
             )}
         </div>
 
-        <div className="account-section" id="profile-information" ref={this.navLinkRefs['#profile-information']}>
-          <h2 className="section-heading">
+        <div className="account-section pt-3 mb-5" id="profile-information" ref={this.navLinkRefs['#profile-information']}>
+          <h2 className="section-heading h4 mb-3">
             {this.props.intl.formatMessage(messages['account.settings.section.profile.information'])}
           </h2>
 
-          <EditableField
+          <EditableSelectField
             name="level_of_education"
             type="select"
             value={this.props.formValues.level_of_education}
-            options={educationLevelOptions}
+            options={getConfig().ENABLE_COPPA_COMPLIANCE
+              ? educationLevelOptions.filter(option => option.value !== 'el')
+              : educationLevelOptions}
             label={this.props.intl.formatMessage(messages['account.settings.field.education'])}
             emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.education.empty'])}
             {...editableFieldProps}
           />
-          <EditableField
+          <EditableSelectField
             name="gender"
             type="select"
             value={this.props.formValues.gender}
@@ -381,7 +680,7 @@ class AccountSettingsPage extends React.Component {
             emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.gender.empty'])}
             {...editableFieldProps}
           />
-          <EditableField
+          <EditableSelectField
             name="language_proficiencies"
             type="select"
             value={this.props.formValues.language_proficiencies}
@@ -401,11 +700,16 @@ class AccountSettingsPage extends React.Component {
             )}
         </div>
         {getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && this.renderDemographicsSection()}
-        <div className="account-section" id="social-media">
-          <h2 className="section-heading">
+        <div className="account-section pt-3 mb-5" id="social-media">
+          <h2 className="section-heading h4 mb-3">
             {this.props.intl.formatMessage(messages['account.settings.section.social.media'])}
           </h2>
-          <p>{this.props.intl.formatMessage(messages['account.settings.section.social.media.description'])}</p>
+          <p>
+            {this.props.intl.formatMessage(
+              messages['account.settings.section.social.media.description'],
+              { siteName: getConfig().SITE_NAME },
+            )}
+          </p>
 
           <EditableField
             name="social_link_linkedin"
@@ -433,13 +737,13 @@ class AccountSettingsPage extends React.Component {
           />
         </div>
 
-        <div className="account-section" id="site-preferences" ref={this.navLinkRefs['#site-preferences']}>
-          <h2 className="section-heading">
+        <div className="account-section pt-3 mb-5" id="site-preferences" ref={this.navLinkRefs['#site-preferences']}>
+          <h2 className="section-heading h4 mb-3">
             {this.props.intl.formatMessage(messages['account.settings.section.site.preferences'])}
           </h2>
 
           <BetaLanguageBanner />
-          <EditableField
+          <EditableSelectField
             name="siteLanguage"
             type="select"
             options={this.props.siteLanguageOptions}
@@ -448,7 +752,7 @@ class AccountSettingsPage extends React.Component {
             helpText={this.props.intl.formatMessage(messages['account.settings.field.site.language.help.text'])}
             {...editableFieldProps}
           />
-          <EditableField
+          <EditableSelectField
             name="time_zone"
             type="select"
             value={this.props.formValues.time_zone}
@@ -464,18 +768,26 @@ class AccountSettingsPage extends React.Component {
           />
         </div>
 
-        <div className="account-section" id="linked-accounts" ref={this.navLinkRefs['#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>
+        <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>
           <ThirdPartyAuth />
         </div>
 
-        <div className="account-section" id="delete-account" ref={this.navLinkRefs['#delete-account']}>
-          <DeleteAccount
-            isVerifiedAccount={this.props.isActive}
-            hasLinkedTPA={hasLinkedTPA}
-          />
-        </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>
+          )}
 
       </>
     );
@@ -512,12 +824,12 @@ class AccountSettingsPage extends React.Component {
         </h1>
         <div>
           <div className="row">
-            <div className="col-md-3">
+            <div className="col-md-2">
               <JumpNav
                 displayDemographicsLink={this.props.formValues.shouldDisplayDemographicsSection}
               />
             </div>
-            <div className="col-md-9">
+            <div className="col-md-10">
               {loading ? this.renderLoading() : null}
               {loaded ? this.renderContent() : null}
               {loadingError ? this.renderError() : null}
@@ -549,6 +861,7 @@ AccountSettingsPage.propTypes = {
     level_of_education: PropTypes.string,
     gender: 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,
@@ -561,7 +874,18 @@ AccountSettingsPage.propTypes = {
     }),
     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,
@@ -585,15 +909,48 @@ AccountSettingsPage.propTypes = {
   })),
   fetchSiteLanguages: PropTypes.func.isRequired,
   updateDraft: PropTypes.func.isRequired,
+  saveMultipleSettings: PropTypes.func.isRequired,
   saveSettings: PropTypes.func.isRequired,
   fetchSettings: PropTypes.func.isRequired,
-  tpaProviders: PropTypes.arrayOf(PropTypes.object),
+  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,
 };
 
 AccountSettingsPage.defaultProps = {
   loading: false,
   loaded: false,
   loadingError: null,
+  committedValues: {
+    useVerifiedNameForCerts: false,
+    verified_name: null,
+  },
+  drafts: {},
+  formErrors: {},
   siteLanguage: null,
   siteLanguageOptions: [],
   timeZoneOptions: [],
@@ -603,11 +960,18 @@ AccountSettingsPage.defaultProps = {
   tpaProviders: [],
   isActive: true,
   secondary_email_enabled: false,
+  nameChangeModal: {},
+  verifiedName: null,
+  mostRecentVerifiedName: {},
+  verifiedNameHistory: [],
 };
 
-export default connect(accountSettingsPageSelector, {
+export default withLocation(withNavigate(connect(accountSettingsPageSelector, {
+  fetchCourseList,
   fetchSettings,
   saveSettings,
+  saveMultipleSettings,
   updateDraft,
   fetchSiteLanguages,
-})(injectIntl(AccountSettingsPage));
+  beginNameChange,
+})(injectIntl(AccountSettingsPage))));

src/account-settings/AccountSettingsPage.messages.jsx

@@ -63,7 +63,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 edX.',
+    defaultMessage: 'You can link your identity accounts to simplify signing in to {siteName}.',
     description: 'The linked accounts section heading description.',
   },
   'account.settings.field.username': {
@@ -73,7 +73,7 @@ const messages = defineMessages({
   },
   'account.settings.field.username.help.text': {
     id: 'account.settings.field.username.help.text',
-    defaultMessage: 'The name that identifies you on edX. You cannot change your username.',
+    defaultMessage: 'The name that identifies you on {siteName}. You cannot change your username.',
     description: 'Help text for the account settings username field.',
   },
   'account.settings.field.full.name': {
@@ -91,6 +91,126 @@ 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)',
@@ -108,7 +228,7 @@ const messages = defineMessages({
   },
   'account.settings.field.email.help.text': {
     id: 'account.settings.field.email.help.text',
-    defaultMessage: 'You receive messages from edX and course teams at this address.',
+    defaultMessage: 'You receive messages from {siteName} and course teams at this address.',
     description: 'Help text for the account settings email field.',
   },
   'account.settings.field.secondary.email': {
@@ -146,6 +266,56 @@ 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,7 +501,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 edX profile.',
+    defaultMessage: 'Optionally, link your personal accounts to the social media icons on your {siteName} profile.',
     description: 'Section subheader for social media links settings',
   },
   'account.settings.field.social.platform.name.linkedin': {
@@ -395,6 +565,11 @@ 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',
+  },
 });
 
 export default messages;

src/account-settings/Alert.jsx

@@ -2,18 +2,16 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-function Alert(props) {
-  return (
-    <div className={classNames('alert d-flex align-items-start', props.className)}>
-      <div>
-        {props.icon}
-      </div>
-      <div>
-        {props.children}
-      </div>
+const Alert = (props) => (
+  <div className={classNames('alert d-flex align-items-start', props.className)}>
+    <div>
+      {props.icon}
     </div>
-  );
-}
+    <div>
+      {props.children}
+    </div>
+  </div>
+);
 
 Alert.propTypes = {
   className: PropTypes.string,

src/account-settings/BetaLanguageBanner.jsx

@@ -49,6 +49,9 @@ class BetaLanguageBanner extends React.Component {
 
   render() {
     const savedLanguage = this.getSiteLanguageEntry(this.context.locale);
+    if (!savedLanguage) {
+      return null;
+    }
     const isSavedLanguageReleased = savedLanguage.released === true;
     const noPreviousLanguageSet = this.props.siteLanguage.previousValue === null;
     if (isSavedLanguageReleased || noPreviousLanguageSet) {

src/account-settings/DOBForm.jsx

@@ -0,0 +1,162 @@
+import PropTypes from 'prop-types';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import {
+  Form, StatefulButton, ModalDialog, ActionRow, useToggle, Button,
+} from '@edx/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));

src/account-settings/EditableField.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import {
-  Button, Input, StatefulButton, ValidationFormGroup,
+  Button, Form, StatefulButton,
 } from '@edx/paragon';
 import { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -16,8 +16,9 @@ import {
   closeForm,
 } from './data/actions';
 import { editableFieldSelector } from './data/selectors';
+import CertificatePreference from './certificate-preference/CertificatePreference';
 
-function EditableField(props) {
+const EditableField = (props) => {
   const {
     name,
     label,
@@ -25,7 +26,6 @@ function EditableField(props) {
     type,
     value,
     userSuppliedValue,
-    options,
     saveState,
     error,
     confirmationMessageDefinition,
@@ -37,6 +37,7 @@ function EditableField(props) {
     onChange,
     isEditing,
     isEditable,
+    isGrayedOut,
     intl,
     ...others
   } = props;
@@ -72,15 +73,6 @@ function EditableField(props) {
     }
     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}`;
     }
@@ -102,54 +94,56 @@ function EditableField(props) {
       expression={isEditing ? 'editing' : 'default'}
       cases={{
         editing: (
-          <form onSubmit={handleSubmit}>
-            <ValidationFormGroup
-              for={id}
-              invalid={error != null}
-              invalidMessage={error}
-              helpText={helpText}
-            >
-              <label className="h6 d-block" htmlFor={id}>{label}</label>
-              <Input
-                data-hj-suppress
-                name={name}
-                id={id}
-                type={type}
-                value={value}
-                onChange={handleChange}
-                options={options}
-                {...others}
-              />
-              <>{others.children}</>
-            </ValidationFormGroup>
-            <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}
+          <>
+            <form onSubmit={handleSubmit}>
+              <Form.Group
+                controlId={id}
+                isInvalid={error != null}
               >
-                {intl.formatMessage(messages['account.settings.editable.field.action.cancel'])}
-              </Button>
-            </p>
-          </form>
+                <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} />}
+          </>
         ),
         default: (
           <div className="form-group">
@@ -161,26 +155,22 @@ function EditableField(props) {
                 </Button>
               ) : null}
             </div>
-            <p data-hj-suppress>{renderValue(value)}</p>
+            <p data-hj-suppress className={isGrayedOut ? 'grayed-out' : null}>{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]),
+  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({
@@ -196,12 +186,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,
@@ -211,6 +201,7 @@ EditableField.defaultProps = {
   helpText: undefined,
   isEditing: false,
   isEditable: true,
+  isGrayedOut: false,
   userSuppliedValue: undefined,
 };
 

src/account-settings/EditableSelectField.jsx

@@ -0,0 +1,232 @@
+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 '@edx/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 => (
+    <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));

src/account-settings/EmailField.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
 import {
-  Button, StatefulButton, Input, ValidationFormGroup,
+  Button, StatefulButton, Form,
 } from '@edx/paragon';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faExclamationTriangle, faPencilAlt } from '@fortawesome/free-solid-svg-icons';
@@ -18,7 +18,7 @@ import {
 } from './data/actions';
 import { editableFieldSelector } from './data/selectors';
 
-function EmailField(props) {
+const EmailField = (props) => {
   const {
     name,
     label,
@@ -106,14 +106,12 @@ function EmailField(props) {
       cases={{
         editing: (
           <form onSubmit={handleSubmit}>
-            <ValidationFormGroup
-              for={id}
-              invalid={error != null}
-              invalidMessage={error}
-              helpText={helpText}
+            <Form.Group
+              controlId={id}
+              isInvalid={error != null}
             >
-              <label className="h6 d-block" htmlFor={id}>{label}</label>
-              <Input
+              <Form.Label className="h6 d-block" htmlFor={id}>{label}</Form.Label>
+              <Form.Control
                 data-hj-suppress
                 name={name}
                 id={id}
@@ -121,7 +119,9 @@ function EmailField(props) {
                 value={value}
                 onChange={handleChange}
               />
-            </ValidationFormGroup>
+              {!!helpText && <Form.Text>{helpText}</Form.Text>}
+              {error != null && <Form.Control.Feedback hasIcon={false}>{error}</Form.Control.Feedback>}
+            </Form.Group>
             <p>
               <StatefulButton
                 type="submit"
@@ -169,7 +169,7 @@ function EmailField(props) {
       }}
     />
   );
-}
+};
 
 EmailField.propTypes = {
   name: PropTypes.string.isRequired,

src/account-settings/JumpNav.jsx

@@ -1,15 +1,26 @@
-import React from 'react';
+import { getConfig } from '@edx/frontend-platform';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { breakpoints, useWindowSize, Icon } from '@edx/paragon';
+import { OpenInNew } from '@edx/paragon/icons';
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React from 'react';
+import { useSelector } from 'react-redux';
 import { NavHashLink } from 'react-router-hash-link';
 import Scrollspy from 'react-scrollspy';
-
-import { getConfig } from '@edx/frontend-platform';
-import PropTypes from 'prop-types';
+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, displayDemographicsLink }) {
   return (
-    <div className="jump-nav">
+    <div className={classNames('jump-nav px-2.25', { 'jump-nav-sm position-sticky pt-3': stickToTop })}>
       <Scrollspy
         items={[
           'basic-information',
@@ -56,15 +67,33 @@ function JumpNav({ intl, displayDemographicsLink }) {
             {intl.formatMessage(messages['account.settings.section.linked.accounts'])}
           </NavHashLink>
         </li>
-        <li>
-          <NavHashLink to="#delete-account">
-            {intl.formatMessage(messages['account.settings.jump.nav.delete.account'])}
-          </NavHashLink>
-        </li>
+        {getConfig().ENABLE_ACCOUNT_DELETION
+          && (
+          <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,

src/account-settings/NotFoundPage.jsx

@@ -1,16 +1,19 @@
 import React from 'react';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 
-export default function NotFoundPage() {
-  return (
-    <div className="container-fluid d-flex py-5 justify-content-center align-items-start text-center">
-      <p className="my-0 py-5 text-muted" style={{ maxWidth: '32em' }}>
-        <FormattedMessage
-          id="error.notfound.message"
-          defaultMessage="The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again."
-          description="error message when a page does not exist"
-        />
-      </p>
-    </div>
-  );
-}
+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;

src/account-settings/OneTimeDismissibleAlert.jsx

@@ -0,0 +1,45 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+
+import { Alert } from '@edx/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;

src/account-settings/SwitchContent.jsx

@@ -22,7 +22,7 @@ const onChildExit = (htmlNode) => {
   }
 };
 
-function SwitchContent({ expression, cases, className }) {
+const SwitchContent = ({ expression, cases, className }) => {
   const getContent = (caseKey) => {
     if (cases[caseKey]) {
       if (typeof cases[caseKey] === 'string') {
@@ -48,7 +48,7 @@ function SwitchContent({ expression, cases, className }) {
       {getContent(expression)}
     </TransitionReplace>
   );
-}
+};
 
 SwitchContent.propTypes = {
   expression: PropTypes.string,

src/account-settings/_style.scss

@@ -14,12 +14,11 @@
     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;
@@ -30,16 +29,6 @@
     }
   }
 
-  .section-heading {
-    @extend .h4;
-    margin-bottom: map-get($spacers, 3);
-  }
-
-  .account-section {
-    // These properties together will shift the hashlink position
-    margin-bottom: map-get($spacers, 5);
-    padding-top: 1rem;
-  }
 
   .custom-switch {
     padding: 0;
@@ -50,4 +39,8 @@
       line-height: 1.6rem;
     }
   }
+  .grayed-out{
+    opacity: 0.6; /* Real browsers */
+    filter: alpha(opacity = 60); /* MSIE */
+  }
 }

src/account-settings/certificate-preference/CertificatePreference.jsx

@@ -0,0 +1,173 @@
+import React, { useState, useEffect } from 'react';
+import { connect, useDispatch } from 'react-redux';
+import PropTypes from 'prop-types';
+
+import {
+  ActionRow,
+  Form,
+  ModalDialog,
+  StatefulButton,
+} from '@edx/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));

src/account-settings/certificate-preference/data/service.js

@@ -0,0 +1,22 @@
+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;
+}

src/account-settings/certificate-preference/messages.js

@@ -0,0 +1,36 @@
+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;

src/account-settings/certificate-preference/test/CertificatePreference.test.jsx

@@ -0,0 +1,171 @@
+/* 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 },
+      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);
+  });
+});

src/account-settings/certificate-preference/test/__snapshots__/CertificatePreference.test.jsx.snap

@@ -0,0 +1,62 @@
+// 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],
+}
+`;

src/account-settings/coaching/CoachingConsent.jsx

@@ -17,13 +17,9 @@ import LogoSVG from '../../logo.svg';
 import { fetchSettings } from '../data/actions';
 import { coachingConsentPageSelector } from '../data/selectors';
 
-const Logo = ({ src, alt, ...attributes }) => (
-  <>
-    <img src={src} alt={alt} {...attributes} />
-  </>
-);
+const Logo = ({ src, alt, ...attributes }) => <img src={src} alt={alt} {...attributes} />;
 
-const SuccessMessage = props => (
+const SuccessMessage = (props) => (
   <div className="col-12 col-lg-6 shadow-lg mx-auto mt-4 p-5">
     <FontAwesomeIcon className="text-success" icon={faCheck} size="5x" />
     <div className="h3">{props.header}</div>
@@ -36,6 +32,7 @@ const SuccessMessage = props => (
 
 const AutoRedirect = (props) => {
   window.location.href = props.redirectUrl;
+  // eslint-disable-next-line react/jsx-no-useless-fragment
   return <></>;
 };
 
@@ -71,6 +68,23 @@ class CoachingConsent extends React.Component {
     this.props.fetchSettings();
   }
 
+  handleSubmit(e) {
+    e.preventDefault();
+    const fullName = e.target.fullName.value;
+    const phoneNumber = e.target.phoneNumber.value;
+    const body = {
+      coaching_consent: true,
+      consent_form_seen: true,
+      phone_number: phoneNumber,
+      full_name: fullName,
+    };
+    this.setState({
+      formErrors: {},
+      formSubmitted: true,
+      declineSubmitted: false,
+    }, () => this.patchUsingCoachingConsentForm(body));
+  }
+
   sanitizeForwardingUrl(url) {
     // Redirect to root of MFE if invalid next param is sent
     return url && url.startsWith(getConfig().LMS_BASE_URL) ? url : `${getConfig().LMS_BASE_URL}/dashboard/`;
@@ -99,23 +113,6 @@ class CoachingConsent extends React.Component {
     }
   }
 
-  handleSubmit(e) {
-    e.preventDefault();
-    const fullName = e.target.fullName.value;
-    const phoneNumber = e.target.phoneNumber.value;
-    const body = {
-      coaching_consent: true,
-      consent_form_seen: true,
-      phone_number: phoneNumber,
-      full_name: fullName,
-    };
-    this.setState({
-      formErrors: {},
-      formSubmitted: true,
-      declineSubmitted: false,
-    }, () => this.patchUsingCoachingConsentForm(body));
-  }
-
   declineCoaching(e) {
     e.preventDefault();
     const body = {
@@ -160,6 +157,7 @@ class CoachingConsent extends React.Component {
       case VIEWS.DECLINED:
         return <AutoRedirect redirectUrl={this.state.redirectUrl} />;
       default:
+        // eslint-disable-next-line react/jsx-no-useless-fragment
         return <></>;
     }
   }
@@ -253,12 +251,12 @@ CoachingConsent.propTypes = {
     }),
   }).isRequired,
   formErrors: PropTypes.shape({
-    coaching: PropTypes.object,
+    coaching: PropTypes.shape({}),
   }).isRequired,
   confirmationValues: PropTypes.shape({
-    coaching: PropTypes.object,
-    name: PropTypes.object,
-    phone_number: PropTypes.object,
+    coaching: PropTypes.shape({}),
+    name: PropTypes.shape({}),
+    phone_number: PropTypes.shape({}),
   }).isRequired,
   fetchSettings: PropTypes.func.isRequired,
   profileDataManager: PropTypes.string,

src/account-settings/coaching/CoachingConsentForm.jsx

@@ -1,30 +1,28 @@
 import React from 'react';
 
 import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
-import { Input, Button, Hyperlink } from '@edx/paragon';
+import { Form, Button, Hyperlink } from '@edx/paragon';
 
 import PropTypes from 'prop-types';
 
 import Alert from '../Alert';
 import messages from './CoachingConsent.messages';
 
-const ErrorMessage = props => (
-  <div className="alert-warning mb-2">{props.message}</div>
-);
+const ErrorMessage = (props) => <div className="alert-warning mb-2">{props.message}</div>;
 
 const ManagedProfileAlert = ({ profileDataManager }) => (
   <Alert className="alert alert-primary" role="alert">
     <FormattedMessage
       id="account.settings.coaching.managed.alert"
       defaultMessage="Your name is managed by {managerTitle}. Contact your administrator for help."
-      description="alert message informing the user their account data is managed by a third party"
+      description="Alert message informing the user their account data is managed by a third party"
       values={{
         managerTitle: <b>{profileDataManager}</b>,
       }}
     />
   </Alert>
 );
-const CoachingForm = props => (
+const CoachingForm = (props) => (
   <div className="col-12 col-md-6 col-xl-5 mx-auto mt-4 p-5 shadow-lg">
     <h2 className="h2">
       {props.intl.formatMessage(messages['account.settings.coaching.consent.welcome.header'])}
@@ -34,13 +32,13 @@ const CoachingForm = props => (
       <form onSubmit={props.onSubmit}>
         <div className="py-3">
           {!!props.profileDataManager && (
-            <ManagedProfileAlert profileDataManager={props.profileDataManager} />
+          <ManagedProfileAlert profileDataManager={props.profileDataManager} />
           )}
           <ErrorMessage message={props.formErrors.full_name} />
           <label className="h6" htmlFor="fullName">
             {props.intl.formatMessage(messages['account.settings.coaching.consent.label.name'])}
           </label>
-          <Input
+          <Form.Control
             type="text"
             name="full-name"
             id="fullName"
@@ -53,7 +51,7 @@ const CoachingForm = props => (
           <label className="h6" htmlFor="phoneNumber">
             {props.intl.formatMessage(messages['account.settings.coaching.consent.label.phone-number'])}
           </label>
-          <Input
+          <Form.Control
             type="text"
             name="phone_number"
             id="phoneNumber"

src/account-settings/coaching/CoachingToggle.jsx

@@ -2,13 +2,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { ValidationFormGroup, Input } from '@edx/paragon';
+import { Form } from '@edx/paragon';
 import messages from './CoachingToggle.messages';
 import { editableFieldSelector } from '../data/selectors';
 import { saveSettings, updateDraft, saveMultipleSettings } from '../data/actions';
 import EditableField from '../EditableField';
 
-const CoachingToggle = props => (
+const CoachingToggle = (props) => (
   <>
     <EditableField
       name="phone_number"
@@ -37,20 +37,18 @@ const CoachingToggle = props => (
         return props.saveSettings('phone_number', props.phone_number);
       }}
     />
-    <ValidationFormGroup
-      for="coachingConsent"
-      helpText={props.intl.formatMessage(messages['account.settings.field.coaching_consent.tooltip'])}
-      invalid={!!props.error}
-      invalidMessage={props.intl.formatMessage(messages['account.settings.field.coaching_consent.error'])}
+    <Form.Group
+      isInvalid={!!props.error}
       className="custom-control custom-switch"
     >
-      <Input
+      <Form.Switch
         name={props.name}
         className="custom-control-input"
         disabled={props.saveState === 'pending'}
         type="checkbox"
         id="coachingConsent"
         checked={props.coaching.coaching_consent}
+        helperText={props.intl.formatMessage(messages['account.settings.field.coaching_consent.tooltip'])}
         value={props.coaching.coaching_consent}
         onChange={async (e) => {
           const { name } = e.target;
@@ -58,14 +56,21 @@ const CoachingToggle = props => (
           const { user, eligible_for_coaching } = props.coaching;
           const value = {
             user,
+            // eslint-disable-next-line camelcase
             eligible_for_coaching,
             coaching_consent: e.target.checked,
           };
           props.saveSettings(name, value);
         }}
-      />
-      <label className="custom-control-label" htmlFor="coachingConsent">{props.intl.formatMessage(messages['account.settings.field.coaching_consent'])}</label>
-    </ValidationFormGroup>
+      >
+        {props.intl.formatMessage(messages['account.settings.field.coaching_consent'])}
+      </Form.Switch>
+      {!!props.error && (
+        <Form.Control.Feedback>
+          {props.intl.formatMessage(messages['account.settings.field.coaching_consent.error'])}
+        </Form.Control.Feedback>
+      )}
+    </Form.Group>
   </>
 );
 

src/account-settings/coaching/test/CoachingConsent.test.jsx

@@ -1,3 +1,4 @@
+/* eslint-disable no-import-assign */
 import React from 'react';
 import { Provider } from 'react-redux';
 import renderer from 'react-test-renderer';

src/account-settings/coaching/test/__snapshots__/CoachingConsent.test.jsx.snap

@@ -34,13 +34,11 @@ exports[`CoachingConsent disables name field on enterprise user 1`] = `
           >
             <div />
             <div>
-              <span>
-                Your name is managed by 
-                <b>
-                  test person
-                </b>
-                . Contact your administrator for help.
-              </span>
+              Your name is managed by 
+              <b>
+                test person
+              </b>
+              . Contact your administrator for help.
             </div>
           </div>
           <div
@@ -54,14 +52,20 @@ exports[`CoachingConsent disables name field on enterprise user 1`] = `
           >
             Please confirm your name
           </label>
-          <input
-            className="form-control"
-            defaultValue="edx edx"
-            disabled={true}
-            id="fullName"
-            name="full-name"
-            type="text"
-          />
+          <div
+            className="pgn__form-control-decorator-group"
+          >
+            <input
+              className="has-value form-control"
+              defaultValue="edx edx"
+              disabled={true}
+              id="fullName"
+              name="full-name"
+              onBlur={[Function]}
+              onChange={[Function]}
+              type="text"
+            />
+          </div>
         </div>
         <div
           className="py-3"
@@ -77,13 +81,19 @@ exports[`CoachingConsent disables name field on enterprise user 1`] = `
           >
             Enter your mobile number
           </label>
-          <input
-            className="form-control"
-            defaultValue="1234567890"
-            id="phoneNumber"
-            name="phone_number"
-            type="text"
-          />
+          <div
+            className="pgn__form-control-decorator-group"
+          >
+            <input
+              className="has-value form-control"
+              defaultValue="1234567890"
+              id="phoneNumber"
+              name="phone_number"
+              onBlur={[Function]}
+              onChange={[Function]}
+              type="text"
+            />
+          </div>
         </div>
         <div
           className=" py-3"
@@ -114,7 +124,7 @@ exports[`CoachingConsent disables name field on enterprise user 1`] = `
           className="mt-3"
         >
           <a
-            className="mt-3 text-dark btn-link small"
+            className="pgn__hyperlink default-link standalone-link mt-3 text-dark btn-link small"
             href="http://localhost:18000/dashboard/"
             onClick={[Function]}
             target="_self"
@@ -203,14 +213,20 @@ exports[`CoachingConsent should render 1`] = `
           >
             Please confirm your name
           </label>
-          <input
-            className="form-control"
-            defaultValue="edx edx"
-            disabled={false}
-            id="fullName"
-            name="full-name"
-            type="text"
-          />
+          <div
+            className="pgn__form-control-decorator-group"
+          >
+            <input
+              className="has-value form-control"
+              defaultValue="edx edx"
+              disabled={false}
+              id="fullName"
+              name="full-name"
+              onBlur={[Function]}
+              onChange={[Function]}
+              type="text"
+            />
+          </div>
         </div>
         <div
           className="py-3"
@@ -226,13 +242,19 @@ exports[`CoachingConsent should render 1`] = `
           >
             Enter your mobile number
           </label>
-          <input
-            className="form-control"
-            defaultValue="1234567890"
-            id="phoneNumber"
-            name="phone_number"
-            type="text"
-          />
+          <div
+            className="pgn__form-control-decorator-group"
+          >
+            <input
+              className="has-value form-control"
+              defaultValue="1234567890"
+              id="phoneNumber"
+              name="phone_number"
+              onBlur={[Function]}
+              onChange={[Function]}
+              type="text"
+            />
+          </div>
         </div>
         <div
           className=" py-3"
@@ -263,7 +285,7 @@ exports[`CoachingConsent should render 1`] = `
           className="mt-3"
         >
           <a
-            className="mt-3 text-dark btn-link small"
+            className="pgn__hyperlink default-link standalone-link mt-3 text-dark btn-link small"
             href="http://localhost:18000/dashboard/"
             onClick={[Function]}
             target="_self"

src/account-settings/data/actions.js

@@ -9,6 +9,7 @@ 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
 
@@ -25,6 +26,7 @@ export const fetchSettingsSuccess = ({
   thirdPartyAuthProviders,
   profileDataManager,
   timeZones,
+  verifiedNameHistory,
 }) => ({
   type: FETCH_SETTINGS.SUCCESS,
   payload: {
@@ -32,6 +34,7 @@ export const fetchSettingsSuccess = ({
     thirdPartyAuthProviders,
     profileDataManager,
     timeZones,
+    verifiedNameHistory,
   },
 });
 
@@ -68,6 +71,10 @@ export const resetDrafts = () => ({
   type: RESET_DRAFTS,
 });
 
+export const beginNameChange = (formId) => ({
+  type: BEGIN_NAME_CHANGE,
+  payload: { formId },
+});
 // SAVE SETTINGS ACTIONS
 
 export const saveSettings = (formId, commitValues) => ({

src/account-settings/data/constants.js

@@ -10,6 +10,11 @@ export const YEAR_OF_BIRTH_OPTIONS = (() => {
   return years.reverse();
 })();
 
+export const COPPA_COMPLIANCE_YEAR = (() => {
+  const currentYear = new Date().getFullYear();
+  return currentYear - 13;
+})();
+
 export const EDUCATION_LEVELS = [
   '',
   'p',

src/account-settings/data/reducers.js

@@ -8,11 +8,13 @@ import {
   UPDATE_DRAFT,
   RESET_DRAFTS,
   SAVE_MULTIPLE_SETTINGS,
+  BEGIN_NAME_CHANGE,
 } from './actions';
 
 import { reducer as deleteAccountReducer, DELETE_ACCOUNT } from '../delete-account';
 import { reducer as siteLanguageReducer, FETCH_SITE_LANGUAGES } from '../site-language';
 import { reducer as resetPasswordReducer, RESET_PASSWORD } from '../reset-password';
+import { reducer as nameChangeReducer, REQUEST_NAME_CHANGE } from '../name-change';
 import { reducer as thirdPartyAuthReducer, DISCONNECT_AUTH } from '../third-party-auth';
 
 export const defaultState = {
@@ -31,10 +33,15 @@ export const defaultState = {
   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) {
@@ -56,6 +63,7 @@ const reducer = (state = defaultState, action) => {
         loading: false,
         loaded: true,
         loadingError: null,
+        verifiedNameHistory: action.payload.verifiedNameHistory,
       };
     case FETCH_SETTINGS.FAILURE:
       return {
@@ -89,6 +97,7 @@ const reducer = (state = defaultState, action) => {
           saveState: null,
           errors: {},
           drafts: {},
+          nameChangeModal: false,
         };
       }
       return state;
@@ -106,6 +115,15 @@ 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,
@@ -119,7 +137,6 @@ const reducer = (state = defaultState, action) => {
         values: { ...state.values, ...action.payload.values },
         errors: {},
         confirmationValues: {
-
           ...state.confirmationValues,
           ...action.payload.confirmationValues,
         },
@@ -198,6 +215,15 @@ const reducer = (state = defaultState, action) => {
         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:

src/account-settings/data/sagas.js

@@ -25,11 +25,13 @@ import {
   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,
@@ -38,7 +40,12 @@ import {
 import { saga as thirdPartyAuthSaga } from '../third-party-auth';
 
 // Services
-import { getSettings, patchSettings, getTimeZones } from './service';
+import {
+  getSettings,
+  patchSettings,
+  getTimeZones,
+  getVerifiedNameHistory,
+} from './service';
 
 export function* handleFetchSettings() {
   try {
@@ -54,6 +61,8 @@ export function* handleFetchSettings() {
       userId,
     );
 
+    const verifiedNameHistory = yield call(getVerifiedNameHistory);
+
     if (values.country) { yield put(fetchTimeZones(values.country)); }
 
     yield put(fetchSettingsSuccess({
@@ -61,6 +70,7 @@ export function* handleFetchSettings() {
       thirdPartyAuthProviders,
       profileDataManager,
       timeZones,
+      verifiedNameHistory,
     }));
   } catch (e) {
     yield put(fetchSettingsFailure(e.message));
@@ -98,6 +108,9 @@ export function* handleSaveSettings(action) {
     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));
@@ -126,6 +139,9 @@ export function* handleSaveMultipleSettings(action) {
     }
   } 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));
@@ -148,6 +164,7 @@ export default function* saga() {
     deleteAccountSaga(),
     siteLanguageSaga(),
     resetPasswordSaga(),
+    nameChangeSaga(),
     thirdPartyAuthSaga(),
   ]);
 }

src/account-settings/data/selectors.js

@@ -1,5 +1,6 @@
 import { createSelector, createStructuredSelector } from 'reselect';
 import { siteLanguageListSelector, siteLanguageOptionsSelector } from '../site-language';
+import { compareVerifiedNamesByCreatedDate } from '../../utils';
 
 export const storeName = 'accountSettings';
 
@@ -7,9 +8,74 @@ 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,
-  accountSettings => accountSettings.values,
+  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(
@@ -50,6 +116,11 @@ const errorSelector = createSelector(
   accountSettings => accountSettings.errors,
 );
 
+const nameChangeModalSelector = createSelector(
+  accountSettingsSelector,
+  accountSettings => accountSettings.nameChangeModal,
+);
+
 const saveStateSelector = createSelector(
   accountSettingsSelector,
   accountSettings => accountSettings.saveState,
@@ -69,7 +140,18 @@ export const profileDataManagerSelector = createSelector(
 
 export const staticFieldsSelector = createSelector(
   accountSettingsSelector,
-  accountSettings => (accountSettings.profileDataManager ? ['name', 'email', 'country'] : []),
+  mostRecentVerifiedNameSelector,
+  (accountSettings, verifiedName) => {
+    const staticFields = [];
+    if (accountSettings.profileDataManager) {
+      staticFields.push('name', 'email', 'country');
+    }
+    if (verifiedName && ['submitted'].includes(verifiedName.status)) {
+      staticFields.push('verifiedName');
+    }
+
+    return staticFields;
+  },
 );
 
 /**
@@ -85,7 +167,11 @@ const formValuesSelector = createSelector(
   (values, drafts) => {
     const formValues = {};
     Object.entries(values).forEach(([name, value]) => {
-      formValues[name] = chooseFormValue(drafts[name], value) || '';
+      if (typeof value === 'boolean') {
+        formValues[name] = chooseFormValue(drafts[name], value);
+      } else {
+        formValues[name] = chooseFormValue(drafts[name], value) || '';
+      }
     });
     return formValues;
   },
@@ -93,7 +179,7 @@ const formValuesSelector = createSelector(
 
 const transformTimeZonesToOptions = timeZoneArr => timeZoneArr
   .map(({ time_zone, description }) => ({ // eslint-disable-line camelcase
-    value: time_zone, label: description,
+    value: time_zone, label: description, // eslint-disable-line camelcase
   }));
 
 const timeZonesSelector = createSelector(
@@ -130,21 +216,35 @@ export const accountSettingsPageSelector = createSelector(
   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,
@@ -155,9 +255,37 @@ export const accountSettingsPageSelector = createSelector(
     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,
   }),
 );
 
@@ -204,3 +332,12 @@ export const demographicsSectionSelector = createSelector(
     formErrors: errors,
   }),
 );
+
+export const nameChangeSelector = createSelector(
+  accountSettingsSelector,
+  formValuesSelector,
+  (accountSettings, formValues) => ({
+    ...accountSettings.nameChange,
+    formValues,
+  }),
+);

src/account-settings/data/service.js

@@ -7,6 +7,7 @@ import isEmpty from 'lodash.isempty';
 
 import { handleRequestError, unpackFieldErrors } from './utils';
 import { getThirdPartyAuthProviders } from '../third-party-auth';
+import { postVerifiedNameConfig } from '../certificate-preference/data/service';
 import { getCoachingPreferences, patchCoachingPreferences } from '../coaching/data/service';
 import { getDemographics, getDemographicsOptions, patchDemographics } from '../demographics/data/service';
 import { DEMOGRAPHICS_FIELDS } from '../demographics/data/utils';
@@ -176,12 +177,57 @@ export async function shouldDisplayDemographicsQuestions() {
   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, Coaching, ThirdPartyAuth, and Demographics
  */
 export async function getSettings(username, userRoles, userId) {
-  const results = await Promise.all([
+  const [
+    account,
+    preferences,
+    thirdPartyAuthProviders,
+    profileDataManager,
+    timeZones,
+    coaching,
+    shouldDisplayDemographicsQuestionsResponse,
+    demographics,
+    demographicsOptions,
+  ] = await Promise.all([
     getAccount(username),
     getPreferences(username),
     getThirdPartyAuthProviders(),
@@ -194,15 +240,15 @@ export async function getSettings(username, userRoles, userId) {
   ]);
 
   return {
-    ...results[0],
-    ...results[1],
-    thirdPartyAuthProviders: results[2],
-    profileDataManager: results[3],
-    timeZones: results[4],
-    coaching: results[5],
-    shouldDisplayDemographicsSection: results[6],
-    ...results[7], // demographics
-    demographicsOptions: results[8],
+    ...account,
+    ...preferences,
+    thirdPartyAuthProviders,
+    profileDataManager,
+    timeZones,
+    coaching,
+    shouldDisplayDemographicsSection: shouldDisplayDemographicsQuestionsResponse,
+    ...demographics,
+    demographicsOptions,
   };
 }
 
@@ -217,11 +263,19 @@ export async function patchSettings(username, commitValues, userId) {
   const preferenceKeys = ['time_zone'];
   const coachingKeys = ['coaching'];
   const demographicsKeys = DEMOGRAPHICS_FIELDS;
+  const certificateKeys = ['useVerifiedNameForCerts'];
   const isDemographicsKey = (value, key) => key.includes('demographics');
-  const accountCommitValues = omit(commitValues, preferenceKeys, coachingKeys, demographicsKeys);
+  const accountCommitValues = omit(
+    commitValues,
+    preferenceKeys,
+    coachingKeys,
+    demographicsKeys,
+    certificateKeys,
+  );
   const preferenceCommitValues = pick(commitValues, preferenceKeys);
   const coachingCommitValues = pick(commitValues, coachingKeys);
   const demographicsCommitValues = pickBy(commitValues, isDemographicsKey);
+  const certCommitValues = pick(commitValues, certificateKeys);
   const patchRequests = [];
 
   if (!isEmpty(accountCommitValues)) {
@@ -236,6 +290,9 @@ export async function patchSettings(username, commitValues, userId) {
   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

src/account-settings/data/utils/sagaUtils.js

@@ -1,8 +1,7 @@
 import { put } from 'redux-saga/effects';
 import { logError } from '@edx/frontend-platform/logging';
-import { history } from '@edx/frontend-platform';
 
-export default function* handleFailure(error, failureAction = null, failureRedirectPath = null) {
+export default function* handleFailure(error, navigate, failureAction = null, failureRedirectPath = null) {
   if (error.fieldErrors && failureAction !== null) {
     yield put(failureAction({ fieldErrors: error.fieldErrors }));
   }
@@ -11,6 +10,6 @@ export default function* handleFailure(error, failureAction = null, failureRedir
     yield put(failureAction(error.message));
   }
   if (failureRedirectPath !== null) {
-    history.push(failureRedirectPath);
+    navigate(failureRedirectPath);
   }
 }

src/account-settings/delete-account/BeforeProceedingBanner.jsx

@@ -6,6 +6,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Hyperlink } from '@edx/paragon';
 
 // Messages
+import { getConfig } from '@edx/frontend-platform';
 import messages from './messages';
 
 // Components
@@ -22,13 +23,16 @@ 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 edX 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 account, but something about your account needs attention first.  The actionLink will be instructions, such as 'unlink your Facebook account'."
         values={{
-          actionLink: (
+          actionLink: supportArticleUrl ? (
             <Hyperlink destination={supportArticleUrl}>
               {intl.formatMessage(messages[instructionMessageId])}
             </Hyperlink>
+          ) : (
+            intl.formatMessage(messages[instructionMessageId])
           ),
+          siteName: getConfig().SITE_NAME,
         }}
       />
     </Alert>

src/account-settings/delete-account/BeforeProceedingBanner.test.jsx

@@ -0,0 +1,48 @@
+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();
+  });
+});

src/account-settings/delete-account/ConfirmationModal.jsx

@@ -2,12 +2,13 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
 import {
-  Button, Input, Modal, ValidationFormGroup,
+  AlertModal,
+  Button, Input, ValidationFormGroup, ActionRow,
 } from '@edx/paragon';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { faExclamationCircle, faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-
+import { getConfig } from '@edx/frontend-platform';
 import messages from './messages';
 import Alert from '../Alert';
 import PrintingInstructions from './PrintingInstructions';
@@ -65,52 +66,66 @@ export class ConfirmationModal extends Component {
     const open = ['confirming', 'pending', 'failed'].includes(status);
     const passwordFieldId = 'passwordFieldId';
     const invalidMessage = messages[this.getShortErrorMessageId(errorType)];
+
+    // TODO: We lack a good way of providing custom language for a particular site.  This is a hack
+    // to allow edx.org to fulfill its business requirements.
+    const deleteAccountModalText2MessageKey = getConfig().SITE_NAME === 'edX'
+      ? 'account.settings.delete.account.modal.text.2.edX'
+      : 'account.settings.delete.account.modal.text.2';
+
     return (
-      <Modal
-        open={open}
+      <AlertModal
+        isOpen={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 variant="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>
     );
   }
 }

src/account-settings/delete-account/DeleteAccount.jsx

@@ -59,20 +59,44 @@ export class DeleteAccount extends React.Component {
       hasLinkedTPA, isVerifiedAccount, status, errorType, intl,
     } = this.props;
     const canDelete = isVerifiedAccount && !hasLinkedTPA;
+    const supportArticleUrl = process.env.SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT;
+
+    // TODO: We lack a good way of providing custom language for a particular site.  This is a hack
+    // to allow edx.org to fulfill its business requirements.
+    const deleteAccountText2MessageKey = getConfig().SITE_NAME === 'edX'
+      ? 'account.settings.delete.account.text.2.edX'
+      : 'account.settings.delete.account.text.2';
+
+    const optInInstructionMessageId = getConfig().MARKETING_EMAILS_OPT_IN
+      ? 'account.settings.delete.account.please.confirm'
+      : 'account.settings.delete.account.please.activate';
 
     return (
       <div>
-        <h2 className="section-heading">
+        <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'])}</p>
-        <p>{intl.formatMessage(messages['account.settings.delete.account.text.2'])}</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'])}
+          {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">
@@ -91,15 +115,15 @@ export class DeleteAccount extends React.Component {
 
         {isVerifiedAccount ? null : (
           <BeforeProceedingBanner
-            instructionMessageId="account.settings.delete.account.please.activate"
-            supportArticleUrl="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-activate-my-account-"
+            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="https://support.edx.org/hc/en-us/articles/207206067"
+            supportArticleUrl={supportArticleUrl}
           />
         ) : null}
 

src/account-settings/delete-account/DeleteAccount.test.jsx

@@ -1,10 +1,15 @@
+/* eslint-disable react/jsx-no-useless-fragment */
 import React from 'react';
 import renderer from 'react-test-renderer';
 import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';
 
 // Testing the modals separately, they just clutter up the snapshots if included here.
-jest.mock('./ConfirmationModal');
-jest.mock('./SuccessModal');
+jest.mock('./ConfirmationModal', () => function ConfirmationModalMock() {
+  return <></>;
+});
+jest.mock('./SuccessModal', () => function SuccessModalMock() {
+  return <></>;
+});
 
 import { DeleteAccount } from './DeleteAccount'; // eslint-disable-line import/first
 
@@ -37,6 +42,7 @@ describe('DeleteAccount', () => {
         </IntlProvider>
       ))
       .toJSON();
+
     expect(tree).toMatchSnapshot();
   });
 

src/account-settings/delete-account/PrintingInstructions.jsx

@@ -2,22 +2,39 @@ import React from 'react';
 import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Hyperlink } from '@edx/paragon';
 
+import { getConfig } from '@edx/frontend-platform';
 import messages from './messages';
 
 const PrintingInstructions = (props) => {
   const actionLink = (
     <Hyperlink
-      destination="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
+      // 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"
     >
       {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 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"
+      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."
       values={{ actionLink }}
     />
   );

src/account-settings/delete-account/SuccessModal.jsx

@@ -1,27 +1,31 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Modal } from '@edx/paragon';
+import { ModalLayer, ModalCloseButton } from '@edx/paragon';
 
 import messages from './messages';
 
 export const SuccessModal = (props) => {
   const { status, intl, onClose } = props;
   return (
-    <Modal
-      open={status === 'deleted'}
-      title={intl.formatMessage(messages['account.settings.delete.account.modal.after.header'])}
-      body={(
-        <div>
+
+    <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">
           <p className="h6">
             {intl.formatMessage(messages['account.settings.delete.account.modal.after.text'])}
           </p>
         </div>
-      )}
-      closeText={intl.formatMessage(messages['account.settings.delete.account.modal.after.button'])}
-      renderHeaderCloseButton={false}
-      onClose={onClose}
-    />
+        <p>
+          <ModalCloseButton className="float-right" variant="link">Close</ModalCloseButton>
+        </p>
+      </div>
+
+    </ModalLayer>
+
   );
 };
 

src/account-settings/delete-account/__snapshots__/BeforeProceedingBanner.test.jsx.snap

@@ -0,0 +1,68 @@
+// 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>
+`;

src/account-settings/delete-account/__snapshots__/ConfirmationModal.test.jsx.snap

@@ -1,262 +1,67 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ConfirmationModal should match default closed confirmation modal snapshot 1`] = `
-Array [
-  <div
-    className="fade"
-    role="presentation"
-  />,
-  <div
-    className="modal fade"
-    role="presentation"
-  >
-    <div
-      aria-labelledby="id1"
-      aria-modal={true}
-      className=""
-      role="dialog"
-    >
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
-      <div
-        data-focus-lock-disabled="disabled"
-        onBlur={[Function]}
-        onFocus={[Function]}
-        onScrollCapture={[Function]}
-        onTouchMoveCapture={[Function]}
-        onWheelCapture={[Function]}
-      >
-        <div
-          className="modal-content"
-        >
-          <div
-            className="modal-header"
-          >
-            <h2
-              className="modal-title"
-              id="id1"
-            >
-              Are you sure?
-            </h2>
-          </div>
-          <div
-            className="modal-body"
-          >
-            <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=""
-                  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
-            className="modal-footer"
-          >
-            <button
-              className="btn btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              Cancel
-            </button>
-            <button
-              className="btn btn-danger"
-              disabled={false}
-              onClick={[MockFunction]}
-              type="button"
-            >
-              Yes, Delete
-            </button>
-          </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[`ConfirmationModal should match default closed confirmation modal snapshot 1`] = `null`;
 
 exports[`ConfirmationModal should match empty password confirmation modal snapshot 1`] = `
 Array [
   <div
-    className="modal-backdrop show"
-    role="presentation"
+    data-focus-guard={true}
+    style={
+      Object {
+        "height": "0px",
+        "left": "1px",
+        "overflow": "hidden",
+        "padding": 0,
+        "position": "fixed",
+        "top": "1px",
+        "width": "1px",
+      }
+    }
+    tabIndex={0}
   />,
   <div
-    className="modal show d-block"
-    role="presentation"
+    className="pgn__modal-layer"
+    data-focus-lock-disabled={false}
+    onBlur={[Function]}
+    onFocus={[Function]}
+    onMouseDown={[Function]}
+    onScrollCapture={[Function]}
+    onTouchMoveCapture={[Function]}
+    onTouchStart={[Function]}
+    onWheelCapture={[Function]}
   >
     <div
-      aria-labelledby="id3"
-      aria-modal={true}
-      className="modal-dialog"
-      role="dialog"
+      className="pgn__modal-content-container"
     >
       <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={0}
+        className="pgn__modal-backdrop"
+        onClick={[MockFunction]}
+        onKeyDown={[MockFunction]}
       />
       <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={1}
-      />
-      <div
-        data-focus-lock-disabled={false}
-        onBlur={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onScrollCapture={[Function]}
-        onTouchMoveCapture={[Function]}
-        onTouchStart={[Function]}
-        onWheelCapture={[Function]}
+        aria-label="Are you sure?"
+        className="pgn__modal pgn__modal-md pgn__modal-default pgn__alert-modal"
+        role="dialog"
       >
         <div
-          className="modal-content"
+          className="pgn__modal-header"
         >
-          <div
-            className="modal-header"
+          <h2
+            className="pgn__modal-title"
           >
-            <h2
-              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"
+        >
+          <div />
+          <div
+            className="pgn__modal-body-content"
+          >
+            <div
+              className="p-3"
             >
-              Are you sure?
-            </h2>
-          </div>
-          <div
-            className="modal-body"
-          >
-            <div>
               <div
                 className="alert d-flex align-items-start alert-danger mt-n2"
               >
@@ -314,23 +119,13 @@ Array [
                 </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.
+                    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 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.
+                    If you proceed, you will be unable to use this account to take courses on localhost.
                   </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>
+                    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>
@@ -361,13 +156,18 @@ Array [
               </div>
             </div>
           </div>
+          <div />
+        </div>
+        <div
+          className="pgn__modal-footer"
+        >
           <div
-            className="modal-footer"
+            className="pgn__action-row"
           >
             <button
               className="btn btn-link"
               disabled={false}
-              onClick={[Function]}
+              onClick={[MockFunction]}
               type="button"
             >
               Cancel
@@ -383,99 +183,84 @@ Array [
           </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={0}
-      />
     </div>
   </div>,
+  <div
+    data-focus-guard={true}
+    style={
+      Object {
+        "height": "0px",
+        "left": "1px",
+        "overflow": "hidden",
+        "padding": 0,
+        "position": "fixed",
+        "top": "1px",
+        "width": "1px",
+      }
+    }
+    tabIndex={0}
+  />,
 ]
 `;
 
 exports[`ConfirmationModal should match open confirmation modal snapshot 1`] = `
 Array [
   <div
-    className="modal-backdrop show"
-    role="presentation"
+    data-focus-guard={true}
+    style={
+      Object {
+        "height": "0px",
+        "left": "1px",
+        "overflow": "hidden",
+        "padding": 0,
+        "position": "fixed",
+        "top": "1px",
+        "width": "1px",
+      }
+    }
+    tabIndex={-1}
   />,
   <div
-    className="modal show d-block"
-    role="presentation"
+    className="pgn__modal-layer"
+    data-focus-lock-disabled="disabled"
+    onBlur={[Function]}
+    onFocus={[Function]}
+    onScrollCapture={[Function]}
+    onTouchMoveCapture={[Function]}
+    onWheelCapture={[Function]}
   >
     <div
-      aria-labelledby="id2"
-      aria-modal={true}
-      className="modal-dialog"
-      role="dialog"
+      className="pgn__modal-content-container"
     >
       <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={0}
+        className="pgn__modal-backdrop"
+        onClick={[MockFunction]}
+        onKeyDown={[MockFunction]}
       />
       <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={1}
-      />
-      <div
-        data-focus-lock-disabled={false}
-        onBlur={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onScrollCapture={[Function]}
-        onTouchMoveCapture={[Function]}
-        onTouchStart={[Function]}
-        onWheelCapture={[Function]}
+        aria-label="Are you sure?"
+        className="pgn__modal pgn__modal-md pgn__modal-default pgn__alert-modal"
+        role="dialog"
       >
         <div
-          className="modal-content"
+          className="pgn__modal-header"
         >
-          <div
-            className="modal-header"
+          <h2
+            className="pgn__modal-title"
           >
-            <h2
-              className="modal-title"
-              id="id2"
+            Are you sure?
+          </h2>
+        </div>
+        <div
+          className="pgn__modal-body pgn__modal-body-scroll-top pgn__modal-body-scroll-bottom"
+        >
+          <div />
+          <div
+            className="pgn__modal-body-content"
+          >
+            <div
+              className="p-3"
             >
-              Are you sure?
-            </h2>
-          </div>
-          <div
-            className="modal-body"
-          >
-            <div>
               <div
                 className="alert d-flex align-items-start alert-warning mt-n2"
               >
@@ -500,23 +285,13 @@ Array [
                 </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.
+                    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 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.
+                    If you proceed, you will be unable to use this account to take courses on localhost.
                   </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>
+                    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>
@@ -547,13 +322,18 @@ Array [
               </div>
             </div>
           </div>
+          <div />
+        </div>
+        <div
+          className="pgn__modal-footer"
+        >
           <div
-            className="modal-footer"
+            className="pgn__action-row"
           >
             <button
               className="btn btn-link"
               disabled={false}
-              onClick={[Function]}
+              onClick={[MockFunction]}
               type="button"
             >
               Cancel
@@ -569,22 +349,22 @@ Array [
           </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={0}
-      />
     </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}
+  />,
 ]
 `;

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"
+    className="section-heading h4 mb-3"
   >
     Delete My Account
   </h2>
@@ -11,31 +11,22 @@ 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. edX 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. localhost 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 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.
+    Once your account is deleted, you cannot use it to take courses on localhost.
   </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>
+    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>
   <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 edX.
+    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.
   </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"
@@ -59,7 +50,7 @@ exports[`DeleteAccount should match default section snapshot 1`] = `
 exports[`DeleteAccount should match unverified account section snapshot 1`] = `
 <div>
   <h2
-    className="section-heading"
+    className="section-heading h4 mb-3"
   >
     Delete My Account
   </h2>
@@ -67,31 +58,22 @@ 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. edX 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. localhost 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 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.
+    Once your account is deleted, you cannot use it to take courses on localhost.
   </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>
+    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>
   <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 edX.
+    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.
   </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"
@@ -132,17 +114,16 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
       </svg>
     </div>
     <div>
-      <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>
+      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>
+      .
     </div>
   </div>
 </div>
@@ -151,7 +132,7 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
 exports[`DeleteAccount should match unverified account section snapshot 2`] = `
 <div>
   <h2
-    className="section-heading"
+    className="section-heading h4 mb-3"
   >
     Delete My Account
   </h2>
@@ -159,31 +140,22 @@ 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. edX 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. localhost 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 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.
+    Once your account is deleted, you cannot use it to take courses on localhost.
   </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>
+    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>
   <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 edX.
+    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.
   </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"
@@ -224,17 +196,16 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
       </svg>
     </div>
     <div>
-      <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>
+      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>
+      .
     </div>
   </div>
 </div>

src/account-settings/delete-account/__snapshots__/SuccessModal.test.jsx.snap

@@ -1,563 +1,89 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`SuccessModal should match default closed success modal snapshot 1`] = `
-Array [
-  <div
-    className="fade"
-    role="presentation"
-  />,
-  <div
-    className="modal fade"
-    role="presentation"
-  >
-    <div
-      aria-labelledby="id1"
-      aria-modal={true}
-      className=""
-      role="dialog"
-    >
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
-      <div
-        data-focus-lock-disabled="disabled"
-        onBlur={[Function]}
-        onFocus={[Function]}
-        onScrollCapture={[Function]}
-        onTouchMoveCapture={[Function]}
-        onWheelCapture={[Function]}
-      >
-        <div
-          className="modal-content"
-        >
-          <div
-            className="modal-header"
-          >
-            <h2
-              className="modal-title"
-              id="id1"
-            >
-              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 btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              Close
-            </button>
-          </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 default closed success modal snapshot 1`] = `null`;
 
-exports[`SuccessModal should match default closed success modal snapshot 2`] = `
-Array [
-  <div
-    className="fade"
-    role="presentation"
-  />,
-  <div
-    className="modal fade"
-    role="presentation"
-  >
-    <div
-      aria-labelledby="id2"
-      aria-modal={true}
-      className=""
-      role="dialog"
-    >
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
-      <div
-        data-focus-lock-disabled="disabled"
-        onBlur={[Function]}
-        onFocus={[Function]}
-        onScrollCapture={[Function]}
-        onTouchMoveCapture={[Function]}
-        onWheelCapture={[Function]}
-      >
-        <div
-          className="modal-content"
-        >
-          <div
-            className="modal-header"
-          >
-            <h2
-              className="modal-title"
-              id="id2"
-            >
-              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 btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              Close
-            </button>
-          </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 default closed success modal snapshot 2`] = `null`;
 
-exports[`SuccessModal should match default closed success modal snapshot 3`] = `
-Array [
-  <div
-    className="fade"
-    role="presentation"
-  />,
-  <div
-    className="modal fade"
-    role="presentation"
-  >
-    <div
-      aria-labelledby="id3"
-      aria-modal={true}
-      className=""
-      role="dialog"
-    >
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
-      <div
-        data-focus-lock-disabled="disabled"
-        onBlur={[Function]}
-        onFocus={[Function]}
-        onScrollCapture={[Function]}
-        onTouchMoveCapture={[Function]}
-        onWheelCapture={[Function]}
-      >
-        <div
-          className="modal-content"
-        >
-          <div
-            className="modal-header"
-          >
-            <h2
-              className="modal-title"
-              id="id3"
-            >
-              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 btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              Close
-            </button>
-          </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 default closed success modal snapshot 3`] = `null`;
 
-exports[`SuccessModal should match default closed success modal snapshot 4`] = `
-Array [
-  <div
-    className="fade"
-    role="presentation"
-  />,
-  <div
-    className="modal fade"
-    role="presentation"
-  >
-    <div
-      aria-labelledby="id4"
-      aria-modal={true}
-      className=""
-      role="dialog"
-    >
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
-      <div
-        data-focus-lock-disabled="disabled"
-        onBlur={[Function]}
-        onFocus={[Function]}
-        onScrollCapture={[Function]}
-        onTouchMoveCapture={[Function]}
-        onWheelCapture={[Function]}
-      >
-        <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 btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              Close
-            </button>
-          </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 default closed success modal snapshot 4`] = `null`;
 
 exports[`SuccessModal should match open success modal snapshot 1`] = `
 Array [
   <div
-    className="modal-backdrop show"
-    role="presentation"
+    data-focus-guard={true}
+    style={
+      Object {
+        "height": "0px",
+        "left": "1px",
+        "overflow": "hidden",
+        "padding": 0,
+        "position": "fixed",
+        "top": "1px",
+        "width": "1px",
+      }
+    }
+    tabIndex={-1}
   />,
   <div
-    className="modal show d-block"
-    role="presentation"
+    className="pgn__modal-layer"
+    data-focus-lock-disabled="disabled"
+    onBlur={[Function]}
+    onFocus={[Function]}
+    onScrollCapture={[Function]}
+    onTouchMoveCapture={[Function]}
+    onWheelCapture={[Function]}
   >
     <div
-      aria-labelledby="id5"
-      aria-modal={true}
-      className="modal-dialog"
-      role="dialog"
+      className="pgn__modal-content-container"
     >
       <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={0}
+        className="pgn__modal-backdrop"
+        onClick={[MockFunction]}
+        onKeyDown={[MockFunction]}
       />
       <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={1}
-      />
-      <div
-        data-focus-lock-disabled={false}
-        onBlur={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onScrollCapture={[Function]}
-        onTouchMoveCapture={[Function]}
-        onTouchStart={[Function]}
-        onWheelCapture={[Function]}
+        className="mw-sm p-5 bg-white mx-auto my-3"
       >
+        <h3>
+          We're sorry to see you go!  Your account will be deleted shortly.
+        </h3>
         <div
-          className="modal-content"
+          className="p-3"
         >
-          <div
-            className="modal-header"
+          <p
+            className="h6"
           >
-            <h2
-              className="modal-title"
-              id="id5"
-            >
-              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 btn-link"
-              disabled={false}
-              onClick={[Function]}
-              type="button"
-            >
-              Close
-            </button>
-          </div>
+            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>
+        <p>
+          <button
+            className="pgn__modal-close-button float-right btn btn-link"
+            disabled={false}
+            onClick={[Function]}
+            type="button"
+          >
+            Close
+          </button>
+        </p>
       </div>
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={0}
-      />
     </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}
+  />,
 ]
 `;

src/account-settings/delete-account/index.js

@@ -1,3 +1,4 @@
+// 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';

src/account-settings/delete-account/messages.js

@@ -13,22 +13,27 @@ 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. edX 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. {siteName} 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 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, ______ .',
+    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.',
   },
   '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 edX.',
+    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}.',
     description: 'A message in the user account deletion area',
   },
   'account.settings.delete.account.text.change.instead': {
@@ -39,13 +44,18 @@ 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 edX account',
+    description: 'Button label to permanently delete your platform 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',
@@ -58,11 +68,16 @@ 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. edX 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. {siteName} 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',
   },

src/account-settings/demographics/Checkboxes.jsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import { CheckBox } from '@edx/paragon';
+import { Form } from '@edx/paragon';
 import { DECLINED } from '../data/constants';
 
 const Checkboxes = (props) => {
@@ -14,7 +14,7 @@ const Checkboxes = (props) => {
   const [selected, setSelected] = useState(values);
   useEffect(() => {
     onChange(id, selected);
-  }, [selected]);
+  }, [id, onChange, selected]);
 
   const handleToggle = (value, option) => {
     // If the user checked 'declined', uncheck all other options
@@ -40,16 +40,17 @@ const Checkboxes = (props) => {
     const isChecked = selected.includes(option.value);
     return (
       <div key={option.value} className="checkboxOption">
-        <CheckBox
+        <Form.Checkbox
           type="checkbox"
           id={option.value}
           name={option.value}
           value={option.value}
           checked={isChecked}
           autoFocus={isFirst}
-          label={option.label}
-          onChange={(value) => handleToggle(value, option.value)}
-        />
+          onChange={(event) => handleToggle(event.target.checked, option.value)}
+        >
+          {option.label}
+        </Form.Checkbox>
       </div>
     );
   });

src/account-settings/demographics/DemographicsSection.jsx

@@ -5,7 +5,7 @@ import {
   intlShape,
 } from '@edx/frontend-platform/i18n';
 
-import { Hyperlink, Input } from '@edx/paragon';
+import { Hyperlink, Form } from '@edx/paragon';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
@@ -13,7 +13,7 @@ import get from 'lodash.get';
 import isEmpty from 'lodash.isempty';
 import memoize from 'memoize-one';
 import { demographicsSectionSelector } from '../data/selectors';
-import EditableField from '../EditableField';
+import EditableSelectField from '../EditableSelectField';
 import Checkboxes from './Checkboxes';
 import Alert from '../Alert';
 import { saveMultipleSettings, updateDraft } from '../data/actions';
@@ -75,7 +75,7 @@ class DemographicsSection extends React.Component {
       const matchingOption = demographicsEthnicityOptions.filter(option => option.value === e)[0];
       return matchingOption && matchingOption.label;
     }).join(', ');
-  }
+  };
 
   handleEditableFieldChange = (name, value) => {
     this.props.updateDraft(name, value);
@@ -162,8 +162,8 @@ class DemographicsSection extends React.Component {
     const showWorkStatusDescribe = this.props.formValues.demographics_work_status === OTHER;
 
     return (
-      <div className="account-section" id="demographics-information" ref={this.props.forwardRef}>
-        <h2 className="section-heading">
+      <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>
@@ -172,7 +172,12 @@ class DemographicsSection extends React.Component {
             target="_blank"
             rel="noopener noreferrer"
           >
-            {this.props.intl.formatMessage(messages['account.settings.section.demographics.why'])}
+            {this.props.intl.formatMessage(
+              messages['account.settings.section.demographics.why'],
+              {
+                siteName: getConfig().SITE_NAME,
+              },
+            )}
           </Hyperlink>
         </p>
         {this.renderDemographicsServiceIssueWarning()}
@@ -183,7 +188,7 @@ class DemographicsSection extends React.Component {
         */}
         {this.hasRetrievedDemographicsOptions() && (
           <div id="demographics-fields">
-            <EditableField
+            <EditableSelectField
               name="demographics_gender"
               type="select"
               value={this.props.formValues.demographics_gender}
@@ -194,7 +199,7 @@ class DemographicsSection extends React.Component {
               {...editableFieldProps}
             >
               {showSelfDescribe && (
-                <Input
+                <Form.Control
                   name="demographics_gender_description"
                   id="field-demographics_gender_description"
                   type="text"
@@ -205,8 +210,8 @@ class DemographicsSection extends React.Component {
                   className="mt-1"
                 />
               )}
-            </EditableField>
-            <EditableField
+            </EditableSelectField>
+            <EditableSelectField
               name="demographics_user_ethnicity"
               type="select"
               hidden
@@ -221,8 +226,8 @@ class DemographicsSection extends React.Component {
                 values={this.props.formValues.demographics_user_ethnicity}
                 {...editableFieldProps}
               />
-            </EditableField>
-            <EditableField
+            </EditableSelectField>
+            <EditableSelectField
               name="demographics_income"
               type="select"
               value={this.props.formValues.demographics_income}
@@ -231,7 +236,7 @@ class DemographicsSection extends React.Component {
               emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.income.empty'])}
               {...editableFieldProps}
             />
-            <EditableField
+            <EditableSelectField
               name="demographics_military_history"
               type="select"
               value={this.props.formValues.demographics_military_history}
@@ -240,7 +245,7 @@ class DemographicsSection extends React.Component {
               emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.military_history.empty'])}
               {...editableFieldProps}
             />
-            <EditableField
+            <EditableSelectField
               name="demographics_learner_education_level"
               type="select"
               value={this.props.formValues.demographics_learner_education_level}
@@ -249,7 +254,7 @@ class DemographicsSection extends React.Component {
               emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.learner_education_level.empty'])}
               {...editableFieldProps}
             />
-            <EditableField
+            <EditableSelectField
               name="demographics_parent_education_level"
               type="select"
               value={this.props.formValues.demographics_parent_education_level}
@@ -258,7 +263,7 @@ class DemographicsSection extends React.Component {
               emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.parent_education_level.empty'])}
               {...editableFieldProps}
             />
-            <EditableField
+            <EditableSelectField
               name="demographics_work_status"
               type="select"
               value={this.props.formValues.demographics_work_status}
@@ -271,7 +276,7 @@ class DemographicsSection extends React.Component {
               {...editableFieldProps}
             >
               {showWorkStatusDescribe && (
-                <Input
+                <Form.Control
                   name="demographics_work_status_description"
                   id="field-demographics_work_status_description"
                   type="text"
@@ -282,8 +287,8 @@ class DemographicsSection extends React.Component {
                   className="mt-1"
                 />
               )}
-            </EditableField>
-            <EditableField
+            </EditableSelectField>
+            <EditableSelectField
               name="demographics_current_work_sector"
               type="select"
               value={this.props.formValues.demographics_current_work_sector}
@@ -292,7 +297,7 @@ class DemographicsSection extends React.Component {
               emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.current_work_sector.empty'])}
               {...editableFieldProps}
             />
-            <EditableField
+            <EditableSelectField
               name="demographics_future_work_sector"
               type="select"
               value={this.props.formValues.demographics_future_work_sector}
@@ -312,7 +317,7 @@ DemographicsSection.propTypes = {
   intl: intlShape.isRequired,
   formValues: PropTypes.shape({
     demographics_gender: PropTypes.string,
-    demographics_user_ethnicity: PropTypes.array,
+    demographics_user_ethnicity: PropTypes.shape([]),
     demographics_income: PropTypes.string,
     demographics_military_history: PropTypes.string,
     demographics_learner_education_level: PropTypes.string,
@@ -322,11 +327,11 @@ DemographicsSection.propTypes = {
     demographics_future_work_sector: PropTypes.string,
     demographics_work_status_description: PropTypes.string,
     demographics_gender_description: PropTypes.string,
-    demographicsOptions: PropTypes.object,
+    demographicsOptions: PropTypes.shape({}),
   }).isRequired,
   drafts: PropTypes.shape({
     demographics_gender: PropTypes.string,
-    demographics_user_ethnicity: PropTypes.array,
+    demographics_user_ethnicity: PropTypes.shape([]),
     demographics_income: PropTypes.string,
     demographics_military_history: PropTypes.string,
     demographics_learner_education_level: PropTypes.string,
@@ -336,7 +341,7 @@ DemographicsSection.propTypes = {
     demographics_future_work_sector: PropTypes.string,
     demographics_work_status_description: PropTypes.string,
     demographics_gender_description: PropTypes.string,
-    demographicsOptions: PropTypes.object,
+    demographicsOptions: PropTypes.shape({}),
   }).isRequired,
   formErrors: PropTypes.shape({
     demographicsError: PropTypes.string,

src/account-settings/demographics/DemographicsSection.messages.jsx

@@ -162,7 +162,7 @@ const messages = defineMessages({
   /* Legal copy link text */
   'account.settings.section.demographics.why': {
     id: 'account.settings.section.demographics.why',
-    defaultMessage: 'Why does edX collect this information?',
+    defaultMessage: 'Why does {siteName} collect this information?',
     description: 'Link text for a link to external legal text',
   },
 });

src/account-settings/demographics/test/DemographicsSection.test.jsx

@@ -1,3 +1,4 @@
+/* eslint-disable no-import-assign */
 import * as auth from '@edx/frontend-platform/auth';
 
 import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';

src/account-settings/demographics/test/__snapshots__/DemographicsSection.test.jsx.snap

@@ -2,30 +2,57 @@
 
 exports[`DemographicsSection should render 1`] = `
 <div
-  className="account-section"
+  className="account-section pt-3 mb-5"
   id="demographics-information"
 >
   <h2
-    className="section-heading"
+    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 noopener noreferrer"
+      rel="noopener noreferrer"
       target="_blank"
     >
-      Why does edX collect this information?
-      <span>
-         
+      Why does localhost collect this information?
+      <span
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
+      >
         <span
-          aria-hidden={false}
-          aria-label="Opens in a new window"
-          className="fa fa-external-link"
-          title="Opens in a new window"
-        />
+          className="pgn__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>
@@ -85,6 +112,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -148,6 +176,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             <button
@@ -218,6 +247,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -281,6 +311,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -344,6 +375,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -407,6 +439,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -470,6 +503,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -533,6 +567,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -596,6 +631,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -612,30 +648,57 @@ exports[`DemographicsSection should render 1`] = `
 
 exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
 <div
-  className="account-section"
+  className="account-section pt-3 mb-5"
   id="demographics-information"
 >
   <h2
-    className="section-heading"
+    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 noopener noreferrer"
+      rel="noopener noreferrer"
       target="_blank"
     >
-      Why does edX collect this information?
-      <span>
-         
+      Why does localhost collect this information?
+      <span
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
+      >
         <span
-          aria-hidden={false}
-          aria-label="Opens in a new window"
-          className="fa fa-external-link"
-          title="Opens in a new window"
-        />
+          className="pgn__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>
@@ -647,9 +710,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
     >
       <div />
       <div>
-        <span>
-          An error occurred attempting to retrieve or save your account information. Please try again later.
-        </span>
+        An error occurred attempting to retrieve or save your account information. Please try again later.
       </div>
     </div>
   </div>
@@ -709,6 +770,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -772,6 +834,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             <button
@@ -842,6 +905,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -905,6 +969,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -968,6 +1033,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1031,6 +1097,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1094,6 +1161,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1157,6 +1225,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1220,6 +1289,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1236,30 +1306,57 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
 
 exports[`DemographicsSection should render an Alert when demographicsOptions props are empty 1`] = `
 <div
-  className="account-section"
+  className="account-section pt-3 mb-5"
   id="demographics-information"
 >
   <h2
-    className="section-heading"
+    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 noopener noreferrer"
+      rel="noopener noreferrer"
       target="_blank"
     >
-      Why does edX collect this information?
-      <span>
-         
+      Why does localhost collect this information?
+      <span
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
+      >
         <span
-          aria-hidden={false}
-          aria-label="Opens in a new window"
-          className="fa fa-external-link"
-          title="Opens in a new window"
-        />
+          className="pgn__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>
@@ -1271,9 +1368,7 @@ exports[`DemographicsSection should render an Alert when demographicsOptions pro
     >
       <div />
       <div>
-        <span>
-          An error occurred attempting to retrieve or save your account information. Please try again later.
-        </span>
+        An error occurred attempting to retrieve or save your account information. Please try again later.
       </div>
     </div>
   </div>
@@ -1282,30 +1377,57 @@ exports[`DemographicsSection should render an Alert when demographicsOptions pro
 
 exports[`DemographicsSection should render ethnicity correctly when multiple options are selected 1`] = `
 <div
-  className="account-section"
+  className="account-section pt-3 mb-5"
   id="demographics-information"
 >
   <h2
-    className="section-heading"
+    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 noopener noreferrer"
+      rel="noopener noreferrer"
       target="_blank"
     >
-      Why does edX collect this information?
-      <span>
-         
+      Why does localhost collect this information?
+      <span
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
+      >
         <span
-          aria-hidden={false}
-          aria-label="Opens in a new window"
-          className="fa fa-external-link"
-          title="Opens in a new window"
-        />
+          className="pgn__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>
@@ -1365,6 +1487,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1428,6 +1551,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Hispanic, Latin, or Spanish origin, White
@@ -1491,6 +1615,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1554,6 +1679,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1617,6 +1743,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1680,6 +1807,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1743,6 +1871,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1806,6 +1935,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1869,6 +1999,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1885,30 +2016,57 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
 
 exports[`DemographicsSection should render ethnicity text correctly 1`] = `
 <div
-  className="account-section"
+  className="account-section pt-3 mb-5"
   id="demographics-information"
 >
   <h2
-    className="section-heading"
+    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 noopener noreferrer"
+      rel="noopener noreferrer"
       target="_blank"
     >
-      Why does edX collect this information?
-      <span>
-         
+      Why does localhost collect this information?
+      <span
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
+      >
         <span
-          aria-hidden={false}
-          aria-label="Opens in a new window"
-          className="fa fa-external-link"
-          title="Opens in a new window"
-        />
+          className="pgn__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>
@@ -1968,6 +2126,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2031,6 +2190,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Asian
@@ -2094,6 +2254,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2157,6 +2318,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2220,6 +2382,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2283,6 +2446,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2346,6 +2510,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2409,6 +2574,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2472,6 +2638,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2488,30 +2655,57 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
 
 exports[`DemographicsSection should set user input correctly when user provides answers to work_status question 1`] = `
 <div
-  className="account-section"
+  className="account-section pt-3 mb-5"
   id="demographics-information"
 >
   <h2
-    className="section-heading"
+    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 noopener noreferrer"
+      rel="noopener noreferrer"
       target="_blank"
     >
-      Why does edX collect this information?
-      <span>
-         
+      Why does localhost collect this information?
+      <span
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
+      >
         <span
-          aria-hidden={false}
-          aria-label="Opens in a new window"
-          className="fa fa-external-link"
-          title="Opens in a new window"
-        />
+          className="pgn__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>
@@ -2571,6 +2765,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2634,6 +2829,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             <button
@@ -2704,6 +2900,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2767,6 +2964,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2830,6 +3028,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2893,6 +3092,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2956,6 +3156,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Other: test
@@ -3019,6 +3220,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3082,6 +3284,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3098,30 +3301,57 @@ exports[`DemographicsSection should set user input correctly when user provides
 
 exports[`DemographicsSection should set user input correctly when user provides gender self-description 1`] = `
 <div
-  className="account-section"
+  className="account-section pt-3 mb-5"
   id="demographics-information"
 >
   <h2
-    className="section-heading"
+    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 noopener noreferrer"
+      rel="noopener noreferrer"
       target="_blank"
     >
-      Why does edX collect this information?
-      <span>
-         
+      Why does localhost collect this information?
+      <span
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
+      >
         <span
-          aria-hidden={false}
-          aria-label="Opens in a new window"
-          className="fa fa-external-link"
-          title="Opens in a new window"
-        />
+          className="pgn__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>
@@ -3181,6 +3411,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer to self describe: test
@@ -3244,6 +3475,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             <button
@@ -3314,6 +3546,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3377,6 +3610,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3440,6 +3674,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3503,6 +3738,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3566,6 +3802,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3629,6 +3866,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3692,6 +3930,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond

src/account-settings/hoc.jsx

@@ -0,0 +1,19 @@
+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;
+};

src/account-settings/hoc.test.jsx

@@ -0,0 +1,38 @@
+import React from 'react';
+import { mount } from 'enzyme';
+
+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 id="btn" onClick={() => navigate('/some-route')}>{location}</button>
+);
+const WrappedComponent = withNavigate(withLocation(MockComponent));
+
+test('Provide Navigation to Component', () => {
+  const wrapper = mount(
+    <WrappedComponent />,
+  );
+  const btn = wrapper.find('#btn');
+  btn.simulate('click');
+
+  expect(mockedNavigator).toHaveBeenCalledWith('/some-route');
+});
+
+test('Provide Location Pathname to Component', () => {
+  const wrapper = mount(
+    <WrappedComponent />,
+  );
+
+  expect(wrapper.find('#btn').text()).toContain('/current-location');
+});

src/account-settings/index.js

@@ -1,3 +1,4 @@
+// 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';

src/account-settings/name-change/NameChange.jsx

@@ -0,0 +1,203 @@
+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 '@edx/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));

src/account-settings/name-change/data/actions.js

@@ -0,0 +1,25 @@
+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,
+});

src/account-settings/name-change/data/reducers.js

@@ -0,0 +1,44 @@
+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;

src/account-settings/name-change/data/sagas.js

@@ -0,0 +1,40 @@
+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);
+}

src/account-settings/name-change/data/service.js

@@ -0,0 +1,17 @@
+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;
+}

src/account-settings/name-change/index.js

@@ -0,0 +1,5 @@
+// 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';

src/account-settings/name-change/messages.js

@@ -0,0 +1,56 @@
+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;

src/account-settings/name-change/test/NameChange.test.jsx

@@ -0,0 +1,170 @@
+/* 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');
+  });
+});

src/account-settings/reset-password/ConfirmationAlert.jsx

@@ -1,5 +1,6 @@
 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 '@edx/paragon';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -12,7 +13,7 @@ const ConfirmationAlert = (props) => {
 
   const technicalSupportLink = (
     <Hyperlink
-      destination="https://support.edx.org/hc/en-us/articles/206212088-What-if-I-did-not-receive-a-password-reset-message-"
+      destination={getConfig().PASSWORD_RESET_SUPPORT_LINK}
     >
       <FormattedMessage
         id="account.settings.editable.field.password.reset.button.confirmation.support.link"

src/account-settings/reset-password/index.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-restricted-exports
 export { default } from './ResetPassword';
 export { default as reducer } from './data/reducers';
 export { RESET_PASSWORD } from './data/actions';

src/account-settings/site-language/actions.js

@@ -2,8 +2,9 @@ import { AsyncActionType } from '../data/utils';
 
 export const FETCH_SITE_LANGUAGES = new AsyncActionType('SITE_LANGUAGE', 'FETCH_SITE_LANGUAGES');
 
-export const fetchSiteLanguages = () => ({
+export const fetchSiteLanguages = handleNavigation => ({
   type: FETCH_SITE_LANGUAGES.BASE,
+  payload: { handleNavigation },
 });
 
 export const fetchSiteLanguagesBegin = () => ({

src/account-settings/site-language/constants.js

@@ -19,6 +19,11 @@ const siteLanguageList = [
     name: 'Español (Latinoamérica)',
     released: true,
   },
+  {
+    code: 'fa-ir',
+    name: 'فارسی',
+    released: true,
+  },
   {
     code: 'fr',
     name: 'Français',
@@ -69,6 +74,31 @@ const siteLanguageList = [
     name: '中文 (简体)',
     released: true,
   },
+  {
+    code: 'pt',
+    name: 'Português',
+    released: true,
+  },
+  {
+    code: 'it',
+    name: 'Italian',
+    released: true,
+  },
+  {
+    code: 'de',
+    name: 'German',
+    released: true,
+  },
+  {
+    code: 'hi',
+    name: 'Hindi',
+    released: true,
+  },
+  {
+    code: 'fr-ca',
+    name: 'French (CA)',
+    released: true,
+  },
 ];
 
 export default siteLanguageList;

src/account-settings/site-language/sagas.js

@@ -10,13 +10,13 @@ import {
 import { getSiteLanguageList } from './service';
 import { handleFailure } from '../data/utils';
 
-function* handleFetchSiteLanguages() {
+function* handleFetchSiteLanguages(action) {
   try {
     yield put(fetchSiteLanguagesBegin());
     const siteLanguageList = yield call(getSiteLanguageList);
     yield put(fetchSiteLanguagesSuccess(siteLanguageList));
   } catch (e) {
-    yield call(handleFailure, e, fetchSiteLanguagesFailure);
+    yield call(handleFailure, e, action.payload.handleNavigation, fetchSiteLanguagesFailure);
   }
 }
 

src/account-settings/test/JumpNav.test.jsx

@@ -1,45 +1,65 @@
 import React from 'react';
 import renderer from 'react-test-renderer';
 import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';
+import { AppProvider } from '@edx/frontend-platform/react';
+import { initializeMockApp, mergeConfig, setConfig } from '@edx/frontend-platform';
 
-import { BrowserRouter as Router } from 'react-router-dom';
-import { mergeConfig, setConfig } from '@edx/frontend-platform';
 import JumpNav from '../JumpNav';
+import configureStore from '../../data/configureStore';
 
 const IntlJumpNav = injectIntl(JumpNav);
 
 describe('JumpNav', () => {
   mergeConfig({
     ENABLE_DEMOGRAPHICS_COLLECTION: false,
+    ENABLE_ACCOUNT_DELETION: true,
   });
 
   let props = {};
+  let store;
 
   beforeEach(() => {
+    initializeMockApp({
+      authenticatedUser: {
+        userId: 3,
+        username: 'abc123',
+        administrator: true,
+        roles: [],
+      },
+    });
+
     props = {
       intl: {},
       displayDemographicsLink: false,
     };
+    store = configureStore({
+      notificationPreferences: {
+        showPreferences: false,
+      },
+    });
   });
 
-  it('should not render Optional Information link', () => {
+  it('should not render Optional Information or delete account link', () => {
+    setConfig({
+      ENABLE_ACCOUNT_DELETION: false,
+    });
+
     const tree = renderer.create((
-      // Had to wrap the following in a router or I will receive an error stating:
-      // "Invariant failed: You should not use <NavLink> outside a <Router>"
-      <Router>
-        <IntlProvider locale="en">
+      <IntlProvider locale="en">
+        <AppProvider store={store}>
           <IntlJumpNav {...props} />
-        </IntlProvider>
-      </Router>
+        </AppProvider>
+      </IntlProvider>
     ))
       .toJSON();
 
     expect(tree).toMatchSnapshot();
   });
 
-  it('should render Optional Information link', () => {
+  it('should render Optional Information and delete account link', () => {
     setConfig({
       ENABLE_DEMOGRAPHICS_COLLECTION: true,
+      ENABLE_ACCOUNT_DELETION: true,
     });
 
     props = {
@@ -48,12 +68,11 @@ describe('JumpNav', () => {
     };
 
     const tree = renderer.create((
-      // Same as previous test
-      <Router>
-        <IntlProvider locale="en">
+      <IntlProvider locale="en">
+        <AppProvider store={store}>
           <IntlJumpNav {...props} />
-        </IntlProvider>
-      </Router>
+        </AppProvider>
+      </IntlProvider>
     ))
       .toJSON();
 

src/account-settings/test/__snapshots__/JumpNav.test.jsx.snap

@@ -1,8 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`JumpNav should not render Optional Information link 1`] = `
+exports[`JumpNav should not render Optional Information or delete account link 1`] = `
 <div
-  className="jump-nav"
+  className="jump-nav px-2.25 jump-nav-sm position-sticky pt-3"
 >
   <ul
     className="list-unstyled"
@@ -15,8 +15,8 @@ exports[`JumpNav should not render Optional Information link 1`] = `
         aria-current="page"
         className="active"
         href="/#basic-information"
+        isActive={[Function]}
         onClick={[Function]}
-        style={Object {}}
       >
         Account Information
       </a>
@@ -28,8 +28,8 @@ exports[`JumpNav should not render Optional Information link 1`] = `
         aria-current="page"
         className="active"
         href="/#profile-information"
+        isActive={[Function]}
         onClick={[Function]}
-        style={Object {}}
       >
         Profile Information
       </a>
@@ -41,8 +41,8 @@ exports[`JumpNav should not render Optional Information link 1`] = `
         aria-current="page"
         className="active"
         href="/#social-media"
+        isActive={[Function]}
         onClick={[Function]}
-        style={Object {}}
       >
         Social Media Links
       </a>
@@ -54,8 +54,8 @@ exports[`JumpNav should not render Optional Information link 1`] = `
         aria-current="page"
         className="active"
         href="/#site-preferences"
+        isActive={[Function]}
         onClick={[Function]}
-        style={Object {}}
       >
         Site Preferences
       </a>
@@ -67,32 +67,19 @@ exports[`JumpNav should not render Optional Information link 1`] = `
         aria-current="page"
         className="active"
         href="/#linked-accounts"
+        isActive={[Function]}
         onClick={[Function]}
-        style={Object {}}
       >
         Linked Accounts
       </a>
     </li>
-    <li
-      className=""
-    >
-      <a
-        aria-current="page"
-        className="active"
-        href="/#delete-account"
-        onClick={[Function]}
-        style={Object {}}
-      >
-        Delete My Account
-      </a>
-    </li>
   </ul>
 </div>
 `;
 
-exports[`JumpNav should render Optional Information link 1`] = `
+exports[`JumpNav should render Optional Information and delete account link 1`] = `
 <div
-  className="jump-nav"
+  className="jump-nav px-2.25 jump-nav-sm position-sticky pt-3"
 >
   <ul
     className="list-unstyled"
@@ -105,8 +92,8 @@ exports[`JumpNav should render Optional Information link 1`] = `
         aria-current="page"
         className="active"
         href="/#basic-information"
+        isActive={[Function]}
         onClick={[Function]}
-        style={Object {}}
       >
         Account Information
       </a>
@@ -118,8 +105,8 @@ exports[`JumpNav should render Optional Information link 1`] = `
         aria-current="page"
         className="active"
         href="/#profile-information"
+        isActive={[Function]}
         onClick={[Function]}
-        style={Object {}}
       >
         Profile Information
       </a>
@@ -131,8 +118,8 @@ exports[`JumpNav should render Optional Information link 1`] = `
         aria-current="page"
         className="active"
         href="/#demographics-information"
+        isActive={[Function]}
         onClick={[Function]}
-        style={Object {}}
       >
         Optional Information
       </a>
@@ -144,8 +131,8 @@ exports[`JumpNav should render Optional Information link 1`] = `
         aria-current="page"
         className="active"
         href="/#social-media"
+        isActive={[Function]}
         onClick={[Function]}
-        style={Object {}}
       >
         Social Media Links
       </a>
@@ -157,8 +144,8 @@ exports[`JumpNav should render Optional Information link 1`] = `
         aria-current="page"
         className="active"
         href="/#site-preferences"
+        isActive={[Function]}
         onClick={[Function]}
-        style={Object {}}
       >
         Site Preferences
       </a>
@@ -170,8 +157,8 @@ exports[`JumpNav should render Optional Information link 1`] = `
         aria-current="page"
         className="active"
         href="/#linked-accounts"
+        isActive={[Function]}
         onClick={[Function]}
-        style={Object {}}
       >
         Linked Accounts
       </a>
@@ -183,8 +170,8 @@ exports[`JumpNav should render Optional Information link 1`] = `
         aria-current="page"
         className="active"
         href="/#delete-account"
+        isActive={[Function]}
         onClick={[Function]}
-        style={Object {}}
       >
         Delete My Account
       </a>

src/account-settings/third-party-auth/ThirdPartyAuth.jsx

@@ -16,7 +16,7 @@ class ThirdPartyAuth extends Component {
     }
     const disconnectUrl = e.currentTarget.getAttribute('data-disconnect-url');
     this.props.disconnectAuth(disconnectUrl, providerId);
-  }
+  };
 
   renderUnconnectedProvider(url, name) {
     return (
@@ -100,7 +100,7 @@ class ThirdPartyAuth extends Component {
       <FormattedMessage
         id="account.settings.sso.no.providers"
         defaultMessage="No accounts can be linked at this time."
-        description="Displayed when no third party accounts are available to link an edX account to"
+        description="Displayed when no third-party accounts are available for the user to link to their account on the platform."
       />
     );
   }

src/account-settings/third-party-auth/index.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-restricted-exports
 export { default } from './ThirdPartyAuth';
 export { default as reducer } from './data/reducers';
 export { default as saga } from './data/sagas';

src/constants.js

@@ -0,0 +1,4 @@
+export const IDLE_STATUS = 'idle';
+export const LOADING_STATUS = 'loading';
+export const SUCCESS_STATUS = 'success';
+export const FAILURE_STATUS = 'failure';

src/data/reducers.js

@@ -4,8 +4,10 @@ import {
   reducer as accountSettingsReducer,
   storeName as accountSettingsStoreName,
 } from '../account-settings';
+import notificationPreferencesReducer from '../notification-preferences/data/reducers';
 
 const createRootReducer = () => combineReducers({
   [accountSettingsStoreName]: accountSettingsReducer,
+  notificationPreferences: notificationPreferencesReducer,
 });
 export default createRootReducer;

src/head/Head.jsx

@@ -0,0 +1,21 @@
+import React from 'react';
+import { Helmet } from 'react-helmet';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { getConfig } from '@edx/frontend-platform';
+
+import messages from './messages';
+
+const Head = ({ intl }) => (
+  <Helmet>
+    <title>
+      {intl.formatMessage(messages['account.page.title'], { siteName: getConfig().SITE_NAME })}
+    </title>
+    <link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
+  </Helmet>
+);
+
+Head.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(Head);

src/head/Head.test.jsx

@@ -0,0 +1,17 @@
+import React from 'react';
+import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { Helmet } from 'react-helmet';
+import { mount } from 'enzyme';
+import { getConfig } from '@edx/frontend-platform';
+import Head from './Head';
+
+describe('Head', () => {
+  const props = {};
+  it('should match render title tag and fivicon with the site configuration values', () => {
+    mount(<IntlProvider locale="en"><Head {...props} /></IntlProvider>);
+    const helmet = Helmet.peek();
+    expect(helmet.title).toEqual(`Account | ${getConfig().SITE_NAME}`);
+    expect(helmet.linkTags[0].rel).toEqual('shortcut icon');
+    expect(helmet.linkTags[0].href).toEqual(getConfig().FAVICON_URL);
+  });
+});

src/head/messages.js

@@ -0,0 +1,11 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  'account.page.title': {
+    id: 'account.page.title',
+    defaultMessage: 'Account | {siteName}',
+    description: 'Title tag',
+  },
+});
+
+export default messages;

src/hooks.js

@@ -0,0 +1,68 @@
+import { useEffect, useState } from 'react';
+import { getConfig } from '@edx/frontend-platform';
+import { logError } from '@edx/frontend-platform/logging';
+
+import {
+  IDLE_STATUS, LOADING_STATUS, SUCCESS_STATUS, FAILURE_STATUS,
+} from './constants';
+
+// eslint-disable-next-line import/prefer-default-export
+export function useAsyncCall(asyncFunc) {
+  // React doesn't batch setStates call in async useEffect hooks,
+  // so we use a combined object here to ensure that users
+  // re-render once.
+  const [data, setData] = useState({ status: IDLE_STATUS });
+
+  useEffect(
+    () => {
+      (async () => {
+        setData(currData => ({ ...currData, status: LOADING_STATUS }));
+        const response = await asyncFunc();
+
+        if (Object.keys(response).length === 0) {
+          setData(currData => ({ ...currData, status: FAILURE_STATUS, data: response }));
+        } else {
+          setData(currData => ({ ...currData, status: SUCCESS_STATUS, data: response }));
+        }
+      })();
+    },
+    [asyncFunc],
+  );
+
+  return data;
+}
+
+// Redirect the user to their original location based on session storage
+export function useRedirect() {
+  const [redirect, setRedirect] = useState({
+    location: 'dashboard',
+    text: 'id.verification.return.dashboard',
+  });
+
+  useEffect(() => {
+    if (sessionStorage.getItem('courseId')) {
+      setRedirect({
+        location: `courses/${sessionStorage.getItem('courseId')}`,
+        text: 'id.verification.return.course',
+      });
+    } else if (sessionStorage.getItem('next')) {
+      setRedirect({
+        location: sessionStorage.getItem('next'),
+        text: 'id.verification.return.generic',
+      });
+    }
+  }, []);
+
+  return redirect;
+}
+
+export function useFeedbackWrapper() {
+  useEffect(() => {
+    try {
+    // eslint-disable-next-line no-undef
+      window.usabilla_live = lightningjs?.require('usabilla_live', getConfig().LEARNER_FEEDBACK_URL);
+    } catch (error) {
+      logError('Error loading usabilla_live', error);
+    }
+  }, []);
+}

src/i18n/index.js

@@ -1,32 +1,44 @@
+import { messages as headerMessages } from '@edx/frontend-component-header';
+import { messages as footerMessages } from '@edx/frontend-component-footer';
+import { messages as paragonMessages } from '@edx/paragon';
 import arMessages from './messages/ar.json';
-import caMessages from './messages/ca.json';
-// no need to import en messages-- they are in the defaultMessage field
+import deMessages from './messages/de.json';
 import es419Messages from './messages/es_419.json';
+import faIRMessages from './messages/fa_IR.json';
 import frMessages from './messages/fr.json';
-import zhcnMessages from './messages/zh_CN.json';
-import heMessages from './messages/he.json';
-import idMessages from './messages/id.json';
-import kokrMessages from './messages/ko_kr.json';
-import plMessages from './messages/pl.json';
-import ptbrMessages from './messages/pt_br.json';
+import frCAMessages from './messages/fr_CA.json';
+import hiMessages from './messages/hi.json';
+import itMessages from './messages/it.json';
+import ptMessages from './messages/pt.json';
 import ruMessages from './messages/ru.json';
-import thMessages from './messages/th.json';
 import ukMessages from './messages/uk.json';
+import zhcnMessages from './messages/zh_CN.json';
+import dedeCAMessages from './messages/de_DE.json';
+import ititCAMessages from './messages/it_IT.json';
+import ptptCAMessages from './messages/pt_PT.json';
+// no need to import en messages-- they are in the defaultMessage field
 
-const messages = {
+const appMessages = {
   ar: arMessages,
   'es-419': es419Messages,
+  'fa-ir': faIRMessages,
   fr: frMessages,
   'zh-cn': zhcnMessages,
-  ca: caMessages,
-  he: heMessages,
-  id: idMessages,
-  'ko-kr': kokrMessages,
-  pl: plMessages,
-  'pt-br': ptbrMessages,
+  pt: ptMessages,
+  it: itMessages,
+  de: deMessages,
+  hi: hiMessages,
+  'fr-ca': frCAMessages,
   ru: ruMessages,
-  th: thMessages,
   uk: ukMessages,
+  'de-de': dedeCAMessages,
+  'it-it': ititCAMessages,
+  'pt-pt': ptptCAMessages,
 };
 
-export default messages;
+export default [
+  headerMessages,
+  paragonMessages,
+  footerMessages,
+  appMessages,
+];

src/i18n/messages/ar.json

@@ -1,55 +1,89 @@
 {
-  "account.settings.message.duplicate.tpa.provider": "إنّ حساب {provider} الذي اخترتَه مرتبط مسبقًا بحساب آخر في edX. ",
-  "account.settings.message.managed.settings": "تتم إدارة إعدادات الملف الشخصي بواسطة {ManagerTitle}. اتصل بالمسؤول أو {support} للحصول على المساعدة.",
+  "account.settings.message.duplicate.tpa.provider": "حساب {provider} الذي حددته موصول من قبل بحساب آخر على {siteName}.",
+  "account.settings.message.managed.settings": "إعدادات ملفك الشخصي يديرها {ManagerTitle}. اتصل بمديرك أو ب{support} للحصول على المساعدة.",
   "account.settings.message.managed.settings.support": "الدعم",
   "account.settings.page.heading": "إعدادات الحساب",
-  "account.settings.loading.message": "جاري التحميل...",
+  "account.settings.loading.message": "التحميل جارٍ...",
   "account.settings.loading.error": "خطأ: {error}",
-  "account.settings.banner.beta.language": "لقد قمت بتعيين لغتك الى {beta_language}، والتي لم تتم ترجمتها بالكامل حاليًا. يمكنك مساعدتنا في ترجمة هذه اللغة بالكامل من خلال الانضمام إلى مجتمع Transifex وإضافة ترجمات من الإنجليزية للمتعلمين الذين يتحدثون {beta_language}.",
-  "account.settings.banner.beta.language.action.switch.back": "العودة لـِ {previous_language}",
-  "account.settings.banner.beta.language.action.help.translate": "المساعدة في الترجمة إلى {beta_language}",
+  "account.settings.banner.beta.language": "لقد قمت بضبط لغتك على {beta_language}، وهي حاليا غير مترجمة بالكامل. يمكنك مساعدتنا في إتمام ترجمة هذه اللغة من خلال الانضمام إلى مجتمع Transifex وإضافة ترجمات من الإنجليزية للمتعلمين الذين يتحدثون {beta_language}.",
+  "account.settings.banner.beta.language.action.switch.back": "العودة إلى {previous_language}",
+  "account.settings.banner.beta.language.action.help.translate": "ساعد في الترجمة إلى {beta_language}",
   "account.settings.section.account.information": "معلومات الحساب",
   "account.settings.section.account.information.description": "تتضمن هذه الإعدادات معلومات أساسية عن حسابك.",
   "account.settings.section.profile.information": "معلومات الملف الشخصي",
   "account.settings.section.demographics.information": "معلومات اختيارية",
   "account.settings.section.site.preferences": "تفضيلات الموقع",
-  "account.settings.section.linked.accounts": "الحسابات المرتبطة",
-  "account.settings.section.linked.accounts.description": "يمكنك ربط حساباتك الشخصية لتسهيل عملية تسجيل دخولك إلى edX.",
+  "account.settings.section.linked.accounts": "الحسابات الموصولة",
+  "account.settings.section.linked.accounts.description": "يمكنك وصل حسابات هويتك لتبسيط تسجيل دخولك إلى {siteName}.",
   "account.settings.field.username": "اسم المستخدم",
-  "account.settings.field.username.help.text": "اسم المستخدم الخاص بك الذي يميزك في edX. لا يمكنك تغيير اسم المستخدم الخاص بك لاحقاً.",
+  "account.settings.field.username.help.text": "الاسم الذي يعرّفك على {siteName}. لا يمكنك تغيير اسم المستخدم الخاص بك.",
   "account.settings.field.full.name": "الاسم الكامل",
-  "account.settings.field.full.name.empty": "إضافة اسم",
-  "account.settings.field.full.name.help.text": "الاسم المستخدم للتحقق من هويتك والذي سوف يظهر على الشهادات الخاصة بك.",
-  "account.settings.field.email": "البريد الالكتروني (الدخول)",
+  "account.settings.field.full.name.empty": "إضافة الاسم",
+  "account.settings.field.full.name.help.text": "الاسم المستعمل للتحقق من هويتك والذي يظهر في شهاداتك.",
+  "account.settings.field.full.name.help.text.default": "الاسم الذي يظهر في ملفك الشخصي العامّ.",
+  "account.settings.field.full.name.help.text.default.certificate": "سيظهر هذا الاسم في شهاداتك و سجلّاتك العامّة.",
+  "account.settings.field.name.verified": "اسم متحقَّق منه",
+  "account.settings.field.name.verified.help.text.verified": "تم التحقق من هذا الاسم عن طريق بطاقة تعريف ذات صورة.",
+  "account.settings.field.name.verified.help.text.verified.proctored": "تم التحقق من هذا الاسم عن طريق المراقبة.",
+  "account.settings.field.name.verified.help.text.verified.certificate": "تم التحقق من هذا الاسم عن طريق بطاقة هوية ذات صورة، وتم اختياره للظهور في الشهادات والسجلات العامة.",
+  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "تم التحقق من هذا الاسم من خلال المراقبة، وتم تحديده للظهور في الشهادات والسجلات العامة.",
+  "account.settings.field.name.verified.help.text.submitted": "تم تسليم طلب التحقق. في العادة يستغرق هذا 48 ساعة أو أقل. لا يمكن تغيير الاسم المتحقَّق منه في هذا الوقت.",
+  "account.settings.field.name.verified.help.text.submitted.proctored": "تم تسليم امتحانك المراقَب. لا يمكن تغيير الاسم المتحقَّق منه في هذا الوقت. رجاءً أعد التفقد بعد 2-5 أيام.",
+  "account.settings.field.name.verified.help.text.submitted.certificate": "عند نجاح التحقق من الهوية، سيظهر هذا الاسم على شهاداتك و سجلاتك العامة. لا يمكن تغيير الاسم المتحقَّق منه في هذا الوقت.",
+  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "بمجرد اجتياز امتحانك المراقب للمراجعة، سيظهر هذا الاسم في شهادتك و سجلاتك العامة. لا يمكن تغيير الاسم المتحقَّق منه في هذا الوقت.",
+  "account.settings.field.name.verified.verification.help": "أدخل اسمك كما يظهر في بطاقة تعريف الطالب أو الموظف الخاصة بك، أو بطاقة تعريفك الصادرة عن الحكومة.",
+  "account.settings.field.full.name.help.text.submitted": "تم تسليم طلب التحقق. يستغرق هذا عادةً 48 ساعة أو أقل. لا يمكن تغيير الاسم الكامل في هذا الوقت.",
+  "account.settings.field.full.name.help.text.submitted.proctored": "تم تسليم امتحانك المراقب. لا يمكن تغيير الاسم الكامل في هذا الوقت. يرجى التحقق مرة أخرى خلال 2-5 أيام.",
+  "account.settings.field.full.name.help.text.submitted.certificate": "عند نجاح التحقق من الهوية، سيظهر هذا الاسم على الشهادات والسجلات العامة. لا يمكن تغيير الاسم الكامل في هذا الوقت.",
+  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "بمجرد اجتياز امتحانك المراقب للمراجعة، سيظهر هذا الاسم في شهاداتك وسجلاتك العامة. لا يمكن تغيير الاسم الكامل في هذا الوقت.",
+  "account.settings.field.name.verified.success.message": "اكتمل طلب التحقق من هويتك بنجاح. لديك الآن خيار تحديد الاسم الذي تفضل ظهوره على شهاداتك وسجلاتك العامة.",
+  "account.settings.field.name.verified.success.message.header": "اكتمل طلب تغيير اسمك!",
+  "account.settings.field.name.verified.failure.message": "لم تنجح آخر محاولاتك للتحقق من هويتك. تم إرجاع إعدادات الحساب ذات الصلة إلى وضعها السابق.",
+  "account.settings.field.name.verified.failure.message.header": "لم نستطع التحقق من هويتك.",
+  "account.settings.field.name.verified.failure.message.help.link": "اعرف المزيد عن التحقق من الهوية.",
+  "account.settings.field.name.verified.submitted.message": "تم تسليم طلب التحقق من هويتك و عادة ما يستغرق إكماله ما بين 24 و 48 ساعة.",
+  "account.settings.field.name.verified.submitted.message.certificate": "عند الموافقة على طلبك، سيظهر اسمك المحدَّث على جميع الشهادات السجلات العامة ذات الصلة.",
+  "account.settings.field.name.verified.submitted.message.header": "طلب تغيير اسمك يكاد يكتمل!",
+  "account.settings.field.email": "البريد الالكتروني (تسجيل الدخول)",
   "account.settings.field.email.empty": "إضافة عنوان البريد الإلكتروني",
-  "account.settings.field.email.confirmation": "لقد أرسلنا رسالة تأكيد إلى {value}. انقر فوق الرابط في الرسالة لتحديث عنوان بريدك الإلكتروني.",
-  "account.settings.field.email.help.text": "أنت تتلقى رسائل من edX وفرق المساق على هذا العنوان.",
-  "account.settings.field.secondary.email": "عنوان البريد الإلكتروني للاسترداد",
-  "account.settings.field.secondary.email.empty": "إضافة عنوان البريد الإلكتروني للاسترداد",
-  "account.settings.field.secondary.email.confirmation": "لقد أرسلنا رسالة تأكيد إلى {value}. انقر فوق الرابط في الرسالة لتحديث عنوان بريد الاسترداد الإلكتروني.",
+  "account.settings.field.email.confirmation": "لقد أرسلنا رسالة تأكيد إلى {value}. انقر على الرابط في الرسالة لتحديث عنوان بريدك الإلكتروني.",
+  "account.settings.field.email.help.text": "على هذا العنوان تصلك الرسائل من {siteName} و من فرق المساقات.",
+  "account.settings.field.secondary.email": "عنوان بريد الاستعادة الإلكتروني.",
+  "account.settings.field.secondary.email.empty": "إضافة عنوان بريد إلكتروني لاستعادة حسابك",
+  "account.settings.field.secondary.email.confirmation": "لقد أرسلنا رسالة تأكيد إلى {value}. انقر على الرابط في الرسالة لتحديث عنوان بريد الاستعادة الإلكتروني الخاص بك.",
   "account.settings.email.field.confirmation.header": "تعليق عملية التأكيد",
   "account.settings.field.dob": "سنة الميلاد",
   "account.settings.field.dob.empty": "إضافة سنة الميلاد",
-  "account.settings.field.year_of_birth.options.empty": "اختر سنة ميلاد",
-  "account.settings.field.country": "الدولة",
+  "account.settings.field.year_of_birth.options.empty": "تحديد سنة الميلاد",
+  "account.settings.field.dob.month": "الشهر",
+  "account.settings.field.dob.year": "السنة",
+  "account.settings.field.month.year.default": "اختر الشهر",
+  "account.settings.field.dob.year.default": "اختر السنة",
+  "account.settings.field.dob.form.button": "يرجى تأكيد تاريخ ميلادك",
+  "account.settings.field.dob.form.title": "أدخل شهر وسنة ميلادك",
+  "account.settings.field.dob.form.help.text": "نطلب معلومات شهر وسنة الميلاد لمساعدتنا على الامتثال لالتزاماتنا القانونية.",
+  "account.settings.field.dob.form.success": "شكرا لك على إدخال المعلومات الخاصة بك.",
+  "account.settings.field.month_of_birth.options.empty": "تحديد شهر الميلاد",
+  "account.settingsfield.dob.error.general": "حدث خطأ تقني. رجاءً حاول مجددا.",
+  "account.settings.field.country": "البلد",
   "account.settings.field.country.empty": "إضافة البلد ",
-  "account.settings.field.country.options.empty": "اختر دولة",
-  "account.settings.field.state": "الحالة",
-  "account.settings.field.state.empty": "إضافة منطقة",
-  "account.settings.field.state.options.empty": "اختر منطقة",
+  "account.settings.field.country.options.empty": "اختر البلد",
+  "account.settings.field.state": "المنطقة / الولاية / المحافظة",
+  "account.settings.field.state.empty": "إضافة المنطقة / الولاية / المحافظة",
+  "account.settings.field.state.options.empty": "حدد المنطقة",
   "account.settings.field.site.language": "لغة الموقع",
   "account.settings.field.site.language.help.text": "اللغة المستخدمة في كافة أقسام هذا الموقع. يتوفّر هذا الموقع حاليًا بعدد محدود من اللغات.",
   "account.settings.field.education": "المستوى التعليمي",
   "account.settings.field.education.empty": "إضافة المستوى التعليمي",
-  "account.settings.field.education.levels.empty": "اختر المستوى التعليمي",
+  "account.settings.field.education.levels.empty": "اختر مستوى تعليميًّا",
   "account.settings.field.education.levels.p": "دكتوراه",
-  "account.settings.field.education.levels.m": "ماجستير أو شهادة مهنيّة",
-  "account.settings.field.education.levels.b": "بكالوريوس",
-  "account.settings.field.education.levels.a": "زمالة",
-  "account.settings.field.education.levels.hs": "شهادة الثانوية العامة",
-  "account.settings.field.education.levels.jhs": "شهادة الثانوية الصغرى/الإعدادية/المرحلة المتوسّطة",
-  "account.settings.field.education.levels.el": "شهادة المدرسة الابتدائية",
-  "account.settings.field.education.levels.none": "لا يوجد تعليم رسمي",
+  "account.settings.field.education.levels.m": "ماجستير / ماستر أو شهادة مهنيّة",
+  "account.settings.field.education.levels.b": "بكالوريوس / ليسانس",
+  "account.settings.field.education.levels.a": "درجة الزمالة / دبلوم الدراسات الجامعية",
+  "account.settings.field.education.levels.hs": "الثانوية العامة / البكالوريا",
+  "account.settings.field.education.levels.jhs": "المدرسة الإعدادية / المتوسطة",
+  "account.settings.field.education.levels.el": "المدرسة الابتدائية / الأساسية",
+  "account.settings.field.education.levels.none": "دون تعليم رسمي",
   "account.settings.field.education.levels.o": "نوع آخر من التعليم",
   "account.settings.field.gender": "الجنس",
   "account.settings.field.gender.empty": "إضافة الجنس",
@@ -62,163 +96,185 @@
   "account.settings.field.language_proficiencies.options.empty": "اختر لغة",
   "account.settings.field.time.zone": "المنطقة الزمنية",
   "account.settings.field.time.zone.empty": "ضبط المنطقة الزمنية",
-  "account.settings.field.time.zone.description": "حدد المنطقة الزمنية لعرض تواريخ المساق. إذا لم تحدد منطقة زمنية، فسيتم عرض تواريخ المساق، بما في ذلك المواعيد النهائية للواجب في المنطقة الزمنية المحلية في المتصفح.",
-  "account.settings.field.time.zone.default": "الافتراضي (منطقة التوقيت المحلي)",
+  "account.settings.field.time.zone.description": "حدد المنطقة الزمنية لعرض تواريخ المساقات. إذا لم تحدد منطقة زمنية، فسيتم عرض تواريخ المساق، بما في ذلك المواعيد النهائية للواجبات بالتوقيت المحلّي للمتصفح.",
+  "account.settings.field.time.zone.default": "الافتراضي (المنطقة الزمنية المحلية)",
   "account.settings.field.time.zone.all": "جميع المناطق الزمنية",
-  "account.settings.field.time.zone.country": "المنطقة الزمنية للدولة",
-  "account.settings.section.social.media": "روابط منصات التواصل الإجتماعي",
-  "account.settings.section.social.media.description": "اختياريا، قم بربط حساباتك الشخصية بأيقونات منصات التواصل الاجتماعي في ملف التعريف الخاص بك.",
+  "account.settings.field.time.zone.country": "المناطق الزمنية للبلدان",
+  "account.settings.section.social.media": "روابط التواصل الإجتماعي",
+  "account.settings.section.social.media.description": "اختياريًا، اربط حساباتك الشخصية بأيقونات التواصل الاجتماعي في ملفك على {siteName}.",
   "account.settings.field.social.platform.name.linkedin": "لينكد إن",
-  "account.settings.field.social.platform.name.linkedin.empty": "إضافة عنوان ملف لينكد إن ",
-  "account.settings.jump.nav.delete.account": "احذف حسابي",
+  "account.settings.field.social.platform.name.linkedin.empty": "إضافة سيرة لينكد إن",
+  "account.settings.jump.nav.delete.account": "حذف حسابي",
   "account.settings.field.social.platform.name.twitter": "تويتر",
-  "account.settings.field.social.platform.name.twitter.empty": "إضافة عنوان صفحة تويتر",
+  "account.settings.field.social.platform.name.twitter.empty": "إضافة صفحة تويتر",
   "account.settings.field.social.platform.name.facebook": "فيسبوك",
-  "account.settings.field.social.platform.name.facebook.empty": "إضافة عنوان صفحة فيسبوك",
+  "account.settings.field.social.platform.name.facebook.empty": "إضافة حساب فيسبوك",
   "account.settings.editable.field.action.save": "حفظ",
   "account.settings.editable.field.action.cancel": "إلغاء",
-  "account.settings.editable.field.action.edit": "تحرير",
-  "account.settings.static.field.empty": "لم يتم تحديد قيمة، فضلًا اتصل بمدير  {enterprise} لتعيين بعض التغييرات.",
-  "account.settings.static.field.empty.no.admin": "لم يتم تحديد قيمة",
-  "account.settings.coaching.consent.welcome.header": "لنبدأ",
+  "account.settings.editable.field.action.edit": "تعديل",
+  "account.settings.static.field.empty": "لا قيمة محددة. رجاءً اتصل بمديرك في {enterprise} ليقوم بالتعديلات.",
+  "account.settings.static.field.empty.no.admin": "لا قيمة محددة.",
+  "notification.preferences.notifications.label": "Notifications",
+  "account.settings.field.name.certificate.select": "في حال التأشير، سيظهر هذا الاسم في شهاداتك و سجلاتك العامة.",
+  "account.settings.field.name.modal.certificate.title": "اختر اسمًا مفضلًا للشهادات والسجلات العامة",
+  "account.settings.field.name.modal.certificate.select": "اختر اسمًا",
+  "account.settings.field.name.modal.certificate.option.full": "الاسم الكامل",
+  "account.settings.field.name.modal.certificate.option.verified": "اسم متحقَّق منه",
+  "account.settings.field.name.modal.certificate.button.choose": "اختيار الاسم",
+  "account.settings.coaching.consent.welcome.header": "لنبدأ.",
   "account.settings.coaching.consent.welcome.subheader": "نحن هنا لأجلك من البداية حتى النهاية",
-  "account.settings.coaching.consent.description": "تتضمن برامج البكالوريوس التدريب الذي يركز على مهنتك وتعليمك وكيفية تحقيق نتائج مبهرة من خلال التواصل الشخصي مع خبراء متمرسين. إذا كنت مهتمًا، فقدّم المعلومات أدناه وانقر فوق \"إرسال\"، وسيتصل بك شريكنا في التدريب عبر البريد الإلكتروني و/أو الرسائل النصية لمساعدتك على المضي قدمًا. تنطبق الشروط والأحكام.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* يتم تضمين خدمات التدريب بدون أي تكلفة إضافية للمتعلمين الذين لديهم أرقام هواتف أمريكية. يتضمن التدريب رسائل نصية متكررة. قد تنطبق أسعار الرسائل والبيانات. إيقاف النص لإلغاء الاشتراك.",
-  "account.settings.coaching.consent.accept-coaching": "سجّل للاستفادة من خدمات التدريب",
-  "account.settings.coaching.consent.decline-coaching": "أفضّل عدم الاتصال بخدمات التدريب المجانية",
-  "account.settings.coaching.consent.label.name": "يرجى تأكيد الاسم",
-  "account.settings.coaching.consent.label.phone-number": "فضلًا أدخل رقم الهاتف ",
-  "account.settings.coaching.consent.success.header": "تمت العملية بنجاح",
-  "account.settings.coaching.consent.success.message": "لقد اشتركت في التدريب. يمكنك توقع استلام رسالة عبر البريد الإلكتروني أو الرسائل القصيرة في الأيام المقبلة.",
+  "account.settings.coaching.consent.description": "تتضمن برامج MicroBachelors مرافقة تركز على مهنتك و تعليمك و كيفية تحقيقك للنتائج، و ذلك من خلال التواصل الفردي مع خبير متمرس. إن كنت مهتمًا، فيرجى تزويدنا بالمعلومات أدناه و النقر على \"إرسال\"، و سيتصل بك شريكنا في المرافقة عبر البريد الإلكتروني و/أو الرسائل النصية لمساعدتك على المضي قدمًا. تنطبق الشروط والأحكام.*",
+  "account.settings.coaching.consent.text-messaging.disclaimer": "* خدمات المرافقة مشمولة دون تكاليف إضافية للمتعلمين الذين لديهم أرقام هواتف أمريكية. تتضمن المرافقة رسائل نصية دورية. قد تنطبق أسعار على الرسائل والبيانات. أرسل STOP للانسحاب.",
+  "account.settings.coaching.consent.accept-coaching": "سجّل للاستفادة من خدمات المرافقة",
+  "account.settings.coaching.consent.decline-coaching": "أفضّل ألا يٌتصَل بي بخصوص خدمات المرافقة المجانية",
+  "account.settings.coaching.consent.label.name": "رجاءً أكّد اسمك",
+  "account.settings.coaching.consent.label.phone-number": "أدخل رقم هاتفك الجوّال",
+  "account.settings.coaching.consent.success.header": "نجحت العملية!",
+  "account.settings.coaching.consent.success.message": "أنت الآن مشترك في المرافقة. ترقّب رسالة عبر البريد الإلكتروني أو خدمة الرسائل القصيرة في في الأيام المقبلة.",
   "account.settings.coaching.consent.success.continue": "البدء في مساقي",
   "account.settings.coaching.managed.support": "الدعم",
-  "account.settings.coaching.managed.alert": "تتم إدارة اسمك بواسطة {ManagerTitle}. اتصل بالمسؤول للحصول على المساعدة.",
+  "account.settings.coaching.managed.alert": "اسمك يديره {ManagerTitle}. اتصل بمديرك للحصول على المساعدة.",
   "account.settings.field.phone_number": "رقم الهاتف",
-  "account.settings.field.phone_number.empty": "إضافة رقم الهاتف",
-  "account.settings.field.coaching_consent": "اتفاقية التدريب",
-  "account.settings.field.coaching_consent.tooltip": "تتضمن برامج البكالوريوس التدريب القائم على الرسائل النصية الذي يساعدك على إقران التجارب التعليمية مع أهدافك المهنية من خلال النصائح الشخصية. يتم تضمين خدمات التدريب بدون أي تكلفة إضافية، وهي متوفرة للمتعلمين الذين لديهم أرقام هواتف نقالة أمريكية. تنطبق أسعار المراسلة القياسية. أرسل \"قف\" في أي وقت لإلغاء الرسائل.",
-  "account.settings.field.coaching_consent.error": "مطلوب رقم هاتف أمريكي صالح للدخول في التدريب",
+  "account.settings.field.phone_number.empty": "إضافة رقم هاتف",
+  "account.settings.field.coaching_consent": "الموافقة على المرافقة",
+  "account.settings.field.coaching_consent.tooltip": "تتضمن برامج MicroBachelors مرافقة قائمة على الرسائل النصية، تساعدك على إقران تجاربك التعلّمية مع أهدافك المهنية من خلال النصائح الفردية. خدمات المرافقة مشمولة دون تكاليف إضافية، وهي متوفرة للمتعلمين الذين لديهم أرقام هواتف جوالة أمريكية. تنطبق أسعار المراسلة القياسية. أرسل 'STOP' في أي وقت للانسحاب من الرسائل.",
+  "account.settings.field.coaching_consent.error": "مطلوب رقم هاتف أمريكي صحيح للتسجيل في المرافقة",
   "account.settings.delete.account.before.proceeding": "قبل المتابعة، يرجى {actionLink}.",
-  "account.settings.delete.account.header": "احذف حسابي",
+  "account.settings.delete.account.header": "حذف حسابي",
   "account.settings.delete.account.subheader": "نأسف لذهابك!",
-  "account.settings.delete.account.text.1": "يرجى ملاحظة: إن حذف حسابك والبيانات الشخصية قرار نهائي ولا يمكن التراجع عنه. لن تتمكن edX من استعادة حسابك أو البيانات التي تم حذفها.",
-  "account.settings.delete.account.text.2": "بمجرد حذف حسابك ، لا يمكنك استخدامه لأخذ دورات تدريبية على تطبيق edX أو edx.org أو أي موقع آخر تستضيفه edX. وهذا يشمل الوصول إلى edx.org من نظام صاحب العمل أو الجامعة والوصول إلى المواقع الخاصة التي تقدمها MIT Open Learning و Wharton Executive Education و Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "اتبع الإرشادات التالية لطباعة أو تحميل شهادة.",
-  "account.settings.delete.account.text.warning": "تحذير: حذف الحساب قرار نهائي. يرجى قراءة ما سبق بعناية قبل المتابعة. هذا إجراء لا رجعة فيه، ولن تتمكن بعد الآن من استخدام البريد الإلكتروني نفسه على edX.",
-  "account.settings.delete.account.text.change.instead": "هل تريد تغيير البريد الإلكتروني أو الاسم أو كلمة المرور بدلاً من ذلك؟",
-  "account.settings.delete.account.button": "احذف حسابي",
-  "account.settings.delete.account.please.activate": "تنشيط حسابك",
-  "account.settings.delete.account.please.unlink": "إلغاء ربط جميع حسابات التواصل الاجتماعي",
+  "account.settings.delete.account.text.1": "ترجى الملاحظة: إن حذف حسابك وبياناتك الشخصية له أثر دائم و لا يمكن التراجع عنه. لن يكون بمقدور {siteName} استعادة حسابك ولا البيانات التي يتم حذفها.",
+  "account.settings.delete.account.text.2": "بمجرد حذف حسابك، فإنك لن تستطيع استخدامه لمتابعة المساقات على {siteName}.",
+  "account.settings.delete.account.text.2.edX": "بمجرد حذف حسابك، فإنك لن تستطيع استخدامه لمتابعة المساقات على تطبيق edX ولا edx.org ولا أي موقع آخر تستضيفه edX. وهذا يشمل الوصول إلى edx.org من نظام صاحب العمل أو الجامعة و الوصول إلى المواقع الخاصة التي تقدمها MIT Open Learning و Wharton Executive Education و Harvard Medical School.",
+  "account.settings.delete.account.text.3.link": "اتّبع هذه التعليمات لطباعة أو تحميل شهادة",
+  "account.settings.delete.account.text.warning": "تحذير: حذف الحساب أثره دائم. يرجى قراءة ما ورد أعلاه بعناية قبل المتابعة. هذا إجراء غير رجعي، و لن تتمكن بعده من استخدام نفس البريد الإلكتروني على {siteName}.",
+  "account.settings.delete.account.text.change.instead": "هل تريد بدلاً من ذلك تغيير بريدك الإلكتروني أو اسمك أو كلمة المرور الخاصة بك؟",
+  "account.settings.delete.account.button": "حذف حسابي",
+  "account.settings.delete.account.please.activate": "تفعيل حسابك",
+  "account.settings.delete.account.please.confirm": "تأكيد حسابك",
+  "account.settings.delete.account.please.unlink": "فصل جميع حسابات التواصل الاجتماعي",
   "account.settings.delete.account.modal.header": "هل أنت متأكد؟",
-  "account.settings.delete.account.modal.text.1": "لقد حددت \"حذف حسابي\". إن حذف حسابك وبياناتك الشخصية قرار نهائي لا يمكن التراجع عنه. لن تتمكن edX من استعادة حسابك أو البيانات التي تم حذفها.",
-  "account.settings.delete.account.modal.text.2": "عند المتابعة، فلن تتمكن من استخدام هذا الحساب للحصول على مساقات على تطبيق edX أو edx.org أو أي موقع آخر يستضيفه edX. وهذا يشمل الوصول إلى edx.org من نظام صاحب العمل أو الجامعة والوصول إلى المواقع الخاصة التي يقدمها معهد ماساتشوستس للتكنولوجيا التعليم المفتوح، وارتون التعليم التنفيذي، وكلية هارفارد الطبية.",
-  "account.settings.delete.account.modal.enter.password": "إذا كنت لا تزال ترغب في المتابعة وحذف حسابك ، فيرجى إدخال كلمة مرور حسابك:",
-  "account.settings.delete.account.modal.confirm.delete": "تعم، أحذف",
-  "account.settings.delete.account.modal.confirm.cancel": "إلغاء",
-  "account.settings.delete.account.error.unable.to.delete": "تعذر حذف الحساب",
+  "account.settings.delete.account.modal.text.1": "لقد اخترت \"حذف حسابي\". إن حذف حسابك وبياناتك الشخصية ذو أثر دائم لا يمكن التراجع عنه. لن يكون بمقدور {siteName} استعادة حسابك و لا البيانات التي حذفت.",
+  "account.settings.delete.account.modal.text.2": "إن واصلت، فلن تستطيع استخدام هذا الحساب لمتابعة المساقات على {siteName}.",
+  "account.settings.delete.account.modal.text.2.edX": "إن واصلت، فلن تستطيع استخدام هذا الحساب لمتابعة المساقات على على تطبيق edX و لا edx.org و لا أي موقع آخر تستضيفه edX. وهذا يشمل الوصول إلى edx.org من نظام صاحب العمل أو الجامعة و الوصول إلى المواقع الخاصة التي يقدمها MIT Open Learning و Wharton Executive Education و Harvard Medical School.",
+  "account.settings.delete.account.modal.enter.password": "إن كنت لا تزال ترغب في المتابعة و حذف حسابك، فيرجى إدخال كلمة المرور:",
+  "account.settings.delete.account.modal.confirm.delete": "تعم، احذف",
+  "account.settings.delete.account.modal.confirm.cancel": "لا",
+  "account.settings.delete.account.error.unable.to.delete": "لم نستطع حذف الحساب",
   "account.settings.delete.account.error.no.password": "كلمة المرور مطلوبة",
-  "account.settings.delete.account.error.invalid.password": "كلمة المرور المدخلة غير صحيحة",
-  "account.settings.delete.account.error.unable.to.delete.details": "عذراً ، حدث خطأ أثناء محاولة معالجة طلبك. الرجاء معاودة المحاولة في وقت لاحق.",
-  "account.settings.delete.account.modal.after.header": "نأسف لذهابك! سيتم حذف حسابك قريبا.",
-  "account.settings.delete.account.modal.after.text": "قد يستغرق حذف الحساب ، بما في ذلك الإزالة من قوائم البريد الإلكتروني ، بضعة أسابيع حتى تتم معالجته بالكامل من خلال نظامنا. إذا كنت ترغب في إلغاء الاشتراك في رسائل البريد الإلكتروني قبل ذلك الحين ، يرجى إلغاء الاشتراك من تذييل أي بريد إلكتروني.",
+  "account.settings.delete.account.error.invalid.password": "كلمة المرور غير صحيحة",
+  "account.settings.delete.account.error.unable.to.delete.details": "عذراً، حدث خطأ أثناء محاولة معالجة طلبك. رجاءً أعد المحاولة لاحقًا.",
+  "account.settings.delete.account.modal.after.header": "نأسف لذهابك! سيُحذف حسابك في ظرف وجيز.",
+  "account.settings.delete.account.modal.after.text": "حذف الحساب، بما في ذلك من إزالة من القوائم البريدية، إجراء قد يستغرق بضعة أسابيع حتى يكتمل عبر نظامنا. إن كنت تريد قبل ذلك الحين إيقاف تلقي البريد الإلكتروني، فيرجى إلغاء الاشتراك من تذييل أي بريد إلكتروني.",
   "account.settings.delete.account.modal.after.button": "إغلاق ",
-  "account.settings.delete.account.text.3": "قد تفقد أيضًا إمكانية الوصول إلى الشهادات التي تم التحقق منها وبيانات اعتماد البرامج الأخرى مثل شهادات MicroMasters. إذا أردت عمل نسخة من هذه السجلات قبل متابعة الحذف، {actionLink}.",
-  "account.settings.message.demographics.service.issue": "حدث خطأ أثناء محاولة استرداد معلومات حسابك أو حفظها. يرجى المحاولة مرة أخرى لاحقًا.",
+  "account.settings.delete.account.text.3.edX": "قد تفقد كذلك إمكانية الوصول إلى الشهادات الموثقة و كذا مؤهلات البرامج الأخرى مثل شهادات MicroMasters. يمكنك الاحتفاظ بنسخة عنها لديك قبل المواصلة إلى الحذف. {actionLink}.",
+  "account.settings.delete.account.text.3": "قد تفقد كذلك إمكانية الوصول إلى الشهادات الموثقة و كذا مؤهلات البرامج الأخرى. يمكنك الاحتفاظ بنسخة عنها لديك قبل المواصلة إلى الحذف.",
+  "account.settings.message.demographics.service.issue": "حدث خطأ أثناء محاولة استخراج أو حفظ معلومات حسابك. رجاءً أعد المحاولة لاحقًا.",
   "account.settings.field.demographics.gender": "هوية الجنس",
   "account.settings.field.demographics.gender.empty": "إضافة هوية الجنس",
   "account.settings.field.demographics.gender.options.empty": "حدد هوية الجنس",
   "account.settings.field.demographics.gender_description": "وصف هوية الجنس",
-  "account.settings.field.demographics.gender_description.empty": "أدخل وصفًا",
+  "account.settings.field.demographics.gender_description.empty": "أدخل الوصف",
   "account.settings.field.demographics.ethnicity": "هوية العرق/ الأصل",
-  "account.settings.field.demographics.ethnicity.empty": "إضافة هوية العرق/الأصل",
-  "account.settings.field.demographics.ethnicity.options.empty": "فضلًا اختر جميع ما ينطبق",
-  "account.settings.field.demographics.income": "الدخل المادي الأسري",
-  "account.settings.field.demographics.income.empty": "إضافة الدخل المادي الأسري",
-  "account.settings.field.demographics.income.options.empty": "حدد نطاق الدخل المادي للأسرة",
-  "account.settings.field.demographics.military_history": "حالة الخدمة العسكرية في الولايات المتحدة الأمريكية",
-  "account.settings.field.demographics.military_history.empty": "إضافة حالة الخدمة العسكرية",
-  "account.settings.field.demographics.military_history.options.empty": "اختر حالة الخدمة العسكرية",
-  "account.settings.field.demographics.learner_education_level": "مؤهلك التعليمي",
-  "account.settings.field.demographics.learner_education_level.empty": "إضافة مؤهلك التعليمي",
-  "account.settings.field.demographics.parent_education_level": "مؤهل الوالدين/الآوصياء التعليمي",
-  "account.settings.field.demographics.parent_education_level.empty": "إضافة المؤهل التعليمي",
-  "account.settings.field.demographics.education_level.options.empty": "حدد موهلاً تعليميًا",
+  "account.settings.field.demographics.ethnicity.empty": "إضافة هوية العرق / الأصل",
+  "account.settings.field.demographics.ethnicity.options.empty": "اختر كل ما ينطبق",
+  "account.settings.field.demographics.income": "دخل الأسرة",
+  "account.settings.field.demographics.income.empty": "إضافة دخل الأسرة",
+  "account.settings.field.demographics.income.options.empty": "حدد نطاقًا لدخل الأسرة",
+  "account.settings.field.demographics.military_history": "الوضعية إزاء الخدمة العسكرية في الولايات المتحدة",
+  "account.settings.field.demographics.military_history.empty": "إضافة الوضعية إزاء الخدمة العسكرية",
+  "account.settings.field.demographics.military_history.options.empty": "اختر الوضعية إزاء الخدمة العسكرية",
+  "account.settings.field.demographics.learner_education_level": "مستواك التعليمي",
+  "account.settings.field.demographics.learner_education_level.empty": "إضافة المستوى التعليمي",
+  "account.settings.field.demographics.parent_education_level": "مستوى الوالدين/الأولياء التعليمي",
+  "account.settings.field.demographics.parent_education_level.empty": "إضافة المستوى التعليمي",
+  "account.settings.field.demographics.education_level.options.empty": "حدد المستوى التعليمي",
   "account.settings.field.demographics.work_status": "الحالة الوظيفية",
   "account.settings.field.demographics.work_status.empty": "إضافة الحالة الوظيفية",
-  "account.settings.field.demographics.work_status.options.empty": "فضلًا حدد حالتك الوظيفية",
+  "account.settings.field.demographics.work_status.options.empty": "حدد الحالة الوظيفية",
   "account.settings.field.demographics.work_status_description": "وصف الحالة الوظيفية",
-  "account.settings.field.demographics.work_status_description.empty": "أدخل وصفًا",
+  "account.settings.field.demographics.work_status_description.empty": "أدخل الوصف",
   "account.settings.field.demographics.current_work_sector": "مجال العمل الحالي",
   "account.settings.field.demographics.current_work_sector.empty": "إضافة مجال العمل",
   "account.settings.field.demographics.future_work_sector": "مجال العمل المستقبلي",
   "account.settings.field.demographics.future_work_sector.empty": "إضافة مجال العمل",
   "account.settings.field.demographics.work_sector.options.empty": "حدد مجال العمل",
-  "account.settings.section.demographics.why": "لماذا تجمع edX هذه المعلومات؟",
-  "error.notfound.message": "الصفحة التي تبحث عنها غير متوفرة أو هناك خطأ في نص الرابط. الرجاء التحقق من الرابط والمحاولة مجددا.",
+  "account.settings.section.demographics.why": "ما هي غاية {siteName} من جمع هذه المعلومات؟",
+  "account.settings.name.change.title.id": "تغيير الاسم هذا يتطلب التحقق من الهوية",
+  "account.settings.name.change.title.begin": "قبل أن نبدأ",
+  "account.settings.name.change.warning.one": "تحذير: يقوم هذا الإجراء بتحديث الاسم الذي يظهر على جميع الشهادات التي تم الحصول عليها على هذا الحساب في الماضي و أي شهادات تحصل عليها حاليا أو مستقبلاً.",
+  "account.settings.name.change.warning.two": "لا يمكن التراجع عن هذا الإجراء دون التحقق من هويتك.",
+  "account.settings.name.change.id.name.label": "أدخل اسمك كما يظهر في بطاقة تعريف الطالب أو العمل أو بطاقة الهوية الصادرة عن الحكومة.",
+  "account.settings.name.change.id.name.placeholder": "أدخل الاسم الموجود في بطاقة تعريفك ذات الصورة.",
+  "account.settings.name.change.error.valid.name": "رجاءً أدخل اسما صحيحا.",
+  "account.settings.name.change.error.general": "حدث خطأ تقني. رجاءً حاول مجددًا.",
+  "account.settings.name.change.continue": "مواصلة",
+  "account.settings.name.change.cancel": "إلغاء",
+  "error.notfound.message": "الصفحة التي تبحث عنها غير متوفرة أو هناك خطأ في العنوان. رجاءً تحقق من العنوان و حاول مجددًا.",
   "account.settings.editable.field.password.reset.button.confirmation.support.link": "الدعم الفني",
-  "account.settings.editable.field.password.reset.button.confirmation": "لقد أرسلنا رسالة إلى {email}. انقر فوق الرابط في الرسالة لإعادة تعيين كلمة المرور. إذا لم يتم استلام الرسالة؟ اتصل بـ {technicalSupportLink}.",
-  "account.settings.editable.field.password.reset.button": "تغيير كلمة المرور",
-  "account.settings.editable.field.password.reset.button.forbidden": "طلبك السابق قيد التقدم، يرجى إعادة المحاولة بعد لحظات قليلة.",
+  "account.settings.editable.field.password.reset.button.confirmation": "لقد أرسلنا رسالة إلى {email}. انقر على الرابط في الرسالة لإعادة ضبط كلمة المرور الخاصة بك. لم تصلك الرسالة؟ اتصل بـ{technicalSupportLink}.",
+  "account.settings.editable.field.password.reset.button": "إعادة ضبط كلمة المرور",
+  "account.settings.editable.field.password.reset.button.forbidden": "طلبك السابق في تقدّم، رجاءً حاول مجددًا بعد لحظات قليلة.",
   "account.settings.editable.field.password.reset.label": "كلمة المرور",
-  "account.settings.sso.link.account": "تسجيل الدخول كـ  {name}",
-  "account.settings.sso.account.connected": "مربوط",
-  "account.settings.sso.account.disconnect.error": "حدثت مشكلة أثناء قطع اتصال هذا الحساب، اتصل بالدعم عند استمرار المشكلة.",
-  "account.settings.sso.unlink.account": "إلغاء ربط حساب {name} ",
-  "account.settings.sso.no.providers": "لا يمكن ربط أية حسابات حاليًا",
-  "id.verification.access.blocked.denied": "لا يمكنك التحقق من هويتك في الوقت الحالي. إذا لم تقم بعد بتنشيط حسابك، فيرجى التحقق من مجلد البريد المهمل للحصول على رسالة التفعيل من {email}.",
+  "account.settings.sso.link.account": "تسجيل الدخول باستخدام {name}",
+  "account.settings.sso.account.connected": "موصول",
+  "account.settings.sso.account.disconnect.error": "حدثت مشكلة أثناء فصل هذا الحساب، اتصل بالدعم إن استمرت المشكلة.",
+  "account.settings.sso.unlink.account": "فصل حساب {name}",
+  "account.settings.sso.no.providers": "لا يمكن وصل أي حسابات في الوقت الراهن.",
+  "account.page.title": "الحساب | {siteName}",
+  "id.verification.access.blocked.denied": "لا يمكننا التحقق من هويتك في الوقت الراهن. إن لم تكن قد فعّلت حسابك بعد، فيرجى تفقد مجلد الرسائل غير المرغوب فيها بحثًا عن بريد التفعيل الإلكتروني من {email}.",
   "id.verification.next": "التالي",
-  "id.verification.support": "support",
-  "id.verification.example.card.alt": "مثال على بطاقة هوية صحيحة بالاسم الكامل وصورة.",
-  "id.verification.requirements.title": "متطلبات التحقق من الصورة",
-  "id.verification.requirements.description": "يجب عليك اتباع الآتي لإكمال عملية التحقق الإلكتروني من هويتك:",
+  "id.verification.support": "الدعم",
+  "id.verification.example.card.alt": "مثال بطاقة تعريف صحيحة بالاسم الكامل والصورة.",
+  "id.verification.requirements.title": "متطلبات التحقق باستخدام الصورة",
+  "id.verification.requirements.description": "لإكمال التحقق بالصورة، ستحتاج ما يلي:",
   "id.verification.requirements.card.device.title": "جهاز مزود بكاميرا",
-  "id.verification.requirements.card.device.allow": "موافق",
-  "id.verification.requirements.card.id.title": "صورة التحقق من الشخصية.",
-  "id.verification.requirements.card.id.text": "تحتاج إلى بطاقة هوية صحيحة للتحقق تحوي اسمك الكامل وصورتك.",
-  "id.verification.privacy.title": "بيانات الخصوصية.",
-  "id.verification.privacy.need.photo.question": "لماذا تحتاج edX إلى صورتي؟ ",
-  "id.verification.privacy.need.photo.answer": "نستخدم صور التحقق الخاصة بك لتأكيد هويتك والتأكد من صحة شهادتك.",
-  "id.verification.privacy.do.with.photo.question": "ما الذي تفعله edX بهذه الصورة؟",
-  "id.verification.privacy.do.with.photo.answer": "سنقوم بتشفير صورتك بأمان وإرسالها لخدمة التحقق للمراجعة . لن يتم حفظ صورتك ومعلوماتك أو عرضها في أي مكان على edX بعد اكتمال عملية التحقق.",
+  "id.verification.requirements.card.device.allow": "السماح",
+  "id.verification.requirements.card.id.title": "بطاقة تعريف بها صورة",
+  "id.verification.requirements.card.id.text": "تحتاج إلى بطاقة تعريف صالحة تحتوي اسمك الكامل وصورتك، كرخصة القيادة أو جواز السفر مثلاً.",
+  "id.verification.privacy.title": "معلومات الخصوصية",
+  "id.verification.privacy.need.photo.question": "ما حاجة {siteName} لصورتي؟",
+  "id.verification.privacy.need.photo.answer": "نستخدم صور التحقق الخاصة بك لتأكيد هويتك ولضمان صحة شهادتك.",
+  "id.verification.privacy.do.with.photo.question": "ماذا يُفعَل بهذه الصورة في {siteName}؟",
+  "id.verification.privacy.do.with.photo.answer": "نقوم بتشفير صورتك بشكل آمن وإرسالها إلى خدمة الترخيص الخاصة بنا للمراجعة. صورتك و معلوماتك لا تُحفَظ و لا تظهر في أي مكان على {siteName} بعد اكتمال عملية التحقق.",
   "id.verification.access.blocked.title": "التحقق من الهوية",
-  "id.verification.access.blocked.enrollment": "أنت الآن ملتحق بمساق يتطلب التحقق من الهوية.",
-  "id.verification.access.blocked.pending": "لقد قمت بالفعل بإرسال معلومات التحقق الخاصة بك. ستصلك رسالة على لوحة المعلومات عند اكتمال عملية التحقق (عادةً خلال 5 أيام).",
+  "id.verification.access.blocked.enrollment": "أنت حاليا غير ملتحق بأي مساق يتطلب التحقق من الهوية.",
+  "id.verification.access.blocked.pending": "لقد سلّمت من قبل معلومات التحقق الخاصة بك. ستصلك رسالة على لوحة المعلومات الخاصة بك عند اكتمال عملية التحقق (عادةً في ظرف 5 أيام).",
   "id.verification.photo.take": "التقاط صورة ",
-  "id.verification.photo.retake": "Retake Photo?",
-  "id.verification.photo.enable.detection": "تمكين خاصية التعرف على الوجه",
-  "id.verification.photo.enable.detection.portrait.help.text": "عند تحديد هذا الخيار، فسيظهر مربع حول وجهك. يمكن رؤية وجهك بوضوح إذا كان المربع المحيط به أزرق. إذا لم يكن وجهك في وضع جيد أو إذا لم يكن قابلاً للاكتشاف، فسيكون المربع باللون الأحمر.",
-  "id.verification.photo.enable.detection.id.help.text": "عند تحديد هذا الخيار، فسيظهر مربع حول صورة وجهك في بطاقة الهوية. يمكن رؤية وجهك بوضوح إذا كان المربع المحيط به أزرق. إذا لم يكن وجهك في وضع جيد أو إذا لم يكن قابلاً للاكتشاف، فسيكون المربع باللون الأحمر.",
-  "id.verification.photo.feedback.correct": "وضع الوجه جيد.",
-  "id.verification.photo.feedback.two.faces": "تم تحديد أكثر من وجه.",
-  "id.verification.photo.feedback.no.faces": "لم يتم تحديد أي وجه.",
-  "id.verification.photo.feedback.top.left": "وضع خاطئ. أعلى اليسار.",
-  "id.verification.photo.feedback.top.center": "وضع خاطئ. أعلى الوسط.",
-  "id.verification.photo.feedback.top.right": "وضع خاطئ. أعلى اليمين.",
-  "id.verification.photo.feedback.center.left": "وضع خاطئ. وسط اليسار.",
-  "id.verification.photo.feedback.center.center": "وضع خاطئ. قريب جدًا من الكاميرا.",
-  "id.verification.photo.feedback.center.right": "وضع خاطئ. وسط اليمين.",
-  "id.verification.photo.feedback.bottom.left": "وضع خاطئ. أسفل اليسار.",
-  "id.verification.photo.feedback.bottom.center": "وضع خاطئ. أسفل الوسط.",
-  "id.verification.photo.feedback.bottom.right": "وضع خاطئ. أسفل اليمين.",
+  "id.verification.photo.retake": "إعادة التقاط الصورة؟",
+  "id.verification.photo.enable.detection": "تفعيل اكتشاف الوجوه",
+  "id.verification.photo.enable.detection.portrait.help.text": "في حال التأشير، سيبرز مربع حول وجهك. يمكن رؤية وجهك بوضوح إن كان المربع المحيط به أزرق اللون. أما إن كان وجهك في وضع غير جيد أو غير قابل للاكتشاف، فسيكون المربع أحمر اللون.",
+  "id.verification.photo.enable.detection.id.help.text": "في حال التأشير، سيظهر مربع حول صورة وجهك في بطاقة الهوية. يمكن رؤية وجهك بوضوح إن كان المربع المحيط به أزرق اللون. أما إن كان وجهك في وضع غير جيد أو غير قابل للاكتشاف، فسيكون المربع أحمر اللون.",
+  "id.verification.photo.feedback.correct": "موضع الوجه جيد.",
+  "id.verification.photo.feedback.two.faces": "تم اكتشاف أكثر من وجه واحد.",
+  "id.verification.photo.feedback.no.faces": "لم يتم اكتشاف أي وجه.",
+  "id.verification.photo.feedback.top.left": "الموضع خاطئ. أعلى اليسار.",
+  "id.verification.photo.feedback.top.center": "الموضع خاطئ. أعلى الوسط.",
+  "id.verification.photo.feedback.top.right": "الموضع خاطئ. أعلى اليمين.",
+  "id.verification.photo.feedback.center.left": "الموضع خاطئ. وسط اليسار.",
+  "id.verification.photo.feedback.center.center": "الموضع خاطئ. قريب جدًا من الكاميرا.",
+  "id.verification.photo.feedback.center.right": "الموضع خاطئ. وسط اليمين.",
+  "id.verification.photo.feedback.bottom.left": "الموضع خاطئ. أسفل اليسار.",
+  "id.verification.photo.feedback.bottom.center": "الموضع خاطئ. أسفل الوسط.",
+  "id.verification.photo.feedback.bottom.right": "الموضع خاطئ. أسفل اليمين.",
   "id.verification.camera.access.title": "صلاحيات الكاميرا",
-  "id.verification.camera.access.title.success": "تمكين الوصول للكاميرا",
+  "id.verification.camera.access.title.success": "الوصول للكاميرا ممكن",
   "id.verification.camera.access.title.failed": "تعذّر الوصول للكاميرا.",
-  "id.verification.camera.access.click.allow": "فضلًا تأكد من اختيار الأمر \"السماح\"",
-  "id.verification.camera.access.enable": "تمكين الكاميرا",
-  "id.verification.camera.access.problems": "هل تواجه أية مشكلة؟",
-  "id.verification.camera.access.skip": "قم بتخطي ملفات الصور وتحميلها بدلاً من ذلك",
-  "id.verification.camera.access.success": "يبدو أن الكاميرا تعمل وجاهزة.",
-  "id.verification.camera.access.failure": "يبدو أننا غير قادرين على الوصول إلى الكاميرا. ستحتاج إلى تحميل ملفات الصور الخاصة بك و معرّف الصور الخاص بك.",
-  "id.verification.camera.access.failure.temporary": "يبدو أننا غير قادرين على الوصول إلى الكاميرا. يرجى التحقق من أن كاميرا الويب متصلة ومن أنك سمحت للمتصفح بالوصول إليها.",
-  "id.verification.camera.access.failure.temporary.chrome": "تمكين الوصول للكاميرا في متصفّح كروم: ",
-  "id.verification.camera.access.failure.temporary.chrome.step1": "فتح متصفّح كروم.",
+  "id.verification.camera.access.click.allow": "رجاءً تأكد من النقر على \"السماح\"",
+  "id.verification.camera.access.enable": "تفعيل الكاميرا",
+  "id.verification.camera.access.problems": "لديك مشاكل؟",
+  "id.verification.camera.access.skip": "تَخَطَّ و قم برفع ملفات صور بدلاً من ذلك.",
+  "id.verification.camera.access.success": "يبدو أن كاميرا جهازك جاهزة و تعمل.",
+  "id.verification.camera.access.failure": "يبدو أننا غير قادرين على الوصول إلى كاميرا جهازك. ستحتاج لرفع ملف صورتك و صورة بطاقة هويتك.",
+  "id.verification.camera.access.failure.temporary": "يبدو أننا غير قادرين على الوصول إلى الكاميرا. رجاءً تحقق من أن كاميرا جهازك متصلة ومن أنك قد سمحت للمتصفح بالوصول إليها.",
+  "id.verification.camera.access.failure.temporary.chrome": "لتفعيل الوصول للكاميرا في متصفح كروم:",
+  "id.verification.camera.access.failure.temporary.chrome.step1": "افتح كروم.",
   "id.verification.camera.access.failure.temporary.chrome.step2": "توجه إلى المزيد > الإعدادات.",
   "id.verification.camera.access.failure.temporary.chrome.step2.windows": "لنظام ويندوز: Alt+F أو Alt+E أو F10 متبوعاً بـ SPACEBAR",
   "id.verification.camera.access.failure.temporary.chrome.step2.mac": "لنظام ماك: Command+,",
-  "id.verification.camera.access.failure.temporary.chrome.step3": "ضمن علامة التبويب \"الخصوصية والأمان\"، حدد \"إعدادات الموقع\" ثم \"الكاميرا\".",
+  "id.verification.camera.access.failure.temporary.chrome.step3": "تحت علامة التبويب \"الخصوصية والأمان\"، اختر \"إعدادات الموقع\" ثم \"الكاميرا\".",
   "id.verification.camera.access.failure.temporary.chrome.step4": "ضمن \"قائمة الحظر\"، ابحث عن \"edx.org\" وحدده.",
-  "id.verification.camera.access.failure.temporary.chrome.step5": "في القسم \"الصلاحيات\"، قم بتحديث صلاحيات الكاميرا إلى \"السماح\".",
-  "id.verification.camera.access.failure.temporary.ie11": "تمكين الوصول للكاميرا في متصفح انترنت إكسبلورر:",
+  "id.verification.camera.access.failure.temporary.chrome.step5": "في قسم \"الصلاحيات\"، قم بتحديث صلاحيات الكاميرا إلى \"السماح\".",
+  "id.verification.camera.access.failure.temporary.ie11": "لتفعيل الوصول للكاميرا في متصفح انترنت إكسبلورر:",
   "id.verification.camera.access.failure.temporary.ie11.step1": "افتح إدارة إعدادات Flash Player عن طريق الانتقال إلى إعدادات Windows > لوحة التحكم > Flash Player.",
   "id.verification.camera.access.failure.temporary.ie11.step2": "حدد علامة التبويب \"Camera and Mic\" (الكاميرا والميكروفون)، ثم حدد الزر \"Camera and Microphone Settings by Site\" (إعدادات الكاميرا والميكروفون حسب الموقع).",
   "id.verification.camera.access.failure.temporary.ie11.step3": "اختر \"edx.org\" من قائمة مواقع ويب وقم بتغيير الصلاحيات من خلال تحديد \"السماح\" في القائمة المنسدلة.",
@@ -232,87 +288,85 @@
   "id.verification.camera.access.failure.temporary.firefox.step7": "اختر \"حفظ التغييرات.\"",
   "id.verification.camera.access.failure.temporary.safari": "تمكين الوصول للكاميرا في متصفّح سفاري: ",
   "id.verification.camera.access.failure.temporary.safari.step1": "فتح متصفّح سفاري.",
-  "id.verification.camera.access.failure.temporary.safari.step2": "انقر فوق قائمة تطبيق سفاري، ثم حدد \"Preferences\" (التفضيلات). يمكنك أيضاً استخدام الأمرCommand+ كاختصار للوحة المفاتيح",
-  "id.verification.camera.access.failure.temporary.safari.step3": "حدد علامة التبويب \"مواقع ويب\" ثم حدد \"كاميرا\".",
+  "id.verification.camera.access.failure.temporary.safari.step2": "انقر فوق قائمة تطبيق سفاري، ثم حدد \"Preferences\" (التفضيلات). يمكنك أيضاً استخدام الأمرCommand+, كاختصار للوحة المفاتيح",
+  "id.verification.camera.access.failure.temporary.safari.step3": "حدد علامة التبويب \"مواقع الويب\" ثم حدد \"كاميرا\".",
   "id.verification.camera.access.failure.temporary.safari.step4": "حدد \"edx.org\" وقم بتغيير صلاحيات الكاميرا إلى \"السماح\".",
-  "id.verification.camera.access.failure.unsupported": "It looks like your browser does not support camera access.",
-  "id.verification.camera.access.failure.unsupported.chrome.explanation": "The Chrome browser currently does not support camera access on iOS devices, such as iPhones and iPads.",
-  "id.verification.camera.access.failure.unsupported.instructions": "Please use another browser to complete Identity Verification.",
-  "id.verification.photo.tips.title": "تلميحات مفيدة للصورة",
-  "id.verification.photo.tips.description": "بعد ذلك، سنحتاج منك التقاط صورة لوجهك. يرجى مراجعة التلميحات المفيدة أدناه.",
-  "id.verification.photo.tips.list.title": "تلميحات الصورة",
+  "id.verification.camera.access.failure.unsupported": "يبدو أن متصفحك لا يدعم الوصول إلى الكاميرا.",
+  "id.verification.camera.access.failure.unsupported.chrome.explanation": "لا يدعم متصفح Chrome حاليًا الوصول إلى الكاميرا على أجهزة iOS مثل أجهزة iPhone و iPad.",
+  "id.verification.camera.access.failure.unsupported.instructions": "رجاءً استخدم متصفحًا آخر لإكمال التحقق من الهوية.",
+  "id.verification.photo.tips.title": "نصائح مفيدة بخصوص الصورة",
+  "id.verification.photo.tips.description": "بعد ذلك، سنحتاج منك التقاط صورة لوجهك. يرجى مراجعة النصائح المفيدة أدناه.",
+  "id.verification.photo.tips.list.title": "نصائح بخصوص الصورة",
   "id.verification.photo.tips.list.description": "لالتقاط صورة ناجحة، يُرجى التأكّد ممّا يلي:",
-  "id.verification.photo.tips.list.well.lit": "أنّ الإضاءة جيّدة على وجهك.",
-  "id.verification.photo.tips.list.inside.frame": "أنّ وجهك داخل إطار الصورة بالكامل.",
+  "id.verification.photo.tips.list.well.lit": "أنّ وجهك مُضاء جيدًا.",
+  "id.verification.photo.tips.list.inside.frame": "أنّ وجهك كلَّه داخل إطار الصورة.",
   "id.verification.portrait.photo.title.camera": "التقط صورة لنفسك",
-  "id.verification.portrait.photo.title.upload": "ارفع صورتك",
-  "id.verification.portrait.photo.preview.alt": "معاينة صورة وجه المستخدم.",
-  "id.verification.portrait.photo.instructions.camera": "عندما يكون وجهك في موضعه، استخدم زر التقاط صورة أدناه لالتقاط الصورة.",
-  "id.verification.portrait.photo.instructions.upload": "Please upload a portrait photo. Ensure your entire face fits inside the frame and is well-lit. Supported formats: ",
-  "id.verification.camera.help.sight.question": "ماذا لو لم أتمكن من رؤية صورة الكاميرا ؟ أو إذا لم أتمكن من رؤية صورتي لتحديد أي جانب مرئي؟",
-  "id.verification.camera.help.sight.answer.portrait": "قد تتمكن من إكمال إجراء التقاط الصور من دون مساعدة، ولكن قد يتطلب الأمر بضع محاولات ضبط وضع الكاميرا بشكل صحيح. يختلف وضع الكاميرا المثالي باختلاف الكمبيوتر، ولكن بشكل عام، يكون أفضل موضع للتصوير في الرأس هو 12 إلى 18 بوصة (30-45 سم) تقريبًا من الكاميرا، مع وضع الرأس في المنتصف بالنسبة إلى شاشة الكمبيوتر. إذا تم رفض الصور التي ترسلها، فحاول تحريك اتجاه الكمبيوتر أو الكاميرا لتغيير زاوية الإضاءة.",
-  "id.verification.camera.help.sight.answer.id": "قد تتمكن من إكمال إجراء التقاط الصور من دون مساعدة، ولكن قد يتطلب الأمر بضع محاولات لضبط وضع الكاميرا بشكل صحيح. يختلف الوضع الأمثل للكاميرا باختلاف جهاز الكمبيوتر، ولكن بشكل عام، يكون أفضل وضع لصورة بطاقة تعريف من 8 إلى 12 بوصة (من 20 إلى 30 سم) عن الكاميرا، مع وضع بطاقة الهوية في الوسط بالنسبة للكاميرا. إذا تم رفض الصور التي ترسلها، فحاول تحريك اتجاه الكمبيوتر أو الكاميرا لتغيير زاوية الإضاءة. إن السبب الأكثر شيوعاً للرفض هو عدم القدرة على قراءة النص الموجود على بطاقة الهوية.",
+  "id.verification.portrait.photo.instructions.camera": "عندما يكون وجهك في موضعه، استخدم زر 'التقاط صورة' أدناه لالتقاط صورتك.",
+  "id.verification.camera.help.sight.question": "ماذا إن لم أتمكن من رؤية صورة الكاميرا أو إن لم أتمكن من رؤية صورتي لتحديد أي جانب مرئي؟",
+  "id.verification.camera.help.sight.answer.portrait": "قد تتمكن من إكمال إجراء التقاط الصور دون مساعدة، لكن قد يتطلب الأمر بضع محاولات لضبط موضع الكاميرا بشكل صحيح.يختلف موضع الكاميرا المثالي من حاسوب ﻵخر، لكن عمومًا يكون أفضل موضع لتصوير الرأس تقريبًا على بعد 12-18 بوصة (30-45 سنتمترًا) من الكاميرا، مع وضع رأسك في المنتصف بالنسبة إلى شاشة الحاسوب. إن تم رفض الصور التي ترسلها، فحاول تغيير اتجاه الكمبيوتر أو الكاميرا لتغيير زاوية الإضاءة.",
+  "id.verification.camera.help.sight.answer.id": "قد تتمكن من إكمال إجراء التقاط الصور دون مساعدة، لكن قد يتطلب الأمر بضع محاولات لضبط موضع الكاميرا بشكل صحيح.يختلف موضع الكاميرا المثالي من حاسوب ﻵخر، لكن عمومًا يكون أفضل موضع لتصوير بطاقة تعريف تقريبًا على بعد 8-12 بوصة (20-30 سنتمترًا) من الكاميرا، مع وضع البطاقة في المنتصف بالنسبة للكاميرا. إن تم رفض الصور التي ترسلها، فحاول تغيير اتجاه الكمبيوتر أو الكاميرا لتغيير زاوية الإضاءة. إن أكثر سبب للرفض هو عدم القدرة على قراءة نص بطاقة التعريف.",
   "id.verification.camera.help.difficulty.question.portrait": "ماذا لو واجهت صعوبة في تثبيت رأسي في الموضع المناسب للكاميرا؟",
   "id.verification.camera.help.difficulty.question.id": "ماذا لو واجهت صعوبة في تثبيت بطاقة هويتي في الموضع المناسب للكاميرا؟",
-  "id.verification.camera.help.difficulty.answer": "إذا كنت بحاجة إلى المساعدة في التقاط صورة للتقديم، فاتصل بدعم edX للحصول على اقتراحات إضافية.",
-  "id.verification.camera.help.upload.question": "What if I want to upload a photo instead?",
-  "id.verification.camera.help.upload.answer": "On the next page you will have the option to switch to upload mode. By selecting that option, you will be able to upload a photo instead.",
-  "id.verification.id.photo.unclear.question": "هل صورة بطاقة الهوية غير واضحة أو ضبابية؟",
-  "id.verification.id.tips.title": "تلميحات مفيدة للهوية ",
-  "id.verification.id.tips.description": "بعد ذلك، سنكون بحاجة إلى التقاط صورة لبطاقة هوية صالحة تتضمن اسمك الكامل وصورتك. يرجى تجهيز بطاقة هويتك.",
-  "id.verification.id.tips.list.well.lit": "إضاءة بطاقة هويتك جيدة.",
+  "id.verification.camera.help.difficulty.answer": "إن احتجت لمساعدة في التقاط صورة لإرسالها، فاتصل بدعم {siteName} للحصول على اقتراحات إضافية.",
+  "id.verification.id.photo.unclear.question": "هل صورة بطاقة تعريفك غير واضحة أو ضبابية جدًا؟",
+  "id.verification.id.tips.title": "نصائح مفيدة بخصوص بطاقة التعريف",
+  "id.verification.id.tips.description": "بعد ذلك، عليك التقاط صورة لبطاقة تعريف صالحة تتضمن اسمك الكامل مع صورة، مثل رخصة القيادة أو جواز السفر.يرجى منك تجهيز بطاقة تعريفك.",
+  "id.verification.id.tips.list.well.lit": "أن تكون بطاقة تعريفك مضاءة جيدًا.",
   "id.verification.id.tips.list.clear": "تأكد من قدرتك على رؤية صورتك وقراءة اسمك بوضوح.",
-  "id.verification.id.photo.title.camera": "التقط صورة لبطاقتك الشخصية",
-  "id.verification.id.photo.title.upload": "حمّل صورة لهويتك",
+  "id.verification.id.photo.title.camera": "التقط صورة لبطاقة تعريفك",
+  "id.verification.id.photo.title.upload": "ارفع صورة لبطاقة تعريفك",
   "id.verification.id.photo.preview.alt": "معاينة صورة الهوية.",
-  "id.verification.id.photo.instructions.camera": "عندما تكون بطاقة هويتك في موضعها، استخدم زر التقاط صورة أدناه لالتقاط الصورة.",
-  "id.verification.id.photo.instructions.upload": "Please upload an ID photo. Ensure the entire ID fits inside the frame and is well-lit. The file size must be under 10 MB. Supported formats: ",
-  "id.verification.id.photo.instructions.upload.error.invalidFileType": "The file you have selected is not a supported image type. Please choose from the following formats: ",
-  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "The file you have selected is too large. Please try again with a file less than 10MB.",
-  "id.verification.account.name.title": "التحقق من اسم الحساب",
-  "id.verification.account.name.instructions": "يجب أن يكون الاسم الموجود على حسابك والاسم الموجود على المعرّف الخاص بك متطابقًا تمامًا. إذا لم يكن الأمر كذلك، فيرجى النقر فوق \"لا\" لتحديث اسم حسابك.",
-  "id.verification.account.name.radio.label": "هل يتطابق الاسم الموجود على هويتك مع اسم الحساب أدناه؟",
-  "id.verification.account.name.radio.yes": "نعم",
-  "id.verification.account.name.radio.no": "لا",
-  "id.verification.account.name.error": "يرجى تحديث اسم الحساب لمطابقة الاسم على بطاقة الهوية.",
-  "id.verification.account.name.warning.prefix": "يُرجى الملاحظة:",
+  "id.verification.id.photo.instructions.camera": "عندما تكون بطاقتك في موضعها، استخدم زر 'التقاط صورة' أدناه لالتقاط صورتك. يرجى استخدام جواز سفر أو رخصة قيادة أو بطاقة تعريف أخرى تتضمن اسمك الكامل وصورة لوجهك.",
+  "id.verification.id.photo.instructions.upload": "يرجى رفع صورة لبطاقة تعريفك. تأكد من أن البطاقة كاملة داخل الإطار و أنها مضاءة جيدًا. يجب أن يكون حجم الملف أقل من 10 ميجابايت. الأنساق المدعومة:",
+  "id.verification.id.photo.instructions.upload.error.invalidFileType": "الملف الذي حددته ليس ضمن أنواع الصورة المدعومة. اختر رجاءً من بين الأنساق التالية:",
+  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "الملف الذي حددته كبير جداً. رجاءً أعد المحاولة باستخدام ملف ذي حجم أقل من 10 ميجابايت.",
+  "id.verification.name.check.title": "تحقق مرة أخرى من اسمك",
+  "id.verification.name.check.instructions": "هل الاسم أدناه يطابق الاسم الموجود في بطاقة تعريفك ذات الصورة. إن لم يكن كذلك، فقم بتحديث الاسم أدناه ليطابق بطاقة تعريفك.",
+  "id.verification.name.check.mismatch.information": "إن كان الاسم أدناه لا يطابق بطاقة تعريفك، فسيتم رفض تأكيد هويتك.",
+  "id.verification.name.error": "رجاءً أدخل اسمك كما يظهر في بطاقة تعريفك ذات الصورة.",
+  "id.verification.account.name.warning.prefix": "تُرجى الملاحظة:",
   "id.verification.account.name.settings": "إعدادات الحساب",
-  "id.verification.account.name.label": "اسم الحساب",
-  "id.verification.account.name.photo.alt": "صورة من هويتك للتقديم.",
-  "id.verification.account.name.save": "حفظ ثم التالي",
+  "id.verification.name.label": "الاسم",
+  "id.verification.account.name.photo.alt": "صورة بطاقة هويتك التي ستُسلَّم.",
   "id.verification.review.title": "مراجعة صورك",
   "id.verification.review.description": "يُرجى التأكّد من أنّ الصور والمعلومات التي قدّمتها تمكّننا من التحقّق من هويّتك. ",
   "id.verification.review.portrait.label": "صورتك الشخصية",
-  "id.verification.review.portrait.alt": "صورة شخصية للتقديم.",
-  "id.verification.review.portrait.retake": "إعادة التقاط الصورة شخصية",
-  "id.verification.review.id.label": "معرّف صورتك",
-  "id.verification.review.id.alt": "صورة من هويتك للتقديم.",
-  "id.verification.review.id.retake": "إعادة التقاط صورة الهوية",
-  "id.verification.review.confirm": "إرسال",
-  "id.verification.submission.alert.error.face": "مطلوب صورة لوجهك. يرجى إعادة التقاط الصورة الشخصية.",
-  "id.verification.submission.alert.error.id": "مطلوب صورة لبطاقة هويتك. يرجى إعادة التقاط صورة بطاقة الهوية.",
-  "id.verification.submission.alert.error.name": "مطلوب اسم حساب صالح. يرجى تحديث اسم حسابك لمطابقة الاسم على هويتك.",
-  "id.verification.submission.alert.error.unsupported": "One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ",
-  "id.verification.review.error": "صفحة فريق دعم edX ",
-  "id.verification.submitted.title": "جارِ التحقق من الهوية",
-  "id.verification.submitted.text": "لقد تلقينا معلوماتك وجاري الآن العمل على التحقق من هويتك. ستصلك رسالة على لوحة المعلومات عند اكتمال عملية التحقق (عادةً خلال 5 أيام). في غضون ذلك، لا يزال بإمكانك الوصول إلى كل محتوى المساق المتوفر.",
-  "id.verification.return.dashboard": "العودة إلى لوحة المعلومات",
+  "id.verification.review.portrait.alt": "صورة وجهك التي ستُسلَّم.",
+  "id.verification.review.portrait.retake": "إعادة التقاط الصورة الشخصية",
+  "id.verification.review.id.label": "بطاقة تعريفك",
+  "id.verification.review.id.alt": "صورة بطاقة تعريفك التي ستُسلَّم.",
+  "id.verification.review.id.retake": "إعادة التقاط صورة بطاقة الهوية",
+  "id.verification.review.confirm": "تسليم",
+  "id.verification.submission.alert.error.face": "مطلوبة صورة لوجهك. رجاءً أعد التقاط صورتك الشخصية.",
+  "id.verification.submission.alert.error.id": "مطلوبة صورة لبطاقة تعريفك. رجاءً أعد التقاط صورة لبطاقة تعريفك.",
+  "id.verification.submission.alert.error.name": "مطلوب اسم حساب صحيح. يرجى تحديث اسم حسابك لمطابقة الاسم على بطاقة تعريفك.",
+  "id.verification.submission.alert.error.unsupported": "واحد أو أكثر من الملفات التي قمت برفعها في نَسقٍ غير مدعوم. رجاءً اختر مما يلي:",
+  "id.verification.review.error": "{siteName} صفحة دعم",
+  "id.verification.submitted.title": "التحقق من الهوية جارٍ",
+  "id.verification.submitted.text": "لقد تلقينا معلوماتك و نحن الآن نتحقق من هويتك. سيتم إخطارك عند اكتمال عملية التحقق (عادةً في ظرف 5 أيام). إلى ذلكم الحين، لا يزال يمكنك الوصول لجميع محتويات المساق المتاحة.",
+  "id.verification.return.dashboard": "العودة للوحة المعلومات",
   "id.verification.return.course": "العودة للمساق",
-  "id.verification.photo.upload.help.title": "Upload a Photo Instead",
-  "id.verification.photo.camera.help.title": "Use Your Camera Instead",
-  "id.verification.photo.upload.help.text": "If you are having trouble using the photo capture above, you may want to upload a photo instead. To upload a photo, click the button below.",
-  "id.verification.photo.camera.help.text": "If you are having trouble uploading a photo above, you may want to use your camera instead. To use your camera, click the button below.",
-  "id.verification.upload.help.button": "Switch to Upload Mode",
-  "id.verification.camera.help.button": "Switch to Camera Mode",
-  "id.verification.choose.mode.title": "Photo Requirements Options",
-  "id.verification.choose.mode.hep.text": "To complete verification, please select one of the following options to submit photos. You will be able to switch between these options throughout the process if needed.",
-  "id.verification.choose.mode.radio.upload": "Upload photos from my device",
-  "id.verification.choose.mode.radio.camera": "Take pictures using my camera",
-  "id.verification.account.name.managed.alert": "Your profile settings are managed by {managerTitle}, so you are not allowed to update your name. Please contact your {profileDataManager} administrator or {support} for help.",
-  "id.verification.request.camera.access.instructions": "لالتقاط صورة باستخدام كاميرا الويب، قد تتلقى طلب المتصفح للوصول إلى الكاميرا. {clickAllow}",
-  "id.verification.requirements.account.managed.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help before completing the Photo Verification process.",
-  "id.verification.requirements.card.device.text": "أنت بحاجة إلى جهاز مزود بكاميرا. إذا تلقيت طلب المتصفح للوصول إلى الكاميرا، فيرجى التأكد من النقر فوق {السماح}.",
-  "id.verification.account.name.summary.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help.",
-  "idv.submission.alert.error": "\nواجهنا خطأ فني أثناء محاولة رفع طلب التحقق من الهوية\nقد تكون هذه مشكلة مؤقتة، لذا يرجى المحاولة مرة أخرى بعد بضع دقائق\nعند استمرار المشكلة يرجى الانتقال إلى {support_link} للحصول على المساعدة",
-  "id.verification.account.name.edit": "Edit {sr}"
+  "id.verification.return.generic": "العودة",
+  "id.verification.photo.upload.help.title": "قم يدلا من هذا برفع صورة",
+  "id.verification.photo.camera.help.title": "استخدم الكاميرا بدلاً من هذا",
+  "id.verification.photo.upload.help.text": "إن واجهتك مشكلة في استخدام مُلتقط الصور أعلاه، فقد ترغب بدﻷ من ذلك في رفع صورة. لرفع صورة، انقر على الزر أدناه.",
+  "id.verification.photo.camera.help.text": "إن واجهتك مشكلة في رفع صورة أعلاه، فقد ترغب بدلا من ذلك في استخدام كاميرا جهازك. لاستخدام الكاميرا، انقر على الزر أدناه.",
+  "id.verification.upload.help.button": "انتقل إلى وضع الرفع",
+  "id.verification.camera.help.button": "انتقل إلى وضع الكاميرا",
+  "id.verification.request.camera.access.instructions": "حتى تلتقط صورة باستخدام الكاميرا، قد تتلقى طلبًا من المتصفح للوصول إلى الكاميرا. {clickAllow}",
+  "id.verification.requirements.account.managed.alert": "إعدادات حسابك يديرها {managerTitle}. إن لم يكن الاسم في بطاقة هويتك ذات الصورة. مطابقًا للاسم الذي في حسابك، فيرجى الاتصال بالمسؤول {profileDataManager} أو ب{support} للحصول على المساعدة قبل إتمام عملية التحقق من الصورة..",
+  "id.verification.requirements.card.device.text": "أنت بحاجة إلى جهاز مزود بكاميرا. إذا تلقيت طلبًا من المتصفح للوصول إلى كاميرا جهازك، فتأكد رجاءً من النقر على {السماح}.",
+  "id.verification.account.name.summary.alert": "إعدادات حسابك يديرها {managerTitle}. إن لم يكن الاسم في بطاقة هويتك ذات الصورة. مطابقًا للاسم الذي في حسابك، فيرجى الاتصال بالمسؤول {profileDataManager} أو ب{support} للحصول على المساعدة قبل إتمام عملية التحقق من الصورة..",
+  "idv.submission.alert.error": "\nواجهنا خطأ فني أثناء محاولة رفع طلب التحقق من الهوية\nقد تكون هذه مشكلة مؤقتة، لذا يرجى المحاولة مجددًا بعد بضع دقائق\nإن استمرت المشكلة، فيرجى الذهاب إلى {support_link} للحصول على المساعدة.",
+  "id.verification.account.name.edit": "تعديل {sr}",
+  "notification.preference.heading": "Notifications",
+  "notification.preference.app.title": "{\n        key, select,\n        discussion {Discussions}\n        coursework {Course Work}\n        other {{key}}\n    }",
+  "notification.preference.title": "{\n        text, select,\n        core {Core notifications}\n        newDiscussionPost {New discussion posts}\n        newQuestionPost {New question posts}\n        other {{text}}\n    }",
+  "notification.preference.type.label": "Type",
+  "notification.preference.web,label": "Web",
+  "notification.preference.help.email": "Email",
+  "notification.preference.help.push": "Push",
+  "notification.preference.load.more.courses": "Load more courses",
+  "notification.preference.guide.link": "as detailed here",
+  "notification.preference.guide.body": "Notifications for certain activities are enabled by default, "
 }