chore(i18n): update translations

build: update pull_translations command

.env

@@ -1,19 +1,29 @@
-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
-ENTERPRISE_LEARNER_PORTAL_HOSTNAME=null
+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=''
+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=''
+MARKETING_EMAILS_OPT_IN=''

.env.development

@@ -1,23 +1,30 @@
 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
-ENTERPRISE_LEARNER_PORTAL_HOSTNAME=null='http://localhost:8080'
+ENABLE_COPPA_COMPLIANCE=''
+MARKETING_EMAILS_OPT_IN=''

.env.test

@@ -1,20 +1,29 @@
 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=''
+ENABLE_COPPA_COMPLIANCE=''
+MARKETING_EMAILS_OPT_IN=''

.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/ci.yml

@@ -0,0 +1,38 @@
+name: ci
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [12, 14, 16]
+        npm: [6, 8.5.0]
+        npm-test:
+        - i18n_extract
+        - is-es5
+        - lint
+        - test
+        exclude:
+          - node: 12
+            npm: 8.5.0
+          - node: 14
+            npm: 8.5.0
+          - node: 16
+            npm: 6
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node }}
+    - run: npm install -g npm@${{ matrix.npm }}
+    - run: make requirements
+    - run: make test NPM_TESTS=build
+    - run: make test NPM_TESTS=${{ matrix.npm-test }}
+    - name: upload coverage
+      uses: codecov/codecov-action@v2
+      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: edx/.github/.github/workflows/commitlint.yml@master

.gitignore

@@ -16,3 +16,4 @@ temp/babel-plugin-react-intl
 *~
 /temp
 /.vscode
+/module.config.js

.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,3 +1,4 @@
+export TRANSIFEX_RESOURCE = frontend-app-account
 transifex_resource = frontend-app-account
 transifex_langs = "ar,fr,es_419,zh_CN"
 
@@ -10,8 +11,19 @@ tx_url2 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transi
 # This directory must match .babelrc .
 transifex_temp = ./temp/babel-plugin-react-intl
 
-requirements:
-	npm install
+NPM_TESTS=build i18n_extract lint test is-es5
+
+.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 +46,15 @@ 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
 
 # Pulls translations from Transifex.
 pull_translations:
-	tx pull -f --mode reviewed --language=$(transifex_langs)
+	tx pull -f --mode reviewed --languages=$(transifex_langs)
 
 # This target is used by Travis.
 validate-no-uncommitted-package-lock-changes:

README.rst

@@ -1,48 +1,110 @@
-|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.
+Please tag **@edx/community-engineering** on any PRs or issues.  Thanks!
 
-Development
------------
+Introduction
+------------
 
-Start Devstack
-^^^^^^^^^^^^^^
+This is a micro-frontend application responsible for the display and updating of a user's account information.
 
-To use this application `devstack <https://github.com/edx/devstack>`__ must be running and you must be logged into it.
+What is the domain of this MFE?
 
--  Start devstack
--  Log in (http://localhost:18000/login)
+In this MFE: Private user settings UIs. Public facing profile is in a `separate MFE (Profile) <https://github.com/edx/frontend-app-profile>`_
 
-Start the development server
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Account settings page
 
-In this project, install requirements and start the development server by running:
+- Demographics collection
 
-.. code:: bash
+- IDV (Identity Verification)
 
-   npm install
-   npm start # The server will run on port 1997
+Installation
+------------
 
-Once the dev server is up visit http://localhost:1997.
+This MFE is bundled with `Devstack <https://github.com/edx/devstack>`_, see the `Getting Started <https://github.com/edx/devstack#getting-started>`_ section for setup instructions.
 
-Configuration and Deployment
-----------------------------
+1. Install Devstack using the `Getting Started <https://github.com/edx/devstack#getting-started>`_ instructions.
 
-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:
+2. Start up Devstack, if it's not already started.
+
+3. Log in to Devstack (http://localhost:18000/login )
+
+4. Within this project, install requirements and start the development server:
+
+   .. code-block::
+
+      npm install
+      npm start # The server will run on port 1997
+
+5. Once the dev server is up, visit http://localhost:1997 to access the MFE
+
+   .. image:: ./docs/images/localhost_preview.png
+
+Environment Variables/Setup Notes
+---------------------------------
+
+This MFE is configured via environment variables supplied at build time.  All micro-frontends have a shared set of required environment variables, as documented in the Open edX Developer Guide under `Required Environment Variables <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.
+
+The account settings micro-frontend also supports the following additional variable:
+
+``SUPPORT_URL``
+
+Example: ``https://support.example.com``
+
+The fully-qualified URL to the support page in the target environment.
+
+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.org/edx/frontend-app-account.svg?branch=master
-   :target: https://travis-ci.org/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/edx/edx-developer-docs/actions/workflows/ci.yml/badge.svg
+   :target: https://github.com/edx/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

@@ -12,7 +12,7 @@
     "build": "fedx-scripts webpack",
     "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
     "is-es5": "es-check es5 ./dist/*.js",
-    "lint": "fedx-scripts eslint",
+    "lint": "fedx-scripts eslint --ext .js --ext .jsx .",
     "snapshot": "fedx-scripts jest --updateSnapshot",
     "start": "fedx-scripts webpack-dev-server --progress",
     "test": "fedx-scripts jest --coverage --passWithNoTests"
@@ -29,26 +29,27 @@
     "ie 11"
   ],
   "dependencies": {
-    "@edx/frontend-component-footer": "10.0.11",
-    "@edx/frontend-component-header": "2.0.5",
-    "@edx/frontend-platform": "1.6.1",
-    "@edx/paragon": "9.1.1",
-    "@fortawesome/fontawesome-svg-core": "1.2.32",
-    "@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.12",
-    "@tensorflow-models/blazeface": "git+https://github.com/alangsto/blazeface.git",
-    "@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",
+    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
+    "@edx/frontend-component-footer": "10.2.0",
+    "@edx/frontend-component-header": "2.4.5",
+    "@edx/frontend-platform": "1.15.1",
+    "@edx/paragon": "19.6.0",
+    "@fortawesome/fontawesome-svg-core": "1.2.36",
+    "@fortawesome/free-brands-svg-icons": "5.15.4",
+    "@fortawesome/free-regular-svg-icons": "5.15.4",
+    "@fortawesome/free-solid-svg-icons": "5.15.4",
+    "@fortawesome/react-fontawesome": "0.1.16",
+    "@tensorflow-models/blazeface": "0.0.7",
+    "@tensorflow/tfjs-converter": "1.7.4",
+    "@tensorflow/tfjs-core": "1.7.4",
+    "bowser": "2.11.0",
+    "classnames": "2.3.1",
+    "core-js": "3.19.3",
     "font-awesome": "4.7.0",
     "form-urlencoded": "4.0.1",
-    "formdata-polyfill": "3.0.20",
+    "formdata-polyfill": "4.0.10",
     "history": "4.10.1",
-    "jslib-html5-camera-photo": "^3.1.3",
+    "jslib-html5-camera-photo": "3.1.8",
     "lodash.camelcase": "4.3.0",
     "lodash.debounce": "4.0.8",
     "lodash.findindex": "4.6.0",
@@ -57,39 +58,37 @@
     "lodash.merge": "4.6.2",
     "lodash.omit": "4.5.0",
     "lodash.pick": "4.4.0",
-    "lodash.pickby": "^4.6.0",
-    "lodash.snakecase": "4.1.1",
-    "memoize-one": "5.1.1",
-    "newrelic": "5.13.1",
+    "lodash.pickby": "4.6.0",
+    "memoize-one": "5.2.1",
     "prop-types": "15.7.2",
-    "qs": "6.9.4",
-    "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",
+    "qs": "6.10.3",
+    "react": "16.14.0",
+    "react-dom": "16.14.0",
+    "react-redux": "7.2.6",
+    "react-router": "5.2.1",
+    "react-router-dom": "5.3.0",
     "react-router-hash-link": "1.2.2",
     "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.2",
+    "redux": "4.1.2",
+    "redux-devtools-extension": "2.13.9",
     "redux-logger": "3.0.6",
     "redux-saga": "1.1.3",
     "redux-thunk": "2.3.0",
+    "regenerator-runtime": "0.13.9",
     "reselect": "4.0.0",
     "universal-cookie": "4.0.4"
   },
   "devDependencies": {
-    "@edx/frontend-build": "5.3.2",
-    "@testing-library/jest-dom": "^5.11.2",
-    "@testing-library/react": "^10.4.7",
-    "codecov": "3.7.2",
-    "enzyme": "3.10.0",
-    "enzyme-adapter-react-16": "1.15.5",
-    "es-check": "5.0.0",
-    "husky": "3.0.9",
-    "jest": "^26.1.0",
-    "react-test-renderer": "16.8.6",
+    "@edx/frontend-build": "9.1.1",
+    "@edx/reactifex": "^1.0.3",
+    "@testing-library/jest-dom": "5.15.1",
+    "@testing-library/react": "12.1.4",
+    "codecov": "3.8.3",
+    "enzyme": "3.11.0",
+    "enzyme-adapter-react-16": "1.15.6",
+    "es-check": "6.1.1",
+    "react-test-renderer": "16.14.0",
     "reactifex": "1.1.1",
     "redux-mock-store": "1.5.4"
   }

public/index.html

@@ -1,10 +1,15 @@
 <!doctype html>
 <html lang="en-us">
   <head>
-      <title>Account | edX</title>
+      <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="<%=webpackConfig.output.publicPath%>favicon.ico" type="image/x-icon" />
+      <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>
     <div id="root"></div>

renovate.json

@@ -1,9 +1,28 @@
 {
   "extends": [
-    "config:base"
+    "config:base",
+    "schedule:weekly",
+    ":automergeLinters",
+    ":automergeMinor",
+    ":automergeTesters",
+    ":enableVulnerabilityAlerts",
+    ":rebaseStalePrs",
+    ":semanticCommits",
+    ":updateNotScheduled"
   ],
-  "patch": {
-    "automerge": true
-  },
-  "rebaseStalePrs": true
+  "packageRules": [
+    {
+      "matchDepTypes": [
+        "devDependencies"
+      ],
+      "matchUpdateTypes": [
+        "lockFileMaintenance",
+        "minor",
+        "patch",
+        "pin"
+      ],
+      "automerge": true
+    }
+  ],
+  "timezone": "America/New_York"
 }

src/account-settings/AccountSettingsPage.jsx

@@ -13,20 +13,30 @@ 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 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 {
   YEAR_OF_BIRTH_OPTIONS,
   EDUCATION_LEVELS,
@@ -38,15 +48,14 @@ import { fetchSiteLanguages } from './site-language';
 import CoachingToggle from './coaching/CoachingToggle';
 import DemographicsSection from './demographics/DemographicsSection';
 
-
 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.
+    // to another user account on the platform. 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);
@@ -81,10 +90,11 @@ class AccountSettingsPage extends React.Component {
       const locationHash = global.location.hash;
       // Check for the locationHash in the URL and then scroll to it if it is in the
       // NavLinks list
-      if (typeof locationHash !== 'string')
+      if (typeof locationHash !== 'string') {
         return;
+      }
       if (Object.keys(this.navLinkRefs).includes(locationHash) && this.navLinkRefs[locationHash].current) {
-        window.scrollTo(0, this.navLinkRefs[locationHash].current.offsetTop)
+        window.scrollTo(0, this.navLinkRefs[locationHash].current.offsetTop);
       }
     }
   }
@@ -136,6 +146,57 @@ class AccountSettingsPage extends React.Component {
     })),
   }));
 
+  sortDates = (a, b) => {
+    const aTimeSinceEpoch = new Date(a).getTime();
+    const bTimeSinceEpoch = new Date(b).getTime();
+
+    return bTimeSinceEpoch - aTimeSinceEpoch;
+  }
+
+  sortVerifiedNameRecords = verifiedNameHistory => {
+    if (Array.isArray(verifiedNameHistory)) {
+      return [...verifiedNameHistory].sort(this.sortDates);
+    }
+
+    return [];
+  }
+
+  handleEditableFieldChange = (name, value) => {
+    this.props.updateDraft(name, value);
+  }
+
+  handleSubmit = (formId, values) => {
+    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);
   }
@@ -146,14 +207,6 @@ class AccountSettingsPage extends React.Component {
     return Boolean(this.props.profileDataManager);
   }
 
-  handleEditableFieldChange = (name, value) => {
-    this.props.updateDraft(name, value);
-  };
-
-  handleSubmit = (formId, values) => {
-    this.props.saveSettings(formId, values);
-  };
-
   renderDuplicateTpaProviderMessage() {
     if (!this.state.duplicateTpaProvider) {
       return null;
@@ -161,13 +214,14 @@ class AccountSettingsPage extends React.Component {
 
     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 +236,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 +259,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,8 +432,15 @@ 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 (!Boolean(this.props.formValues.secondary_email_enabled)) {
+    if (!this.props.formValues.secondary_email_enabled) {
       return null;
     }
 
@@ -235,11 +460,10 @@ class AccountSettingsPage extends React.Component {
     // check the result of an LMS API call to determine if we should render the DemographicsSection component
     if (this.props.formValues.shouldDisplayDemographicsSection) {
       return (
-        <DemographicsSection forwardRef={this.navLinkRefs['#demographics-information']}/>
+        <DemographicsSection forwardRef={this.navLinkRefs['#demographics-information']} />
       );
-    } else {
-      return null;
     }
+    return null;
   }
 
   renderContent() {
@@ -259,7 +483,9 @@ class AccountSettingsPage extends React.Component {
     } = this.getLocalizedOptions(this.context.locale, this.props.formValues.country);
 
     // Show State field only if the country is US (could include Canada later)
-    const showState = this.props.formValues.country == COUNTRY_WITH_STATES;
+    const showState = this.props.formValues.country === COUNTRY_WITH_STATES;
+
+    const { verifiedName } = this.props;
 
     const timeZoneOptions = this.getLocalizedTimeZoneOptions(
       this.props.timeZoneOptions,
@@ -268,64 +494,120 @@ class AccountSettingsPage extends React.Component {
     );
 
     const hasLinkedTPA = findIndex(this.props.tpaProviders, provider => provider.connected) >= 0;
-
     return (
-      <React.Fragment>
+      <>
         <div className="account-section" id="basic-information" ref={this.navLinkRefs['#basic-information']}>
+          {
+            this.props.mostRecentVerifiedName
+            && this.renderVerifiedNameMessage(this.props.mostRecentVerifiedName)
+          }
+
           <h2 className="section-heading">
             {this.props.intl.formatMessage(messages['account.settings.section.account.information'])}
           </h2>
           <p>{this.props.intl.formatMessage(messages['account.settings.section.account.information.description'])}</p>
           {this.renderManagedProfileMessage()}
 
+          {this.renderNameChangeModal()}
+
           <EditableField
             name="username"
             type="text"
             value={this.props.formValues.username}
             label={this.props.intl.formatMessage(messages['account.settings.field.username'])}
-            helpText={this.props.intl.formatMessage(messages['account.settings.field.username.help.text'])}
+            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()
+              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'])}
             emptyLabel={
-              this.isEditable('email') ?
-                this.props.intl.formatMessage(messages['account.settings.field.email.empty']) :
-                this.renderEmptyStaticFieldMessage()
+              this.isEditable('email')
+                ? this.props.intl.formatMessage(messages['account.settings.field.email.empty'])
+                : this.renderEmptyStaticFieldMessage()
             }
             value={this.props.formValues.email}
             confirmationMessageDefinition={messages['account.settings.field.email.confirmation']}
-            helpText={this.props.intl.formatMessage(messages['account.settings.field.email.help.text'])}
+            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}
-          />
+          {(!getConfig().ENABLE_COPPA_COMPLIANCE)
+            && (
+            <EditableField
+              name="year_of_birth"
+              type="select"
+              label={this.props.intl.formatMessage(messages['account.settings.field.dob'])}
+              emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.dob.empty'])}
+              value={this.props.formValues.year_of_birth}
+              options={yearOfBirthOptions}
+              {...editableFieldProps}
+            />
+            )}
           <EditableField
             name="country"
             type="select"
@@ -333,14 +615,15 @@ class AccountSettingsPage extends React.Component {
             options={countryOptions}
             label={this.props.intl.formatMessage(messages['account.settings.field.country'])}
             emptyLabel={
-              this.isEditable('country') ?
-                this.props.intl.formatMessage(messages['account.settings.field.country.empty']) :
-                this.renderEmptyStaticFieldMessage()
+              this.isEditable('country')
+                ? this.props.intl.formatMessage(messages['account.settings.field.country.empty'])
+                : this.renderEmptyStaticFieldMessage()
             }
             isEditable={this.isEditable('country')}
             {...editableFieldProps}
           />
-          {showState &&
+          {showState
+            && (
             <EditableField
               name="state"
               type="select"
@@ -348,14 +631,14 @@ class AccountSettingsPage extends React.Component {
               options={stateOptions}
               label={this.props.intl.formatMessage(messages['account.settings.field.state'])}
               emptyLabel={
-                this.isEditable('state') ?
-                  this.props.intl.formatMessage(messages['account.settings.field.state.empty']) :
-                  this.renderEmptyStaticFieldMessage()
+                this.isEditable('state')
+                  ? this.props.intl.formatMessage(messages['account.settings.field.state.empty'])
+                  : this.renderEmptyStaticFieldMessage()
               }
               isEditable={this.isEditable('state')}
               {...editableFieldProps}
             />
-          }
+            )}
         </div>
 
         <div className="account-section" id="profile-information" ref={this.navLinkRefs['#profile-information']}>
@@ -390,21 +673,27 @@ class AccountSettingsPage extends React.Component {
             emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.language.proficiencies.empty'])}
             {...editableFieldProps}
           />
-          {getConfig().COACHING_ENABLED &&
-            this.props.formValues.coaching.eligible_for_coaching &&
+          {getConfig().COACHING_ENABLED
+            && this.props.formValues.coaching.eligible_for_coaching
+            && (
             <CoachingToggle
               name="coaching"
               phone_number={this.props.formValues.phone_number}
               coaching={this.props.formValues.coaching}
             />
-          }
+            )}
         </div>
         {getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && this.renderDemographicsSection()}
         <div className="account-section" id="social-media">
           <h2 className="section-heading">
             {this.props.intl.formatMessage(messages['account.settings.section.social.media'])}
           </h2>
-          <p>{this.props.intl.formatMessage(messages['account.settings.section.social.media.description'])}</p>
+          <p>
+            {this.props.intl.formatMessage(
+              messages['account.settings.section.social.media.description'],
+              { siteName: getConfig().SITE_NAME },
+            )}
+          </p>
 
           <EditableField
             name="social_link_linkedin"
@@ -465,7 +754,12 @@ class AccountSettingsPage extends React.Component {
 
         <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>
+          <p>
+            {this.props.intl.formatMessage(
+              messages['account.settings.section.linked.accounts.description'],
+              { siteName: getConfig().SITE_NAME },
+            )}
+          </p>
           <ThirdPartyAuth />
         </div>
 
@@ -476,7 +770,7 @@ class AccountSettingsPage extends React.Component {
           />
         </div>
 
-      </React.Fragment>
+      </>
     );
   }
 
@@ -542,11 +836,13 @@ AccountSettingsPage.propTypes = {
     name: PropTypes.string,
     email: PropTypes.string,
     secondary_email: PropTypes.string,
+    secondary_email_enabled: PropTypes.bool,
     year_of_birth: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     country: PropTypes.string,
     level_of_education: PropTypes.string,
     gender: PropTypes.string,
     language_proficiencies: PropTypes.string,
+    pending_name_change: PropTypes.string,
     phone_number: PropTypes.string,
     social_link_linkedin: PropTypes.string,
     social_link_facebook: PropTypes.string,
@@ -557,7 +853,20 @@ AccountSettingsPage.propTypes = {
       user: PropTypes.number.isRequired,
       eligible_for_coaching: PropTypes.bool.isRequired,
     }),
+    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,
@@ -581,15 +890,45 @@ 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,
+  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,
+    }),
+  ),
 };
 
 AccountSettingsPage.defaultProps = {
   loading: false,
   loaded: false,
   loadingError: null,
+  committedValues: {
+    useVerifiedNameForCerts: false,
+    verified_name: null,
+  },
+  drafts: {},
+  formErrors: {},
   siteLanguage: null,
   siteLanguageOptions: [],
   timeZoneOptions: [],
@@ -599,11 +938,17 @@ AccountSettingsPage.defaultProps = {
   tpaProviders: [],
   isActive: true,
   secondary_email_enabled: false,
+  nameChangeModal: {},
+  verifiedName: null,
+  mostRecentVerifiedName: {},
+  verifiedNameHistory: [],
 };
 
 export default connect(accountSettingsPageSelector, {
   fetchSettings,
   saveSettings,
+  saveMultipleSettings,
   updateDraft,
   fetchSiteLanguages,
+  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': {
@@ -279,18 +399,18 @@ const messages = defineMessages({
   },
   'account.settings.field.language.proficiencies': {
     id: 'account.settings.field.language.proficiencies',
-    defaultMessage: 'Spoken languages',
-    description: 'Label for account settings spoken languages field.',
+    defaultMessage: 'Spoken language',
+    description: 'Label for account settings spoken language field.',
   },
   'account.settings.field.language.proficiencies.empty': {
     id: 'account.settings.field.language.proficiencies.empty',
     defaultMessage: 'Add a spoken language',
-    description: 'Placeholder for empty account settings spoken languages field.',
+    description: 'Placeholder for empty account settings spoken language field.',
   },
   'account.settings.field.language_proficiencies.options.empty': {
     id: 'account.settings.field.language_proficiencies.options.empty',
     defaultMessage: 'Select a Language',
-    description: 'Option for an empty value on account settings spoken languages field.',
+    description: 'Option for an empty value on account settings spoken language field.',
   },
 
   'account.settings.field.time.zone': {
@@ -331,7 +451,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': {

src/account-settings/Alert.jsx

@@ -2,7 +2,6 @@ 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)}>
@@ -16,7 +15,6 @@ function Alert(props) {
   );
 }
 
-
 Alert.propTypes = {
   className: PropTypes.string,
   icon: PropTypes.node,
@@ -29,5 +27,4 @@ Alert.defaultProps = {
   children: undefined,
 };
 
-
 export default Alert;

src/account-settings/BetaLanguageBanner.jsx

@@ -65,7 +65,7 @@ class BetaLanguageBanner extends React.Component {
             })}
           </p>
           <div>
-            <Button onClick={this.handleRevertLanguage} className="btn btn-primary mr-2">
+            <Button onClick={this.handleRevertLanguage} className="mr-2">
               {this.props.intl.formatMessage(
                 messages['account.settings.banner.beta.language.action.switch.back'],
                 { previous_language: previousLanguage.name },

src/account-settings/EditableField.jsx

@@ -1,8 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
+import { getConfig } from '@edx/frontend-platform';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Button, Input, StatefulButton, ValidationFormGroup } from '@edx/paragon';
+import {
+  Button, Input, StatefulButton, ValidationFormGroup,
+} from '@edx/paragon';
 import { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
@@ -14,7 +17,7 @@ import {
   closeForm,
 } from './data/actions';
 import { editableFieldSelector } from './data/selectors';
-
+import CertificatePreference from './certificate-preference/CertificatePreference';
 
 function EditableField(props) {
   const {
@@ -36,10 +39,15 @@ function EditableField(props) {
     onChange,
     isEditing,
     isEditable,
+    isGrayedOut,
     intl,
     ...others
   } = props;
   const id = `field-${name}`;
+  let inputOptions = options;
+  if (getConfig().ENABLE_COPPA_COMPLIANCE && name === 'level_of_education' && options) {
+    inputOptions = options.filter(option => option.value !== 'el');
+  }
 
   const handleSubmit = (e) => {
     e.preventDefault();
@@ -60,33 +68,37 @@ function EditableField(props) {
 
   const renderEmptyLabel = () => {
     if (isEditable) {
-      return <Button onClick={handleEdit} className="btn-link p-0">{emptyLabel}</Button>;
+      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 value = 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) {
-        value = selectedOption.label;
-      };
+        finalValue = selectedOption.label;
+      }
     }
 
     if (userSuppliedValue) {
-      value += `: ${userSuppliedValue}`;
+      finalValue += `: ${userSuppliedValue}`;
     }
 
-    return value;
+    return finalValue;
   };
 
   const renderConfirmationMessage = () => {
-    if (!confirmationMessageDefinition || !confirmationValue) return null;
+    if (!confirmationMessageDefinition || !confirmationValue) {
+      return null;
+    }
     return intl.formatMessage(confirmationMessageDefinition, {
       value: confirmationValue,
     });
@@ -97,66 +109,69 @@ 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="btn-primary mr-2"
-                state={saveState}
-                labels={{
-                  default: intl.formatMessage(messages['account.settings.editable.field.action.save']),
-                }}
-                onClick={(e) => {
-                  // Swallow clicks if the state is pending.
-                  // We do this instead of disabling the button to prevent
-                  // it from losing focus (disabled elements cannot have focus).
-                  // Disabling it would causes upstream issues in focus management.
-                  // Swallowing the onSubmit event on the form would be better, but
-                  // we would have to add that logic for every field given our
-                  // current structure of the application.
-                  if (saveState === 'pending') e.preventDefault();
-                }}
-                disabledStates={[]}
-              />
-              <Button
-                onClick={handleCancel}
-                className="btn-outline-primary"
+          <>
+            <form onSubmit={handleSubmit}>
+              <ValidationFormGroup
+                for={id}
+                invalid={error != null}
+                invalidMessage={error}
+                helpText={helpText}
               >
-                {intl.formatMessage(messages['account.settings.editable.field.action.cancel'])}
-              </Button>
-            </p>
-          </form>
+                <label className="h6 d-block" htmlFor={id}>{label}</label>
+                <Input
+                  data-hj-suppress
+                  name={name}
+                  id={id}
+                  type={type}
+                  value={value}
+                  onChange={handleChange}
+                  options={inputOptions}
+                  {...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}
+                >
+                  {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 onClick={handleEdit} className="ml-3 btn-link">
+                <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>{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>
         ),
@@ -165,10 +180,9 @@ function EditableField(props) {
   );
 }
 
-
 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]),
@@ -192,6 +206,7 @@ EditableField.propTypes = {
   onChange: PropTypes.func.isRequired,
   isEditing: PropTypes.bool,
   isEditable: PropTypes.bool,
+  isGrayedOut: PropTypes.bool,
   intl: intlShape.isRequired,
 };
 
@@ -207,9 +222,10 @@ EditableField.defaultProps = {
   helpText: undefined,
   isEditing: false,
   isEditable: true,
+  isGrayedOut: false,
+  userSuppliedValue: undefined,
 };
 
-
 export default connect(editableFieldSelector, {
   onEdit: openForm,
   onCancel: closeForm,

src/account-settings/EmailField.jsx

@@ -2,7 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
-import { Button, StatefulButton, Input, ValidationFormGroup } from '@edx/paragon';
+import {
+  Button, StatefulButton, Input, ValidationFormGroup,
+} from '@edx/paragon';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faExclamationTriangle, faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 
@@ -16,7 +18,6 @@ import {
 } from './data/actions';
 import { editableFieldSelector } from './data/selectors';
 
-
 function EmailField(props) {
   const {
     name,
@@ -56,7 +57,9 @@ function EmailField(props) {
   };
 
   const renderConfirmationMessage = () => {
-    if (!confirmationMessageDefinition || !confirmationValue) return null;
+    if (!confirmationMessageDefinition || !confirmationValue) {
+      return null;
+    }
     return (
       <Alert
         className="alert-warning mt-n2"
@@ -85,13 +88,15 @@ function EmailField(props) {
 
   const renderEmptyLabel = () => {
     if (isEditable) {
-      return <Button onClick={handleEdit} className="btn-link p-0">{emptyLabel}</Button>;
+      return <Button variant="link" onClick={handleEdit} className="p-0">{emptyLabel}</Button>;
     }
     return <span className="text-muted">{emptyLabel}</span>;
   };
 
   const renderValue = () => {
-    if (confirmationValue) return renderConfirmationValue();
+    if (confirmationValue) {
+      return renderConfirmationValue();
+    }
     return value || renderEmptyLabel();
   };
 
@@ -120,7 +125,7 @@ function EmailField(props) {
             <p>
               <StatefulButton
                 type="submit"
-                className="btn-primary mr-2"
+                className="mr-2"
                 state={saveState}
                 labels={{
                   default: intl.formatMessage(messages['account.settings.editable.field.action.save']),
@@ -133,13 +138,13 @@ function EmailField(props) {
                   // Swallowing the onSubmit event on the form would be better, but
                   // we would have to add that logic for every field given our
                   // current structure of the application.
-                  if (saveState === 'pending') e.preventDefault();
+                  if (saveState === 'pending') { e.preventDefault(); }
                 }}
                 disabledStates={[]}
               />
               <Button
+                variant="outline-primary"
                 onClick={handleCancel}
-                className="btn-outline-primary"
               >
                 {intl.formatMessage(messages['account.settings.editable.field.action.cancel'])}
               </Button>
@@ -151,7 +156,7 @@ function EmailField(props) {
             <div className="d-flex align-items-start">
               <h6 aria-level="3">{label}</h6>
               {isEditable ? (
-                <Button onClick={handleEdit} className="ml-3 btn-link">
+                <Button variant="link" onClick={handleEdit} className="ml-3">
                   <FontAwesomeIcon className="mr-1" icon={faPencilAlt} />
                   {intl.formatMessage(messages['account.settings.editable.field.action.edit'])}
                 </Button>
@@ -166,7 +171,6 @@ function EmailField(props) {
   );
 }
 
-
 EmailField.propTypes = {
   name: PropTypes.string.isRequired,
   label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
@@ -203,7 +207,6 @@ EmailField.defaultProps = {
   isEditable: true,
 };
 
-
 export default connect(editableFieldSelector, {
   onEdit: openForm,
   onCancel: closeForm,

src/account-settings/JumpNav.jsx

@@ -3,10 +3,9 @@ import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { NavHashLink } from 'react-router-hash-link';
 import Scrollspy from 'react-scrollspy';
 
-import messages from './AccountSettingsPage.messages';
 import { getConfig } from '@edx/frontend-platform';
 import PropTypes from 'prop-types';
-
+import messages from './AccountSettingsPage.messages';
 
 function JumpNav({ intl, displayDemographicsLink }) {
   return (
@@ -34,13 +33,14 @@ function JumpNav({ intl, displayDemographicsLink }) {
             {intl.formatMessage(messages['account.settings.section.profile.information'])}
           </NavHashLink>
         </li>
-        {getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && displayDemographicsLink &&
+        {getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && displayDemographicsLink
+          && (
           <li>
             <NavHashLink to="#demographics-information">
               {intl.formatMessage(messages['account.settings.section.demographics.information'])}
             </NavHashLink>
           </li>
-        }
+          )}
         <li>
           <NavHashLink to="#social-media">
             {intl.formatMessage(messages['account.settings.section.social.media'])}
@@ -66,14 +66,9 @@ function JumpNav({ intl, displayDemographicsLink }) {
   );
 }
 
-
 JumpNav.propTypes = {
   intl: intlShape.isRequired,
   displayDemographicsLink: PropTypes.bool.isRequired,
 };
 
-JumpNav.defaultProps = {
-  displayDemographicsLink: false,
-}
-
 export default injectIntl(JumpNav);

src/account-settings/NotFoundPage.jsx

@@ -8,7 +8,7 @@ export default function NotFoundPage() {
         <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"
+          description="Error message when a page does not exist"
         />
       </p>
     </div>

src/account-settings/OneTimeDismissibleAlert.jsx

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

src/account-settings/SwitchContent.jsx

@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { TransitionReplace } from '@edx/paragon';
 
-
 const onChildExit = (htmlNode) => {
   // If the leaving child has focus, take control and redirect it
   if (htmlNode.contains(document.activeElement)) {
@@ -11,7 +10,9 @@ const onChildExit = (htmlNode) => {
     const enteringChild = htmlNode.previousSibling || htmlNode.nextSibling;
 
     // There's no replacement, do nothing.
-    if (!enteringChild) return;
+    if (!enteringChild) {
+      return;
+    }
 
     // Get all the focusable elements in the entering child and focus the first one
     const focusableElements = enteringChild.querySelectorAll('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])');
@@ -21,7 +22,6 @@ const onChildExit = (htmlNode) => {
   }
 };
 
-
 function SwitchContent({ expression, cases, className }) {
   const getContent = (caseKey) => {
     if (cases[caseKey]) {
@@ -29,7 +29,8 @@ function SwitchContent({ expression, cases, className }) {
         return getContent(cases[caseKey]);
       }
       return React.cloneElement(cases[caseKey], { key: caseKey });
-    } else if (cases.default) {
+    }
+    if (cases.default) {
       if (typeof cases.default === 'string') {
         return getContent(cases.default);
       }
@@ -49,7 +50,6 @@ function SwitchContent({ expression, cases, className }) {
   );
 }
 
-
 SwitchContent.propTypes = {
   expression: PropTypes.string,
   cases: PropTypes.objectOf(PropTypes.node).isRequired,
@@ -61,5 +61,4 @@ SwitchContent.defaultProps = {
   className: null,
 };
 
-
 export default SwitchContent;

src/account-settings/_style.scss

@@ -2,9 +2,11 @@
   .form-group {
     margin-bottom: 1.5rem;
   }
+
   h6, .h6 {
     margin-bottom: .25rem;
   }
+
   .btn-link {
     line-height: 1.2;
     border: none;
@@ -18,8 +20,10 @@
       position: sticky;
       top: 1rem;
     }
+
     li {
       margin-bottom: .5rem;
+
       a {
         text-decoration: underline;
       }
@@ -30,18 +34,24 @@
     @extend .h4;
     margin-bottom: map-get($spacers, 3);
   }
+
   .account-section {
     // These properties together will shift the hashlink position
     margin-bottom: map-get($spacers, 5);
     padding-top: 1rem;
   }
-  
+
   .custom-switch {
     padding: 0;
     max-width: 500px;
+
     .custom-control-label {
       left: 2.25rem;
       line-height: 1.6rem;
     }
   }
+  .grayed-out{
+    opacity: 0.6; /* Real browsers */
+    filter: alpha(opacity = 60); /* MSIE */
+  }
 }

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

@@ -0,0 +1,172 @@
+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';
+
+function CertificatePreference({
+  intl,
+  fieldName,
+  originalFullName,
+  originalVerifiedName,
+  saveState,
+  useVerifiedNameForCerts,
+}) {
+  if (!originalVerifiedName) {
+    // If the user doesn't have an approved verified name, do not display this component
+    return null;
+  }
+
+  const dispatch = useDispatch();
+  const [checked, setChecked] = useState(false);
+  const [modalIsOpen, setModalIsOpen] = useState(false);
+  const formId = 'useVerifiedNameForCerts';
+
+  function handleCheckboxChange() {
+    if (!checked) {
+      if (fieldName === 'verified_name') {
+        dispatch(updateDraft(formId, true));
+      } else {
+        dispatch(updateDraft(formId, false));
+      }
+    } else {
+      setModalIsOpen(true);
+    }
+  }
+
+  function handleCancel() {
+    setModalIsOpen(false);
+    dispatch(resetDrafts());
+  }
+
+  function handleModalChange(e) {
+    if (e.target.value === 'fullName') {
+      dispatch(updateDraft(formId, false));
+    } else {
+      dispatch(updateDraft(formId, true));
+    }
+  }
+
+  function handleSubmit(e) {
+    e.preventDefault();
+
+    if (saveState === 'pending') {
+      return;
+    }
+
+    dispatch(saveSettings(formId, useVerifiedNameForCerts));
+  }
+
+  useEffect(() => {
+    if (fieldName === 'verified_name') {
+      setChecked(useVerifiedNameForCerts);
+    } else {
+      setChecked(!useVerifiedNameForCerts);
+    }
+  }, [useVerifiedNameForCerts]);
+
+  useEffect(() => {
+    if (modalIsOpen && saveState === 'complete') {
+      setModalIsOpen(false);
+      dispatch(closeForm(fieldName));
+    }
+  }, [modalIsOpen, saveState]);
+
+  return (
+    <>
+      <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>
+    </>
+  );
+}
+
+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,173 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Provider } from 'react-redux';
+import { Router } from 'react-router-dom';
+import configureStore from 'redux-mock-store';
+import {
+  fireEvent,
+  render,
+  screen,
+} from '@testing-library/react';
+import { createMemoryHistory } from 'history';
+
+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 history = createMemoryHistory();
+
+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 history={history}>
+      <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

@@ -97,7 +97,6 @@ class CoachingConsent extends React.Component {
     if (get(data, 'status') === 200) {
       this.setState({ submissionSuccess: true });
     }
-    
   }
 
   handleSubmit(e) {
@@ -135,23 +134,27 @@ class CoachingConsent extends React.Component {
       case VIEWS.NOT_LOADED:
         return <PageLoading srMessage="" />;
       case VIEWS.LOADED:
-        return (<CoachingConsentForm
-          onSubmit={this.handleSubmit}
-          declineCoaching={this.declineCoaching}
-          formErrors={this.state.formErrors}
-          formValues={this.props.formValues}
-          redirectUrl={this.state.redirectUrl}
-          profileDataManager={this.props.profileDataManager}
-        />);
+        return (
+          <CoachingConsentForm
+            onSubmit={this.handleSubmit}
+            declineCoaching={this.declineCoaching}
+            formErrors={this.state.formErrors}
+            formValues={this.props.formValues}
+            redirectUrl={this.state.redirectUrl}
+            profileDataManager={this.props.profileDataManager}
+          />
+        );
       case VIEWS.SUCCESS_PENDING:
         return <PageLoading srMessage="Submitting..." />;
       case VIEWS.SUCCESS:
-        return (<SuccessMessage
-          continueUrl={this.state.redirectUrl}
-          header={this.props.intl.formatMessage(messages['account.settings.coaching.consent.success.header'])}
-          message={this.props.intl.formatMessage(messages['account.settings.coaching.consent.success.message'])}
-          continue={this.props.intl.formatMessage(messages['account.settings.coaching.consent.success.continue'])}
-        />);
+        return (
+          <SuccessMessage
+            continueUrl={this.state.redirectUrl}
+            header={this.props.intl.formatMessage(messages['account.settings.coaching.consent.success.header'])}
+            message={this.props.intl.formatMessage(messages['account.settings.coaching.consent.success.message'])}
+            continue={this.props.intl.formatMessage(messages['account.settings.coaching.consent.success.continue'])}
+          />
+        );
       case VIEWS.DECLINE_PENDING:
         return <PageLoading srMessage="Redirecting..." />;
       case VIEWS.DECLINED:
@@ -233,7 +236,6 @@ AutoRedirect.propTypes = {
 
 CoachingConsent.defaultProps = {
   loaded: false,
-  saveState: undefined,
   profileDataManager: null,
 };
 
@@ -259,7 +261,6 @@ CoachingConsent.propTypes = {
     phone_number: PropTypes.object,
   }).isRequired,
   fetchSettings: PropTypes.func.isRequired,
-  saveState: PropTypes.string,
   profileDataManager: PropTypes.string,
 };
 

src/account-settings/coaching/CoachingConsentForm.jsx

@@ -17,7 +17,7 @@ const ManagedProfileAlert = ({ profileDataManager }) => (
     <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>,
       }}
@@ -33,12 +33,13 @@ const CoachingForm = props => (
     <div>
       <form onSubmit={props.onSubmit}>
         <div className="py-3">
-          {
-            !!props.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>
+          <label className="h6" htmlFor="fullName">
+            {props.intl.formatMessage(messages['account.settings.coaching.consent.label.name'])}
+          </label>
           <Input
             type="text"
             name="full-name"
@@ -49,7 +50,9 @@ const CoachingForm = props => (
         </div>
         <div className="py-3">
           <ErrorMessage message={props.formErrors.phone_number} />
-          <label className="h6" htmlFor="phoneNumber">{props.intl.formatMessage(messages['account.settings.coaching.consent.label.phone-number'])}</label>
+          <label className="h6" htmlFor="phoneNumber">
+            {props.intl.formatMessage(messages['account.settings.coaching.consent.label.phone-number'])}
+          </label>
           <Input
             type="text"
             name="phone_number"
@@ -64,7 +67,7 @@ const CoachingForm = props => (
         </div>
         <ErrorMessage message={props.formErrors.coaching} />
         <div className="d-flex flex-column align-items-center">
-          <Button className="w-100 btn-outline-primary" type="submit">
+          <Button variant="outline-primary" className="w-100" type="submit">
             {props.intl.formatMessage(messages['account.settings.coaching.consent.accept-coaching'])}
           </Button>
         </div>
@@ -123,7 +126,6 @@ ErrorMessage.propTypes = {
 
 ManagedProfileAlert.propTypes = {
   profileDataManager: PropTypes.string.isRequired,
-  intl: intlShape.isRequired,
 };
 
 export default injectIntl(CoachingForm);

src/account-settings/coaching/CoachingToggle.jsx

@@ -8,7 +8,6 @@ import { editableFieldSelector } from '../data/selectors';
 import { saveSettings, updateDraft, saveMultipleSettings } from '../data/actions';
 import EditableField from '../EditableField';
 
-
 const CoachingToggle = props => (
   <>
     <EditableField
@@ -33,10 +32,10 @@ const CoachingToggle = props => (
               formId: 'phone_number',
               commitValues: props.phone_number,
             },
-        ], 'phone_number');
-      }
+          ], 'phone_number');
+        }
         return props.saveSettings('phone_number', props.phone_number);
-    }}
+      }}
     />
     <ValidationFormGroup
       for="coachingConsent"

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

@@ -13,9 +13,7 @@ jest.mock('@edx/frontend-platform/auth');
 
 const IntlCoachingConsent = injectIntl(CoachingConsent);
 
-jest.mock('../../data/selectors', () => {
-  return jest.fn().mockImplementation(() => ({ coachingConsentPageSelector: () => ({}) }));
-});
+jest.mock('../../data/selectors', () => jest.fn().mockImplementation(() => ({ coachingConsentPageSelector: () => ({}) })));
 
 const mockStore = configureStore();
 

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

@@ -103,10 +103,8 @@ exports[`CoachingConsent disables name field on enterprise user 1`] = `
           className="d-flex flex-column align-items-center"
         >
           <button
-            className="btn w-100 btn-outline-primary"
-            onBlur={[Function]}
-            onClick={[Function]}
-            onKeyDown={[Function]}
+            className="w-100 btn btn-outline-primary"
+            disabled={false}
             type="submit"
           >
             Sign up for coaching
@@ -116,7 +114,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"
@@ -254,10 +252,8 @@ exports[`CoachingConsent should render 1`] = `
           className="d-flex flex-column align-items-center"
         >
           <button
-            className="btn w-100 btn-outline-primary"
-            onBlur={[Function]}
-            onClick={[Function]}
-            onKeyDown={[Function]}
+            className="w-100 btn btn-outline-primary"
+            disabled={false}
             type="submit"
           >
             Sign up for coaching
@@ -267,7 +263,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,
   },
 });
 
@@ -44,7 +47,6 @@ export const fetchSettingsReset = () => ({
   type: FETCH_SETTINGS.RESET,
 });
 
-
 // FORM STATE ACTIONS
 
 export const openForm = formId => ({
@@ -69,7 +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

@@ -1,4 +1,3 @@
-
 export const YEAR_OF_BIRTH_OPTIONS = (() => {
   const currentYear = new Date().getFullYear();
   const years = [];

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,7 +33,12 @@ export const defaultState = {
   deleteAccount: deleteAccountReducer(),
   siteLanguage: siteLanguageReducer(),
   resetPassword: resetPasswordReducer(),
+  nameChange: nameChangeReducer(),
   thirdPartyAuth: thirdPartyAuthReducer(),
+  nameChangeModal: false,
+  verifiedName: null,
+  mostRecentVerifiedName: {},
+  verifiedNameHistory: {},
 };
 
 const reducer = (state = defaultState, action) => {
@@ -48,16 +55,15 @@ const reducer = (state = defaultState, action) => {
     case FETCH_SETTINGS.SUCCESS:
       return {
         ...state,
-        values: Object.assign({}, state.values, action.payload.values),
+        values: { ...state.values, ...action.payload.values },
         // Dump the providers into thirdPartyAuth.
-        thirdPartyAuth: Object.assign({}, state.thirdPartyAuth, {
-          providers: action.payload.thirdPartyAuthProviders,
-        }),
+        thirdPartyAuth: { ...state.thirdPartyAuth, providers: action.payload.thirdPartyAuthProviders },
         profileDataManager: action.payload.profileDataManager,
         timeZones: action.payload.timeZones,
         loading: false,
         loaded: true,
         loadingError: null,
+        verifiedNameHistory: action.payload.verifiedNameHistory,
       };
     case FETCH_SETTINGS.FAILURE:
       return {
@@ -91,15 +97,14 @@ const reducer = (state = defaultState, action) => {
           saveState: null,
           errors: {},
           drafts: {},
+          nameChangeModal: false,
         };
       }
       return state;
     case UPDATE_DRAFT:
       return {
         ...state,
-        drafts: Object.assign({}, state.drafts, {
-          [action.payload.name]: action.payload.value,
-        }),
+        drafts: { ...state.drafts, [action.payload.name]: action.payload.value },
         saveState: null,
         errors: {},
       };
@@ -110,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,
@@ -120,19 +134,18 @@ const reducer = (state = defaultState, action) => {
       return {
         ...state,
         saveState: 'complete',
-        values: Object.assign({}, state.values, action.payload.values),
+        values: { ...state.values, ...action.payload.values },
         errors: {},
-        confirmationValues: Object.assign(
-          {},
-          state.confirmationValues,
-          action.payload.confirmationValues,
-        ),
+        confirmationValues: {
+          ...state.confirmationValues,
+          ...action.payload.confirmationValues,
+        },
       };
     case SAVE_SETTINGS.FAILURE:
       return {
         ...state,
         saveState: 'error',
-        errors: Object.assign({}, state.errors, action.payload.errors),
+        errors: { ...state.errors, ...action.payload.errors },
       };
     case SAVE_SETTINGS.RESET:
       return {
@@ -161,7 +174,7 @@ const reducer = (state = defaultState, action) => {
       return {
         ...state,
         saveState: 'error',
-        errors: Object.assign({}, state.errors, action.payload.errors),
+        errors: { ...state.errors, ...action.payload.errors },
       };
 
     case FETCH_TIME_ZONES.SUCCESS:
@@ -202,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

@@ -1,4 +1,6 @@
-import { call, put, delay, takeEvery, all } from 'redux-saga/effects';
+import {
+  call, put, delay, takeEvery, all,
+} from 'redux-saga/effects';
 
 import { publish } from '@edx/frontend-platform';
 import { getLocale, handleRtl, LOCALE_CHANGED } from '@edx/frontend-platform/i18n';
@@ -23,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,
@@ -36,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 {
@@ -52,13 +61,16 @@ export function* handleFetchSettings() {
       userId,
     );
 
-    if (values.country) yield put(fetchTimeZones(values.country));
+    const verifiedNameHistory = yield call(getVerifiedNameHistory);
+
+    if (values.country) { yield put(fetchTimeZones(values.country)); }
 
     yield put(fetchSettingsSuccess({
       values,
       thirdPartyAuthProviders,
       profileDataManager,
       timeZones,
+      verifiedNameHistory,
     }));
   } catch (e) {
     yield put(fetchSettingsFailure(e.message));
@@ -91,11 +103,14 @@ export function* handleSaveSettings(action) {
       savedValues = yield call(patchSettings, username, commitData, userId);
     }
     yield put(saveSettingsSuccess(savedValues, commitData));
-    if (savedValues.country) yield put(fetchTimeZones(savedValues.country));
+    if (savedValues.country) { yield put(fetchTimeZones(savedValues.country)); }
     yield delay(1000);
     yield put(closeForm(action.payload.formId));
   } catch (e) {
     if (e.fieldErrors) {
+      if (e.fieldErrors.name?.includes('verification')) {
+        yield put(beginNameChange('name'));
+      }
       yield put(saveSettingsFailure({ fieldErrors: e.fieldErrors }));
     } else {
       yield put(saveSettingsFailure(e.message));
@@ -104,7 +119,6 @@ export function* handleSaveSettings(action) {
   }
 }
 
-
 // handles mutiple settings saved at once, in order, and stops executing on first failure.
 export function* handleSaveMultipleSettings(action) {
   try {
@@ -125,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));
@@ -138,7 +155,6 @@ export function* handleFetchTimeZones(action) {
   yield put(fetchTimeZonesSuccess(response, action.payload.country));
 }
 
-
 export default function* saga() {
   yield takeEvery(FETCH_SETTINGS.BASE, handleFetchSettings);
   yield takeEvery(SAVE_SETTINGS.BASE, handleSaveSettings);
@@ -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,9 +140,19 @@ 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;
+  },
+);
 
 /**
  * If there's no draft present at all (undefined), use the original committed value.
@@ -86,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;
   },
@@ -131,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,
@@ -156,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,
   }),
 );
 
@@ -205,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';
@@ -44,7 +45,9 @@ function packAccountCommitData(commitData) {
 
   SOCIAL_PLATFORMS.forEach(({ id, key }) => {
     // Skip missing values. Empty strings are valid values and should be preserved.
-    if (commitData[key] === undefined) return;
+    if (commitData[key] === undefined) {
+      return;
+    }
 
     packedData.social_links = [{ platform: id, social_link: commitData[key] }];
     delete packedData[key];
@@ -174,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(),
@@ -192,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,
   };
 }
 
@@ -215,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)) {
@@ -234,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/dataUtils.js

@@ -1,38 +0,0 @@
-import camelCase from 'lodash.camelcase';
-import snakeCase from 'lodash.snakecase';
-
-export function modifyObjectKeys(object, modify) {
-  // If the passed in object is not an object, return it.
-  if (
-    object === undefined ||
-    object === null ||
-    (typeof object !== 'object' && !Array.isArray(object))
-  ) {
-    return object;
-  }
-
-  if (Array.isArray(object)) {
-    return object.map(value => modifyObjectKeys(value, modify));
-  }
-
-  // Otherwise, process all its keys.
-  const result = {};
-  Object.entries(object).forEach(([key, value]) => {
-    result[modify(key)] = modifyObjectKeys(value, modify);
-  });
-  return result;
-}
-
-export function camelCaseObject(object) {
-  return modifyObjectKeys(object, camelCase);
-}
-
-export function snakeCaseObject(object) {
-  return modifyObjectKeys(object, snakeCase);
-}
-
-export function convertKeyNames(object, nameMap) {
-  const transformer = key => (nameMap[key] === undefined ? key : nameMap[key]);
-
-  return modifyObjectKeys(object, transformer);
-}

src/account-settings/data/utils/dataUtils.test.js

@@ -1,90 +0,0 @@
-import {
-  modifyObjectKeys,
-  camelCaseObject,
-  snakeCaseObject,
-  convertKeyNames,
-} from './dataUtils';
-
-describe('modifyObjectKeys', () => {
-  it('should use the provided modify function to change all keys in and object and its children', () => {
-    function meowKeys(key) {
-      return `${key}Meow`;
-    }
-
-    const result = modifyObjectKeys(
-      {
-        one: undefined,
-        two: null,
-        three: '',
-        four: 0,
-        five: NaN,
-        six: [1, 2, { seven: 'woof' }],
-        eight: { nine: { ten: 'bark' }, eleven: true },
-      },
-      meowKeys,
-    );
-
-    expect(result).toEqual({
-      oneMeow: undefined,
-      twoMeow: null,
-      threeMeow: '',
-      fourMeow: 0,
-      fiveMeow: NaN,
-      sixMeow: [1, 2, { sevenMeow: 'woof' }],
-      eightMeow: { nineMeow: { tenMeow: 'bark' }, elevenMeow: true },
-    });
-  });
-});
-
-describe('camelCaseObject', () => {
-  it('should make everything camelCase', () => {
-    const result = camelCaseObject({
-      what_now: 'brown cow',
-      but_who: { says_you_people: 'okay then', but_how: { will_we_even_know: 'the song is over' } },
-      'dot.dot.dot': 123,
-    });
-
-    expect(result).toEqual({
-      whatNow: 'brown cow',
-      butWho: { saysYouPeople: 'okay then', butHow: { willWeEvenKnow: 'the song is over' } },
-      dotDotDot: 123,
-    });
-  });
-});
-
-describe('snakeCaseObject', () => {
-  it('should make everything snake_case', () => {
-    const result = snakeCaseObject({
-      whatNow: 'brown cow',
-      butWho: { saysYouPeople: 'okay then', butHow: { willWeEvenKnow: 'the song is over' } },
-      'dot.dot.dot': 123,
-    });
-
-    expect(result).toEqual({
-      what_now: 'brown cow',
-      but_who: { says_you_people: 'okay then', but_how: { will_we_even_know: 'the song is over' } },
-      dot_dot_dot: 123,
-    });
-  });
-});
-
-describe('convertKeyNames', () => {
-  it('should replace the specified keynames', () => {
-    const result = convertKeyNames(
-      {
-        one: { two: { three: 'four' } },
-        five: 'six',
-      },
-      {
-        two: 'blue',
-        five: 'alive',
-        seven: 'heaven',
-      },
-    );
-
-    expect(result).toEqual({
-      one: { blue: { three: 'four' } },
-      alive: 'six',
-    });
-  });
-});

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

@@ -1,9 +1,3 @@
-export {
-  camelCaseObject,
-  convertKeyNames,
-  modifyObjectKeys,
-  snakeCaseObject,
-} from './dataUtils';
 export {
   AsyncActionType,
   getModuleState,

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,14 @@ 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: (
             <Hyperlink destination={supportArticleUrl}>
               {intl.formatMessage(messages[instructionMessageId])}
             </Hyperlink>
           ),
+          siteName: getConfig().SITE_NAME,
         }}
       />
     </Alert>

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

@@ -1,11 +1,14 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
-import { Button, Input, Modal, ValidationFormGroup } from '@edx/paragon';
+import {
+  Button, Input, Modal, ValidationFormGroup,
+} from '@edx/paragon';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { faExclamationCircle, faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
+import { getConfig } from '@edx/frontend-platform';
 import messages from './messages';
 import Alert from '../Alert';
 import PrintingInstructions from './PrintingInstructions';
@@ -33,10 +36,9 @@ export class ConfirmationModal extends Component {
       return null;
     }
     const headerMessageId = this.getShortErrorMessageId(errorType);
-    const detailsMessageId =
-      reason === 'empty-password'
-        ? null
-        : 'account.settings.delete.account.error.unable.to.delete.details';
+    const detailsMessageId = reason === 'empty-password'
+      ? null
+      : 'account.settings.delete.account.error.unable.to.delete.details';
 
     return (
       <Alert
@@ -64,11 +66,18 @@ 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}
         title={intl.formatMessage(messages['account.settings.delete.account.modal.header'])}
-        body={
+        body={(
           <div>
             {this.renderError()}
             <Alert
@@ -76,9 +85,17 @@ export class ConfirmationModal extends Component {
               icon={<FontAwesomeIcon className="mr-2" icon={faExclamationTriangle} />}
             >
               <h6>
-                {intl.formatMessage(messages['account.settings.delete.account.modal.text.1'])}
+                {intl.formatMessage(
+                  messages['account.settings.delete.account.modal.text.1'],
+                  { siteName: getConfig().SITE_NAME },
+                )}
               </h6>
-              <p>{intl.formatMessage(messages['account.settings.delete.account.modal.text.2'])}</p>
+              <p>
+                {intl.formatMessage(
+                  messages[deleteAccountModalText2MessageKey],
+                  { siteName: getConfig().SITE_NAME },
+                )}
+              </p>
               <p>
                 <PrintingInstructions />
               </p>
@@ -100,9 +117,9 @@ export class ConfirmationModal extends Component {
               />
             </ValidationFormGroup>
           </div>
-        }
+        )}
         buttons={[
-          <Button className="btn-danger" onClick={onSubmit}>
+          <Button variant="danger" onClick={onSubmit}>
             {intl.formatMessage(messages['account.settings.delete.account.modal.confirm.delete'])}
           </Button>,
         ]}

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

@@ -24,9 +24,13 @@ import ConnectedSuccessModal from './SuccessModal';
 import BeforeProceedingBanner from './BeforeProceedingBanner';
 
 export class DeleteAccount extends React.Component {
-  state = {
-    password: '',
-  };
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      password: '',
+    };
+  }
 
   handleSubmit = () => {
     if (this.state.password === '') {
@@ -56,19 +60,40 @@ export class DeleteAccount extends React.Component {
     } = this.props;
     const canDelete = isVerifiedAccount && !hasLinkedTPA;
 
+    // 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">
           {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">
@@ -77,7 +102,7 @@ export class DeleteAccount extends React.Component {
         </p>
         <p>
           <Button
-            className="btn-outline-danger"
+            variant="outline-danger"
             onClick={canDelete ? this.props.deleteAccountConfirmation : null}
             disabled={!canDelete}
           >
@@ -87,8 +112,8 @@ 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-"
           />
         )}
 

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

@@ -11,13 +11,13 @@ export const SuccessModal = (props) => {
     <Modal
       open={status === 'deleted'}
       title={intl.formatMessage(messages['account.settings.delete.account.modal.after.header'])}
-      body={
+      body={(
         <div>
           <p className="h6">
             {intl.formatMessage(messages['account.settings.delete.account.modal.after.text'])}
           </p>
         </div>
-      }
+      )}
       closeText={intl.formatMessage(messages['account.settings.delete.account.modal.after.button'])}
       renderHeaderCloseButton={false}
       onClose={onClose}

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

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

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

@@ -11,31 +11,24 @@ 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>
-      .
+      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
     </span>
   </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"
@@ -47,9 +40,7 @@ exports[`DeleteAccount should match default section snapshot 1`] = `
     <button
       className="btn btn-outline-danger"
       disabled={false}
-      onBlur={[Function]}
-      onClick={[Function]}
-      onKeyDown={[Function]}
+      onClick={[MockFunction]}
       type="button"
     >
       Delete My Account
@@ -69,31 +60,24 @@ 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>
-      .
+      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
     </span>
   </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"
@@ -105,9 +89,7 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
     <button
       className="btn btn-outline-danger"
       disabled={true}
-      onBlur={[Function]}
-      onClick={[Function]}
-      onKeyDown={[Function]}
+      onClick={null}
       type="button"
     >
       Delete My Account
@@ -139,7 +121,8 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
       <span>
         Before proceeding, please 
         <a
-          href="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-activate-my-account-"
+          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"
         >
@@ -163,31 +146,24 @@ 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>
-      .
+      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
     </span>
   </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"
@@ -199,9 +175,7 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
     <button
       className="btn btn-outline-danger"
       disabled={true}
-      onBlur={[Function]}
-      onClick={[Function]}
-      onKeyDown={[Function]}
+      onClick={null}
       type="button"
     >
       Delete My Account
@@ -233,6 +207,7 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
       <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"

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

@@ -1,14 +1,110 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`SuccessModal should match default closed success modal snapshot 1`] = `
-<div>
+Array [
   <div
     className="fade"
     role="presentation"
-  />
+  />,
   <div
-    className="modal js-close-modal-on-click fade"
-    onMouseDown={[Function]}
+    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-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 2`] = `
+Array [
+  <div
+    className="fade"
+    role="presentation"
+  />,
+  <div
+    className="modal fade"
     role="presentation"
   >
     <div
@@ -16,61 +112,193 @@ exports[`SuccessModal should match default closed success modal snapshot 1`] = `
       aria-modal={true}
       className=""
       role="dialog"
-      tabIndex="-1"
     >
       <div
-        className="modal-content"
+        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-header"
+          className="modal-content"
         >
-          <h2
-            className="modal-title"
-            id="id2"
+          <div
+            className="modal-header"
           >
-            We're sorry to see you go!  Your account will be deleted shortly.
-          </h2>
-        </div>
-        <div
-          className="modal-body"
-        >
-          <div>
-            <p
-              className="h6"
+            <h2
+              className="modal-title"
+              id="id2"
             >
-              Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
-            </p>
+              We're sorry to see you go!  Your account will be deleted shortly.
+            </h2>
+          </div>
+          <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
-          className="modal-footer"
-        >
-          <button
-            className="btn js-close-modal-on-click btn-secondary"
-            id="paragonCloseModalButton1"
-            onBlur={[Function]}
-            onClick={[Function]}
-            onKeyDown={[Function]}
-            type="button"
-          >
-            Close
-          </button>
-        </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>
-</div>
+  </div>,
+]
 `;
 
-exports[`SuccessModal should match default closed success modal snapshot 2`] = `
-<div>
+exports[`SuccessModal should match default closed success modal snapshot 3`] = `
+Array [
   <div
     className="fade"
     role="presentation"
-  />
+  />,
   <div
-    className="modal js-close-modal-on-click fade"
-    onMouseDown={[Function]}
+    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-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 4`] = `
+Array [
+  <div
+    className="fade"
+    role="presentation"
+  />,
+  <div
+    className="modal fade"
     role="presentation"
   >
     <div
@@ -78,234 +306,183 @@ exports[`SuccessModal should match default closed success modal snapshot 2`] = `
       aria-modal={true}
       className=""
       role="dialog"
-      tabIndex="-1"
     >
       <div
-        className="modal-content"
-      >
-        <div
-          className="modal-header"
-        >
-          <h2
-            className="modal-title"
-            id="id4"
-          >
-            We're sorry to see you go!  Your account will be deleted shortly.
-          </h2>
-        </div>
-        <div
-          className="modal-body"
-        >
-          <div>
-            <p
-              className="h6"
-            >
-              Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
-            </p>
-          </div>
-        </div>
-        <div
-          className="modal-footer"
-        >
-          <button
-            className="btn js-close-modal-on-click btn-secondary"
-            id="paragonCloseModalButton3"
-            onBlur={[Function]}
-            onClick={[Function]}
-            onKeyDown={[Function]}
-            type="button"
-          >
-            Close
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`SuccessModal should match default closed success modal snapshot 3`] = `
-<div>
-  <div
-    className="fade"
-    role="presentation"
-  />
-  <div
-    className="modal js-close-modal-on-click fade"
-    onMouseDown={[Function]}
-    role="presentation"
-  >
-    <div
-      aria-labelledby="id6"
-      aria-modal={true}
-      className=""
-      role="dialog"
-      tabIndex="-1"
-    >
+        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-content"
+        data-focus-lock-disabled="disabled"
+        onBlur={[Function]}
+        onFocus={[Function]}
+        onScrollCapture={[Function]}
+        onTouchMoveCapture={[Function]}
+        onWheelCapture={[Function]}
       >
         <div
-          className="modal-header"
+          className="modal-content"
         >
-          <h2
-            className="modal-title"
-            id="id6"
+          <div
+            className="modal-header"
           >
-            We're sorry to see you go!  Your account will be deleted shortly.
-          </h2>
-        </div>
-        <div
-          className="modal-body"
-        >
-          <div>
-            <p
-              className="h6"
+            <h2
+              className="modal-title"
+              id="id4"
             >
-              Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
-            </p>
+              We're sorry to see you go!  Your account will be deleted shortly.
+            </h2>
+          </div>
+          <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
-          className="modal-footer"
-        >
-          <button
-            className="btn js-close-modal-on-click btn-secondary"
-            id="paragonCloseModalButton5"
-            onBlur={[Function]}
-            onClick={[Function]}
-            onKeyDown={[Function]}
-            type="button"
-          >
-            Close
-          </button>
-        </div>
       </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`SuccessModal should match default closed success modal snapshot 4`] = `
-<div>
-  <div
-    className="fade"
-    role="presentation"
-  />
-  <div
-    className="modal js-close-modal-on-click fade"
-    onMouseDown={[Function]}
-    role="presentation"
-  >
-    <div
-      aria-labelledby="id8"
-      aria-modal={true}
-      className=""
-      role="dialog"
-      tabIndex="-1"
-    >
       <div
-        className="modal-content"
-      >
-        <div
-          className="modal-header"
-        >
-          <h2
-            className="modal-title"
-            id="id8"
-          >
-            We're sorry to see you go!  Your account will be deleted shortly.
-          </h2>
-        </div>
-        <div
-          className="modal-body"
-        >
-          <div>
-            <p
-              className="h6"
-            >
-              Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
-            </p>
-          </div>
-        </div>
-        <div
-          className="modal-footer"
-        >
-          <button
-            className="btn js-close-modal-on-click btn-secondary"
-            id="paragonCloseModalButton7"
-            onBlur={[Function]}
-            onClick={[Function]}
-            onKeyDown={[Function]}
-            type="button"
-          >
-            Close
-          </button>
-        </div>
-      </div>
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={-1}
+      />
     </div>
-  </div>
-</div>
+  </div>,
+]
 `;
 
 exports[`SuccessModal should match open success modal snapshot 1`] = `
-<div>
+Array [
   <div
     className="modal-backdrop show"
     role="presentation"
-  />
+  />,
   <div
-    className="modal js-close-modal-on-click show d-block"
-    onMouseDown={[Function]}
+    className="modal show d-block"
     role="presentation"
   >
     <div
-      aria-labelledby="id10"
+      aria-labelledby="id5"
       aria-modal={true}
       className="modal-dialog"
       role="dialog"
-      tabIndex="-1"
     >
       <div
-        className="modal-content"
+        data-focus-guard={true}
+        style={
+          Object {
+            "height": "0px",
+            "left": "1px",
+            "overflow": "hidden",
+            "padding": 0,
+            "position": "fixed",
+            "top": "1px",
+            "width": "1px",
+          }
+        }
+        tabIndex={0}
+      />
+      <div
+        data-focus-lock-disabled={false}
+        onBlur={[Function]}
+        onFocus={[Function]}
+        onMouseDown={[Function]}
+        onScrollCapture={[Function]}
+        onTouchMoveCapture={[Function]}
+        onTouchStart={[Function]}
+        onWheelCapture={[Function]}
       >
         <div
-          className="modal-header"
+          className="modal-content"
         >
-          <h2
-            className="modal-title"
-            id="id10"
+          <div
+            className="modal-header"
           >
-            We're sorry to see you go!  Your account will be deleted shortly.
-          </h2>
-        </div>
-        <div
-          className="modal-body"
-        >
-          <div>
-            <p
-              className="h6"
+            <h2
+              className="modal-title"
+              id="id5"
             >
-              Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
-            </p>
+              We're sorry to see you go!  Your account will be deleted shortly.
+            </h2>
+          </div>
+          <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
-          className="modal-footer"
-        >
-          <button
-            className="btn js-close-modal-on-click btn-secondary"
-            id="paragonCloseModalButton9"
-            onBlur={[Function]}
-            onClick={[Function]}
-            onKeyDown={[Function]}
-            type="button"
-          >
-            Close
-          </button>
-        </div>
       </div>
+      <div
+        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>
+  </div>,
+]
 `;

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

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { CheckBox } from '@edx/paragon';
 import { DECLINED } from '../data/constants';
 
-export const Checkboxes = (props) => {
+const Checkboxes = (props) => {
   const {
     id,
     options,
@@ -13,12 +13,12 @@ export const Checkboxes = (props) => {
 
   const [selected, setSelected] = useState(values);
   useEffect(() => {
-    onChange(id, selected)
-  }, [selected])
+    onChange(id, selected);
+  }, [selected]);
 
   const handleToggle = (value, option) => {
     // If the user checked 'declined', uncheck all other options
-    if (value && option == DECLINED) {
+    if (value && option === DECLINED) {
       setSelected([DECLINED]);
       return;
     }
@@ -33,46 +33,47 @@ export const Checkboxes = (props) => {
     if (!value) {
       setSelected(selected.filter(i => i !== option));
     }
-  }
+  };
 
-  const renderCheckboxes = () => {
-    return options.map((option, index) => {
-      const isFirst = index == 0;
-      const isChecked = selected.includes(option.value);
-      return (
-        <div key={index} className="checkboxOption">
-          <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)}
-          />
-        </div>
-      )
-    })
-  }
+  const renderCheckboxes = () => options.map((option, index) => {
+    const isFirst = index === 0;
+    const isChecked = selected.includes(option.value);
+    return (
+      <div key={option.value} className="checkboxOption">
+        <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)}
+        />
+      </div>
+    );
+  });
 
   return (
     <div role="group">
       {renderCheckboxes()}
     </div>
-  )
-}
+  );
+};
 
 Checkboxes.propTypes = {
-  id: PropTypes.string,
-  options: PropTypes.array,
-  values: PropTypes.array,
-  onChange: PropTypes.func,
+  id: PropTypes.string.isRequired,
+  options: PropTypes.arrayOf(PropTypes.shape({
+    value: PropTypes.string,
+    label: PropTypes.string,
+  })),
+  values: PropTypes.arrayOf(PropTypes.string),
+  onChange: PropTypes.func.isRequired,
 };
 
 Checkboxes.defaultProps = {
   options: [],
   values: [],
-}
+};
 
 export default Checkboxes;

src/account-settings/demographics/DemographicsSection.jsx

@@ -1,31 +1,109 @@
-import {
-  OTHER,
-  SELF_DESCRIBE,
-} from '../data/constants';
 import { getConfig } from '@edx/frontend-platform';
 import {
   FormattedMessage,
   injectIntl,
   intlShape,
 } from '@edx/frontend-platform/i18n';
-import { saveMultipleSettings, updateDraft } from '../data/actions';
 
-import Alert from '../Alert';
-import Checkboxes from './Checkboxes';
-import EditableField from '../EditableField';
-import { Input } from '@edx/paragon';
+import { Hyperlink, Input } from '@edx/paragon';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
-import { demographicsSectionSelector } from '../data/selectors';
 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 Checkboxes from './Checkboxes';
+import Alert from '../Alert';
+import { saveMultipleSettings, updateDraft } from '../data/actions';
+import {
+  OTHER,
+  SELF_DESCRIBE,
+} from '../data/constants';
 import messages from './DemographicsSection.messages';
 
 class DemographicsSection extends React.Component {
-  constructor(props, context) {
-    super(props, context);
+  // We check the `demographicsOptions` prop to see if it is empty before we attempt to extract and
+  // format the available options for each question from the API response.
+  getApiOptions = memoize((demographicsOptions) => (this.hasRetrievedDemographicsOptions() && {
+    demographicsGenderOptions: this.addDefaultOption('account.settings.field.demographics.gender.options.empty')
+      .concat(demographicsOptions.actions.POST.gender.choices.map(key => ({
+        value: key.value,
+        label: key.display_name,
+      }))),
+    /* Ethnicity options don't need the blank/default option */
+    demographicsEthnicityOptions: demographicsOptions.actions.POST.user_ethnicity.child.children.ethnicity.choices.map(
+      key => ({
+        value: key.value,
+        label: key.display_name,
+      }),
+    ),
+    demographicsIncomeOptions: this.addDefaultOption('account.settings.field.demographics.income.options.empty')
+      .concat(demographicsOptions.actions.POST.income.choices.map(key => ({
+        value: key.value,
+        label: key.display_name,
+      }))),
+    demographicsMilitaryHistoryOptions: this.addDefaultOption('account.settings.field.demographics.military_history.options.empty')
+      .concat(demographicsOptions.actions.POST.military_history.choices.map(key => ({
+        value: key.value,
+        label: key.display_name,
+      }))),
+    demographicsEducationLevelOptions: this.addDefaultOption('account.settings.field.demographics.education_level.options.empty')
+      .concat(demographicsOptions.actions.POST.learner_education_level.choices.map(key => ({
+        value: key.value,
+        label: key.display_name,
+      }))),
+    demographicsWorkStatusOptions: this.addDefaultOption('account.settings.field.demographics.work_status.options.empty')
+      .concat(demographicsOptions.actions.POST.work_status.choices.map(key => ({
+        value: key.value,
+        label: key.display_name,
+      }))),
+    demographicsWorkSectorOptions: this.addDefaultOption('account.settings.field.demographics.work_sector.options.empty')
+      .concat(demographicsOptions.actions.POST.current_work_sector.choices.map(key => ({
+        value: key.value,
+        label: key.display_name,
+      }))),
+  }));
+
+  ethnicityFieldDisplay = (demographicsEthnicityOptions) => {
+    let ethnicities = [];
+    if (get(this, 'props.formValues.demographics_user_ethnicity')) {
+      ethnicities = this.props.formValues.demographics_user_ethnicity;
+    }
+    return ethnicities.map((e) => {
+      const matchingOption = demographicsEthnicityOptions.filter(option => option.value === e)[0];
+      return matchingOption && matchingOption.label;
+    }).join(', ');
+  }
+
+  handleEditableFieldChange = (name, value) => {
+    this.props.updateDraft(name, value);
+  };
+
+  handleSubmit = (formId) => {
+    // We have some custom fields in this section. Instead of relying on the
+    // submitted values, submit the values stored in 'drafts'.
+    const { drafts } = this.props;
+    const settingsArray = Object.entries(drafts).map(([field, value]) => ({
+      formId: field,
+      commitValues: value,
+    }));
+
+    this.props.saveMultipleSettings(settingsArray, formId);
+  };
+
+  /**
+   * Utility method that adds the specified message as a default option to the list of available
+   * choices.
+   *
+   * @param {*} messageId id of message matching desired default label text
+   */
+  addDefaultOption(messageId) {
+    return [{
+      value: '',
+      label: this.props.intl.formatMessage(messages[messageId]),
+    }];
   }
 
   /**
@@ -38,100 +116,19 @@ class DemographicsSection extends React.Component {
     return !isEmpty(this.props.formValues.demographicsOptions);
   }
 
-  /**
-   * Utility method that adds the specified message as a default option to the list of available
-   * choices.
-   * 
-   * @param {*} messageId id of message matching desired default label text
-   */
-  addDefaultOption(messageId) {
-    return [{
-      value: '',
-      label: this.props.intl.formatMessage(messages[messageId]),
-    }];
-  }
-  
-  // We check the `demographicsOptions` prop to see if it is empty before we attempt to extract and
-  // format the available options for each question from the API response.
-  getApiOptions = memoize((demographicsOptions) => ( this.hasRetrievedDemographicsOptions() && {
-    demographicsGenderOptions: this.addDefaultOption('account.settings.field.demographics.gender.options.empty')
-      .concat(demographicsOptions.actions.POST.gender.choices.map(key => ({
-        value: key.value,
-        label: key.display_name
-    }))),
-    /* Ethnicity options don't need the blank/default option */
-    demographicsEthnicityOptions: demographicsOptions.actions.POST.user_ethnicity.child.children.ethnicity.choices.map(key => ({
-        value: key.value,
-        label: key.display_name
-    })),
-    demographicsIncomeOptions: this.addDefaultOption('account.settings.field.demographics.income.options.empty')
-      .concat(demographicsOptions.actions.POST.income.choices.map(key => ({
-        value: key.value,
-        label: key.display_name
-    }))),
-    demographicsMilitaryHistoryOptions: this.addDefaultOption('account.settings.field.demographics.military_history.options.empty')
-      .concat(demographicsOptions.actions.POST.military_history.choices.map(key => ({
-        value: key.value,
-        label: key.display_name
-    }))),
-    demographicsEducationLevelOptions: this.addDefaultOption('account.settings.field.demographics.education_level.options.empty')
-      .concat(demographicsOptions.actions.POST.learner_education_level.choices.map(key => ({
-        value: key.value,
-        label: key.display_name
-    }))),
-    demographicsWorkStatusOptions: this.addDefaultOption('account.settings.field.demographics.work_status.options.empty')
-      .concat(demographicsOptions.actions.POST.work_status.choices.map(key => ({
-        value: key.value,
-        label: key.display_name
-    }))),
-    demographicsWorkSectorOptions: this.addDefaultOption('account.settings.field.demographics.work_sector.options.empty')
-      .concat(demographicsOptions.actions.POST.current_work_sector.choices.map(key => ({
-        value: key.value,
-        label: key.display_name
-    }))),
-  }));
-
-  ethnicityFieldDisplay = (demographicsEthnicityOptions) => {
-    if (get(this, 'props.formValues.demographics_user_ethnicity')) {
-      const ethnicities = this.props.formValues.demographics_user_ethnicity;  
-      return ethnicities.map((e) => {
-        var matchingOption = demographicsEthnicityOptions.filter(option => option.value === e)[0];
-        return matchingOption && matchingOption.label;
-      }).join(", ")
-    }
-  }
-
-  handleEditableFieldChange = (name, value) => {
-    this.props.updateDraft(name, value);
-  };
-
-  handleSubmit = (formId, values) => {
-    // We have some custom fields in this section. Instead of relying on the
-    // submitted values, submit the values stored in 'drafts'.
-    const drafts = this.props.drafts;
-    const settingsArray = []
-    for (let field in drafts) {
-      settingsArray.push({
-        formId: field,
-        commitValues: drafts[field]
-      })
-    }
-
-    this.props.saveMultipleSettings(settingsArray, formId);
-  };
-
   /**
    * If an error is encountered when trying to communicate with the Demographics IDA then we will
    * display an Alert letting the user know that their info will not be displayed and temporarily
    * cannot be updated.
    */
   renderDemographicsServiceIssueWarning() {
-    if (!isEmpty(this.props.formErrors.demographicsError) |
-        this.hasRetrievedDemographicsOptions() == false) {
+    if (!isEmpty(this.props.formErrors.demographicsError)
+        || !this.hasRetrievedDemographicsOptions()) {
       return (
         <div
           tabIndex="-1"
-          ref={this.alertRef}>
+          ref={this.alertRef}
+        >
           <Alert className="alert alert-danger" role="alert">
             <FormattedMessage
               id="account.settings.message.demographics.service.issue"
@@ -141,9 +138,8 @@ class DemographicsSection extends React.Component {
           </Alert>
         </div>
       );
-    } else {
-      return null;
     }
+    return null;
   }
 
   render() {
@@ -162,8 +158,8 @@ class DemographicsSection extends React.Component {
       demographicsWorkSectorOptions,
     } = this.getApiOptions(this.props.formValues.demographicsOptions);
 
-    const showSelfDescribe = this.props.formValues.demographics_gender == SELF_DESCRIBE;
-    const showWorkStatusDescribe = this.props.formValues.demographics_work_status == OTHER;
+    const showSelfDescribe = this.props.formValues.demographics_gender === SELF_DESCRIBE;
+    const showWorkStatusDescribe = this.props.formValues.demographics_work_status === OTHER;
 
     return (
       <div className="account-section" id="demographics-information" ref={this.props.forwardRef}>
@@ -171,17 +167,26 @@ class DemographicsSection extends React.Component {
           {this.props.intl.formatMessage(messages['account.settings.section.demographics.information'])}
         </h2>
         <p>
-          <a href={getConfig().MARKETING_SITE_BASE_URL + '/demographics'} target="_blank">
-            {this.props.intl.formatMessage(messages['account.settings.section.demographics.why'])}
-          </a>
+          <Hyperlink
+            destination={`${getConfig().MARKETING_SITE_BASE_URL}/demographics`}
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            {this.props.intl.formatMessage(
+              messages['account.settings.section.demographics.why'],
+              {
+                siteName: getConfig().SITE_NAME,
+              },
+            )}
+          </Hyperlink>
         </p>
         {this.renderDemographicsServiceIssueWarning()}
-        {/* 
+        {/*
           If the demographicsOptions props are empty then there is no need to display the fields as
           the user will not have any choices available to select, nor will they be able to update
           their answers.
         */}
-        { this.hasRetrievedDemographicsOptions() &&
+        {this.hasRetrievedDemographicsOptions() && (
           <div id="demographics-fields">
             <EditableField
               name="demographics_gender"
@@ -193,18 +198,18 @@ class DemographicsSection extends React.Component {
               emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.gender.empty'])}
               {...editableFieldProps}
             >
-              {showSelfDescribe &&
+              {showSelfDescribe && (
                 <Input
-                  name='demographics_gender_description'
-                  id='field-demographics_gender_description'
-                  type='text'
+                  name="demographics_gender_description"
+                  id="field-demographics_gender_description"
+                  type="text"
                   placeholder={this.props.intl.formatMessage(messages['account.settings.field.demographics.gender_description.empty'])}
                   value={this.props.formValues.demographics_gender_description}
-                  onChange={(e) => this.handleEditableFieldChange(`demographics_gender_description`, e.target.value)}
+                  onChange={(e) => this.handleEditableFieldChange('demographics_gender_description', e.target.value)}
                   aria-label={this.props.intl.formatMessage(messages['account.settings.field.demographics.gender_description'])}
                   className="mt-1"
                 />
-              }
+              )}
             </EditableField>
             <EditableField
               name="demographics_user_ethnicity"
@@ -262,24 +267,26 @@ class DemographicsSection extends React.Component {
               name="demographics_work_status"
               type="select"
               value={this.props.formValues.demographics_work_status}
-              userSuppliedValue={showWorkStatusDescribe ? this.props.formValues.demographics_work_status_description : null}
+              userSuppliedValue={showWorkStatusDescribe
+                ? this.props.formValues.demographics_work_status_description
+                : null}
               options={demographicsWorkStatusOptions}
               label={this.props.intl.formatMessage(messages['account.settings.field.demographics.work_status'])}
               emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.demographics.work_status.empty'])}
               {...editableFieldProps}
             >
-              {showWorkStatusDescribe &&
+              {showWorkStatusDescribe && (
                 <Input
-                  name='demographics_work_status_description'
-                  id='field-demographics_work_status_description'
-                  type='text'
+                  name="demographics_work_status_description"
+                  id="field-demographics_work_status_description"
+                  type="text"
                   placeholder={this.props.intl.formatMessage(messages['account.settings.field.demographics.work_status_description.empty'])}
                   value={this.props.formValues.demographics_work_status_description}
-                  onChange={(e) => this.handleEditableFieldChange(`demographics_work_status_description`, e.target.value)}
+                  onChange={(e) => this.handleEditableFieldChange('demographics_work_status_description', e.target.value)}
                   aria-label={this.props.intl.formatMessage(messages['account.settings.field.demographics.work_status_description'])}
                   className="mt-1"
                 />
-              }
+              )}
             </EditableField>
             <EditableField
               name="demographics_current_work_sector"
@@ -300,11 +307,11 @@ class DemographicsSection extends React.Component {
               {...editableFieldProps}
             />
           </div>
-        }
+        )}
       </div>
-    )
+    );
   }
-};
+}
 
 DemographicsSection.propTypes = {
   intl: intlShape.isRequired,
@@ -318,11 +325,30 @@ DemographicsSection.propTypes = {
     demographics_work_status: PropTypes.string,
     demographics_current_work_sector: PropTypes.string,
     demographics_future_work_sector: PropTypes.string,
+    demographics_work_status_description: PropTypes.string,
+    demographics_gender_description: PropTypes.string,
+    demographicsOptions: PropTypes.object,
+  }).isRequired,
+  drafts: PropTypes.shape({
+    demographics_gender: PropTypes.string,
+    demographics_user_ethnicity: PropTypes.array,
+    demographics_income: PropTypes.string,
+    demographics_military_history: PropTypes.string,
+    demographics_learner_education_level: PropTypes.string,
+    demographics_parent_education_level: PropTypes.string,
+    demographics_work_status: PropTypes.string,
+    demographics_current_work_sector: PropTypes.string,
+    demographics_future_work_sector: PropTypes.string,
+    demographics_work_status_description: PropTypes.string,
+    demographics_gender_description: PropTypes.string,
+    demographicsOptions: PropTypes.object,
   }).isRequired,
   formErrors: PropTypes.shape({
     demographicsError: PropTypes.string,
   }).isRequired,
-  updateDraft: PropTypes.func.isRequired
+  forwardRef: PropTypes.func.isRequired,
+  updateDraft: PropTypes.func.isRequired,
+  saveMultipleSettings: PropTypes.func.isRequired,
 };
 
 export default connect(demographicsSectionSelector, {

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/data/service.js

@@ -22,8 +22,7 @@ export function createDemographicsError(error) {
       delete apiError.fieldErrors.gender_description;
     } else if (get(apiError, 'fieldErrors.work_status_description')) {
       // eslint-disable-next-line prefer-destructuring
-      apiError.fieldErrors.demographics_work_status =
-        apiError.fieldErrors.work_status_description[0];
+      apiError.fieldErrors.demographics_work_status = apiError.fieldErrors.work_status_description[0];
       delete apiError.fieldErrors.work_status_description;
     }
   // Otherwise, when the service is down, the error response will not contain a

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

@@ -2,582 +2,582 @@ import * as auth from '@edx/frontend-platform/auth';
 
 import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';
 
-import DemographicsSection from '../DemographicsSection';
 import { Provider } from 'react-redux';
 import React from 'react';
 import configureStore from 'redux-mock-store';
 import renderer from 'react-test-renderer';
+import DemographicsSection from '../DemographicsSection';
 
 jest.mock('@edx/frontend-platform/auth');
 
 const IntlDemographicsSection = injectIntl(DemographicsSection);
 
-jest.mock('../../data/selectors', () => {
-   return jest.fn().mockImplementation(() => ({ demographicsSectionSelector: () => ({}) })); 
-});
+jest.mock('../../data/selectors', () => jest.fn().mockImplementation(() => ({ demographicsSectionSelector: () => ({}) })));
 
 const mockStore = configureStore();
 
 describe('DemographicsSection', () => {
-    let props = {};
-    let store = {};
-    
-    const reduxWrapper = children => (
-        <IntlProvider locale="en">
-            <Provider store={store}>{children}</Provider>
-        </IntlProvider>
-    );
-    
-    beforeEach(() => {
-        store = mockStore();
-        props = {
-            updateDraft: jest.fn(),
-            formValues: {
-                demographics_gender: 'declined',
-                demographics_gender_description: '',
-                demographics_user_ethnicity: [],
-                demographics_income: 'declined',
-                demographics_military_history: 'declined',
-                demographics_learner_education_level: 'declined',
-                demographics_parent_education_level: 'declined',
-                demographics_work_status: 'declined',
-                demographics_work_status_description: '',
-                demographics_current_work_sector: 'declined',
-                demographics_future_work_sector: 'declined',
-                demographics_user: 1,
-                demographicsOptions: {
-                    actions: {
-                        POST: {
-                            gender: {
-                                choices: [
-                                    {
-                                        "value": "woman",
-                                        "display_name": "Woman"
-                                      },
-                                      {
-                                        "value": "man",
-                                        "display_name": "Man"
-                                      },
-                                      {
-                                        "value": "non-binary",
-                                        "display_name": "Non-binary"
-                                      },
-                                      {
-                                        "value": "self-describe",
-                                        "display_name": "Prefer to self describe"
-                                      },
-                                      {
-                                        "value": "declined",
-                                        "display_name": "Prefer not to respond"
-                                      }
-                                ]
-                            },
-                            income: {
-                                choices: [
-                                    {
-                                        "value": "less-than-10k",
-                                        "display_name": "Less than US $10,000"
-                                    },
-                                    {
-                                        "value": "10k-25k",
-                                        "display_name": "US $10,000 - $25,000"
-                                    },
-                                    {
-                                        "value": "25k-50k",
-                                        "display_name": "US $25,000 - $50,000"
-                                    },
-                                    {
-                                        "value": "50k-75k",
-                                        "display_name": "US $50,000 - $75,000"
-                                    },
-                                    {
-                                        "value": "75k-100k",
-                                        "display_name": "US $75,000 - $100,000"
-                                    },
-                                    {
-                                        "value": "over-100k",
-                                        "display_name": "Over US $100,000"
-                                    },
-                                    {
-                                        "value": "unsure",
-                                        "display_name": "I don't know"
-                                    },
-                                    {
-                                        "value": "declined",
-                                        "display_name": "Prefer not to respond"
-                                    }                                    
-                                ]
-                            },
-                            learner_education_level: {
-                                choices: [
-                                    {
-                                        "value": "no-high-school",
-                                        "display_name": "No High School"
-                                    },
-                                    {
-                                        "value": "some-high-school",
-                                        "display_name": "Some High School"
-                                    },
-                                    {
-                                        "value": "high-school-ged-equivalent",
-                                        "display_name": "High School diploma, GED, or equivalent"
-                                    },
-                                    {
-                                        "value": "some-college",
-                                        "display_name": "Some college, but no degree"
-                                    },
-                                    {
-                                        "value": "associates",
-                                        "display_name": "Associates degree"
-                                    },
-                                    {
-                                        "value": "bachelors",
-                                        "display_name": "Bachelors degree"
-                                    },
-                                    {
-                                        "value": "masters",
-                                        "display_name": "Masters degree"
-                                    },
-                                    {
-                                        "value": "professional",
-                                        "display_name": "Professional degree"
-                                    },
-                                    {
-                                        "value": "doctorate",
-                                        "display_name": "Doctorate degree"
-                                    },
-                                    {
-                                        "value": "declined",
-                                        "display_name": "Prefer not to respond"
-                                    }
-                                ]
-                            },
-                            parent_education_level: {
-                                choices: [
-                                    {
-                                        "value": "no-high-school",
-                                        "display_name": "No High School"
-                                    },
-                                    {
-                                        "value": "some-high-school",
-                                        "display_name": "Some High School"
-                                    },
-                                    {
-                                        "value": "high-school-ged-equivalent",
-                                        "display_name": "High School diploma, GED, or equivalent"
-                                    },
-                                    {
-                                        "value": "some-college",
-                                        "display_name": "Some college, but no degree"
-                                    },
-                                    {
-                                        "value": "associates",
-                                        "display_name": "Associates degree"
-                                    },
-                                    {
-                                        "value": "bachelors",
-                                        "display_name": "Bachelors degree"
-                                    },
-                                    {
-                                        "value": "masters",
-                                        "display_name": "Masters degree"
-                                    },
-                                    {
-                                        "value": "professional",
-                                        "display_name": "Professional degree"
-                                    },
-                                    {
-                                        "value": "doctorate",
-                                        "display_name": "Doctorate degree"
-                                    },
-                                    {
-                                        "value": "declined",
-                                        "display_name": "Prefer not to respond"
-                                    }
-                                ]
-                            },
-                            military_history: {
-                                choices: [
-                                    {
-                                        "value": "never-served",
-                                        "display_name": "Never served in the military"
-                                    },
-                                    {
-                                        "value": "training",
-                                        "display_name": "Only on active duty for training"
-                                    },
-                                    {
-                                        "value": "active",
-                                        "display_name": "Now on active duty"
-                                    },
-                                    {
-                                        "value": "previously-active",
-                                        "display_name": "On active duty in the past, but not now"
-                                    },
-                                    {
-                                        "value": "declined",
-                                        "display_name": "Prefer not to respond"
-                                    }
-                                ]
-                            },
-                            work_status: {
-                                choices: [
-                                    {
-                                        "value": "full-time",
-                                        "display_name": "Employed, working full-time"
-                                    },
-                                    {
-                                        "value": "part-time",
-                                        "display_name": "Employed, working part-time"
-                                    },
-                                    {
-                                        "value": "self-employed",
-                                        "display_name": "Self-Employed"
-                                    },
-                                    {
-                                        "value": "not-employed-looking",
-                                        "display_name": "Not employed, looking for work"
-                                    },
-                                    {
-                                        "value": "not-employed-not-looking",
-                                        "display_name": "Not employed, not looking for work"
-                                    },
-                                    {
-                                        "value": "unable",
-                                        "display_name": "Unable to work"
-                                    },
-                                    {
-                                        "value": "retired",
-                                        "display_name": "Retired"
-                                    },
-                                    {
-                                        "value": "other",
-                                        "display_name": "Other"
-                                    },
-                                    {
-                                        "value": "declined",
-                                        "display_name": "Prefer not to respond"
-                                    }                                    
-                                ]
-                            },
-                            current_work_sector: {
-                                choices: [
-                                    {
-                                        "value": "accommodation-food",
-                                        "display_name": "Accommodation and Food Services"
-                                    },
-                                    {
-                                        "value": "administrative-support-waste-remediation",
-                                        "display_name": "Administrative and Support and Waste Management and Remediation Services"
-                                    },
-                                    {
-                                        "value": "agriculture-forestry-fishing-hunting",
-                                        "display_name": "Agriculture, Forestry, Fishing and Hunting"
-                                    },
-                                    {
-                                        "value": "arts-entertainment-recreation",
-                                        "display_name": "Arts, Entertainment, and Recreation"
-                                    },
-                                    {
-                                        "value": "construction",
-                                        "display_name": "Construction"
-                                    },
-                                    {
-                                        "value": "educational",
-                                        "display_name": "Education Services"
-                                    },
-                                    {
-                                        "value": "finance-insurance",
-                                        "display_name": "Finance and Insurance"
-                                    },
-                                    {
-                                        "value": "healthcare-social",
-                                        "display_name": "Health Care and Social Assistance"
-                                    },
-                                    {
-                                        "value": "information",
-                                        "display_name": "Information"
-                                    },
-                                    {
-                                        "value": "management",
-                                        "display_name": "Management of Companies and Enterprises"
-                                    },
-                                    {
-                                        "value": "manufacturing",
-                                        "display_name": "Manufacturing"
-                                    },
-                                    {
-                                        "value": "mining-quarry-oil-gas",
-                                        "display_name": "Mining, Quarrying, and Oil and Gas Extraction"
-                                    },
-                                    {
-                                        "value": "professional-scientific-technical",
-                                        "display_name": "Professional, Scientific, and Technical Services"
-                                    },
-                                    {
-                                        "value": "public-admin",
-                                        "display_name": "Public Administration"
-                                    },
-                                    {
-                                        "value": "real-estate",
-                                        "display_name": "Real Estate and Rental and Leasing"
-                                    },
-                                    {
-                                        "value": "retail",
-                                        "display_name": "Retail Trade"
-                                    },
-                                    {
-                                        "value": "transport-warehousing",
-                                        "display_name": "Transportation and Warehousing"
-                                    },
-                                    {
-                                        "value": "utilities",
-                                        "display_name": "Utilities"
-                                    },
-                                    {
-                                        "value": "trade",
-                                        "display_name": "Wholesale Trade"
-                                    },
-                                    {
-                                        "value": "other",
-                                        "display_name": "Other"
-                                    },
-                                    {
-                                        "value": "declined",
-                                        "display_name": "Prefer not to respond"
-                                    }                                    
-                                ]
-                            },
-                            future_work_sector: {
-                                choices: [
-                                    {
-                                        "value": "accommodation-food",
-                                        "display_name": "Accommodation and Food Services"
-                                    },
-                                    {
-                                        "value": "administrative-support-waste-remediation",
-                                        "display_name": "Administrative and Support and Waste Management and Remediation Services"
-                                    },
-                                    {
-                                        "value": "agriculture-forestry-fishing-hunting",
-                                        "display_name": "Agriculture, Forestry, Fishing and Hunting"
-                                    },
-                                    {
-                                        "value": "arts-entertainment-recreation",
-                                        "display_name": "Arts, Entertainment, and Recreation"
-                                    },
-                                    {
-                                        "value": "construction",
-                                        "display_name": "Construction"
-                                    },
-                                    {
-                                        "value": "educational",
-                                        "display_name": "Education Services"
-                                    },
-                                    {
-                                        "value": "finance-insurance",
-                                        "display_name": "Finance and Insurance"
-                                    },
-                                    {
-                                        "value": "healthcare-social",
-                                        "display_name": "Health Care and Social Assistance"
-                                    },
-                                    {
-                                        "value": "information",
-                                        "display_name": "Information"
-                                    },
-                                    {
-                                        "value": "management",
-                                        "display_name": "Management of Companies and Enterprises"
-                                    },
-                                    {
-                                        "value": "manufacturing",
-                                        "display_name": "Manufacturing"
-                                    },
-                                    {
-                                        "value": "mining-quarry-oil-gas",
-                                        "display_name": "Mining, Quarrying, and Oil and Gas Extraction"
-                                    },
-                                    {
-                                        "value": "professional-scientific-technical",
-                                        "display_name": "Professional, Scientific, and Technical Services"
-                                    },
-                                    {
-                                        "value": "public-admin",
-                                        "display_name": "Public Administration"
-                                    },
-                                    {
-                                        "value": "real-estate",
-                                        "display_name": "Real Estate and Rental and Leasing"
-                                    },
-                                    {
-                                        "value": "retail",
-                                        "display_name": "Retail Trade"
-                                    },
-                                    {
-                                        "value": "transport-warehousing",
-                                        "display_name": "Transportation and Warehousing"
-                                    },
-                                    {
-                                        "value": "utilities",
-                                        "display_name": "Utilities"
-                                    },
-                                    {
-                                        "value": "trade",
-                                        "display_name": "Wholesale Trade"
-                                    },
-                                    {
-                                        "value": "other",
-                                        "display_name": "Other"
-                                    },
-                                    {
-                                        "value": "declined",
-                                        "display_name": "Prefer not to respond"
-                                    }                                    
-                                ]
-                            },
-                            user_ethnicity: {
-                                child: {
-                                    children: {
-                                        ethnicity: {
-                                            choices: [
-                                                {
-                                                    "value": "american-indian-or-alaska-native",
-                                                    "display_name": "American Indian or Alaska Native"
-                                                  },
-                                                  {
-                                                    "value": "asian",
-                                                    "display_name": "Asian"
-                                                  },
-                                                  {
-                                                    "value": "black-or-african-american",
-                                                    "display_name": "Black or African American"
-                                                  },
-                                                  {
-                                                    "value": "hispanic-latin-spanish",
-                                                    "display_name": "Hispanic, Latin, or Spanish origin"
-                                                  },
-                                                  {
-                                                    "value": "middle-eastern-or-north-african",
-                                                    "display_name": "Middle Eastern or North African"
-                                                  },
-                                                  {
-                                                    "value": "native-hawaiian-or-pacific-islander",
-                                                    "display_name": "Native Hawaiian or Other Pacific Islander"
-                                                  },
-                                                  {
-                                                    "value": "white",
-                                                    "display_name": "White"
-                                                  },
-                                                  {
-                                                    "value": "other",
-                                                    "display_name": "Some other race, ethnicity, or origin"
-                                                  },
-                                                  {
-                                                    "value": "declined",
-                                                    "display_name": "Prefer not to respond"
-                                                  }
-                                            ]
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
+  let props = {};
+  let store = {};
+
+  const reduxWrapper = children => (
+    <IntlProvider locale="en">
+      <Provider store={store}>{children}</Provider>
+    </IntlProvider>
+  );
+
+  beforeEach(() => {
+    store = mockStore();
+    props = {
+      updateDraft: jest.fn(),
+      formValues: {
+        demographics_gender: 'declined',
+        demographics_gender_description: '',
+        demographics_user_ethnicity: [],
+        demographics_income: 'declined',
+        demographics_military_history: 'declined',
+        demographics_learner_education_level: 'declined',
+        demographics_parent_education_level: 'declined',
+        demographics_work_status: 'declined',
+        demographics_work_status_description: '',
+        demographics_current_work_sector: 'declined',
+        demographics_future_work_sector: 'declined',
+        demographics_user: 1,
+        demographicsOptions: {
+          actions: {
+            POST: {
+              gender: {
+                choices: [
+                  {
+                    value: 'woman',
+                    display_name: 'Woman',
+                  },
+                  {
+                    value: 'man',
+                    display_name: 'Man',
+                  },
+                  {
+                    value: 'non-binary',
+                    display_name: 'Non-binary',
+                  },
+                  {
+                    value: 'self-describe',
+                    display_name: 'Prefer to self describe',
+                  },
+                  {
+                    value: 'declined',
+                    display_name: 'Prefer not to respond',
+                  },
+                ],
+              },
+              income: {
+                choices: [
+                  {
+                    value: 'less-than-10k',
+                    display_name: 'Less than US $10,000',
+                  },
+                  {
+                    value: '10k-25k',
+                    display_name: 'US $10,000 - $25,000',
+                  },
+                  {
+                    value: '25k-50k',
+                    display_name: 'US $25,000 - $50,000',
+                  },
+                  {
+                    value: '50k-75k',
+                    display_name: 'US $50,000 - $75,000',
+                  },
+                  {
+                    value: '75k-100k',
+                    display_name: 'US $75,000 - $100,000',
+                  },
+                  {
+                    value: 'over-100k',
+                    display_name: 'Over US $100,000',
+                  },
+                  {
+                    value: 'unsure',
+                    display_name: "I don't know",
+                  },
+                  {
+                    value: 'declined',
+                    display_name: 'Prefer not to respond',
+                  },
+                ],
+              },
+              learner_education_level: {
+                choices: [
+                  {
+                    value: 'no-high-school',
+                    display_name: 'No High School',
+                  },
+                  {
+                    value: 'some-high-school',
+                    display_name: 'Some High School',
+                  },
+                  {
+                    value: 'high-school-ged-equivalent',
+                    display_name: 'High School diploma, GED, or equivalent',
+                  },
+                  {
+                    value: 'some-college',
+                    display_name: 'Some college, but no degree',
+                  },
+                  {
+                    value: 'associates',
+                    display_name: 'Associates degree',
+                  },
+                  {
+                    value: 'bachelors',
+                    display_name: 'Bachelors degree',
+                  },
+                  {
+                    value: 'masters',
+                    display_name: 'Masters degree',
+                  },
+                  {
+                    value: 'professional',
+                    display_name: 'Professional degree',
+                  },
+                  {
+                    value: 'doctorate',
+                    display_name: 'Doctorate degree',
+                  },
+                  {
+                    value: 'declined',
+                    display_name: 'Prefer not to respond',
+                  },
+                ],
+              },
+              parent_education_level: {
+                choices: [
+                  {
+                    value: 'no-high-school',
+                    display_name: 'No High School',
+                  },
+                  {
+                    value: 'some-high-school',
+                    display_name: 'Some High School',
+                  },
+                  {
+                    value: 'high-school-ged-equivalent',
+                    display_name: 'High School diploma, GED, or equivalent',
+                  },
+                  {
+                    value: 'some-college',
+                    display_name: 'Some college, but no degree',
+                  },
+                  {
+                    value: 'associates',
+                    display_name: 'Associates degree',
+                  },
+                  {
+                    value: 'bachelors',
+                    display_name: 'Bachelors degree',
+                  },
+                  {
+                    value: 'masters',
+                    display_name: 'Masters degree',
+                  },
+                  {
+                    value: 'professional',
+                    display_name: 'Professional degree',
+                  },
+                  {
+                    value: 'doctorate',
+                    display_name: 'Doctorate degree',
+                  },
+                  {
+                    value: 'declined',
+                    display_name: 'Prefer not to respond',
+                  },
+                ],
+              },
+              military_history: {
+                choices: [
+                  {
+                    value: 'never-served',
+                    display_name: 'Never served in the military',
+                  },
+                  {
+                    value: 'training',
+                    display_name: 'Only on active duty for training',
+                  },
+                  {
+                    value: 'active',
+                    display_name: 'Now on active duty',
+                  },
+                  {
+                    value: 'previously-active',
+                    display_name: 'On active duty in the past, but not now',
+                  },
+                  {
+                    value: 'declined',
+                    display_name: 'Prefer not to respond',
+                  },
+                ],
+              },
+              work_status: {
+                choices: [
+                  {
+                    value: 'full-time',
+                    display_name: 'Employed, working full-time',
+                  },
+                  {
+                    value: 'part-time',
+                    display_name: 'Employed, working part-time',
+                  },
+                  {
+                    value: 'self-employed',
+                    display_name: 'Self-Employed',
+                  },
+                  {
+                    value: 'not-employed-looking',
+                    display_name: 'Not employed, looking for work',
+                  },
+                  {
+                    value: 'not-employed-not-looking',
+                    display_name: 'Not employed, not looking for work',
+                  },
+                  {
+                    value: 'unable',
+                    display_name: 'Unable to work',
+                  },
+                  {
+                    value: 'retired',
+                    display_name: 'Retired',
+                  },
+                  {
+                    value: 'other',
+                    display_name: 'Other',
+                  },
+                  {
+                    value: 'declined',
+                    display_name: 'Prefer not to respond',
+                  },
+                ],
+              },
+              current_work_sector: {
+                choices: [
+                  {
+                    value: 'accommodation-food',
+                    display_name: 'Accommodation and Food Services',
+                  },
+                  {
+                    value: 'administrative-support-waste-remediation',
+                    display_name: 'Administrative and Support and Waste Management and Remediation Services',
+                  },
+                  {
+                    value: 'agriculture-forestry-fishing-hunting',
+                    display_name: 'Agriculture, Forestry, Fishing and Hunting',
+                  },
+                  {
+                    value: 'arts-entertainment-recreation',
+                    display_name: 'Arts, Entertainment, and Recreation',
+                  },
+                  {
+                    value: 'construction',
+                    display_name: 'Construction',
+                  },
+                  {
+                    value: 'educational',
+                    display_name: 'Education Services',
+                  },
+                  {
+                    value: 'finance-insurance',
+                    display_name: 'Finance and Insurance',
+                  },
+                  {
+                    value: 'healthcare-social',
+                    display_name: 'Health Care and Social Assistance',
+                  },
+                  {
+                    value: 'information',
+                    display_name: 'Information',
+                  },
+                  {
+                    value: 'management',
+                    display_name: 'Management of Companies and Enterprises',
+                  },
+                  {
+                    value: 'manufacturing',
+                    display_name: 'Manufacturing',
+                  },
+                  {
+                    value: 'mining-quarry-oil-gas',
+                    display_name: 'Mining, Quarrying, and Oil and Gas Extraction',
+                  },
+                  {
+                    value: 'professional-scientific-technical',
+                    display_name: 'Professional, Scientific, and Technical Services',
+                  },
+                  {
+                    value: 'public-admin',
+                    display_name: 'Public Administration',
+                  },
+                  {
+                    value: 'real-estate',
+                    display_name: 'Real Estate and Rental and Leasing',
+                  },
+                  {
+                    value: 'retail',
+                    display_name: 'Retail Trade',
+                  },
+                  {
+                    value: 'transport-warehousing',
+                    display_name: 'Transportation and Warehousing',
+                  },
+                  {
+                    value: 'utilities',
+                    display_name: 'Utilities',
+                  },
+                  {
+                    value: 'trade',
+                    display_name: 'Wholesale Trade',
+                  },
+                  {
+                    value: 'other',
+                    display_name: 'Other',
+                  },
+                  {
+                    value: 'declined',
+                    display_name: 'Prefer not to respond',
+                  },
+                ],
+              },
+              future_work_sector: {
+                choices: [
+                  {
+                    value: 'accommodation-food',
+                    display_name: 'Accommodation and Food Services',
+                  },
+                  {
+                    value: 'administrative-support-waste-remediation',
+                    display_name: 'Administrative and Support and Waste Management and Remediation Services',
+                  },
+                  {
+                    value: 'agriculture-forestry-fishing-hunting',
+                    display_name: 'Agriculture, Forestry, Fishing and Hunting',
+                  },
+                  {
+                    value: 'arts-entertainment-recreation',
+                    display_name: 'Arts, Entertainment, and Recreation',
+                  },
+                  {
+                    value: 'construction',
+                    display_name: 'Construction',
+                  },
+                  {
+                    value: 'educational',
+                    display_name: 'Education Services',
+                  },
+                  {
+                    value: 'finance-insurance',
+                    display_name: 'Finance and Insurance',
+                  },
+                  {
+                    value: 'healthcare-social',
+                    display_name: 'Health Care and Social Assistance',
+                  },
+                  {
+                    value: 'information',
+                    display_name: 'Information',
+                  },
+                  {
+                    value: 'management',
+                    display_name: 'Management of Companies and Enterprises',
+                  },
+                  {
+                    value: 'manufacturing',
+                    display_name: 'Manufacturing',
+                  },
+                  {
+                    value: 'mining-quarry-oil-gas',
+                    display_name: 'Mining, Quarrying, and Oil and Gas Extraction',
+                  },
+                  {
+                    value: 'professional-scientific-technical',
+                    display_name: 'Professional, Scientific, and Technical Services',
+                  },
+                  {
+                    value: 'public-admin',
+                    display_name: 'Public Administration',
+                  },
+                  {
+                    value: 'real-estate',
+                    display_name: 'Real Estate and Rental and Leasing',
+                  },
+                  {
+                    value: 'retail',
+                    display_name: 'Retail Trade',
+                  },
+                  {
+                    value: 'transport-warehousing',
+                    display_name: 'Transportation and Warehousing',
+                  },
+                  {
+                    value: 'utilities',
+                    display_name: 'Utilities',
+                  },
+                  {
+                    value: 'trade',
+                    display_name: 'Wholesale Trade',
+                  },
+                  {
+                    value: 'other',
+                    display_name: 'Other',
+                  },
+                  {
+                    value: 'declined',
+                    display_name: 'Prefer not to respond',
+                  },
+                ],
+              },
+              user_ethnicity: {
+                child: {
+                  children: {
+                    ethnicity: {
+                      choices: [
+                        {
+                          value: 'american-indian-or-alaska-native',
+                          display_name: 'American Indian or Alaska Native',
+                        },
+                        {
+                          value: 'asian',
+                          display_name: 'Asian',
+                        },
+                        {
+                          value: 'black-or-african-american',
+                          display_name: 'Black or African American',
+                        },
+                        {
+                          value: 'hispanic-latin-spanish',
+                          display_name: 'Hispanic, Latin, or Spanish origin',
+                        },
+                        {
+                          value: 'middle-eastern-or-north-african',
+                          display_name: 'Middle Eastern or North African',
+                        },
+                        {
+                          value: 'native-hawaiian-or-pacific-islander',
+                          display_name: 'Native Hawaiian or Other Pacific Islander',
+                        },
+                        {
+                          value: 'white',
+                          display_name: 'White',
+                        },
+                        {
+                          value: 'other',
+                          display_name: 'Some other race, ethnicity, or origin',
+                        },
+                        {
+                          value: 'declined',
+                          display_name: 'Prefer not to respond',
+                        },
+                      ],
+                    },
+                  },
+                },
+              },
             },
-            formErrors: {},
-            intl: {},
-        };    
-        auth.getAuthenticatedHttpClient = jest.fn(() => ({
-            patch: async () => ({
-                data: { status: 200 },
-            catch: () => {},
-            }),
-        }));
-        auth.getAuthenticatedUser = jest.fn(() => ({ userId: 1 }));
-    });
+          },
+        },
+      },
+      formErrors: {},
+      intl: {},
+      forwardRef: () => {},
+      drafts: {},
+    };
+    auth.getAuthenticatedHttpClient = jest.fn(() => ({
+      patch: async () => ({
+        data: { status: 200 },
+        catch: () => {},
+      }),
+    }));
+    auth.getAuthenticatedUser = jest.fn(() => ({ userId: 1 }));
+  });
 
-    it('should render', () => {
-        const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
-        expect(wrapper).toMatchSnapshot();
-    });
+  it('should render', () => {
+    const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
+    expect(wrapper).toMatchSnapshot();
+  });
 
-    it('should render an Alert if an error occurs', () => {
-        props = {
-            ...props,
-            formErrors: {
-                demographicsError: "api-error"
-            }
-        };
+  it('should render an Alert if an error occurs', () => {
+    props = {
+      ...props,
+      formErrors: {
+        demographicsError: 'api-error',
+      },
+    };
 
-        const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
-        expect(wrapper).toMatchSnapshot();
-    });
-    
-    it('should set user input correctly when user provides gender self-description', () => {
-        props = {
-            ...props,
-            formValues: {
-                ...props.formValues,
-                demographics_gender: 'self-describe',
-                demographics_gender_description: 'test',
-            },
-        }; 
-       
-       const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
-       expect(wrapper).toMatchSnapshot();
-    });
+    const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
+    expect(wrapper).toMatchSnapshot();
+  });
 
-    it('should set user input correctly when user provides answers to work_status question', () => {
-        props = {
-            ...props,
-            formValues: {
-                ...props.formValues,
-                demographics_work_status: 'other',
-                demographics_work_status_description: 'test',
-            }
-        }
+  it('should set user input correctly when user provides gender self-description', () => {
+    props = {
+      ...props,
+      formValues: {
+        ...props.formValues,
+        demographics_gender: 'self-describe',
+        demographics_gender_description: 'test',
+      },
+    };
 
-        const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
-        expect(wrapper).toMatchSnapshot();
-    });
+    const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
+    expect(wrapper).toMatchSnapshot();
+  });
 
-    it('should render ethnicity text correctly', () => {
-        props = {
-            ...props,
-            formValues: {
-                ...props.formValues,
-                demographics_user_ethnicity: ['asian']
-            }
-        }
-        
-        const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
-        expect(wrapper).toMatchSnapshot();
-    });
+  it('should set user input correctly when user provides answers to work_status question', () => {
+    props = {
+      ...props,
+      formValues: {
+        ...props.formValues,
+        demographics_work_status: 'other',
+        demographics_work_status_description: 'test',
+      },
+    };
 
-    it('should render ethnicity correctly when multiple options are selected', () => {
-        props = {
-            ...props,
-            formValues: {
-                ...props.formValues,
-                demographics_user_ethnicity: ['hispanic-latin-spanish', 'white']
-            }
-        }
+    const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
+    expect(wrapper).toMatchSnapshot();
+  });
 
-        const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
-        expect(wrapper).toMatchSnapshot();
-    });
+  it('should render ethnicity text correctly', () => {
+    props = {
+      ...props,
+      formValues: {
+        ...props.formValues,
+        demographics_user_ethnicity: ['asian'],
+      },
+    };
 
-    it('should render an Alert when demographicsOptions props are empty', () => {
-        props = {
-            ...props,
-            formValues: {
-                demographicsOptions: ""
-            }
-        }
+    const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
+    expect(wrapper).toMatchSnapshot();
+  });
 
-        const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
-        expect(wrapper).toMatchSnapshot();
-    });
+  it('should render ethnicity correctly when multiple options are selected', () => {
+    props = {
+      ...props,
+      formValues: {
+        ...props.formValues,
+        demographics_user_ethnicity: ['hispanic-latin-spanish', 'white'],
+      },
+    };
+
+    const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it('should render an Alert when demographicsOptions props are empty', () => {
+    props = {
+      ...props,
+      formValues: {
+        demographicsOptions: null,
+      },
+    };
+
+    const wrapper = renderer.create(reduxWrapper(<IntlDemographicsSection {...props} />)).toJSON();
+    expect(wrapper).toMatchSnapshot();
+  });
 });

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

@@ -12,10 +12,48 @@ exports[`DemographicsSection should render 1`] = `
   </h2>
   <p>
     <a
+      className="pgn__hyperlink default-link standalone-link"
       href="http://localhost:5335/demographics"
+      onClick={[Function]}
+      rel="noopener noreferrer"
       target="_blank"
     >
-      Why does edX collect this information?
+      Why does localhost collect this information?
+      <span
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
+      >
+        <span
+          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>
   <div
@@ -48,10 +86,9 @@ exports[`DemographicsSection should render 1`] = `
               Gender identity
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -75,6 +112,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -112,10 +150,9 @@ exports[`DemographicsSection should render 1`] = `
               Race/Ethnicity identity
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -139,13 +176,13 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             <button
-              className="btn btn-link p-0"
-              onBlur={[Function]}
+              className="p-0 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               Add race/ethnicity identity
@@ -184,10 +221,9 @@ exports[`DemographicsSection should render 1`] = `
               Family income
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -211,6 +247,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -248,10 +285,9 @@ exports[`DemographicsSection should render 1`] = `
               U.S. Military status
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -275,6 +311,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -312,10 +349,9 @@ exports[`DemographicsSection should render 1`] = `
               Your education level
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -339,6 +375,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -376,10 +413,9 @@ exports[`DemographicsSection should render 1`] = `
               Parents/Guardians education level
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -403,6 +439,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -440,10 +477,9 @@ exports[`DemographicsSection should render 1`] = `
               Employment status
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -467,6 +503,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -504,10 +541,9 @@ exports[`DemographicsSection should render 1`] = `
               Current work industry
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -531,6 +567,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -568,10 +605,9 @@ exports[`DemographicsSection should render 1`] = `
               Future work industry
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -595,6 +631,7 @@ exports[`DemographicsSection should render 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -621,10 +658,48 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
   </h2>
   <p>
     <a
+      className="pgn__hyperlink default-link standalone-link"
       href="http://localhost:5335/demographics"
+      onClick={[Function]}
+      rel="noopener noreferrer"
       target="_blank"
     >
-      Why does edX collect this information?
+      Why does localhost collect this information?
+      <span
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
+      >
+        <span
+          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>
   <div
@@ -671,10 +746,9 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
               Gender identity
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -698,6 +772,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
@@ -735,10 +810,9 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
               Race/Ethnicity identity
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -762,13 +836,13 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             <button
-              className="btn btn-link p-0"
-              onBlur={[Function]}
+              className="p-0 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               Add race/ethnicity identity
@@ -807,10 +881,9 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
               Family income
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -834,6 +907,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
@@ -871,10 +945,9 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
               U.S. Military status
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -898,6 +971,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
@@ -935,10 +1009,9 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
               Your education level
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -962,6 +1035,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
@@ -999,10 +1073,9 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
               Parents/Guardians education level
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -1026,6 +1099,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
@@ -1063,10 +1137,9 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
               Employment status
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -1090,6 +1163,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
@@ -1127,10 +1201,9 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
               Current work industry
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -1154,6 +1227,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
@@ -1191,10 +1265,9 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
               Future work industry
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -1218,6 +1291,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
@@ -1244,10 +1318,48 @@ exports[`DemographicsSection should render an Alert when demographicsOptions pro
   </h2>
   <p>
     <a
+      className="pgn__hyperlink default-link standalone-link"
       href="http://localhost:5335/demographics"
+      onClick={[Function]}
+      rel="noopener noreferrer"
       target="_blank"
     >
-      Why does edX collect this information?
+      Why does localhost collect this information?
+      <span
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
+      >
+        <span
+          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>
   <div
@@ -1279,10 +1391,48 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
   </h2>
   <p>
     <a
+      className="pgn__hyperlink default-link standalone-link"
       href="http://localhost:5335/demographics"
+      onClick={[Function]}
+      rel="noopener noreferrer"
       target="_blank"
     >
-      Why does edX collect this information?
+      Why does localhost collect this information?
+      <span
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
+      >
+        <span
+          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>
   <div
@@ -1315,10 +1465,9 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
               Gender identity
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -1342,6 +1491,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1379,10 +1529,9 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
               Race/Ethnicity identity
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -1406,6 +1555,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
@@ -1443,10 +1593,9 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
               Family income
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -1470,6 +1619,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1507,10 +1657,9 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
               U.S. Military status
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -1534,6 +1683,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1571,10 +1721,9 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
               Your education level
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -1598,6 +1747,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1635,10 +1785,9 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
               Parents/Guardians education level
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -1662,6 +1811,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1699,10 +1849,9 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
               Employment status
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -1726,6 +1875,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1763,10 +1913,9 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
               Current work industry
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -1790,6 +1939,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1827,10 +1977,9 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
               Future work industry
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -1854,6 +2003,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1880,10 +2030,48 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
   </h2>
   <p>
     <a
+      className="pgn__hyperlink default-link standalone-link"
       href="http://localhost:5335/demographics"
+      onClick={[Function]}
+      rel="noopener noreferrer"
       target="_blank"
     >
-      Why does edX collect this information?
+      Why does localhost collect this information?
+      <span
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
+      >
+        <span
+          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>
   <div
@@ -1916,10 +2104,9 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
               Gender identity
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -1943,6 +2130,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -1980,10 +2168,9 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
               Race/Ethnicity identity
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2007,6 +2194,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Asian
@@ -2044,10 +2232,9 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
               Family income
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2071,6 +2258,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2108,10 +2296,9 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
               U.S. Military status
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2135,6 +2322,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2172,10 +2360,9 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
               Your education level
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2199,6 +2386,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2236,10 +2424,9 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
               Parents/Guardians education level
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2263,6 +2450,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2300,10 +2488,9 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
               Employment status
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2327,6 +2514,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2364,10 +2552,9 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
               Current work industry
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2391,6 +2578,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2428,10 +2616,9 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
               Future work industry
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2455,6 +2642,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2481,10 +2669,48 @@ exports[`DemographicsSection should set user input correctly when user provides
   </h2>
   <p>
     <a
+      className="pgn__hyperlink default-link standalone-link"
       href="http://localhost:5335/demographics"
+      onClick={[Function]}
+      rel="noopener noreferrer"
       target="_blank"
     >
-      Why does edX collect this information?
+      Why does localhost collect this information?
+      <span
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
+      >
+        <span
+          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>
   <div
@@ -2517,10 +2743,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Gender identity
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2544,6 +2769,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2581,10 +2807,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Race/Ethnicity identity
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2608,13 +2833,13 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             <button
-              className="btn btn-link p-0"
-              onBlur={[Function]}
+              className="p-0 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               Add race/ethnicity identity
@@ -2653,10 +2878,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Family income
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2680,6 +2904,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2717,10 +2942,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               U.S. Military status
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2744,6 +2968,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2781,10 +3006,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Your education level
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2808,6 +3032,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2845,10 +3070,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Parents/Guardians education level
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2872,6 +3096,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -2909,10 +3134,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Employment status
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -2936,6 +3160,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Other: test
@@ -2973,10 +3198,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Current work industry
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -3000,6 +3224,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3037,10 +3262,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Future work industry
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -3064,6 +3288,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3090,10 +3315,48 @@ exports[`DemographicsSection should set user input correctly when user provides
   </h2>
   <p>
     <a
+      className="pgn__hyperlink default-link standalone-link"
       href="http://localhost:5335/demographics"
+      onClick={[Function]}
+      rel="noopener noreferrer"
       target="_blank"
     >
-      Why does edX collect this information?
+      Why does localhost collect this information?
+      <span
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
+      >
+        <span
+          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>
   <div
@@ -3126,10 +3389,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Gender identity
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -3153,6 +3415,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
@@ -3190,10 +3453,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Race/Ethnicity identity
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -3217,13 +3479,13 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             <button
-              className="btn btn-link p-0"
-              onBlur={[Function]}
+              className="p-0 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               Add race/ethnicity identity
@@ -3262,10 +3524,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Family income
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -3289,6 +3550,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3326,10 +3588,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               U.S. Military status
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -3353,6 +3614,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3390,10 +3652,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Your education level
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -3417,6 +3678,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3454,10 +3716,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Parents/Guardians education level
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -3481,6 +3742,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3518,10 +3780,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Employment status
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -3545,6 +3806,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3582,10 +3844,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Current work industry
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -3609,6 +3870,7 @@ exports[`DemographicsSection should set user input correctly when user provides
             </button>
           </div>
           <p
+            className={null}
             data-hj-suppress={true}
           >
             Prefer not to respond
@@ -3646,10 +3908,9 @@ exports[`DemographicsSection should set user input correctly when user provides
               Future work industry
             </h6>
             <button
-              className="btn ml-3 btn-link"
-              onBlur={[Function]}
+              className="ml-3 btn btn-link"
+              disabled={false}
               onClick={[Function]}
-              onKeyDown={[Function]}
               type="button"
             >
               <svg
@@ -3673,6 +3934,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/name-change/NameChange.jsx

@@ -0,0 +1,203 @@
+import React, { useEffect, useState } from 'react';
+import { connect, useDispatch } from 'react-redux';
+import { useHistory } 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';
+
+function NameChangeModal({
+  targetFormId,
+  errors,
+  formValues,
+  intl,
+  saveState,
+}) {
+  const dispatch = useDispatch();
+  const { push } = useHistory();
+  const { username } = getAuthenticatedUser();
+  const [verifiedNameInput, setVerifiedNameInput] = useState(formValues.verified_name || '');
+  const [confirmedWarning, setConfirmedWarning] = useState(false);
+
+  function resetLocalState() {
+    setConfirmedWarning(false);
+    dispatch(requestNameChangeReset());
+  }
+
+  function handleChange(e) {
+    setVerifiedNameInput(e.target.value);
+  }
+
+  function handleClose() {
+    resetLocalState();
+    dispatch(closeForm(targetFormId));
+    dispatch(saveSettingsReset());
+  }
+
+  function 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();
+      push(`/id-verification?next=${encodeURIComponent('account/settings')}`);
+    }
+  }, [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,4 @@
+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,172 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Provider } from 'react-redux';
+import { Router } from 'react-router-dom';
+import configureStore from 'redux-mock-store';
+import {
+  fireEvent,
+  render,
+  screen,
+} from '@testing-library/react';
+import { createMemoryHistory } from 'history';
+
+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 history = createMemoryHistory();
+
+const IntlNameChange = injectIntl(NameChange);
+
+const mockStore = configureStore();
+
+describe('NameChange', () => {
+  let props = {};
+  let store = {};
+
+  const reduxWrapper = children => (
+    <Router history={history}>
+      <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(history.location.pathname).toEqual('/id-verification');
+  });
+});

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

@@ -5,20 +5,17 @@ import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 
 import Alert from '../Alert';
 
-const RequestInProgressAlert = (props) => {
-
-  return (
-    <Alert
-      className="alert-warning mt-n2"
-      icon={<FontAwesomeIcon className="mr-2" icon={faExclamationTriangle} />}
-    >
-      <FormattedMessage
-        id="account.settings.editable.field.password.reset.button.forbidden"
-        defaultMessage="Your previous request is in progress, please try again in few moments."
-        description="A message displayed when a previous password reset request is still in progress."
-      />
-    </Alert>
-  );
-};
+const RequestInProgressAlert = () => (
+  <Alert
+    className="alert-warning mt-n2"
+    icon={<FontAwesomeIcon className="mr-2" icon={faExclamationTriangle} />}
+  >
+    <FormattedMessage
+      id="account.settings.editable.field.password.reset.button.forbidden"
+      defaultMessage="Your previous request is in progress, please try again in few moments."
+      description="A message displayed when a previous password reset request is still in progress."
+    />
+  </Alert>
+);
 
 export default RequestInProgressAlert;

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

@@ -22,7 +22,7 @@ const ResetPassword = (props) => {
       </h6>
       <p>
         <StatefulButton
-          className="btn-link"
+          variant="link"
           state={status}
           onClick={(e) => {
             // Swallow clicks if the state is pending.

src/account-settings/reset-password/data/sagas.js

@@ -1,6 +1,8 @@
 import { put, call, takeEvery } from 'redux-saga/effects';
 
-import { resetPasswordBegin, resetPasswordForbidden, resetPasswordSuccess, RESET_PASSWORD } from './actions';
+import {
+  resetPasswordBegin, resetPasswordForbidden, resetPasswordSuccess, RESET_PASSWORD,
+} from './actions';
 import { postResetPassword } from './service';
 
 function* handleResetPassword(action) {

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

@@ -12,9 +12,8 @@ export const siteLanguageListSelector = createSelector(
 
 export const siteLanguageOptionsSelector = createSelector(
   siteLanguageSelector,
-  siteLanguage =>
-    siteLanguage.siteLanguageList.map(({ code, name }) => ({
-      value: code,
-      label: name,
-    })),
+  siteLanguage => siteLanguage.siteLanguageList.map(({ code, name }) => ({
+    value: code,
+    label: name,
+  })),
 );

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

@@ -1,7 +1,7 @@
 import { getConfig } from '@edx/frontend-platform';
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
+import { convertKeyNames, snakeCaseObject } from '@edx/frontend-platform/utils';
 import siteLanguageList from './constants';
-import { snakeCaseObject, convertKeyNames } from '../data/utils';
 
 export async function getSiteLanguageList() {
   return siteLanguageList;

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

@@ -2,61 +2,61 @@ import React from 'react';
 import renderer from 'react-test-renderer';
 import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';
 
-import JumpNav from "../JumpNav";
 import { BrowserRouter as Router } from 'react-router-dom';
 import { mergeConfig, setConfig } from '@edx/frontend-platform';
+import JumpNav from '../JumpNav';
 
-const IntlJumpNav = injectIntl(JumpNav); 
+const IntlJumpNav = injectIntl(JumpNav);
 
 describe('JumpNav', () => {
-    mergeConfig({
-        ENABLE_DEMOGRAPHICS_COLLECTION: false,
-    });
-    
-    let props = {};
-    
-    beforeEach(() => {
-        props = {
-            intl: {},
-            displayDemographicsLink: false,
-        };
-    });
-    
-    it('should not render Optional Information link', () => {
-        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">
-                    <IntlJumpNav {...props} />
-                </IntlProvider>
-            </Router>
-        ))
-        .toJSON();
+  mergeConfig({
+    ENABLE_DEMOGRAPHICS_COLLECTION: false,
+  });
 
-        expect(tree).toMatchSnapshot();
+  let props = {};
+
+  beforeEach(() => {
+    props = {
+      intl: {},
+      displayDemographicsLink: false,
+    };
+  });
+
+  it('should not render Optional Information link', () => {
+    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">
+          <IntlJumpNav {...props} />
+        </IntlProvider>
+      </Router>
+    ))
+      .toJSON();
+
+    expect(tree).toMatchSnapshot();
+  });
+
+  it('should render Optional Information link', () => {
+    setConfig({
+      ENABLE_DEMOGRAPHICS_COLLECTION: true,
     });
 
-    it('should render Optional Information link', () => {
-        setConfig({
-            ENABLE_DEMOGRAPHICS_COLLECTION: true,
-        });
+    props = {
+      ...props,
+      displayDemographicsLink: true,
+    };
 
-        props = {
-            ...props,
-            displayDemographicsLink: true,
-        }
+    const tree = renderer.create((
+      // Same as previous test
+      <Router>
+        <IntlProvider locale="en">
+          <IntlJumpNav {...props} />
+        </IntlProvider>
+      </Router>
+    ))
+      .toJSON();
 
-        const tree = renderer.create((
-            // Same as previous test
-            <Router>
-                <IntlProvider locale="en">
-                    <IntlJumpNav {...props} />
-                </IntlProvider>
-            </Router>
-        ))
-        .toJSON();
-
-        expect(tree).toMatchSnapshot();
-    });
+    expect(tree).toMatchSnapshot();
+  });
 });

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

@@ -11,14 +11,16 @@ class ThirdPartyAuth extends Component {
   onClickDisconnect = (e) => {
     e.preventDefault();
     const providerId = e.currentTarget.getAttribute('data-provider-id');
-    if (this.props.disconnectionStatuses[providerId] === 'pending') return;
+    if (this.props.disconnectionStatuses[providerId] === 'pending') {
+      return;
+    }
     const disconnectUrl = e.currentTarget.getAttribute('data-disconnect-url');
     this.props.disconnectAuth(disconnectUrl, providerId);
   }
 
   renderUnconnectedProvider(url, name) {
     return (
-      <React.Fragment>
+      <>
         <h6 aria-level="3">{name}</h6>
         <Hyperlink destination={url} className="btn btn-outline-primary">
           <FormattedMessage
@@ -28,7 +30,7 @@ class ThirdPartyAuth extends Component {
             values={{ name }}
           />
         </Hyperlink>
-      </React.Fragment>
+      </>
     );
   }
 
@@ -36,7 +38,7 @@ class ThirdPartyAuth extends Component {
     const hasError = this.props.errors[id];
 
     return (
-      <React.Fragment>
+      <>
         <h6 aria-level="3">
           {name}
           <span className="small font-weight-normal text-muted ml-2">
@@ -58,7 +60,7 @@ class ThirdPartyAuth extends Component {
         ) : null}
 
         <StatefulButton
-          className="btn-link"
+          variant="link"
           state={this.props.disconnectionStatuses[id]}
           labels={{
             default: (
@@ -75,7 +77,7 @@ class ThirdPartyAuth extends Component {
           data-disconnect-url={url}
           data-provider-id={id}
         />
-      </React.Fragment>
+      </>
     );
   }
 
@@ -85,9 +87,9 @@ class ThirdPartyAuth extends Component {
     return (
       <div className="form-group" key={id}>
         {
-          connected ?
-          this.renderConnectedProvider(disconnectUrl, name, id) :
-          this.renderUnconnectedProvider(connectUrl, name)
+          connected
+            ? this.renderConnectedProvider(disconnectUrl, name, id)
+            : this.renderUnconnectedProvider(connectUrl, name)
         }
       </div>
     );
@@ -98,13 +100,15 @@ 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."
       />
     );
   }
 
   render() {
-    if (this.props.providers === undefined) return null;
+    if (this.props.providers === undefined) {
+      return null;
+    }
 
     if (this.props.providers.length === 0) {
       return this.renderNoProviders();
@@ -114,7 +118,6 @@ class ThirdPartyAuth extends Component {
   }
 }
 
-
 ThirdPartyAuth.propTypes = {
   providers: PropTypes.arrayOf(PropTypes.shape({
     name: PropTypes.string,

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/hooks.js

@@ -0,0 +1,55 @@
+import { useEffect, useState } from 'react';
+
+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;
+}

src/i18n/messages/ar.json

@@ -1,292 +1,350 @@
 {
-  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another edX account.",
-  "account.settings.message.managed.settings": "Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help.",
-  "account.settings.message.managed.settings.support": "support",
-  "account.settings.page.heading": "Account Settings",
-  "account.settings.loading.message": "Loading...",
-  "account.settings.loading.error": "Error: {error}",
-  "account.settings.banner.beta.language": "You have set your language to {beta_language}, which is currently not fully translated. You can help us translate this language fully by joining the Transifex community and adding translations from English for learners that speak {beta_language}.",
-  "account.settings.banner.beta.language.action.switch.back": "Switch Back to {previous_language}",
-  "account.settings.banner.beta.language.action.help.translate": "Help Translate into {beta_language}",
-  "account.settings.section.account.information": "Account Information",
-  "account.settings.section.account.information.description": "These settings include basic information about your account.",
-  "account.settings.section.profile.information": "Profile Information",
-  "account.settings.section.demographics.information": "Optional Information",
-  "account.settings.section.site.preferences": "Site Preferences",
-  "account.settings.section.linked.accounts": "Linked Accounts",
-  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to edX.",
-  "account.settings.field.username": "Username",
-  "account.settings.field.username.help.text": "The name that identifies you on edX. You cannot change your username.",
-  "account.settings.field.full.name": "Full name",
-  "account.settings.field.full.name.empty": "Add name",
-  "account.settings.field.full.name.help.text": "The name that is used for ID verification and that appears on your certificates.",
-  "account.settings.field.email": "Email address (Sign in)",
-  "account.settings.field.email.empty": "Add email address",
-  "account.settings.field.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your email address.",
-  "account.settings.field.email.help.text": "You receive messages from edX and course teams at this address.",
-  "account.settings.field.secondary.email": "Recovery email address",
-  "account.settings.field.secondary.email.empty": "Add a recovery email address",
-  "account.settings.field.secondary.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your recovery email address.",
-  "account.settings.email.field.confirmation.header": "Pending confirmation",
-  "account.settings.field.dob": "Year of birth",
-  "account.settings.field.dob.empty": "Add year of birth",
-  "account.settings.field.year_of_birth.options.empty": "Select a year of birth",
-  "account.settings.field.country": "Country",
-  "account.settings.field.country.empty": "Add country",
-  "account.settings.field.country.options.empty": "Select a Country",
-  "account.settings.field.state": "State",
-  "account.settings.field.state.empty": "Add state",
-  "account.settings.field.state.options.empty": "Select a State",
-  "account.settings.field.site.language": "Site language",
-  "account.settings.field.site.language.help.text": "The language used throughout this site. This site is currently available in a limited number of languages.",
-  "account.settings.field.education": "Education",
-  "account.settings.field.education.empty": "Add level of education",
-  "account.settings.field.education.levels.empty": "Select a level of education",
-  "account.settings.field.education.levels.p": "Doctorate",
-  "account.settings.field.education.levels.m": "Master's or professional degree",
-  "account.settings.field.education.levels.b": "Bachelor's Degree",
-  "account.settings.field.education.levels.a": "Associate's degree",
-  "account.settings.field.education.levels.hs": "Secondary/high school",
-  "account.settings.field.education.levels.jhs": "Junior secondary/junior high/middle school",
-  "account.settings.field.education.levels.el": "Elementary/primary school",
-  "account.settings.field.education.levels.none": "No formal education",
-  "account.settings.field.education.levels.o": "Other education",
-  "account.settings.field.gender": "Gender",
-  "account.settings.field.gender.empty": "Add gender",
-  "account.settings.field.gender.options.empty": "Select a gender",
-  "account.settings.field.gender.options.f": "Female",
-  "account.settings.field.gender.options.m": "Male",
-  "account.settings.field.gender.options.o": "Other",
-  "account.settings.field.language.proficiencies": "Spoken languages",
-  "account.settings.field.language.proficiencies.empty": "Add a spoken language",
-  "account.settings.field.language_proficiencies.options.empty": "Select a Language",
-  "account.settings.field.time.zone": "Time zone",
-  "account.settings.field.time.zone.empty": "Set time zone",
-  "account.settings.field.time.zone.description": "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser’s local time zone.",
-  "account.settings.field.time.zone.default": "Default (Local Time Zone)",
-  "account.settings.field.time.zone.all": "All time zones",
-  "account.settings.field.time.zone.country": "Country time zones",
-  "account.settings.section.social.media": "Social Media Links",
-  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your edX profile.",
-  "account.settings.field.social.platform.name.linkedin": "LinkedIn",
-  "account.settings.field.social.platform.name.linkedin.empty": "Add LinkedIn profile",
-  "account.settings.jump.nav.delete.account": "Delete My Account",
-  "account.settings.field.social.platform.name.twitter": "Twitter",
-  "account.settings.field.social.platform.name.twitter.empty": "Add Twitter profile",
-  "account.settings.field.social.platform.name.facebook": "Facebook",
-  "account.settings.field.social.platform.name.facebook.empty": "Add Facebook profile",
-  "account.settings.editable.field.action.save": "Save",
-  "account.settings.editable.field.action.cancel": "Cancel",
-  "account.settings.editable.field.action.edit": "Edit",
-  "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
-  "account.settings.static.field.empty.no.admin": "No value set.",
-  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
-  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
-  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
-  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
-  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
-  "account.settings.coaching.consent.label.name": "Please confirm your name",
-  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
-  "account.settings.coaching.consent.success.header": "Success!",
-  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You can expect a message via email or SMS in the coming days.",
-  "account.settings.coaching.consent.success.continue": "Start my course",
-  "account.settings.coaching.managed.support": "support",
-  "account.settings.coaching.managed.alert": "Your name is managed by {managerTitle}. Contact your administrator for help.",
-  "account.settings.field.phone_number": "Phone Number",
-  "account.settings.field.phone_number.empty": "Add a phone number",
-  "account.settings.field.coaching_consent": "Coaching consent",
-  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available to learners with U.S. mobile phone numbers. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
-  "account.settings.field.coaching_consent.error": "A valid US phone number is required to opt into coaching",
-  "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
-  "account.settings.delete.account.header": "Delete My Account",
-  "account.settings.delete.account.subheader": "We're sorry to see you go!",
-  "account.settings.delete.account.text.1": "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.",
-  "account.settings.delete.account.text.2": "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.",
-  "account.settings.delete.account.text.3.link": "follow the instructions for printing or downloading a certificate",
-  "account.settings.delete.account.text.warning": "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.",
-  "account.settings.delete.account.text.change.instead": "Want to change your email, name, or password instead?",
-  "account.settings.delete.account.button": "Delete My Account",
-  "account.settings.delete.account.please.activate": "activate your account",
-  "account.settings.delete.account.please.unlink": "unlink all social media accounts",
-  "account.settings.delete.account.modal.header": "Are you sure?",
-  "account.settings.delete.account.modal.text.1": "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.",
-  "account.settings.delete.account.modal.text.2": "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.",
-  "account.settings.delete.account.modal.enter.password": "If you still wish to continue and delete your account, please enter your account password:",
-  "account.settings.delete.account.modal.confirm.delete": "Yes, Delete",
-  "account.settings.delete.account.modal.confirm.cancel": "Cancel",
-  "account.settings.delete.account.error.unable.to.delete": "Unable to delete account",
-  "account.settings.delete.account.error.no.password": "A password is required",
-  "account.settings.delete.account.error.invalid.password": "Password is incorrect",
-  "account.settings.delete.account.error.unable.to.delete.details": "Sorry, there was an error trying to process your request. Please try again later.",
-  "account.settings.delete.account.modal.after.header": "We're sorry to see you go!  Your account will be deleted shortly.",
-  "account.settings.delete.account.modal.after.text": "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.",
-  "account.settings.delete.account.modal.after.button": "Close",
-  "account.settings.delete.account.text.3": "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}.",
-  "account.settings.message.demographics.service.issue": "An error occurred attempting to retrieve or save your account information. Please try again later.",
-  "account.settings.field.demographics.gender": "Gender identity",
-  "account.settings.field.demographics.gender.empty": "Add gender identity",
-  "account.settings.field.demographics.gender.options.empty": "Select a gender identity",
-  "account.settings.field.demographics.gender_description": "Gender identity description",
-  "account.settings.field.demographics.gender_description.empty": "Enter description",
-  "account.settings.field.demographics.ethnicity": "Race/Ethnicity identity",
-  "account.settings.field.demographics.ethnicity.empty": "Add race/ethnicity identity",
-  "account.settings.field.demographics.ethnicity.options.empty": "Select all that apply",
-  "account.settings.field.demographics.income": "Family income",
-  "account.settings.field.demographics.income.empty": "Add family income",
-  "account.settings.field.demographics.income.options.empty": "Select a family income range",
-  "account.settings.field.demographics.military_history": "U.S. Military status",
-  "account.settings.field.demographics.military_history.empty": "Add military status",
-  "account.settings.field.demographics.military_history.options.empty": "Select military status",
-  "account.settings.field.demographics.learner_education_level": "Your education level",
-  "account.settings.field.demographics.learner_education_level.empty": "Add education level",
-  "account.settings.field.demographics.parent_education_level": "Parents/Guardians education level",
-  "account.settings.field.demographics.parent_education_level.empty": "Add education level",
-  "account.settings.field.demographics.education_level.options.empty": "Select education level",
-  "account.settings.field.demographics.work_status": "Employment status",
-  "account.settings.field.demographics.work_status.empty": "Add employment status",
-  "account.settings.field.demographics.work_status.options.empty": "Select employment status",
-  "account.settings.field.demographics.work_status_description": "Employment status description",
-  "account.settings.field.demographics.work_status_description.empty": "Enter description",
-  "account.settings.field.demographics.current_work_sector": "Current work industry",
-  "account.settings.field.demographics.current_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.future_work_sector": "Future work industry",
-  "account.settings.field.demographics.future_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.work_sector.options.empty": "Select work industry",
-  "account.settings.section.demographics.why": "Why does edX collect this information?",
-  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
-  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
-  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
-  "account.settings.editable.field.password.reset.button": "Reset Password",
-  "account.settings.editable.field.password.reset.button.forbidden": "Your previous request is in progress, please try again in few moments.",
-  "account.settings.editable.field.password.reset.label": "Password",
-  "account.settings.sso.link.account": "Sign in with {name}",
-  "account.settings.sso.account.connected": "Linked",
-  "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
-  "account.settings.sso.unlink.account": "Unlink {name} account",
-  "account.settings.sso.no.providers": "No accounts can be linked at this time.",
-  "id.verification.existing.request.denied.text": "You cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
-  "id.verification.next": "Next",
-  "id.verification.requirements.title": "Photo Verification Requirements",
-  "id.verification.requirements.description": "In order to complete Photo Verification online, you will need the following:",
-  "id.verification.requirements.card.device.title": "Device with Camera",
-  "id.verification.requirements.card.device.allow": "Allow",
-  "id.verification.requirements.card.id.title": "Photo Identification",
-  "id.verification.requirements.card.id.text": "You need a valid ID that contains your full name and photo.",
-  "id.verification.privacy.title": "Privacy Information",
-  "id.verification.privacy.need.photo.question": "Why does edX need my photo?",
-  "id.verification.privacy.need.photo.answer": "We use your verification photos to confirm your identity and ensure the validity of your certificate.",
-  "id.verification.privacy.do.with.photo.question": "What does edX do with this photo?",
-  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on edX after the verification process is complete.",
-  "id.verification.existing.request.title": "Identity Verification",
-  "id.verification.existing.request.pending.text": "You have already submitted your verification information. You will see a message on your dashboard when the verification process is complete (usually within 5 days).",
-  "id.verification.photo.take": "Take Photo",
-  "id.verification.photo.retake": "Retake Photo",
-  "id.verification.photo.enable.detection": "Enable Face Detection",
-  "id.verification.photo.enable.detection.portrait.help.text": "If checked, a box will appear around your face. Your face can be seen clearly if the box around it is blue. If your face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.enable.detection.id.help.text": "If checked, a box will appear around the face on your ID card. The face can be seen clearly if the box around it is blue. If the face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.feedback.correct": "Face is in a good position.",
-  "id.verification.photo.feedback.two.faces": "More than one face detected.",
-  "id.verification.photo.feedback.no.faces": "No face detected.",
-  "id.verification.photo.feedback.top.left": "Incorrect position. Top left.",
-  "id.verification.photo.feedback.top.center": "Incorrect position. Top center.",
-  "id.verification.photo.feedback.top.right": "Incorrect position. Top right.",
-  "id.verification.photo.feedback.center.left": "Incorrect position. Center left.",
-  "id.verification.photo.feedback.center.center": "Incorrect position. Too close to camera.",
-  "id.verification.photo.feedback.center.right": "Incorrect position. Center right.",
-  "id.verification.photo.feedback.bottom.left": "Incorrect position. Bottom left.",
-  "id.verification.photo.feedback.bottom.center": "Incorrect position. Bottom center.",
-  "id.verification.photo.feedback.bottom.right": "Incorrect position. Bottom right.",
-  "id.verification.camera.access.title": "Camera Permissions",
-  "id.verification.camera.access.title.success": "Camera Access Enabled",
-  "id.verification.camera.access.title.failed": "Camera Access Failed",
-  "id.verification.camera.access.click.allow": "Please make sure to click \"Allow\"",
-  "id.verification.camera.access.enable": "Enable Camera",
-  "id.verification.camera.access.problems": "Having problems?",
-  "id.verification.camera.access.skip": "Skip and upload image files instead",
-  "id.verification.camera.access.success": "Looks like your camera is working and ready.",
-  "id.verification.camera.access.failure": "It looks like we're unable to access your camera. You will need to upload image files of you and your photo id.",
-  "id.verification.camera.access.failure.temporary": "It looks like we're unable to access your camera. Please verify that your webcam is connected and that you have allowed your browser to access it.",
-  "id.verification.camera.access.failure.temporary.chrome": "To enable camera access in Chrome:",
-  "id.verification.camera.access.failure.temporary.chrome.step1": "Open Chrome.",
-  "id.verification.camera.access.failure.temporary.chrome.step2": "Navigate to More > Settings.",
-  "id.verification.camera.access.failure.temporary.chrome.step2.windows": "For Windows: Alt+F, Alt+E, or F10 followed by the spacebar",
-  "id.verification.camera.access.failure.temporary.chrome.step2.mac": "For Mac: Command+,",
-  "id.verification.camera.access.failure.temporary.chrome.step3": "Under the \"Privacy and security\" tab, select \"Site Settings\" and then \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.chrome.step4": "Under \"Blocked,\" find \"edx.org\" and select it.",
-  "id.verification.camera.access.failure.temporary.chrome.step5": "In the \"Permissions\" section, update the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.temporary.ie11": "To enable camera access in Internet Explorer:",
-  "id.verification.camera.access.failure.temporary.ie11.step1": "Open the Flash Player Settings Manager by navigating to Windows Settings > Control Panel > Flash Player.",
-  "id.verification.camera.access.failure.temporary.ie11.step2": "Select the \"Camera and Mic\" tab, and then select the \"Camera and Microphone Settings by Site\" button.",
-  "id.verification.camera.access.failure.temporary.ie11.step3": "Choose \"edx.org\" from the list of websites and change the permissions by selecting \"Allow\" in the dropdown menu.",
-  "id.verification.camera.access.failure.temporary.firefox": "To enable camera access in Firefox:",
-  "id.verification.camera.access.failure.temporary.firefox.step1": "Open Firefox.",
-  "id.verification.camera.access.failure.temporary.firefox.step2": "Enter \"about:preferences\" in the URL bar.",
-  "id.verification.camera.access.failure.temporary.firefox.step3": "Select the \"Privacy & Security\" tab, and navigate to the \"Permissions\" section.",
-  "id.verification.camera.access.failure.temporary.firefox.step4": "Next to \"Camera,\" select the \"Settings…\" button.",
-  "id.verification.camera.access.failure.temporary.firefox.step5": "In the search bar, enter \"edx.org.\"",
-  "id.verification.camera.access.failure.temporary.firefox.step6": "In the status column for \"edx.org,\" select \"Allow\" from the drop down.",
-  "id.verification.camera.access.failure.temporary.firefox.step7": "Select \"Save Changes.\"",
-  "id.verification.camera.access.failure.temporary.safari": "To enable camera access in Safari:",
-  "id.verification.camera.access.failure.temporary.safari.step1": "Open Safari.",
-  "id.verification.camera.access.failure.temporary.safari.step2": "Click on the Safari app menu, then select \"Preferences.\" You can also use Command+, as a keyboard shortcut.",
-  "id.verification.camera.access.failure.temporary.safari.step3": "Select the \"Websites\" tab and then select \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.safari.step4": "Select \"edx.org\" and change the camera permissions to \"Allow.\"",
-  "id.verification.photo.tips.title": "Helpful Photo Tips",
-  "id.verification.photo.tips.description": "Next, we'll need you to take a photo of your face. Please review the helpful tips below.",
-  "id.verification.photo.tips.list.title": "Photo Tips",
-  "id.verification.photo.tips.list.description": "To take a successful photo, make sure that:",
-  "id.verification.photo.tips.list.well.lit": "Your face is well-lit.",
-  "id.verification.photo.tips.list.inside.frame": "Your entire face fits inside the frame.",
-  "id.verification.portrait.photo.title.camera": "Take a Photo of Yourself",
-  "id.verification.portrait.photo.title.upload": "Upload a Photo of Yourself",
-  "id.verification.portrait.photo.preview.alt": "Preview of photo of user's face.",
-  "id.verification.portrait.photo.instructions.camera": "When your face is in position, use the Take Photo button below to take your photo.",
-  "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: .jpg, .jpeg, .png)",
-  "id.verification.camera.help.sight.question": "What if I can't see the camera image or if I can't see my photo to determine which side is visible?",
-  "id.verification.camera.help.sight.answer.portrait": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally the best position for a headshot is approximately 12-18 inches (30-45 centimeters) from the camera, with your head centered relative to the computer screen. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle.",
-  "id.verification.camera.help.sight.answer.id": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally, the best position for a photo of an ID card is 8-12 inches (20-30 centimeters) from the camera, with the ID card centered relative to the camera. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle. The most common reason for rejection is inability to read the text on the ID card.",
-  "id.verification.camera.help.difficulty.question.portrait": "What if I have difficulty holding my head in position relative to the camera?",
-  "id.verification.camera.help.difficulty.question.id": "What if I have difficulty holding my ID in position relative to the camera?",
-  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact edX support for additional suggestions.",
-  "id.verification.id.photo.unclear.question": "Is your ID image not clear or too blurry?",
-  "id.verification.id.tips.title": "Helpful ID Tips",
-  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid ID that includes your name. Please have your ID ready.",
-  "id.verification.id.tips.list.well.lit": "Your ID is well-lit.",
-  "id.verification.id.tips.list.clear": "Ensure that you can see your photo and clearly read your name.",
-  "id.verification.id.photo.title.camera": "Take a Photo of Your ID",
-  "id.verification.id.photo.title.upload": "Upload a Photo of Your ID",
-  "id.verification.id.photo.preview.alt": "Preview of photo ID.",
-  "id.verification.id.photo.instructions.camera": "When your ID is in position, use the Take Photo button below to take your photo.",
-  "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: .jpg, .jpeg, .png)",
-  "id.verification.id.photo.instructions.upload.error": "The file you have selected is too large. Please try again with a file less than 10MB.",
-  "id.verification.account.name.title": "Account Name Check",
-  "id.verification.account.name.instructions": "The name on your account and the name on your ID must be an exact match. If not, please click \"No\" to update your account name.",
-  "id.verification.account.name.radio.label": "Does the name on your ID match the Account Name below?",
-  "id.verification.account.name.radio.yes": "Yes",
-  "id.verification.account.name.radio.no": "No",
-  "id.verification.account.name.error": "Please update account name to match the name on your ID.",
-  "id.verification.account.name.warning.prefix": "Please Note:",
-  "id.verification.account.name.settings": "Account Settings",
-  "id.verification.account.name.label": "Account Name",
-  "id.verification.account.name.photo.alt": "Photo of your ID to be submitted.",
-  "id.verification.account.name.save": "Save and Next",
-  "id.verification.review.title": "Review Your Photos",
-  "id.verification.review.description": "Make sure we can verify your identity with the photos and information you have provided.",
-  "id.verification.review.portrait.label": "Your Portrait",
-  "id.verification.review.portrait.alt": "Photo of your face to be submitted.",
-  "id.verification.review.portrait.retake": "Retake Portrait Photo",
-  "id.verification.review.id.label": "Your Photo ID",
-  "id.verification.review.id.alt": "Photo of your ID to be submitted.",
-  "id.verification.review.id.retake": "Retake ID Photo",
-  "id.verification.review.confirm": "Submit",
-  "id.verification.review.error": "edX Support Page",
-  "id.verification.submitted.title": "Identity Verification in Progress",
-  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will see a message on your dashboard when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
-  "id.verification.return.dashboard": "Return to Your Dashboard",
-  "id.verification.return.course": "Return to Course",
-  "id.verification.request.camera.access.instructions": "In order to take a photo using your webcam, you may receive a browser prompt for access to your camera. {clickAllow}",
-  "id.verification.requirements.card.device.text": "You need a device that has a camera. If you receive a browser prompt for access to your camera, please make sure to click {allow}.",
-  "idv.submission.alert.error": "\n            We encountered a technical error while trying to submit ID verification.\n            This might be a temporary issue, so please try again in a few minutes.\n            If the problem persists,\n            please go to {support_link} for help.\n          ",
-  "id.verification.account.name.edit": "Edit{sr}"
+  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
+  "account.settings.message.managed.settings": "تتم إدارة إعدادات الملف الشخصي بواسطة {ManagerTitle}. اتصل بالمسؤول أو {support} للحصول على المساعدة.",
+  "account.settings.message.managed.settings.support": "الدعم",
+  "account.settings.page.heading": "إعدادات الحساب",
+  "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.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": "You can link your identity accounts to simplify signing in to {siteName}.",
+  "account.settings.field.username": "اسم المستخدم",
+  "account.settings.field.username.help.text": "The name that identifies you on {siteName}. You cannot change your username.",
+  "account.settings.field.full.name": "الاسم الكامل",
+  "account.settings.field.full.name.empty": "إضافة اسم",
+  "account.settings.field.full.name.help.text": "الاسم المستخدم للتحقق من هويتك والذي سوف يظهر على الشهادات الخاصة بك.",
+  "account.settings.field.full.name.help.text.default": "The name that appears on your public profile.",
+  "account.settings.field.full.name.help.text.default.certificate": "This name is selected to appear on your certificates and public-facing records.",
+  "account.settings.field.name.verified": "Verified name",
+  "account.settings.field.name.verified.help.text.verified": "This name has been verified by photo ID.",
+  "account.settings.field.name.verified.help.text.verified.proctored": "This name has been verified by proctoring.",
+  "account.settings.field.name.verified.help.text.verified.certificate": "This name has been verified by photo ID, and is selected to appear on your certificates and public-facing records.",
+  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "This name has been verified by proctoring, and is selected to appear on your certificates and public-facing records.",
+  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
+  "account.settings.field.name.verified.help.text.submitted.proctored": "Your proctored exam has been submitted. Verified name cannot be changed at this time. Please check back in 2-5 days.",
+  "account.settings.field.name.verified.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Verified name cannot be changed at this time.",
+  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "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.",
+  "account.settings.field.name.verified.verification.help": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
+  "account.settings.field.full.name.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Full name cannot be changed at this time.",
+  "account.settings.field.full.name.help.text.submitted.proctored": "Your proctored exam has been submitted. Full name cannot be changed at this time. Please check back in 2-5 days.",
+  "account.settings.field.full.name.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
+  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "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.",
+  "account.settings.field.name.verified.success.message": "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.",
+  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
+  "account.settings.field.name.verified.failure.message": "Your most recent identity verification attempt did not pass. Related account settings have been restored.",
+  "account.settings.field.name.verified.failure.message.header": "We were not able to verify your identity.",
+  "account.settings.field.name.verified.failure.message.help.link": "Learn more about ID verification",
+  "account.settings.field.name.verified.submitted.message": "Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete.",
+  "account.settings.field.name.verified.submitted.message.certificate": "When your request is approved, your updated name will appear on all associated certificates and public-facing records.",
+  "account.settings.field.name.verified.submitted.message.header": "Your name change request is almost complete!",
+  "account.settings.field.email": "البريد الالكتروني (الدخول)",
+  "account.settings.field.email.empty": "إضافة عنوان البريد الإلكتروني",
+  "account.settings.field.email.confirmation": "لقد أرسلنا رسالة تأكيد إلى {value}. انقر فوق الرابط في الرسالة لتحديث عنوان بريدك الإلكتروني.",
+  "account.settings.field.email.help.text": "You receive messages from {siteName} and course teams at this address.",
+  "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.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.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.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.o": "نوع آخر من التعليم",
+  "account.settings.field.gender": "الجنس",
+  "account.settings.field.gender.empty": "إضافة الجنس",
+  "account.settings.field.gender.options.empty": "اختر جنسًا",
+  "account.settings.field.gender.options.f": "أنثى",
+  "account.settings.field.gender.options.m": "ذكر",
+  "account.settings.field.gender.options.o": "آخر",
+  "account.settings.field.language.proficiencies": "لغة التحدّث",
+  "account.settings.field.language.proficiencies.empty": "إضافة لغة التحدث",
+  "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.all": "جميع المناطق الزمنية",
+  "account.settings.field.time.zone.country": "المنطقة الزمنية للدولة",
+  "account.settings.section.social.media": "روابط منصات التواصل الإجتماعي",
+  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
+  "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.twitter": "تويتر",
+  "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.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.field.name.certificate.select": "If checked, this name will appear on your certificates and public-facing records.",
+  "account.settings.field.name.modal.certificate.title": "Choose a preferred name for certificates and public-facing records",
+  "account.settings.field.name.modal.certificate.select": "Select a name",
+  "account.settings.field.name.modal.certificate.option.full": "Full Name",
+  "account.settings.field.name.modal.certificate.option.verified": "Verified Name",
+  "account.settings.field.name.modal.certificate.button.choose": "Choose name",
+  "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.success.continue": "البدء في مساقي",
+  "account.settings.coaching.managed.support": "الدعم",
+  "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.delete.account.before.proceeding": "قبل المتابعة، يرجى {actionLink}.",
+  "account.settings.delete.account.header": "احذف حسابي",
+  "account.settings.delete.account.subheader": "نأسف لذهابك!",
+  "account.settings.delete.account.text.1": "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.",
+  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on {siteName}.",
+  "account.settings.delete.account.text.2.edX": "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.",
+  "account.settings.delete.account.text.3.link": "Follow these instructions for printing or downloading a certificate",
+  "account.settings.delete.account.text.warning": "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}.",
+  "account.settings.delete.account.text.change.instead": "هل تريد تغيير البريد الإلكتروني أو الاسم أو كلمة المرور بدلاً من ذلك؟",
+  "account.settings.delete.account.button": "احذف حسابي",
+  "account.settings.delete.account.please.activate": "تنشيط حسابك",
+  "account.settings.delete.account.please.confirm": "confirm your account",
+  "account.settings.delete.account.please.unlink": "إلغاء ربط جميع حسابات التواصل الاجتماعي",
+  "account.settings.delete.account.modal.header": "هل أنت متأكد؟",
+  "account.settings.delete.account.modal.text.1": "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.",
+  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on {siteName}.",
+  "account.settings.delete.account.modal.text.2.edX": "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.",
+  "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.modal.after.button": "إغلاق ",
+  "account.settings.delete.account.text.3.edX": "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}.",
+  "account.settings.delete.account.text.3": "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.",
+  "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.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.work_status": "الحالة الوظيفية",
+  "account.settings.field.demographics.work_status.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.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": "Why does {siteName} collect this information?",
+  "account.settings.name.change.title.id": "This name change requires identity verification",
+  "account.settings.name.change.title.begin": "Before we begin",
+  "account.settings.name.change.warning.one": "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.",
+  "account.settings.name.change.warning.two": "This action cannot be undone without verifying your identity.",
+  "account.settings.name.change.id.name.label": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
+  "account.settings.name.change.id.name.placeholder": "Enter the name on your photo ID",
+  "account.settings.name.change.error.valid.name": "Please enter a valid name.",
+  "account.settings.name.change.error.general": "A technical error occurred. Please try again.",
+  "account.settings.name.change.continue": "Continue",
+  "account.settings.name.change.cancel": "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.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": "We cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
+  "id.verification.next": "التالي",
+  "id.verification.support": "support",
+  "id.verification.example.card.alt": "مثال على بطاقة هوية صحيحة بالاسم الكامل وصورة.",
+  "id.verification.requirements.title": "متطلبات التحقق من الصورة",
+  "id.verification.requirements.description": "In order to complete Photo Verification, you will need the following:",
+  "id.verification.requirements.card.device.title": "جهاز مزود بكاميرا",
+  "id.verification.requirements.card.device.allow": "موافق",
+  "id.verification.requirements.card.id.title": "Photo Identification Card",
+  "id.verification.requirements.card.id.text": "You need a valid identification card that contains your full name and photo, such as a driver’s license or passport.",
+  "id.verification.privacy.title": "بيانات الخصوصية.",
+  "id.verification.privacy.need.photo.question": "Why does {siteName} need my photo?",
+  "id.verification.privacy.need.photo.answer": "نستخدم صور التحقق الخاصة بك لتأكيد هويتك والتأكد من صحة شهادتك.",
+  "id.verification.privacy.do.with.photo.question": "What does {siteName} do with this photo?",
+  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.",
+  "id.verification.access.blocked.title": "التحقق من الهوية",
+  "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.camera.access.title": "صلاحيات الكاميرا",
+  "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.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.step4": "ضمن \"قائمة الحظر\"، ابحث عن \"edx.org\" وحدده.",
+  "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\" من قائمة مواقع ويب وقم بتغيير الصلاحيات من خلال تحديد \"السماح\" في القائمة المنسدلة.",
+  "id.verification.camera.access.failure.temporary.firefox": "لتمكين الوصول للكاميرا في متصفّح فايرفوكس: ",
+  "id.verification.camera.access.failure.temporary.firefox.step1": "فتح متصفّح فايرفوكس.",
+  "id.verification.camera.access.failure.temporary.firefox.step2": "أدخل \"about:preferences\" في شريط عنوان الرابط.",
+  "id.verification.camera.access.failure.temporary.firefox.step3": "حدد علامة التبويب \"الخصوصية والأمان\"، وانتقل إلى القسم \"الصلاحيات\".",
+  "id.verification.camera.access.failure.temporary.firefox.step4": "بجوار \"Camera\" (الكاميرا)، حدد \"Settings…\" (الإعدادات…) الزر.",
+  "id.verification.camera.access.failure.temporary.firefox.step5": "في شريط البحث أدخل \"edx.org.\"",
+  "id.verification.camera.access.failure.temporary.firefox.step6": "في عمود الحالة لـ \"edx.org,\" حدد \"السماح\" من القائمة المنسدلة.",
+  "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.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.photo.tips.list.description": "لالتقاط صورة ناجحة، يُرجى التأكّد ممّا يلي:",
+  "id.verification.photo.tips.list.well.lit": "أنّ الإضاءة جيّدة على وجهك.",
+  "id.verification.photo.tips.list.inside.frame": "أنّ وجهك داخل إطار الصورة بالكامل.",
+  "id.verification.portrait.photo.title.camera": "التقط صورة لنفسك",
+  "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": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
+  "id.verification.id.photo.unclear.question": "Is your ID card image not clear or too blurry?",
+  "id.verification.id.tips.title": "Helpful Identification Card Tips",
+  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid identification card that includes your full name and photo, such as a driver’s license or passport. Please have your ID ready.",
+  "id.verification.id.tips.list.well.lit": "Your identification card is well-lit.",
+  "id.verification.id.tips.list.clear": "تأكد من قدرتك على رؤية صورتك وقراءة اسمك بوضوح.",
+  "id.verification.id.photo.title.camera": "Take a Photo of Your Identification Card",
+  "id.verification.id.photo.title.upload": "Upload a Photo of Your Identification Card",
+  "id.verification.id.photo.preview.alt": "معاينة صورة الهوية.",
+  "id.verification.id.photo.instructions.camera": "When your ID is in position, use the Take Photo button below to take your photo. Please use a passport, driver’s license, or another identification card that includes your full name and a picture of your face.",
+  "id.verification.id.photo.instructions.upload": "Please upload a photo of your identification card. 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.name.check.title": "Double-Check Your Name",
+  "id.verification.name.check.instructions": "Does the name below match the name on your photo ID? If not, update the name below to match your photo ID.",
+  "id.verification.name.check.mismatch.information": "If the name below does not match your photo ID, your identity verification will be denied.",
+  "id.verification.name.error": "Please enter your name as it appears on your photo ID.",
+  "id.verification.account.name.warning.prefix": "يُرجى الملاحظة:",
+  "id.verification.account.name.settings": "إعدادات الحساب",
+  "id.verification.name.label": "Name",
+  "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": "Your Identification Card",
+  "id.verification.review.id.alt": "Photo of your identification card to be submitted.",
+  "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": "{siteName} Support Page",
+  "id.verification.submitted.title": "جارِ التحقق من الهوية",
+  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will be notified when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
+  "id.verification.return.dashboard": "العودة إلى لوحة المعلومات",
+  "id.verification.return.course": "العودة للمساق",
+  "id.verification.return.generic": "Return",
+  "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.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}"
 }

src/i18n/messages/es_419.json

@@ -1,5 +1,5 @@
 {
-  "account.settings.message.duplicate.tpa.provider": "La cuenta de {provider} seleccionada ya está vinculada con otra cuenta de edX. ",
+  "account.settings.message.duplicate.tpa.provider": "La cuenta de {provider} seleccionada ya está vinculada con otra cuenta de {siteName}. ",
   "account.settings.message.managed.settings": "Los ajustes en el perfil son administrados por {managerTitle}. Contacte su administrador o {support} para obtener ayuda.",
   "account.settings.message.managed.settings.support": "soporte",
   "account.settings.page.heading": "Configuración de cuenta",
@@ -14,16 +14,40 @@
   "account.settings.section.demographics.information": "Información opcional",
   "account.settings.section.site.preferences": "Preferencias del sitio",
   "account.settings.section.linked.accounts": "Cuentas vinculadas",
-  "account.settings.section.linked.accounts.description": "Puedes vincular tus cuentas de redes sociales para simplificar el proceso de iniciar sesión en edX.",
+  "account.settings.section.linked.accounts.description": "Puedes vincular tus cuentas de redes sociales para simplificar el proceso de iniciar sesión en {siteName}.",
   "account.settings.field.username": "Nombre de usuario",
-  "account.settings.field.username.help.text": "El nombre que lo identifica en edX. No podrá cambiar el nombre de usuario.",
+  "account.settings.field.username.help.text": "El nombre que lo identifica en {siteName}. No podrá cambiar el nombre de usuario.",
   "account.settings.field.full.name": "Nombre completo",
   "account.settings.field.full.name.empty": "Añade nombre",
   "account.settings.field.full.name.help.text": "El nombre que es usado para la verificación de identidad y aparece en sus certificados.",
+  "account.settings.field.full.name.help.text.default": "El nombre que aparece en tu perfil público.",
+  "account.settings.field.full.name.help.text.default.certificate": "Este nombre está seleccionado para aparecer en tus certificados y registros públicos.",
+  "account.settings.field.name.verified": "Nombre verificado",
+  "account.settings.field.name.verified.help.text.verified": "Este nombre ha sido verificado por una identificación con foto.",
+  "account.settings.field.name.verified.help.text.verified.proctored": "Este nombre ha sido verificado por supervisión.",
+  "account.settings.field.name.verified.help.text.verified.certificate": "Este nombre ha sido verificado por una identificación con foto y está seleccionado para aparecer en sus certificados y registros públicos.",
+  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "Este nombre se ha verificado mediante supervisión y se ha seleccionado para que aparezca en sus certificados y registros públicos.",
+  "account.settings.field.name.verified.help.text.submitted": "La verificación ha sido enviada. Este proceso usualmente toma 48 horas o menos. El nombre verificado no puede ser modificado en este momento. ",
+  "account.settings.field.name.verified.help.text.submitted.proctored": "Su examen supervisado ha sido enviado. El nombre verificado no se puede cambiar en este momento. Vuelva a consultar en 2-5 días.",
+  "account.settings.field.name.verified.help.text.submitted.certificate": "Cuando el proceso de verificación de identidad sea exitoso, este nombre aparecerá en tus certificados y registros públicos. El nombre verificado no puede ser cambiado en este momento. ",
+  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "Una vez que su examen supervisado pase la revisión, este nombre aparecerá en su certificado y en los registros públicos. El nombre verificado no se puede cambiar en este momento.",
+  "account.settings.field.name.verified.verification.help": "Ingrese su nombre tal como aparece en su tarjeta de identificación vigente de estudiante, trabajo o emitida por el gobierno.",
+  "account.settings.field.full.name.help.text.submitted": "La verificación ha sido enviada. Este proceso usualmente toma 48 horas o menos. El nombre verificado no puede ser modificado en este momento. ",
+  "account.settings.field.full.name.help.text.submitted.proctored": "Su examen supervisado ha sido enviado. El nombre completo no se puede cambiar en este momento. Vuelva a consultar en 2-5 días.",
+  "account.settings.field.full.name.help.text.submitted.certificate": "En cuanto el proceso de verificación de identidad sea exitoso, este nombre aparecerá en tus certificados y registros públicos. El nombre completo no puede ser cambiado en este momento. ",
+  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "Una vez que su examen supervisado pase la revisión, este nombre aparecerá en sus certificados y registros públicos. El nombre completo no se puede cambiar en este momento.",
+  "account.settings.field.name.verified.success.message": "Tu solicitud de verificación de identidad se ha completado exitosamente. Ahora puedes seleccionar el nombre prefieres que aparezca en tus certificados y registros públicos.",
+  "account.settings.field.name.verified.success.message.header": "¡Tu solicitud de cambio de nombre está completada!",
+  "account.settings.field.name.verified.failure.message": "Tu más reciente intento de verificación de ID no fue aprobado. Las configuraciones relacionadas con el proceso se han restablecido.",
+  "account.settings.field.name.verified.failure.message.header": "No pudimos verificar tu identidad.",
+  "account.settings.field.name.verified.failure.message.help.link": "Más información sobre la verificación de ID",
+  "account.settings.field.name.verified.submitted.message": "Tu solicitud de verificación de identidad ha sido enviada y usualmente se tarda entre 24 a 48 horas para completarse. ",
+  "account.settings.field.name.verified.submitted.message.certificate": "Cuando la solicitud esté aprobada, la actualización de tu nombre aparecerá en todos los certificados asociados y registros públicos.",
+  "account.settings.field.name.verified.submitted.message.header": "¡Tu solicitud de cambio de nombre esta por completarse!",
   "account.settings.field.email": "Correo electrónico (Ingresar)",
   "account.settings.field.email.empty": "Agregar correo electrónico",
   "account.settings.field.email.confirmation": "Le enviamos un mensaje de confirmación a  {value}. Hacer click en la liga del mensaje para actualizar su correo electrónico.",
-  "account.settings.field.email.help.text": "Recibes mensajes de edX y equipos del curso en esta dirección.",
+  "account.settings.field.email.help.text": "Tienes un mensaje de {siteName} y el equipo de curso en esta dirección. ",
   "account.settings.field.secondary.email": "Correo electrónico de recuperación",
   "account.settings.field.secondary.email.empty": "Agregar un correo electrónico de recuperación",
   "account.settings.field.secondary.email.confirmation": "Le enviamos un mensaje de confirmación a  {value}. Hacer click en la liga del mensaje para actualizar su correo electrónico.",
@@ -57,7 +81,7 @@
   "account.settings.field.gender.options.f": "Femenino",
   "account.settings.field.gender.options.m": "Masculino",
   "account.settings.field.gender.options.o": "Otro",
-  "account.settings.field.language.proficiencies": "Idiomas hablados",
+  "account.settings.field.language.proficiencies": "Idioma hablado",
   "account.settings.field.language.proficiencies.empty": "Agregar un idioma hablado",
   "account.settings.field.language_proficiencies.options.empty": "Selecciona lenguaje",
   "account.settings.field.time.zone": "Zona horaria",
@@ -67,7 +91,7 @@
   "account.settings.field.time.zone.all": "Todas las zonas horarias",
   "account.settings.field.time.zone.country": "Zonas horarias",
   "account.settings.section.social.media": "Enlaces de redes sociales",
-  "account.settings.section.social.media.description": "Opcionalmente, conecte sus cuentas personales a los iconos de redes sociales en su perfil de edX.",
+  "account.settings.section.social.media.description": "Opcionalmente, conecte sus cuentas personales a los iconos de redes sociales en su perfil de {siteName}.",
   "account.settings.field.social.platform.name.linkedin": "LinkedIn",
   "account.settings.field.social.platform.name.linkedin.empty": "Agregar perfil de LinkedIn",
   "account.settings.jump.nav.delete.account": "Eliminar mi cuenta",
@@ -80,6 +104,12 @@
   "account.settings.editable.field.action.edit": "Editar",
   "account.settings.static.field.empty": "No hay valor establecido. Contacte su administrador {enterprise} para hacer cambios.",
   "account.settings.static.field.empty.no.admin": "No hay valor establecido.",
+  "account.settings.field.name.certificate.select": "En caso de ser seleccionado, este nombre aparecerá en tus certificados y registros públicos. ",
+  "account.settings.field.name.modal.certificate.title": "Escoge un nombre de preferencia para tus certificados y registros públicos.",
+  "account.settings.field.name.modal.certificate.select": "Selecciona un nombre",
+  "account.settings.field.name.modal.certificate.option.full": "Nombre completo",
+  "account.settings.field.name.modal.certificate.option.verified": "Nombre verificado",
+  "account.settings.field.name.modal.certificate.button.choose": "Escoge un nombre",
   "account.settings.coaching.consent.welcome.header": "Empecemos",
   "account.settings.coaching.consent.welcome.subheader": "Estamos aquí para ustede desde el inicio hasta el final",
   "account.settings.coaching.consent.description": "Los programas de MicroBachelors incluyen entrenamiento que se enfoca en su carrera, educación y cómo logrará resultados a través de la comunicación individual con un profesional experimentado. Si está interesado, proporcione la información a continuación y haga clic en \"Enviar\", y nuestro socio asesor se comunicará con usted por correo electrónico y / o mensaje de texto para ayudarlo a avanzar. Los términos y Condiciones aplican.*",
@@ -89,7 +119,7 @@
   "account.settings.coaching.consent.label.name": "Por favor confirme su nombre",
   "account.settings.coaching.consent.label.phone-number": "Ingrese su número de teléfono móvil",
   "account.settings.coaching.consent.success.header": "¡Éxito!",
-  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You can expect a message via email or SMS in the coming days.",
+  "account.settings.coaching.consent.success.message": "Estás inscrito para coaching. Puedes esperar un mensaje por correo electrónico o SMS en los próximos días.",
   "account.settings.coaching.consent.success.continue": "Iniciar mi curso",
   "account.settings.coaching.managed.support": "soporte",
   "account.settings.coaching.managed.alert": "{ManagerTitle} administra su Nombre. Póngase en contacto con su administrador para obtener ayuda.",
@@ -101,17 +131,20 @@
   "account.settings.delete.account.before.proceeding": "Antes de continuar, por favor {actionLink}.",
   "account.settings.delete.account.header": "Eliminar mi cuenta",
   "account.settings.delete.account.subheader": "¡Sentimos que te vayas!",
-  "account.settings.delete.account.text.1": "Cuidado: la eliminación de tu cuenta y datos personales es permanente e irreversible. edX no podrá recuperar ni tu cuenta ni los datos eliminados.",
-  "account.settings.delete.account.text.2": "Una vez su cuenta haya sido eliminada, no la podrá usar para tomar cursos en la app de edX, edx.org o en cualquier otro sitio administrado por edX. Esto incluye el acceso a edx.org desde el sistema de su empleador o  universidad y el acceso a páginas privadas ofrecidas por MIT Open Learning, Wharton Executive Education y Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "siga las instrucciones para imprimir o descargar el certificado",
-  "account.settings.delete.account.text.warning": "Warning: La eliminación de la cuenta es permanente. Por favor lee la información de más arriba con atención antes de proceder. Esta es una acción irreversible, y no podrás volver a usar el mismo correo electrónico en edX.",
+  "account.settings.delete.account.text.1": "Para tener en cuenta: La eliminación de su cuenta y sus datos personales es permanente y no se puede deshacer. {siteName} no podrá recuperar tu cuenta o la información que sea eliminada.",
+  "account.settings.delete.account.text.2": "Una véz tu cuenta haya sido eliminada, no podrás usarla para tomar cursos en {siteName}. ",
+  "account.settings.delete.account.text.2.edX": "Una vez su cuenta haya sido eliminada, no la podrá usar para tomar cursos en la app de edX, edx.org o en cualquier otro sitio administrado por edX. Esto incluye el acceso a edx.org desde el sistema de su empleador o  universidad y el acceso a páginas privadas ofrecidas por MIT Open Learning, Wharton Executive Education y Harvard Medical School.",
+  "account.settings.delete.account.text.3.link": "Sigue estas instrucciones para imprimir o descargar un certificado. ",
+  "account.settings.delete.account.text.warning": "Atención: la eliminación de su cuenta es permanente. Por favor lea el previo aviso cautelosamente antes de proceder, ya que esto es una acción irreversible, y no podrá usar el mismo correo electrónico en {siteName}.",
   "account.settings.delete.account.text.change.instead": "En lugar de eso, ¿quieres cambiar tu correo electrónico, nombre o contraseña?",
   "account.settings.delete.account.button": "Eliminar mi cuenta",
   "account.settings.delete.account.please.activate": "activar su cuenta",
+  "account.settings.delete.account.please.confirm": "Confirma tu cuenta",
   "account.settings.delete.account.please.unlink": "Desvincular todas las cuentas de redes sociales.",
   "account.settings.delete.account.modal.header": "¿Está seguro?",
-  "account.settings.delete.account.modal.text.1": "Has seleccionado “Eliminar mi cuenta”. La eliminación de tu cuenta y datos personales es permanente e irreversible. edX no será capaz de recuperar tu cuenta o los datos que se hayan borrado.",
-  "account.settings.delete.account.modal.text.2": "Si procedes, no será posible usar esta cuenta para tomar cursos ni en la aplicación móvil de edX, ni en edx.org, ni en cualquier otro sitio hospedado por edX. Esto incluye el acceso a edx.org desde el sistema de tu empleador o universidad, y el acceso a sitios privados ofrecidos por MIT Open Learning, Wharton Executive Education, y Harvard Medical School.",
+  "account.settings.delete.account.modal.text.1": "Has seleccionado la opción ''Eliminar mi cuenta''. Ten en cuenta que la eliminación de tu cuenta e información personal es permanente y no puede revertirse. {siteName} no será capaz de recuperar tu cuenta o información una vez esta sea eliminada. ",
+  "account.settings.delete.account.modal.text.2": "Si aceptas proceder, ya no podrás usar esta cuenta para tomar cursos en {siteName}.",
+  "account.settings.delete.account.modal.text.2.edX": "Si procedes, no será posible usar esta cuenta para tomar cursos ni en la aplicación móvil de edX, ni en edx.org, ni en cualquier otro sitio hospedado por edX. Esto incluye el acceso a edx.org desde el sistema de tu empleador o universidad, y el acceso a sitios privados ofrecidos por MIT Open Learning, Wharton Executive Education, y Harvard Medical School.",
   "account.settings.delete.account.modal.enter.password": "Si deseas continuar y eliminar tu cuenta, por favor introduce la contraseña de tu cuenta:",
   "account.settings.delete.account.modal.confirm.delete": "Si, Eliminar",
   "account.settings.delete.account.modal.confirm.cancel": "Cancelar",
@@ -122,7 +155,8 @@
   "account.settings.delete.account.modal.after.header": "¡Sentimos que te vayas! Tu cuenta será eliminada en breve.",
   "account.settings.delete.account.modal.after.text": "La eliminación de cuenta, incluyendo la eliminación de las listas de correo electrónico, puede tardar unas semanas en procesarse totalmente en nuestro sistema. Si quieres renunciar a recibir correos antes de que la eliminación se haya completado, por favor date de baja mediante el enlace que aparece al final de los correos.",
   "account.settings.delete.account.modal.after.button": "Cerrar",
-  "account.settings.delete.account.text.3": "Puede que también pierdas el acceso a los certificados verificados y otros certificados de programas como los de los MicroMasters. Si quieres hacer una copia de dichos certificados para tus archivos antes de proceder a la eliminación, {actionLink}.",
+  "account.settings.delete.account.text.3.edX": "También podrás perder el acceso a certificados verificados y a otras credenciales del programa como los certificados MicroMasters. Puedes hacer una copia de estos registros antes de proceder con la eliminación. {actionLink}.",
+  "account.settings.delete.account.text.3": "También podrás perder el acceso a certificados verificados y a otras credenciales del programa. Puedes hacer una copia de estos registros antes de proceder con la eliminación. ",
   "account.settings.message.demographics.service.issue": "Ocurrió un error al intentar recuperar o guardar la información de tu cuenta. Por favor inténtalo más tarde.",
   "account.settings.field.demographics.gender": "Identidad de género",
   "account.settings.field.demographics.gender.empty": "Añade identidad de género",
@@ -136,7 +170,7 @@
   "account.settings.field.demographics.income.empty": "Añade ingreso familiar",
   "account.settings.field.demographics.income.options.empty": "Selecciona un rango de ingreso familiar",
   "account.settings.field.demographics.military_history": "Estatus militar en EE.UU.",
-  "account.settings.field.demographics.military_history.empty": "Add military status",
+  "account.settings.field.demographics.military_history.empty": "Añade estatus militar",
   "account.settings.field.demographics.military_history.options.empty": "Selecciona estatus militar",
   "account.settings.field.demographics.learner_education_level": "Tu nivel educacional",
   "account.settings.field.demographics.learner_education_level.empty": "Añade nivel educacional",
@@ -153,7 +187,17 @@
   "account.settings.field.demographics.future_work_sector": "Área profesional futura",
   "account.settings.field.demographics.future_work_sector.empty": "Añade área profesional",
   "account.settings.field.demographics.work_sector.options.empty": "Selecciona área profesional",
-  "account.settings.section.demographics.why": "¿Por qué edX obtiene esta información?",
+  "account.settings.section.demographics.why": "¿Por qué {siteName} recauda esta información?",
+  "account.settings.name.change.title.id": "Este cambio de nombre requiere de verificación de identidad.",
+  "account.settings.name.change.title.begin": "Antes de empezar",
+  "account.settings.name.change.warning.one": "Atención: esta acción actualizará el nombre que aparece en todos los certificados obtenidos a través de esta cuenta en el pasado y en aquellos en que actualmente estás obteniendo o que adquirirás en el futuro.",
+  "account.settings.name.change.warning.two": "Esta acción no podrá revertirse sin antes verificar tu identidad.",
+  "account.settings.name.change.id.name.label": "Ingrese su nombre tal como aparece en su tarjeta de identificación vigente de estudiante, trabajo o emitida por el gobierno.",
+  "account.settings.name.change.id.name.placeholder": "Enter the name on your photo ID",
+  "account.settings.name.change.error.valid.name": "Por favor ingresa un nombre valido.",
+  "account.settings.name.change.error.general": "Ha ocurrido un error técnico. Por favor intentalo de nuevo.",
+  "account.settings.name.change.continue": "Continuar",
+  "account.settings.name.change.cancel": "Cancelar",
   "error.notfound.message": "La página que estas buscando no está disponible o hay un error en la URL. Por favor, comprueba la URL y vuelve a intentarlo.",
   "account.settings.editable.field.password.reset.button.confirmation.support.link": "soporte técnico",
   "account.settings.editable.field.password.reset.button.confirmation": "Hemos mandado un mensaje a {email}. Haz clic en el enlace en el mensaje para restablecer tu contraseña. ¿No recibiste el mensaje? Contáctate con {technicalSupportLink}.",
@@ -165,128 +209,142 @@
   "account.settings.sso.account.disconnect.error": "Hubo un problema al desconectar esta Cuenta. Si el problema persiste, contacte soporte.",
   "account.settings.sso.unlink.account": "Desvincular la cuenta de {accountName} ",
   "account.settings.sso.no.providers": "No se pueden vincular cuentas en este momento.",
-  "id.verification.existing.request.denied.text": "You cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
+  "id.verification.access.blocked.denied": "No podemos verificar tu identidad en este momento. Si aún no has activado tu cuenta, comprueba en tu carpeta de correo no deseado el correo de activación de {email}.",
   "id.verification.next": "Siguiente",
+  "id.verification.support": "soporte",
+  "id.verification.example.card.alt": "Ejemplo de un documento de identidad válido con foto y nombre completo.",
   "id.verification.requirements.title": "Requerimientos de verificación por foto",
-  "id.verification.requirements.description": "Para completar la verificación por foto en línea, necesitarás lo siguiente:",
+  "id.verification.requirements.description": "Para completa la verificación de foto, necesitarás lo siguiente:",
   "id.verification.requirements.card.device.title": "Dispositivo con cámara",
   "id.verification.requirements.card.device.allow": "Permitir",
-  "id.verification.requirements.card.id.title": "Identificación por foto",
-  "id.verification.requirements.card.id.text": "Necesitas un ID válido que contenga tu nombre completo y tu foto.",
-  "id.verification.privacy.title": "Privacy Information",
-  "id.verification.privacy.need.photo.question": "¿Por qué edX necesita mi foto?",
+  "id.verification.requirements.card.id.title": "Tarjeta de identificación con foto",
+  "id.verification.requirements.card.id.text": "Necesitas una tarjeta de identificación válida que contenga tu nombre completo y foto, similar a una licencia de conducir o pasaporte.",
+  "id.verification.privacy.title": "Información de privacidad",
+  "id.verification.privacy.need.photo.question": "¿Por qué {siteName} necesita mi foto?",
   "id.verification.privacy.need.photo.answer": "Utilizamos tus fotos de verificación para confirmar tu identidad y garantizar la validez de tu certificado.",
-  "id.verification.privacy.do.with.photo.question": "¿Qué hace edX con esta foto?",
-  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on edX after the verification process is complete.",
-  "id.verification.existing.request.title": "Verificación de identidad",
-  "id.verification.existing.request.pending.text": "You have already submitted your verification information. You will see a message on your dashboard when the verification process is complete (usually within 5 days).",
+  "id.verification.privacy.do.with.photo.question": "¿Qué hace {siteName} con esta foto?",
+  "id.verification.privacy.do.with.photo.answer": "Encriptamos de forma segura tu foto y la enviamos a nuestro servicio de autorización para su revisión. Tu foto e información no se guardan ni se ven en ninguna parte de {siteName} después de que se completa el proceso de verificación.",
+  "id.verification.access.blocked.title": "Verificación de identidad",
+  "id.verification.access.blocked.enrollment": "Actualmente, no estás inscrito en un curso que requiera verificación de identidad.",
+  "id.verification.access.blocked.pending": "Ya has enviado tu información de verificación de identidad. Recibirás un mensaje en tu panel principal cuando el proceso de verificación esté completado (usualmente dentro de los 5 días).",
   "id.verification.photo.take": "Tomar la foto",
-  "id.verification.photo.retake": "Tomar nuevamente la foto",
-  "id.verification.photo.enable.detection": "Enable Face Detection",
-  "id.verification.photo.enable.detection.portrait.help.text": "If checked, a box will appear around your face. Your face can be seen clearly if the box around it is blue. If your face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.enable.detection.id.help.text": "If checked, a box will appear around the face on your ID card. The face can be seen clearly if the box around it is blue. If the face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.feedback.correct": "Face is in a good position.",
-  "id.verification.photo.feedback.two.faces": "More than one face detected.",
-  "id.verification.photo.feedback.no.faces": "No face detected.",
-  "id.verification.photo.feedback.top.left": "Incorrect position. Top left.",
-  "id.verification.photo.feedback.top.center": "Incorrect position. Top center.",
-  "id.verification.photo.feedback.top.right": "Incorrect position. Top right.",
-  "id.verification.photo.feedback.center.left": "Incorrect position. Center left.",
-  "id.verification.photo.feedback.center.center": "Incorrect position. Too close to camera.",
-  "id.verification.photo.feedback.center.right": "Incorrect position. Center right.",
-  "id.verification.photo.feedback.bottom.left": "Incorrect position. Bottom left.",
-  "id.verification.photo.feedback.bottom.center": "Incorrect position. Bottom center.",
-  "id.verification.photo.feedback.bottom.right": "Incorrect position. Bottom right.",
+  "id.verification.photo.retake": "¿Tomar nuevamente la foto?",
+  "id.verification.photo.enable.detection": "Habilitar la detección de rostro",
+  "id.verification.photo.enable.detection.portrait.help.text": "Si está marcada, aparecerá un cuadro alrededor de tu cara. Tu rostro se puede ver claramente si el cuadro que lo rodea es azul. Si Tu cara no está en una buena posición o es indetectable, el cuadro será rojo.",
+  "id.verification.photo.enable.detection.id.help.text": "Si está marcada, aparecerá una casilla alrededor de la cara de tu documento de identificación. La cara se puede ver claramente si la caja que la rodea es azul. Si la cara no está en una buena posición o es indetectable, el cuadro será rojo.",
+  "id.verification.photo.feedback.correct": "La cara está en una buena posición.",
+  "id.verification.photo.feedback.two.faces": "Más de un rostro detectado.",
+  "id.verification.photo.feedback.no.faces": "No se detectó el rostro.",
+  "id.verification.photo.feedback.top.left": "Posición incorrecta. Arriba a la izquierda.",
+  "id.verification.photo.feedback.top.center": "Posición incorrecta. Centro Superior.",
+  "id.verification.photo.feedback.top.right": "Posición incorrecta. Parte superior derecha.",
+  "id.verification.photo.feedback.center.left": "Posición incorrecta. Centro izquierda.",
+  "id.verification.photo.feedback.center.center": "Posición incorrecta. Demasiado cerca de la cámara.",
+  "id.verification.photo.feedback.center.right": "Posición incorrecta. Centro derecha.",
+  "id.verification.photo.feedback.bottom.left": "Posición incorrecta. Abajo a la izquierda.",
+  "id.verification.photo.feedback.bottom.center": "Posición incorrecta. Parte inferior central.",
+  "id.verification.photo.feedback.bottom.right": "Posición incorrecta. Abajo a la derecha.",
   "id.verification.camera.access.title": "Permisos de la cámara",
-  "id.verification.camera.access.title.success": "Camera Access Enabled",
-  "id.verification.camera.access.title.failed": "Camera Access Failed",
+  "id.verification.camera.access.title.success": "Acceso a la cámara habilitado",
+  "id.verification.camera.access.title.failed": "Acceso a la cámara no habilitado",
   "id.verification.camera.access.click.allow": "Por favor asegúrate de hacer clic en \"Permitir\"",
   "id.verification.camera.access.enable": "Habilitar cámara",
   "id.verification.camera.access.problems": "¿Tienes problemas?",
   "id.verification.camera.access.skip": "Omitir y cargar un archivo de imagen",
   "id.verification.camera.access.success": "Parece que tu cámara está funcionando y está lista.",
-  "id.verification.camera.access.failure": "It looks like we're unable to access your camera. You will need to upload image files of you and your photo id.",
-  "id.verification.camera.access.failure.temporary": "It looks like we're unable to access your camera. Please verify that your webcam is connected and that you have allowed your browser to access it.",
-  "id.verification.camera.access.failure.temporary.chrome": "To enable camera access in Chrome:",
-  "id.verification.camera.access.failure.temporary.chrome.step1": "Open Chrome.",
-  "id.verification.camera.access.failure.temporary.chrome.step2": "Navigate to More > Settings.",
-  "id.verification.camera.access.failure.temporary.chrome.step2.windows": "For Windows: Alt+F, Alt+E, or F10 followed by the spacebar",
-  "id.verification.camera.access.failure.temporary.chrome.step2.mac": "For Mac: Command+,",
-  "id.verification.camera.access.failure.temporary.chrome.step3": "Under the \"Privacy and security\" tab, select \"Site Settings\" and then \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.chrome.step4": "Under \"Blocked,\" find \"edx.org\" and select it.",
-  "id.verification.camera.access.failure.temporary.chrome.step5": "In the \"Permissions\" section, update the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.temporary.ie11": "To enable camera access in Internet Explorer:",
-  "id.verification.camera.access.failure.temporary.ie11.step1": "Open the Flash Player Settings Manager by navigating to Windows Settings > Control Panel > Flash Player.",
-  "id.verification.camera.access.failure.temporary.ie11.step2": "Select the \"Camera and Mic\" tab, and then select the \"Camera and Microphone Settings by Site\" button.",
-  "id.verification.camera.access.failure.temporary.ie11.step3": "Choose \"edx.org\" from the list of websites and change the permissions by selecting \"Allow\" in the dropdown menu.",
-  "id.verification.camera.access.failure.temporary.firefox": "To enable camera access in Firefox:",
-  "id.verification.camera.access.failure.temporary.firefox.step1": "Open Firefox.",
-  "id.verification.camera.access.failure.temporary.firefox.step2": "Enter \"about:preferences\" in the URL bar.",
-  "id.verification.camera.access.failure.temporary.firefox.step3": "Select the \"Privacy & Security\" tab, and navigate to the \"Permissions\" section.",
-  "id.verification.camera.access.failure.temporary.firefox.step4": "Next to \"Camera,\" select the \"Settings…\" button.",
-  "id.verification.camera.access.failure.temporary.firefox.step5": "In the search bar, enter \"edx.org.\"",
-  "id.verification.camera.access.failure.temporary.firefox.step6": "In the status column for \"edx.org,\" select \"Allow\" from the drop down.",
-  "id.verification.camera.access.failure.temporary.firefox.step7": "Select \"Save Changes.\"",
-  "id.verification.camera.access.failure.temporary.safari": "To enable camera access in Safari:",
-  "id.verification.camera.access.failure.temporary.safari.step1": "Open Safari.",
-  "id.verification.camera.access.failure.temporary.safari.step2": "Click on the Safari app menu, then select \"Preferences.\" You can also use Command+, as a keyboard shortcut.",
-  "id.verification.camera.access.failure.temporary.safari.step3": "Select the \"Websites\" tab and then select \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.safari.step4": "Select \"edx.org\" and change the camera permissions to \"Allow.\"",
+  "id.verification.camera.access.failure": "Parece que no podemos acceder a tu cámara. Deberás cargar archivos de imagen de tu rostro y tu identificación con foto.",
+  "id.verification.camera.access.failure.temporary": "Parece que no podemos acceder a tu cámara. Verifica que tu cámara web esté conectada y que permitiste que tu navegador acceda a ella.",
+  "id.verification.camera.access.failure.temporary.chrome": "Para habilitar el acceso a la cámara en Chrome:",
+  "id.verification.camera.access.failure.temporary.chrome.step1": "Abrir Chrome.",
+  "id.verification.camera.access.failure.temporary.chrome.step2": "Navega a Más > Configuración.",
+  "id.verification.camera.access.failure.temporary.chrome.step2.windows": "Para Windows: Alt + F, Alt + E o F10 seguido de la barra espaciadora",
+  "id.verification.camera.access.failure.temporary.chrome.step2.mac": "Para Mac: Comando +,",
+  "id.verification.camera.access.failure.temporary.chrome.step3": "En la pestaña \"Privacidad y seguridad\", selecciona \"Configuración del sitio\" y luego \"Cámara.\"",
+  "id.verification.camera.access.failure.temporary.chrome.step4": "En \"Bloqueado\", busca \"edx.org\" y selecciónalo.",
+  "id.verification.camera.access.failure.temporary.chrome.step5": "En la sección \"Permisos\", actualiza los permisos de la cámara a \"Permitir\".",
+  "id.verification.camera.access.failure.temporary.ie11": "Para habilitar el acceso a la cámara en Internet Explorer:",
+  "id.verification.camera.access.failure.temporary.ie11.step1": "Abre el Administrador de configuración de Flash Player navegando a Configuración de Windows > Panel de control > Flash Player.",
+  "id.verification.camera.access.failure.temporary.ie11.step2": "Selecciona la pestaña \"Cámara y micrófono,\" y luego selecciona el botón \"Configuración de cámara y micrófono por sitio.\"",
+  "id.verification.camera.access.failure.temporary.ie11.step3": "Elige \"edx.org\" de la lista de sitios web y cambia los permisos seleccionando \"Permitir\" en el menú desplegable.",
+  "id.verification.camera.access.failure.temporary.firefox": "Para habilitar el acceso a la cámara en Firefox:",
+  "id.verification.camera.access.failure.temporary.firefox.step1": "Abrir Firefox.",
+  "id.verification.camera.access.failure.temporary.firefox.step2": "Coloca \"about:preferences\" en la barra del URL.",
+  "id.verification.camera.access.failure.temporary.firefox.step3": "Selecciona la pestaña \"Privacidad y seguridad\" y navega hasta la sección \"Permisos.\"",
+  "id.verification.camera.access.failure.temporary.firefox.step4": "Junto a \"Cámara,\" selecciona el botón \"Configuración...\"",
+  "id.verification.camera.access.failure.temporary.firefox.step5": "En la barra de búsqueda, ingresa \"edx.org\".",
+  "id.verification.camera.access.failure.temporary.firefox.step6": "En la columna de estado de \"edx.org\", selecciona \"Permitir\" en el menú desplegable.",
+  "id.verification.camera.access.failure.temporary.firefox.step7": "Selecciona \"Guardar cambios.\"",
+  "id.verification.camera.access.failure.temporary.safari": "Para habilitar el acceso a la cámara en Safari:",
+  "id.verification.camera.access.failure.temporary.safari.step1": "Abrir Safari.",
+  "id.verification.camera.access.failure.temporary.safari.step2": "Haz clic en el menú de la aplicación Safari y luego selecciona \"Preferencias\". También puedes utilizar Command +, como método abreviado de teclado.",
+  "id.verification.camera.access.failure.temporary.safari.step3": "Selecciona la pestaña \"Sitios web\" y luego selecciona \"Cámara\".",
+  "id.verification.camera.access.failure.temporary.safari.step4": "Selecciona \"edx.org\" y cambia los permisos de la cámara a \"Permitir.\"",
+  "id.verification.camera.access.failure.unsupported": "Parece que tu navegar no soporta el acceso a la cámara.",
+  "id.verification.camera.access.failure.unsupported.chrome.explanation": "El navegador de Chrome actualmente no soporta el acceso a la cámara en dispositivos iOS, como iPhones y iPads.",
+  "id.verification.camera.access.failure.unsupported.instructions": "Por favor utilice otro navegador para completar la verificación de identidad.",
   "id.verification.photo.tips.title": "Consejos útiles de fotos",
-  "id.verification.photo.tips.description": "Next, we'll need you to take a photo of your face. Please review the helpful tips below.",
-  "id.verification.photo.tips.list.title": "Photo Tips",
-  "id.verification.photo.tips.list.description": "To take a successful photo, make sure that:",
-  "id.verification.photo.tips.list.well.lit": "Your face is well-lit.",
-  "id.verification.photo.tips.list.inside.frame": "Your entire face fits inside the frame.",
-  "id.verification.portrait.photo.title.camera": "Take a Photo of Yourself",
-  "id.verification.portrait.photo.title.upload": "Upload a Photo of Yourself",
-  "id.verification.portrait.photo.preview.alt": "Preview of photo of user's face.",
-  "id.verification.portrait.photo.instructions.camera": "When your face is in position, use the Take Photo button below to take your photo.",
-  "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: .jpg, .jpeg, .png)",
-  "id.verification.camera.help.sight.question": "What if I can't see the camera image or if I can't see my photo to determine which side is visible?",
-  "id.verification.camera.help.sight.answer.portrait": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally the best position for a headshot is approximately 12-18 inches (30-45 centimeters) from the camera, with your head centered relative to the computer screen. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle.",
-  "id.verification.camera.help.sight.answer.id": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally, the best position for a photo of an ID card is 8-12 inches (20-30 centimeters) from the camera, with the ID card centered relative to the camera. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle. The most common reason for rejection is inability to read the text on the ID card.",
-  "id.verification.camera.help.difficulty.question.portrait": "What if I have difficulty holding my head in position relative to the camera?",
-  "id.verification.camera.help.difficulty.question.id": "What if I have difficulty holding my ID in position relative to the camera?",
-  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact edX support for additional suggestions.",
-  "id.verification.id.photo.unclear.question": "Is your ID image not clear or too blurry?",
-  "id.verification.id.tips.title": "Helpful ID Tips",
-  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid ID that includes your name. Please have your ID ready.",
-  "id.verification.id.tips.list.well.lit": "Your ID is well-lit.",
-  "id.verification.id.tips.list.clear": "Ensure that you can see your photo and clearly read your name.",
-  "id.verification.id.photo.title.camera": "Take a Photo of Your ID",
-  "id.verification.id.photo.title.upload": "Upload a Photo of Your ID",
-  "id.verification.id.photo.preview.alt": "Preview of photo ID.",
-  "id.verification.id.photo.instructions.camera": "When your ID is in position, use the Take Photo button below to take your photo.",
-  "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: .jpg, .jpeg, .png)",
-  "id.verification.id.photo.instructions.upload.error": "The file you have selected is too large. Please try again with a file less than 10MB.",
-  "id.verification.account.name.title": "Account Name Check",
-  "id.verification.account.name.instructions": "The name on your account and the name on your ID must be an exact match. If not, please click \"No\" to update your account name.",
-  "id.verification.account.name.radio.label": "Does the name on your ID match the Account Name below?",
-  "id.verification.account.name.radio.yes": "Yes",
-  "id.verification.account.name.radio.no": "No",
-  "id.verification.account.name.error": "Please update account name to match the name on your ID.",
-  "id.verification.account.name.warning.prefix": "Please Note:",
-  "id.verification.account.name.settings": "Account Settings",
-  "id.verification.account.name.label": "Account Name",
-  "id.verification.account.name.photo.alt": "Photo of your ID to be submitted.",
-  "id.verification.account.name.save": "Save and Next",
-  "id.verification.review.title": "Review Your Photos",
-  "id.verification.review.description": "Make sure we can verify your identity with the photos and information you have provided.",
-  "id.verification.review.portrait.label": "Your Portrait",
-  "id.verification.review.portrait.alt": "Photo of your face to be submitted.",
-  "id.verification.review.portrait.retake": "Retake Portrait Photo",
-  "id.verification.review.id.label": "Your Photo ID",
-  "id.verification.review.id.alt": "Photo of your ID to be submitted.",
-  "id.verification.review.id.retake": "Retake ID Photo",
-  "id.verification.review.confirm": "Submit",
-  "id.verification.review.error": "edX Support Page",
-  "id.verification.submitted.title": "Identity Verification in Progress",
-  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will see a message on your dashboard when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
-  "id.verification.return.dashboard": "Return to Your Dashboard",
-  "id.verification.return.course": "Return to Course",
-  "id.verification.request.camera.access.instructions": "In order to take a photo using your webcam, you may receive a browser prompt for access to your camera. {clickAllow}",
-  "id.verification.requirements.card.device.text": "You need a device that has a camera. If you receive a browser prompt for access to your camera, please make sure to click {allow}.",
-  "idv.submission.alert.error": "\n            We encountered a technical error while trying to submit ID verification.\n            This might be a temporary issue, so please try again in a few minutes.\n            If the problem persists,\n            please go to {support_link} for help.\n          ",
-  "id.verification.account.name.edit": "Edit{sr}"
+  "id.verification.photo.tips.description": "A continuación, necesitaremos que tomes una foto de tu rostro. Por favor, revisa los siguientes consejos útiles.",
+  "id.verification.photo.tips.list.title": "Consejos para fotos",
+  "id.verification.photo.tips.list.description": "Para tomar la foto correctamente, asegúrate de: ",
+  "id.verification.photo.tips.list.well.lit": "El rostro esté bien iluminado",
+  "id.verification.photo.tips.list.inside.frame": "Tu cara está completamente dentro del marco de la foto.",
+  "id.verification.portrait.photo.title.camera": "Toma una foto de ti mismo",
+  "id.verification.portrait.photo.instructions.camera": "Cuando tu rostro esté en posición, usa el botón Tomar foto a continuación para tomar tu foto.",
+  "id.verification.camera.help.sight.question": "¿Qué pasa si no puedo ver la imagen de la cámara o si no puedo ver mi foto para determinar qué lado es visible?",
+  "id.verification.camera.help.sight.answer.portrait": "Es posible que puedas completar el procedimiento de captura de imágenes sin ayuda, pero es posible que necesites un par de intentos de envío para que la cámara se coloque correctamente. La posición óptima de la cámara varía con cada computadora, pero generalmente la mejor distancia para una foto de rostro es aproximadamente a 12 a 18 pulgadas (30 a 45 centímetros) de la cámara, con la cabeza centrada en relación con la pantalla de la computadora. Si las fotos que envías son rechazadas, intenta mover la computadora o la orientación de la cámara para cambiar el ángulo de iluminación.",
+  "id.verification.camera.help.sight.answer.id": "Es posible que puedas completar el procedimiento de captura de imágenes sin ayuda, pero es posible que necesites un par de intentos de envío para que la cámara se coloque correctamente. El posicionamiento óptimo de la cámara varía con cada computadora pero, generalmente, la mejor distancia para una foto de un documento de identificación es a 8 a 12 pulgadas (20 a 30 centímetros) de la cámara, con el documento de identificación centrado en relación con la cámara. Si las fotos que envías son rechazadas, intenta mover la computadora o la orientación de la cámara para cambiar el ángulo de iluminación. La razón más común de rechazo es la imposibilidad de leer el texto del documento de identidad.",
+  "id.verification.camera.help.difficulty.question.portrait": "¿Qué sucede si tengo dificultades para mantener la cabeza en posición con respecto a la cámara?",
+  "id.verification.camera.help.difficulty.question.id": "¿Qué sucede si tengo dificultades para mantener mi identificación en posición con respecto a la cámara?",
+  "id.verification.camera.help.difficulty.answer": "Si requieres de asistencia para cargar una foto, contacta el equipo de soporte de {siteName} para sugerencias adicionales.",
+  "id.verification.id.photo.unclear.question": "¿No es clara la foto de tu tarjeta de ID ó es muy borrosa?",
+  "id.verification.id.tips.title": "Tips de ayuda para tarjetas de identificación",
+  "id.verification.id.tips.description": "Después, necesitaremos que tomes una foto de una tarjeta de ID válida que tengas en la que incluya tu nombre completo y foto, como una licencia de conducción o un pasaporte. Por favor ten tú ID lista.",
+  "id.verification.id.tips.list.well.lit": "Tu tarjeta de identificación está bien iluminada.",
+  "id.verification.id.tips.list.clear": "Asegúrate de que puedes ver tu foto y leer claramente tu nombre.",
+  "id.verification.id.photo.title.camera": "Toma una foto de tu tarjeta de identificación",
+  "id.verification.id.photo.title.upload": "Sube una foto de tu tarjeta de identificación",
+  "id.verification.id.photo.preview.alt": "Previsualización de Foto ID",
+  "id.verification.id.photo.instructions.camera": "Cuando tú ID este en posición, utiliza el botón de tomar foto que se encuentra debajo para proceder a tomar tu foto. Por favor usa un pasaporte, licencia de conducción, u otra tarjeta de identificación que incluya tu nombre completo y una foto de tu rostro.",
+  "id.verification.id.photo.instructions.upload": "Por favor sube una foto de tu identificación. Asegurate de que todo el ID encaje dentro de el marco y que este bien iluminado. El tamaño del archivo debe ser por debajo de 10 MB. Los formatos soportados son: ",
+  "id.verification.id.photo.instructions.upload.error.invalidFileType": "El archivo que has seleccionado no cumple con el tipo de imágenes soportadas. Por favor escoge entre los siguientes formatos:",
+  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "El archivo que has seleccionado es demasiado grande. Vuelve a intentarlo con un archivo de menos de 10 MB.",
+  "id.verification.name.check.title": "Revisa nuevamente tu nombre",
+  "id.verification.name.check.instructions": "Does the name below match the name on your photo ID? If not, update the name below to match your photo ID.",
+  "id.verification.name.check.mismatch.information": "Si el nombre a continuación no coincide con su identificación con foto, se denegará su verificación de identidad.",
+  "id.verification.name.error": "Ingrese su nombre tal como aparece en su identificación con foto.",
+  "id.verification.account.name.warning.prefix": "Ten en cuenta:",
+  "id.verification.account.name.settings": "Configuración de cuenta",
+  "id.verification.name.label": "Nombre",
+  "id.verification.account.name.photo.alt": "Foto de tu identificación a enviar.",
+  "id.verification.review.title": "Revisar tus fotos",
+  "id.verification.review.description": "Asegúrate de que podamos verificar tu identidad con las imágenes y la información suministradas.",
+  "id.verification.review.portrait.label": "Tu Retrato",
+  "id.verification.review.portrait.alt": "Foto de tu rostro a enviar.",
+  "id.verification.review.portrait.retake": "Retomar Foto de Retrato",
+  "id.verification.review.id.label": "Tú tarjeta de identificación",
+  "id.verification.review.id.alt": "Foto de tu tarjeta de identificación para ser enviada.",
+  "id.verification.review.id.retake": "Retomar Foto de identificación",
+  "id.verification.review.confirm": "Enviar",
+  "id.verification.submission.alert.error.face": "Se requiere una foto de tu rostro. Vuelve a tomar tu foto de retrato.",
+  "id.verification.submission.alert.error.id": "Se requiere una foto de tu documento de ID. Vuelve a tomar tu foto de ID.",
+  "id.verification.submission.alert.error.name": "Se requiere un nombre de cuenta válido. Actualiza el nombre de tu cuenta para que coincida con el nombre que figura en tu ID.",
+  "id.verification.submission.alert.error.unsupported": "Uno o más de los siguientes archivos que has subido se encuentran en un formato no soportado. Por favor escoge de los siguientes formatos:",
+  "id.verification.review.error": "Página de soporte de {siteName}",
+  "id.verification.submitted.title": "Verificación de identidad en progreso.",
+  "id.verification.submitted.text": "Hemos recibido su información y estamos verificando su identidad. Se le notificará cuando se complete el proceso de verificación (generalmente dentro de los 5 días). Mientras tanto, aún puede acceder a todo el contenido del curso disponible.",
+  "id.verification.return.dashboard": "Volver al panel principal",
+  "id.verification.return.course": "Regresar al curso",
+  "id.verification.return.generic": "Regresar",
+  "id.verification.photo.upload.help.title": "Cargar una imágen en vez",
+  "id.verification.photo.camera.help.title": "Usar la cámara en vez",
+  "id.verification.photo.upload.help.text": "Si estás presentando problemas usando el capturador de fotos, es posible que prefieras subir una foto en vez. Para subir una foto, has clic en el botón a continuación ",
+  "id.verification.photo.camera.help.text": "Si estás presentando problemas subiendo una foto, es posible que prefieras usar la cámara en vez. Para usar una cámara, has clic en el botón a continuación.",
+  "id.verification.upload.help.button": "Cambia a modo de carga",
+  "id.verification.camera.help.button": "Cambia a modo de cámara",
+  "id.verification.request.camera.access.instructions": "Para tomar una foto con tu cámara web, es posible que recibas un aviso del navegador para acceder a tu cámara. {clickAllow}",
+  "id.verification.requirements.account.managed.alert": "La configuración de tu perfil es administrada por {managerTitle}. Por lo tanto si el nombre en tu ID de foto coincide con tu nombre de cuenta por favor ponte en contacto con tu administrador de {profileDataManager} o con {soporte} para solicitar ayuda antes de completar el proceso de verificación de foto.",
+  "id.verification.requirements.card.device.text": "Necesitas un dispositivo que tenga una cámara. Si has recibido un aviso del navegador para habilitar acceso a tu cámara, por favor asegúrate de seleccionar [allow].",
+  "id.verification.account.name.summary.alert": "La configuración de tu perfil es administrada por {managerTitle}. Por lo tanto si el nombre en tu ID de foto coincide con tu nombre de cuenta por favor ponte en contacto con tu administrador de {profileDataManager} o con {soporte} para solicitar ayuda.",
+  "idv.submission.alert.error": "\n          Se produjo un error técnico al intentar enviar la verificación de ID.\n          Es posible que sea una cuestión temporal, así que inténtalo de nuevo en unos minutos.\n          Si el problema continúa, dirígete a {support_link} para obtener ayuda.\n        ",
+  "id.verification.account.name.edit": "Editar {sr}"
 }

src/i18n/messages/fr.json

@@ -1,292 +1,350 @@
 {
-  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another edX account.",
-  "account.settings.message.managed.settings": "Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help.",
+  "account.settings.message.duplicate.tpa.provider": "Le compte {provider} que vous avez sélectionné est déjà lié à un autre compte {siteName}.",
+  "account.settings.message.managed.settings": "Vos paramètres de profile sont gérés par {managerTitle}. Contactez votre administrateur ou {support} en cas de besoin.",
   "account.settings.message.managed.settings.support": "support",
-  "account.settings.page.heading": "Account Settings",
-  "account.settings.loading.message": "Loading...",
-  "account.settings.loading.error": "Error: {error}",
-  "account.settings.banner.beta.language": "You have set your language to {beta_language}, which is currently not fully translated. You can help us translate this language fully by joining the Transifex community and adding translations from English for learners that speak {beta_language}.",
-  "account.settings.banner.beta.language.action.switch.back": "Switch Back to {previous_language}",
-  "account.settings.banner.beta.language.action.help.translate": "Help Translate into {beta_language}",
-  "account.settings.section.account.information": "Account Information",
-  "account.settings.section.account.information.description": "These settings include basic information about your account.",
-  "account.settings.section.profile.information": "Profile Information",
-  "account.settings.section.demographics.information": "Optional Information",
-  "account.settings.section.site.preferences": "Site Preferences",
-  "account.settings.section.linked.accounts": "Linked Accounts",
-  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to edX.",
-  "account.settings.field.username": "Username",
-  "account.settings.field.username.help.text": "The name that identifies you on edX. You cannot change your username.",
-  "account.settings.field.full.name": "Full name",
-  "account.settings.field.full.name.empty": "Add name",
-  "account.settings.field.full.name.help.text": "The name that is used for ID verification and that appears on your certificates.",
-  "account.settings.field.email": "Email address (Sign in)",
-  "account.settings.field.email.empty": "Add email address",
-  "account.settings.field.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your email address.",
-  "account.settings.field.email.help.text": "You receive messages from edX and course teams at this address.",
-  "account.settings.field.secondary.email": "Recovery email address",
-  "account.settings.field.secondary.email.empty": "Add a recovery email address",
-  "account.settings.field.secondary.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your recovery email address.",
-  "account.settings.email.field.confirmation.header": "Pending confirmation",
-  "account.settings.field.dob": "Year of birth",
-  "account.settings.field.dob.empty": "Add year of birth",
-  "account.settings.field.year_of_birth.options.empty": "Select a year of birth",
-  "account.settings.field.country": "Country",
-  "account.settings.field.country.empty": "Add country",
-  "account.settings.field.country.options.empty": "Select a Country",
-  "account.settings.field.state": "State",
-  "account.settings.field.state.empty": "Add state",
-  "account.settings.field.state.options.empty": "Select a State",
-  "account.settings.field.site.language": "Site language",
-  "account.settings.field.site.language.help.text": "The language used throughout this site. This site is currently available in a limited number of languages.",
+  "account.settings.page.heading": "Paramètres du compte",
+  "account.settings.loading.message": "Chargement...",
+  "account.settings.loading.error": "Erreur : {error}",
+  "account.settings.banner.beta.language": "Vous avez réglé votre langue sur {beta_language}, qui n'est actuellement pas entièrement traduite. Vous pouvez nous aider à traduire complètement cette langue en rejoignant la communauté Transifex et en ajoutant des traductions de l'anglais pour les apprenants qui parlent {beta_language}.",
+  "account.settings.banner.beta.language.action.switch.back": "Revenir au {previous_language}",
+  "account.settings.banner.beta.language.action.help.translate": "Aidez-nous à traduire en {beta_language}",
+  "account.settings.section.account.information": "Information du compte",
+  "account.settings.section.account.information.description": "Ces paramètres comprennent des informations de base à propos de votre compte.",
+  "account.settings.section.profile.information": "Informations de profil",
+  "account.settings.section.demographics.information": "Informations optionnelles",
+  "account.settings.section.site.preferences": "Préférences de site",
+  "account.settings.section.linked.accounts": "Comptes liés",
+  "account.settings.section.linked.accounts.description": "Vous pouvez associer vos comptes d'identité pour simplifier la connexion à {siteName}.",
+  "account.settings.field.username": "Nom d’utilisateur",
+  "account.settings.field.username.help.text": "Le nom qui vous identifie sur {siteName}. Vous ne pouvez pas changer votre nom d'utilisateur.",
+  "account.settings.field.full.name": "Nom complet",
+  "account.settings.field.full.name.empty": "Ajouter un nom",
+  "account.settings.field.full.name.help.text": "Le nom qui apparaîtra sur vos certificats et dans le cadre de toute vérification d'identité.",
+  "account.settings.field.full.name.help.text.default": "Le nom qui apparaît sur votre profile public.",
+  "account.settings.field.full.name.help.text.default.certificate": "Ce nom va apparaître sur vos attestations et dossiers publics.",
+  "account.settings.field.name.verified": "Nom vérifié",
+  "account.settings.field.name.verified.help.text.verified": "Ce nom a été vérifié par une pièce d'identité avec photo.",
+  "account.settings.field.name.verified.help.text.verified.proctored": "Ce nom a été vérifié par la surveillance.",
+  "account.settings.field.name.verified.help.text.verified.certificate": "Ce nom a été vérifié par une pièce d'identité avec photo et est sélectionné pour apparaître sur vos certificats et vos dossiers publics.",
+  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "Ce nom a été vérifié par la surveillance et est sélectionné pour apparaître sur vos certificats et vos enregistrements publics.",
+  "account.settings.field.name.verified.help.text.submitted": "La vérification a été soumise. Cela prend généralement 48 heures ou moins. Le nom vérifié ne peut pas être modifié pour le moment.",
+  "account.settings.field.name.verified.help.text.submitted.proctored": "Votre examen surveillé a été soumis. Le nom vérifié ne peut pas être modifié pour le moment. Veuillez réessayer dans 2 à 5 jours.",
+  "account.settings.field.name.verified.help.text.submitted.certificate": "Une fois la vérification d'identité réussie, ce nom apparaîtra sur vos attestations et vos dossiers publics. Le nom complet ne peut pas être modifié pour le moment.",
+  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "Une fois que votre examen surveillé a réussi l'examen, ce nom apparaîtra sur votre certificat et vos dossiers publics. Le nom vérifié ne peut pas être modifié pour le moment.",
+  "account.settings.field.name.verified.verification.help": "Entrez votre nom tel qu'il apparaît sur votre carte d'étudiant, de travail ou d'identité émise par le gouvernement.",
+  "account.settings.field.full.name.help.text.submitted": "La vérification a été soumise. Cela prend généralement 48 heures ou moins. Le nom vérifié ne peut pas être modifié pour le moment.",
+  "account.settings.field.full.name.help.text.submitted.proctored": "Votre examen surveillé a été soumis. Le nom complet ne peut pas être modifié pour le moment. Veuillez réessayer dans 2 à 5 jours.",
+  "account.settings.field.full.name.help.text.submitted.certificate": "Une fois la vérification d'identité réussie, ce nom apparaîtra sur vos attestations et vos dossiers publics. Le nom complet ne peut pas être modifié pour le moment.",
+  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "Une fois que votre examen surveillé a réussi l'examen, ce nom apparaîtra sur vos certificats et vos dossiers publics. Le nom complet ne peut pas être modifié pour le moment.",
+  "account.settings.field.name.verified.success.message": "Votre demande de vérification d'identité a été complétée avec succès. Vous avez maintenant la possibilité de sélectionner le nom que vous préférez voir apparaître sur vos attestations et documents publics.",
+  "account.settings.field.name.verified.success.message.header": "Votre demande de changement de nom est terminée!",
+  "account.settings.field.name.verified.failure.message": "Votre dernière tentative de vérification d'identité n'a pas abouti. Les paramètres du compte correspondant ont été restaurés.",
+  "account.settings.field.name.verified.failure.message.header": "Nous n'avons pas pu vérifier votre identité.",
+  "account.settings.field.name.verified.failure.message.help.link": "En savoir plus sur la vérification d'identité",
+  "account.settings.field.name.verified.submitted.message": "Votre demande de vérification d'identité a bien été envoyée et prend généralement entre 24 et 48 heures afin d'être validée.",
+  "account.settings.field.name.verified.submitted.message.certificate": "Lorsque votre demande est approuvée, votre nouveau nom apparaîtra sur tous les certificats associés et les enregistrements publics.",
+  "account.settings.field.name.verified.submitted.message.header": "Votre demande de changement de nom est presque terminée!",
+  "account.settings.field.email": "Adresse e-mail (Connexion)",
+  "account.settings.field.email.empty": "Ajouter l'adresse e-mail",
+  "account.settings.field.email.confirmation": "Un message de confirmation a été envoyé à {value}. Cliquer le lien dans le message afin de mettre à jour votre adresse email.",
+  "account.settings.field.email.help.text": "Vous recevrez des messages de {siteName} et des équipes pédagogiques à cette adresse.",
+  "account.settings.field.secondary.email": "Adresse électronique de récupération",
+  "account.settings.field.secondary.email.empty": "Ajouter une adresse électronique de récupération",
+  "account.settings.field.secondary.email.confirmation": "Un message de confirmation a été envoyé à {value}. Cliquer le lien dans le message afin de mettre à jour votre adresse email.",
+  "account.settings.email.field.confirmation.header": "En attente de confirmation",
+  "account.settings.field.dob": "Année de naissance",
+  "account.settings.field.dob.empty": "Ajouter année de naissance",
+  "account.settings.field.year_of_birth.options.empty": "Sélectionnez une année de naissance",
+  "account.settings.field.country": "Pays",
+  "account.settings.field.country.empty": "Ajouter un pays",
+  "account.settings.field.country.options.empty": "Sélectionnez un pays",
+  "account.settings.field.state": "État",
+  "account.settings.field.state.empty": "Ajouter un état",
+  "account.settings.field.state.options.empty": "Choisir un état",
+  "account.settings.field.site.language": "Langue du site",
+  "account.settings.field.site.language.help.text": "La langue utilisée au travers du site. Le site est actuellement disponible dans un nombre limité de langues.",
   "account.settings.field.education": "Education",
-  "account.settings.field.education.empty": "Add level of education",
-  "account.settings.field.education.levels.empty": "Select a level of education",
-  "account.settings.field.education.levels.p": "Doctorate",
-  "account.settings.field.education.levels.m": "Master's or professional degree",
-  "account.settings.field.education.levels.b": "Bachelor's Degree",
-  "account.settings.field.education.levels.a": "Associate's degree",
-  "account.settings.field.education.levels.hs": "Secondary/high school",
-  "account.settings.field.education.levels.jhs": "Junior secondary/junior high/middle school",
-  "account.settings.field.education.levels.el": "Elementary/primary school",
-  "account.settings.field.education.levels.none": "No formal education",
-  "account.settings.field.education.levels.o": "Other education",
-  "account.settings.field.gender": "Gender",
-  "account.settings.field.gender.empty": "Add gender",
-  "account.settings.field.gender.options.empty": "Select a gender",
-  "account.settings.field.gender.options.f": "Female",
-  "account.settings.field.gender.options.m": "Male",
-  "account.settings.field.gender.options.o": "Other",
-  "account.settings.field.language.proficiencies": "Spoken languages",
-  "account.settings.field.language.proficiencies.empty": "Add a spoken language",
-  "account.settings.field.language_proficiencies.options.empty": "Select a Language",
-  "account.settings.field.time.zone": "Time zone",
-  "account.settings.field.time.zone.empty": "Set time zone",
-  "account.settings.field.time.zone.description": "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser’s local time zone.",
-  "account.settings.field.time.zone.default": "Default (Local Time Zone)",
-  "account.settings.field.time.zone.all": "All time zones",
-  "account.settings.field.time.zone.country": "Country time zones",
-  "account.settings.section.social.media": "Social Media Links",
-  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your edX profile.",
+  "account.settings.field.education.empty": "Ajouter le niveau d'éducation",
+  "account.settings.field.education.levels.empty": "Sélectionnez un niveau d'éducation",
+  "account.settings.field.education.levels.p": "Doctorat",
+  "account.settings.field.education.levels.m": "Master ou diplôme professionnel",
+  "account.settings.field.education.levels.b": "Diplôme de licence",
+  "account.settings.field.education.levels.a": "Grade de l'associé",
+  "account.settings.field.education.levels.hs": "Lycée / enseignement secondaire",
+  "account.settings.field.education.levels.jhs": "Collège / enseignement secondaire inférieur",
+  "account.settings.field.education.levels.el": "Enseignement primaire",
+  "account.settings.field.education.levels.none": "Sans diplôme",
+  "account.settings.field.education.levels.o": "Autre niveau d'étude",
+  "account.settings.field.gender": "Genre",
+  "account.settings.field.gender.empty": "Ajouter le genre",
+  "account.settings.field.gender.options.empty": "Sélectionner un genre",
+  "account.settings.field.gender.options.f": "Femme",
+  "account.settings.field.gender.options.m": "Homme",
+  "account.settings.field.gender.options.o": "Autre",
+  "account.settings.field.language.proficiencies": "Langue parlée",
+  "account.settings.field.language.proficiencies.empty": "Ajouter une langue parlée",
+  "account.settings.field.language_proficiencies.options.empty": "Sélectionnez une langue",
+  "account.settings.field.time.zone": "Fuseau horaire",
+  "account.settings.field.time.zone.empty": "Définir le fuseau horaire",
+  "account.settings.field.time.zone.description": "Sélectionnez le fuseau horaire pour l'affichage des dates de cours. Si vous n'indiquez aucun fuseau horaire, les dates de cours, y compris les échéances de devoirs, seront affichés en fonction du fuseau horaire local de votre navigateur. ",
+  "account.settings.field.time.zone.default": "Défaut (fuseau horaire local)",
+  "account.settings.field.time.zone.all": "Tous les fuseaux horaires",
+  "account.settings.field.time.zone.country": "Fuseaux horaires des pays",
+  "account.settings.section.social.media": "Liens vers les réseaux sociaux",
+  "account.settings.section.social.media.description": "Optionnellement, liez vos comptes personnels aux icônes des médias sociaux sur votre profil {siteName}.",
   "account.settings.field.social.platform.name.linkedin": "LinkedIn",
-  "account.settings.field.social.platform.name.linkedin.empty": "Add LinkedIn profile",
-  "account.settings.jump.nav.delete.account": "Delete My Account",
+  "account.settings.field.social.platform.name.linkedin.empty": "Ajouter un profil LinkedIn",
+  "account.settings.jump.nav.delete.account": "Supprimer mon compte",
   "account.settings.field.social.platform.name.twitter": "Twitter",
-  "account.settings.field.social.platform.name.twitter.empty": "Add Twitter profile",
+  "account.settings.field.social.platform.name.twitter.empty": "Ajouter un profil Twitter",
   "account.settings.field.social.platform.name.facebook": "Facebook",
-  "account.settings.field.social.platform.name.facebook.empty": "Add Facebook profile",
-  "account.settings.editable.field.action.save": "Save",
-  "account.settings.editable.field.action.cancel": "Cancel",
-  "account.settings.editable.field.action.edit": "Edit",
-  "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
-  "account.settings.static.field.empty.no.admin": "No value set.",
-  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
-  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
-  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
-  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
-  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
-  "account.settings.coaching.consent.label.name": "Please confirm your name",
-  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
-  "account.settings.coaching.consent.success.header": "Success!",
-  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You can expect a message via email or SMS in the coming days.",
-  "account.settings.coaching.consent.success.continue": "Start my course",
+  "account.settings.field.social.platform.name.facebook.empty": "Ajouter un profil Facebook",
+  "account.settings.editable.field.action.save": "Enregistrer",
+  "account.settings.editable.field.action.cancel": "Annuler",
+  "account.settings.editable.field.action.edit": "Modifier",
+  "account.settings.static.field.empty": "Aucune valeur n'a été fixée. Contactez l'administrateur de votre {entreprise} pour effectuer des modifications.",
+  "account.settings.static.field.empty.no.admin": "Pas de valeur définie.",
+  "account.settings.field.name.certificate.select": "Si sélectionné, ce nom va apparaître sur vos attestations et dossiers publics.",
+  "account.settings.field.name.modal.certificate.title": "Choisissez le nom qui va apparaîtres sur vos attestations et dossiers publics.",
+  "account.settings.field.name.modal.certificate.select": "Sélectionnez un nom",
+  "account.settings.field.name.modal.certificate.option.full": "Nom complet",
+  "account.settings.field.name.modal.certificate.option.verified": "Nom vérifié",
+  "account.settings.field.name.modal.certificate.button.choose": "Choisissez un nom",
+  "account.settings.coaching.consent.welcome.header": "Commençons.",
+  "account.settings.coaching.consent.welcome.subheader": "Nous sommes là pour vous du début à la fin",
+  "account.settings.coaching.consent.description": "Les programmes MicroBachelors comprennent un coaching axé sur votre carrière, vos études et la façon dont vous obtiendrez des résultats grâce à une communication individuelle avec un professionnel expérimenté. Si vous êtes intéressé, fournissez les informations ci-dessous et cliquez sur \"Soumettre\". Notre partenaire de coaching vous contactera par courrier électronique et/ou par SMS pour vous aider à progresser. Les conditions générales s'appliquent.*",
+  "account.settings.coaching.consent.text-messaging.disclaimer": "* Les services de coaching sont inclus sans frais supplémentaires pour les apprenants ayant un numéro de téléphone aux États-Unis. Le coaching comprend des messages textes récurrents. Les tarifs des messages et des données peuvent s'appliquer. Text STOP pour se désengager.",
+  "account.settings.coaching.consent.accept-coaching": "S'inscrire pour le coaching.",
+  "account.settings.coaching.consent.decline-coaching": "Je préfère ne pas être contacté par les services de coaching gratuit.",
+  "account.settings.coaching.consent.label.name": "Veuillez confirmer votre nom",
+  "account.settings.coaching.consent.label.phone-number": "Entrer un numéro de cellulaire",
+  "account.settings.coaching.consent.success.header": "Opération réussie!",
+  "account.settings.coaching.consent.success.message": "Vous êtes inscrit au coaching. Vous pouvez vous attendre à un message par courriel ou SMS dans les prochains jours.",
+  "account.settings.coaching.consent.success.continue": "Démarrer mon cours",
   "account.settings.coaching.managed.support": "support",
-  "account.settings.coaching.managed.alert": "Your name is managed by {managerTitle}. Contact your administrator for help.",
-  "account.settings.field.phone_number": "Phone Number",
-  "account.settings.field.phone_number.empty": "Add a phone number",
-  "account.settings.field.coaching_consent": "Coaching consent",
-  "account.settings.field.coaching_consent.tooltip": "MicroBachelors programs include text message based coaching that helps you pair educational experiences with your career goals through one-on-one advice. Coaching services are included at no additional cost, and are available to learners with U.S. mobile phone numbers. Standard messaging rates apply. Text ‘STOP’ at anytime to opt-out of messages.",
-  "account.settings.field.coaching_consent.error": "A valid US phone number is required to opt into coaching",
-  "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
-  "account.settings.delete.account.header": "Delete My Account",
-  "account.settings.delete.account.subheader": "We're sorry to see you go!",
-  "account.settings.delete.account.text.1": "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.",
-  "account.settings.delete.account.text.2": "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.",
-  "account.settings.delete.account.text.3.link": "follow the instructions for printing or downloading a certificate",
-  "account.settings.delete.account.text.warning": "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.",
-  "account.settings.delete.account.text.change.instead": "Want to change your email, name, or password instead?",
-  "account.settings.delete.account.button": "Delete My Account",
-  "account.settings.delete.account.please.activate": "activate your account",
-  "account.settings.delete.account.please.unlink": "unlink all social media accounts",
-  "account.settings.delete.account.modal.header": "Are you sure?",
-  "account.settings.delete.account.modal.text.1": "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.",
-  "account.settings.delete.account.modal.text.2": "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.",
-  "account.settings.delete.account.modal.enter.password": "If you still wish to continue and delete your account, please enter your account password:",
-  "account.settings.delete.account.modal.confirm.delete": "Yes, Delete",
-  "account.settings.delete.account.modal.confirm.cancel": "Cancel",
-  "account.settings.delete.account.error.unable.to.delete": "Unable to delete account",
-  "account.settings.delete.account.error.no.password": "A password is required",
-  "account.settings.delete.account.error.invalid.password": "Password is incorrect",
-  "account.settings.delete.account.error.unable.to.delete.details": "Sorry, there was an error trying to process your request. Please try again later.",
-  "account.settings.delete.account.modal.after.header": "We're sorry to see you go!  Your account will be deleted shortly.",
-  "account.settings.delete.account.modal.after.text": "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.",
-  "account.settings.delete.account.modal.after.button": "Close",
-  "account.settings.delete.account.text.3": "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}.",
-  "account.settings.message.demographics.service.issue": "An error occurred attempting to retrieve or save your account information. Please try again later.",
-  "account.settings.field.demographics.gender": "Gender identity",
-  "account.settings.field.demographics.gender.empty": "Add gender identity",
-  "account.settings.field.demographics.gender.options.empty": "Select a gender identity",
-  "account.settings.field.demographics.gender_description": "Gender identity description",
-  "account.settings.field.demographics.gender_description.empty": "Enter description",
-  "account.settings.field.demographics.ethnicity": "Race/Ethnicity identity",
-  "account.settings.field.demographics.ethnicity.empty": "Add race/ethnicity identity",
-  "account.settings.field.demographics.ethnicity.options.empty": "Select all that apply",
-  "account.settings.field.demographics.income": "Family income",
-  "account.settings.field.demographics.income.empty": "Add family income",
-  "account.settings.field.demographics.income.options.empty": "Select a family income range",
-  "account.settings.field.demographics.military_history": "U.S. Military status",
-  "account.settings.field.demographics.military_history.empty": "Add military status",
-  "account.settings.field.demographics.military_history.options.empty": "Select military status",
-  "account.settings.field.demographics.learner_education_level": "Your education level",
-  "account.settings.field.demographics.learner_education_level.empty": "Add education level",
-  "account.settings.field.demographics.parent_education_level": "Parents/Guardians education level",
-  "account.settings.field.demographics.parent_education_level.empty": "Add education level",
-  "account.settings.field.demographics.education_level.options.empty": "Select education level",
-  "account.settings.field.demographics.work_status": "Employment status",
-  "account.settings.field.demographics.work_status.empty": "Add employment status",
-  "account.settings.field.demographics.work_status.options.empty": "Select employment status",
-  "account.settings.field.demographics.work_status_description": "Employment status description",
-  "account.settings.field.demographics.work_status_description.empty": "Enter description",
-  "account.settings.field.demographics.current_work_sector": "Current work industry",
-  "account.settings.field.demographics.current_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.future_work_sector": "Future work industry",
-  "account.settings.field.demographics.future_work_sector.empty": "Add work industry",
-  "account.settings.field.demographics.work_sector.options.empty": "Select work industry",
-  "account.settings.section.demographics.why": "Why does edX collect this information?",
-  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
+  "account.settings.coaching.managed.alert": "Votre nom est géré par {managerTitle}. Contactez votre administrateur pour obtenir de l'aide.",
+  "account.settings.field.phone_number": "Numéro de téléphone",
+  "account.settings.field.phone_number.empty": "Ajouter un numéro de téléphone",
+  "account.settings.field.coaching_consent": "Consentement pour le coaching",
+  "account.settings.field.coaching_consent.tooltip": "Un parcours MicroBachelors inclus du coaching par texto avec un professionnel expériementé qui vous aidera à combiner votre expérience éducationnelle et vos objectifs de carrière. Les services de coaching sont inclus sans coût additionnel aux apprenant ayant un numéro de téléphone US. Le coût standard des textos s'applique. Texter 'STOP' en tout temp pour arrêter les messages.",
+  "account.settings.field.coaching_consent.error": "Un numéro de téléphone US valide est requis pour s'inscrire pour du coaching",
+  "account.settings.delete.account.before.proceeding": "Avant de poursuivre, veuillez {actionLink}.",
+  "account.settings.delete.account.header": "Supprimer mon compte",
+  "account.settings.delete.account.subheader": "Nous sommes désolés de vous voir quitter!",
+  "account.settings.delete.account.text.1": "Veuillez noter que la suppression de votre compte et de vos données personnelles est permanente et ne peut être annulée. {siteName} ne pourra pas récupérer votre compte ou les données supprimées.",
+  "account.settings.delete.account.text.2": "Une fois votre compte supprimé, vous ne pourrez plus l'utiliser pour suivre des cours sur {siteName}.",
+  "account.settings.delete.account.text.2.edX": "Une fois votre compte supprimé, vous ne pourrez plus l'utiliser pour prendre des cours sur l'application edX, edx.org, ou tout autre site hébergé par edX. Cela comprend l'accès à edx.org à partir du système de votre employeur ou de votre université et l'accès aux sites privés offerts par MIT Open Learning, Wharton Executive Education, et Harvard Medical School.",
+  "account.settings.delete.account.text.3.link": "Suivez ces instructions pour imprimer ou télécharger une attestation",
+  "account.settings.delete.account.text.warning": "Avertissement : la suppression d'un compte est permanente. Veuillez lire attentivement ce qui précède avant de continuer. Cette action est irréversible et vous ne pourrez plus utiliser la même adresse courriel sur {siteName}.",
+  "account.settings.delete.account.text.change.instead": "Vous souhaitez modifier votre adresse électronique, votre nom ou votre mot de passe?",
+  "account.settings.delete.account.button": "Supprimer mon compte",
+  "account.settings.delete.account.please.activate": "activez votre compte",
+  "account.settings.delete.account.please.confirm": "confirmer votre compte",
+  "account.settings.delete.account.please.unlink": "dissocier tous les comptes de médias sociaux",
+  "account.settings.delete.account.modal.header": "Êtes-vous certain ?",
+  "account.settings.delete.account.modal.text.1": "Vous avez sélectionné \"Supprimer mon compte\". La suppression de votre compte et de vos données personnelles est permanente et ne peut être annulée. {siteName} ne pourra ni récupérer votre compte ni les données supprimées.",
+  "account.settings.delete.account.modal.text.2": "Si vous continuez, vous ne pourrez plus utiliser ce compte pour suivre des cours sur {siteName}.",
+  "account.settings.delete.account.modal.text.2.edX": "Si vous procédez ainsi, vous ne pourrez pas utiliser ce compte pour suivre des cours sur l'application edX, edx.org ou tout autre site hébergé par edX. Cela inclut l'accès à edx.org depuis le système de votre employeur ou de votre université et l'accès aux sites privés proposés par MIT Open Learning, Wharton Executive Education et Harvard Medical School.",
+  "account.settings.delete.account.modal.enter.password": "Si vous souhaitez toujours supprimer votre compte, veuillez saisir le mot de passe de votre compte :",
+  "account.settings.delete.account.modal.confirm.delete": "Oui, supprimer",
+  "account.settings.delete.account.modal.confirm.cancel": "Annuler",
+  "account.settings.delete.account.error.unable.to.delete": "Impossible de supprimer le compte",
+  "account.settings.delete.account.error.no.password": "Un mot de passe est requis",
+  "account.settings.delete.account.error.invalid.password": "Mot de passe incorrect.",
+  "account.settings.delete.account.error.unable.to.delete.details": "Nous sommes désolés, il y a eu une erreur dans le suivi de votre demande. Veuillez réessayer plus tard.",
+  "account.settings.delete.account.modal.after.header": "Nous sommes désolés de vous voir quitter! Votre compte sera bientôt supprimé.",
+  "account.settings.delete.account.modal.after.text": "La suppression d'un compte, comprenant le retrait des listes d'e-mail, peu prendre quelques semaines afin de traiter entièrement notre système. Si vous souhaitez renoncer aux e-mails ultérieurement, veuillez vous désinscrire en consultant le pied de page de n'importe quel e-mail.",
+  "account.settings.delete.account.modal.after.button": "Fermer",
+  "account.settings.delete.account.text.3.edX": "Vous pouvez également perdre l'accès aux attestations vérifiées et à d'autres informations d'identification de programme, comme les attestations MicroMasters. Vous pouvez en faire une copie pour vos dossiers avant de procéder à la suppression. {actionLink}.",
+  "account.settings.delete.account.text.3": "Vous pouvez également perdre accès aux attestations vérifiées et à d'autres informations d'identification de programme. Vous pouvez en faire une copie pour vos dossiers avant de procéder à la suppression.",
+  "account.settings.message.demographics.service.issue": "Une erreur s'est produite lors de la tentative de récupération ou d'enregistrement des informations de votre compte. Veuillez réessayer plus tard.",
+  "account.settings.field.demographics.gender": "Identité de genre",
+  "account.settings.field.demographics.gender.empty": "Ajouter une identité de genre",
+  "account.settings.field.demographics.gender.options.empty": "Sélectionnez une identité de genre",
+  "account.settings.field.demographics.gender_description": "Description de l'identité de genre",
+  "account.settings.field.demographics.gender_description.empty": "Entrez la description",
+  "account.settings.field.demographics.ethnicity": "Identité raciale / ethnique",
+  "account.settings.field.demographics.ethnicity.empty": "Ajouter une identité raciale / ethnique",
+  "account.settings.field.demographics.ethnicity.options.empty": "Sélectionnez tout ce qui s'y rapporte",
+  "account.settings.field.demographics.income": "Revenu familial",
+  "account.settings.field.demographics.income.empty": "Ajouter le revenu familial",
+  "account.settings.field.demographics.income.options.empty": "Sélectionnez une fourchette de revenu familial",
+  "account.settings.field.demographics.military_history": "Statut militaire U.S.",
+  "account.settings.field.demographics.military_history.empty": "Ajouter un statut militaire",
+  "account.settings.field.demographics.military_history.options.empty": "Sélectionnez un statut militaire",
+  "account.settings.field.demographics.learner_education_level": "Votre niveau d'éducation",
+  "account.settings.field.demographics.learner_education_level.empty": "Ajouter un niveau d'éducation",
+  "account.settings.field.demographics.parent_education_level": "Niveau d'éducation des parents / tuteurs",
+  "account.settings.field.demographics.parent_education_level.empty": "Ajouter un niveau d'éducation",
+  "account.settings.field.demographics.education_level.options.empty": "Sélectionnez le niveau d'éducation",
+  "account.settings.field.demographics.work_status": "Statut d'emploi",
+  "account.settings.field.demographics.work_status.empty": "Ajouter un statut d'emploi",
+  "account.settings.field.demographics.work_status.options.empty": "Sélectionnez le statut d'emploi",
+  "account.settings.field.demographics.work_status_description": "Description du statut d'emploi",
+  "account.settings.field.demographics.work_status_description.empty": "Entrez la description",
+  "account.settings.field.demographics.current_work_sector": "Secteur d'emploi actuel",
+  "account.settings.field.demographics.current_work_sector.empty": "Ajouter le secteur d'emploi",
+  "account.settings.field.demographics.future_work_sector": "Secteur d'emploi futur",
+  "account.settings.field.demographics.future_work_sector.empty": "Ajouter le secteur d'emploi",
+  "account.settings.field.demographics.work_sector.options.empty": "Sélectionnez un secteur d'emploi",
+  "account.settings.section.demographics.why": "Pourquoi est-ce que {siteName} collecte ces informations ?",
+  "account.settings.name.change.title.id": "Ce changement de nom requiert une vérification d'identité.",
+  "account.settings.name.change.title.begin": "Avant que l'on commençons",
+  "account.settings.name.change.warning.one": "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.",
+  "account.settings.name.change.warning.two": "Cette action ne peut pas être renversée sans vérification d'identité.",
+  "account.settings.name.change.id.name.label": "Entrez votre nom tel qu'il apparaît sur votre carte d'étudiant, de travail ou d'identité émise par le gouvernement.",
+  "account.settings.name.change.id.name.placeholder": "Entrez le nom sur votre pièce d'identité avec photo",
+  "account.settings.name.change.error.valid.name": "Entrez un nom valide",
+  "account.settings.name.change.error.general": "Une erreur est survenue. Veuillez réessayer.",
+  "account.settings.name.change.continue": "Continuer",
+  "account.settings.name.change.cancel": "Annuler",
+  "error.notfound.message": "La page que vous recherchez n'est pas disponible ou il y a une erreur dans l'URL. Veuillez vérifier l'URL et réessayer.",
   "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
-  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
-  "account.settings.editable.field.password.reset.button": "Reset Password",
-  "account.settings.editable.field.password.reset.button.forbidden": "Your previous request is in progress, please try again in few moments.",
-  "account.settings.editable.field.password.reset.label": "Password",
-  "account.settings.sso.link.account": "Sign in with {name}",
-  "account.settings.sso.account.connected": "Linked",
-  "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
-  "account.settings.sso.unlink.account": "Unlink {name} account",
-  "account.settings.sso.no.providers": "No accounts can be linked at this time.",
-  "id.verification.existing.request.denied.text": "You cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
-  "id.verification.next": "Next",
-  "id.verification.requirements.title": "Photo Verification Requirements",
-  "id.verification.requirements.description": "In order to complete Photo Verification online, you will need the following:",
-  "id.verification.requirements.card.device.title": "Device with Camera",
-  "id.verification.requirements.card.device.allow": "Allow",
-  "id.verification.requirements.card.id.title": "Photo Identification",
-  "id.verification.requirements.card.id.text": "You need a valid ID that contains your full name and photo.",
-  "id.verification.privacy.title": "Privacy Information",
-  "id.verification.privacy.need.photo.question": "Why does edX need my photo?",
-  "id.verification.privacy.need.photo.answer": "We use your verification photos to confirm your identity and ensure the validity of your certificate.",
-  "id.verification.privacy.do.with.photo.question": "What does edX do with this photo?",
-  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on edX after the verification process is complete.",
-  "id.verification.existing.request.title": "Identity Verification",
-  "id.verification.existing.request.pending.text": "You have already submitted your verification information. You will see a message on your dashboard when the verification process is complete (usually within 5 days).",
-  "id.verification.photo.take": "Take Photo",
-  "id.verification.photo.retake": "Retake Photo",
-  "id.verification.photo.enable.detection": "Enable Face Detection",
-  "id.verification.photo.enable.detection.portrait.help.text": "If checked, a box will appear around your face. Your face can be seen clearly if the box around it is blue. If your face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.enable.detection.id.help.text": "If checked, a box will appear around the face on your ID card. The face can be seen clearly if the box around it is blue. If the face is not in a good position or undetectable, the box will be red.",
-  "id.verification.photo.feedback.correct": "Face is in a good position.",
-  "id.verification.photo.feedback.two.faces": "More than one face detected.",
-  "id.verification.photo.feedback.no.faces": "No face detected.",
-  "id.verification.photo.feedback.top.left": "Incorrect position. Top left.",
-  "id.verification.photo.feedback.top.center": "Incorrect position. Top center.",
-  "id.verification.photo.feedback.top.right": "Incorrect position. Top right.",
-  "id.verification.photo.feedback.center.left": "Incorrect position. Center left.",
-  "id.verification.photo.feedback.center.center": "Incorrect position. Too close to camera.",
-  "id.verification.photo.feedback.center.right": "Incorrect position. Center right.",
-  "id.verification.photo.feedback.bottom.left": "Incorrect position. Bottom left.",
-  "id.verification.photo.feedback.bottom.center": "Incorrect position. Bottom center.",
-  "id.verification.photo.feedback.bottom.right": "Incorrect position. Bottom right.",
-  "id.verification.camera.access.title": "Camera Permissions",
-  "id.verification.camera.access.title.success": "Camera Access Enabled",
-  "id.verification.camera.access.title.failed": "Camera Access Failed",
-  "id.verification.camera.access.click.allow": "Please make sure to click \"Allow\"",
-  "id.verification.camera.access.enable": "Enable Camera",
-  "id.verification.camera.access.problems": "Having problems?",
-  "id.verification.camera.access.skip": "Skip and upload image files instead",
-  "id.verification.camera.access.success": "Looks like your camera is working and ready.",
-  "id.verification.camera.access.failure": "It looks like we're unable to access your camera. You will need to upload image files of you and your photo id.",
-  "id.verification.camera.access.failure.temporary": "It looks like we're unable to access your camera. Please verify that your webcam is connected and that you have allowed your browser to access it.",
-  "id.verification.camera.access.failure.temporary.chrome": "To enable camera access in Chrome:",
-  "id.verification.camera.access.failure.temporary.chrome.step1": "Open Chrome.",
-  "id.verification.camera.access.failure.temporary.chrome.step2": "Navigate to More > Settings.",
-  "id.verification.camera.access.failure.temporary.chrome.step2.windows": "For Windows: Alt+F, Alt+E, or F10 followed by the spacebar",
-  "id.verification.camera.access.failure.temporary.chrome.step2.mac": "For Mac: Command+,",
-  "id.verification.camera.access.failure.temporary.chrome.step3": "Under the \"Privacy and security\" tab, select \"Site Settings\" and then \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.chrome.step4": "Under \"Blocked,\" find \"edx.org\" and select it.",
-  "id.verification.camera.access.failure.temporary.chrome.step5": "In the \"Permissions\" section, update the camera permissions to \"Allow.\"",
-  "id.verification.camera.access.failure.temporary.ie11": "To enable camera access in Internet Explorer:",
-  "id.verification.camera.access.failure.temporary.ie11.step1": "Open the Flash Player Settings Manager by navigating to Windows Settings > Control Panel > Flash Player.",
-  "id.verification.camera.access.failure.temporary.ie11.step2": "Select the \"Camera and Mic\" tab, and then select the \"Camera and Microphone Settings by Site\" button.",
-  "id.verification.camera.access.failure.temporary.ie11.step3": "Choose \"edx.org\" from the list of websites and change the permissions by selecting \"Allow\" in the dropdown menu.",
-  "id.verification.camera.access.failure.temporary.firefox": "To enable camera access in Firefox:",
-  "id.verification.camera.access.failure.temporary.firefox.step1": "Open Firefox.",
-  "id.verification.camera.access.failure.temporary.firefox.step2": "Enter \"about:preferences\" in the URL bar.",
-  "id.verification.camera.access.failure.temporary.firefox.step3": "Select the \"Privacy & Security\" tab, and navigate to the \"Permissions\" section.",
-  "id.verification.camera.access.failure.temporary.firefox.step4": "Next to \"Camera,\" select the \"Settings…\" button.",
-  "id.verification.camera.access.failure.temporary.firefox.step5": "In the search bar, enter \"edx.org.\"",
-  "id.verification.camera.access.failure.temporary.firefox.step6": "In the status column for \"edx.org,\" select \"Allow\" from the drop down.",
-  "id.verification.camera.access.failure.temporary.firefox.step7": "Select \"Save Changes.\"",
-  "id.verification.camera.access.failure.temporary.safari": "To enable camera access in Safari:",
-  "id.verification.camera.access.failure.temporary.safari.step1": "Open Safari.",
-  "id.verification.camera.access.failure.temporary.safari.step2": "Click on the Safari app menu, then select \"Preferences.\" You can also use Command+, as a keyboard shortcut.",
-  "id.verification.camera.access.failure.temporary.safari.step3": "Select the \"Websites\" tab and then select \"Camera.\"",
-  "id.verification.camera.access.failure.temporary.safari.step4": "Select \"edx.org\" and change the camera permissions to \"Allow.\"",
-  "id.verification.photo.tips.title": "Helpful Photo Tips",
-  "id.verification.photo.tips.description": "Next, we'll need you to take a photo of your face. Please review the helpful tips below.",
-  "id.verification.photo.tips.list.title": "Photo Tips",
-  "id.verification.photo.tips.list.description": "To take a successful photo, make sure that:",
-  "id.verification.photo.tips.list.well.lit": "Your face is well-lit.",
-  "id.verification.photo.tips.list.inside.frame": "Your entire face fits inside the frame.",
-  "id.verification.portrait.photo.title.camera": "Take a Photo of Yourself",
-  "id.verification.portrait.photo.title.upload": "Upload a Photo of Yourself",
-  "id.verification.portrait.photo.preview.alt": "Preview of photo of user's face.",
-  "id.verification.portrait.photo.instructions.camera": "When your face is in position, use the Take Photo button below to take your photo.",
-  "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: .jpg, .jpeg, .png)",
-  "id.verification.camera.help.sight.question": "What if I can't see the camera image or if I can't see my photo to determine which side is visible?",
-  "id.verification.camera.help.sight.answer.portrait": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally the best position for a headshot is approximately 12-18 inches (30-45 centimeters) from the camera, with your head centered relative to the computer screen. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle.",
-  "id.verification.camera.help.sight.answer.id": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally, the best position for a photo of an ID card is 8-12 inches (20-30 centimeters) from the camera, with the ID card centered relative to the camera. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle. The most common reason for rejection is inability to read the text on the ID card.",
-  "id.verification.camera.help.difficulty.question.portrait": "What if I have difficulty holding my head in position relative to the camera?",
-  "id.verification.camera.help.difficulty.question.id": "What if I have difficulty holding my ID in position relative to the camera?",
-  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact edX support for additional suggestions.",
-  "id.verification.id.photo.unclear.question": "Is your ID image not clear or too blurry?",
-  "id.verification.id.tips.title": "Helpful ID Tips",
-  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid ID that includes your name. Please have your ID ready.",
-  "id.verification.id.tips.list.well.lit": "Your ID is well-lit.",
-  "id.verification.id.tips.list.clear": "Ensure that you can see your photo and clearly read your name.",
-  "id.verification.id.photo.title.camera": "Take a Photo of Your ID",
-  "id.verification.id.photo.title.upload": "Upload a Photo of Your ID",
-  "id.verification.id.photo.preview.alt": "Preview of photo ID.",
-  "id.verification.id.photo.instructions.camera": "When your ID is in position, use the Take Photo button below to take your photo.",
-  "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: .jpg, .jpeg, .png)",
-  "id.verification.id.photo.instructions.upload.error": "The file you have selected is too large. Please try again with a file less than 10MB.",
-  "id.verification.account.name.title": "Account Name Check",
-  "id.verification.account.name.instructions": "The name on your account and the name on your ID must be an exact match. If not, please click \"No\" to update your account name.",
-  "id.verification.account.name.radio.label": "Does the name on your ID match the Account Name below?",
-  "id.verification.account.name.radio.yes": "Yes",
-  "id.verification.account.name.radio.no": "No",
-  "id.verification.account.name.error": "Please update account name to match the name on your ID.",
-  "id.verification.account.name.warning.prefix": "Please Note:",
-  "id.verification.account.name.settings": "Account Settings",
-  "id.verification.account.name.label": "Account Name",
-  "id.verification.account.name.photo.alt": "Photo of your ID to be submitted.",
-  "id.verification.account.name.save": "Save and Next",
-  "id.verification.review.title": "Review Your Photos",
-  "id.verification.review.description": "Make sure we can verify your identity with the photos and information you have provided.",
-  "id.verification.review.portrait.label": "Your Portrait",
-  "id.verification.review.portrait.alt": "Photo of your face to be submitted.",
-  "id.verification.review.portrait.retake": "Retake Portrait Photo",
-  "id.verification.review.id.label": "Your Photo ID",
-  "id.verification.review.id.alt": "Photo of your ID to be submitted.",
-  "id.verification.review.id.retake": "Retake ID Photo",
-  "id.verification.review.confirm": "Submit",
-  "id.verification.review.error": "edX Support Page",
-  "id.verification.submitted.title": "Identity Verification in Progress",
-  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will see a message on your dashboard when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
-  "id.verification.return.dashboard": "Return to Your Dashboard",
-  "id.verification.return.course": "Return to Course",
-  "id.verification.request.camera.access.instructions": "In order to take a photo using your webcam, you may receive a browser prompt for access to your camera. {clickAllow}",
-  "id.verification.requirements.card.device.text": "You need a device that has a camera. If you receive a browser prompt for access to your camera, please make sure to click {allow}.",
-  "idv.submission.alert.error": "\n            We encountered a technical error while trying to submit ID verification.\n            This might be a temporary issue, so please try again in a few minutes.\n            If the problem persists,\n            please go to {support_link} for help.\n          ",
-  "id.verification.account.name.edit": "Edit{sr}"
+  "account.settings.editable.field.password.reset.button.confirmation": "Nous avons envoyé un message à {email}. Cliquez sur le lien dans le message pour réinitialiser votre mot de passe. Vous n'avez pas reçu le message? Contactez {technicalSupportLink}.",
+  "account.settings.editable.field.password.reset.button": "Réinitialiser le mot de passe",
+  "account.settings.editable.field.password.reset.button.forbidden": "Votre demande précédente est en cours, veuillez réessayer dans quelques instants.",
+  "account.settings.editable.field.password.reset.label": "Mot de passe",
+  "account.settings.sso.link.account": "Se connecter avec {name}",
+  "account.settings.sso.account.connected": "Lié",
+  "account.settings.sso.account.disconnect.error": "Un problème est survenu lors de la déconnexion de ce compte. Contactez le support si le problème persiste.",
+  "account.settings.sso.unlink.account": "Dissocier le compte {name}",
+  "account.settings.sso.no.providers": "Aucun compte ne peut être lié pour le moment.",
+  "id.verification.access.blocked.denied": "Nous ne pouvez pas vérifier votre identité pour le moment. Si vous n'avez pas encore activé votre compte, veuillez vérifier votre dossier de pourriels pour le courriel d'activation de {email}.",
+  "id.verification.next": "Suivant",
+  "id.verification.support": "support",
+  "id.verification.example.card.alt": "Exemple de carte d'identité valide avec un nom complet et une photo.",
+  "id.verification.requirements.title": "Exigences de vérification des photos",
+  "id.verification.requirements.description": "Afin de procéder à la vérification des photos, vous aurez besoin des éléments suivants :",
+  "id.verification.requirements.card.device.title": "Appareil avec caméra",
+  "id.verification.requirements.card.device.allow": "Autoriser",
+  "id.verification.requirements.card.id.title": "Carte d'identité avec photo",
+  "id.verification.requirements.card.id.text": "Vous avez besoin d'une carte d'identité valide contenant votre nom complet et votre photo, comme un permis de conduire ou un passeport.",
+  "id.verification.privacy.title": "Information sur la confidentialité",
+  "id.verification.privacy.need.photo.question": "Pourquoi est-ce que {siteName} a besoin de ma photo?",
+  "id.verification.privacy.need.photo.answer": "Nous utilisons vos photos de vérification pour confirmer votre identité et assurer la validité de votre certificat.",
+  "id.verification.privacy.do.with.photo.question": "Qu'est-ce que {siteName} fait avec cette photo?",
+  "id.verification.privacy.do.with.photo.answer": "Nous chiffrons votre photo de manière sécurisée et l'envoyons à notre service d'autorisation pour vérification. Votre photo et vos informations ne sont pas enregistrées ni visibles nulle part sur {siteName} une fois le processus de vérification terminé.",
+  "id.verification.access.blocked.title": "Vérification d'identité",
+  "id.verification.access.blocked.enrollment": "Vous n'êtes actuellement pas inscrit à un cours nécessitant une vérification d'identité.",
+  "id.verification.access.blocked.pending": "Vous avez déjà soumis vos informations de vérification. Vous verrez un message sur votre tableau de bord lorsque le processus de vérification sera terminé (généralement dans les 5 jours).",
+  "id.verification.photo.take": "Prendre une photo",
+  "id.verification.photo.retake": "Reprendre la photo ?",
+  "id.verification.photo.enable.detection": "Activer la détection des visages",
+  "id.verification.photo.enable.detection.portrait.help.text": "Si coché, une case apparaîtra autour de votre visage. Votre visage peut être vu clairement si la boîte qui l'entoure est bleue. Si votre visage n'est pas dans une bonne position ou indétectable, la case sera rouge.",
+  "id.verification.photo.enable.detection.id.help.text": "Si coché, une case apparaîtra autour du visage sur votre pièce d'identité. Le visage peut être vu clairement si la boîte qui l'entoure est bleue. Si le visage n'est pas dans une bonne position ou indétectable, la case sera rouge.",
+  "id.verification.photo.feedback.correct": "Le visage est en bonne position.",
+  "id.verification.photo.feedback.two.faces": "Plus d'un visage détecté.",
+  "id.verification.photo.feedback.no.faces": "Aucun visage détecté.",
+  "id.verification.photo.feedback.top.left": "Position incorrecte. En haut à gauche.",
+  "id.verification.photo.feedback.top.center": "Position incorrecte. En haut au centre.",
+  "id.verification.photo.feedback.top.right": "Position incorrecte. En haut à droite.",
+  "id.verification.photo.feedback.center.left": "Position incorrecte. Centre gauche.",
+  "id.verification.photo.feedback.center.center": "Position incorrecte. Trop près de la caméra.",
+  "id.verification.photo.feedback.center.right": "Position incorrecte. Centre droit.",
+  "id.verification.photo.feedback.bottom.left": "Position incorrecte. En bas à gauche.",
+  "id.verification.photo.feedback.bottom.center": "Position incorrecte. En bas au centre.",
+  "id.verification.photo.feedback.bottom.right": "Position incorrecte. En bas à droite.",
+  "id.verification.camera.access.title": "Autorisations de la caméra",
+  "id.verification.camera.access.title.success": "Accès à la caméra activé",
+  "id.verification.camera.access.title.failed": "L'accès à la caméra a échoué",
+  "id.verification.camera.access.click.allow": "Veuillez vous assurer de cliquer sur \"Autoriser\"",
+  "id.verification.camera.access.enable": "Activer la caméra",
+  "id.verification.camera.access.problems": "Vous avez des problèmes?",
+  "id.verification.camera.access.skip": "Ignorer et télécharger les fichiers image au lieu",
+  "id.verification.camera.access.success": "Il semble que votre appareil photo fonctionne et est prêt.",
+  "id.verification.camera.access.failure": "Il semble que nous ne puissions pas accéder à votre caméra. Vous devrez télécharger des fichiers image de vous et de votre pièce d'identité.",
+  "id.verification.camera.access.failure.temporary": "Il semblerait que nous ne pouvons pas accéder à votre caméra. Vérifiez qu'elle est bien connectée et que votre navigateur est autorisé à y accéder.",
+  "id.verification.camera.access.failure.temporary.chrome": "Pour activer l'accès à la caméra dans Chrome:",
+  "id.verification.camera.access.failure.temporary.chrome.step1": "Ouvrir Chrome.",
+  "id.verification.camera.access.failure.temporary.chrome.step2": "Accédez à Plus> Paramètres.",
+  "id.verification.camera.access.failure.temporary.chrome.step2.windows": "Pour Windows: Alt+F, Alt+E ou F10 suivi de la barre d'espace",
+  "id.verification.camera.access.failure.temporary.chrome.step2.mac": "Pour Mac: Command+,",
+  "id.verification.camera.access.failure.temporary.chrome.step3": "Sous l'onglet «Confidentialité et sécurité», sélectionnez «Paramètres du site», puis «Appareil photo».",
+  "id.verification.camera.access.failure.temporary.chrome.step4": "Sous \"Bloqué\", trouvez \"edx.org\" et sélectionnez-le.",
+  "id.verification.camera.access.failure.temporary.chrome.step5": "Dans la section \"Autorisations\", mettez à jour les autorisations de la caméra pour \"Autoriser\".",
+  "id.verification.camera.access.failure.temporary.ie11": "Pour activer l'accès à la caméra dans Internet Explorer:",
+  "id.verification.camera.access.failure.temporary.ie11.step1": "Ouvrez le Gestionnaire des paramètres de Flash Player en accédant à Paramètres Windows> Panneau de configuration> Flash Player.",
+  "id.verification.camera.access.failure.temporary.ie11.step2": "Sélectionnez l'onglet \"Caméra et micro\", puis sélectionnez le bouton \"Paramètres de la caméra et du microphone par site\".",
+  "id.verification.camera.access.failure.temporary.ie11.step3": "Choisissez \"edx.org\" dans la liste des sites Web et modifiez les autorisations en sélectionnant \"Autoriser\" dans le menu déroulant.",
+  "id.verification.camera.access.failure.temporary.firefox": "Pour activer l'accès à la caméra dans Firefox:",
+  "id.verification.camera.access.failure.temporary.firefox.step1": "Ouvrez Firefox.",
+  "id.verification.camera.access.failure.temporary.firefox.step2": "Saisissez \"about:preferences\" dans la barre d'URL.",
+  "id.verification.camera.access.failure.temporary.firefox.step3": "Sélectionnez l'onglet \"Confidentialité et sécurité\" et accédez à la section \"Autorisations\".",
+  "id.verification.camera.access.failure.temporary.firefox.step4": "À côté de \"Appareil photo\", sélectionnez le bouton \"Paramètres…\".",
+  "id.verification.camera.access.failure.temporary.firefox.step5": "Dans la barre de recherche, entrez \"edx.org\".",
+  "id.verification.camera.access.failure.temporary.firefox.step6": "Dans la colonne d'état de \"edx.org\", sélectionnez \"Autoriser\" dans la liste déroulante.",
+  "id.verification.camera.access.failure.temporary.firefox.step7": "Sélectionnez \"Enregistrer les modifications\".",
+  "id.verification.camera.access.failure.temporary.safari": "Pour activer l'accès à la caméra dans Safari:",
+  "id.verification.camera.access.failure.temporary.safari.step1": "Ouvrir Safari.",
+  "id.verification.camera.access.failure.temporary.safari.step2": "Cliquez sur le menu de l'application Safari, puis sélectionnez \"Préférences\". Vous pouvez également utiliser Command+ comme raccourci clavier.",
+  "id.verification.camera.access.failure.temporary.safari.step3": "Sélectionnez l'onglet \"Sites Web\", puis sélectionnez \"Appareil photo\".",
+  "id.verification.camera.access.failure.temporary.safari.step4": "Sélectionnez \"edx.org\" et changez les autorisations de la caméra en \"Allow\".",
+  "id.verification.camera.access.failure.unsupported": "Il semble que votre fureteur ne prend pas en charge l'accès à la caméra.",
+  "id.verification.camera.access.failure.unsupported.chrome.explanation": "Le fureteur Chrome ne prend actuellement pas en charge l'accès à la caméra sur les appareils iOS, tels que les iPhones et les iPad.",
+  "id.verification.camera.access.failure.unsupported.instructions": "Veuillez utiliser un autre navigateur pour terminer la vérification d'identité.",
+  "id.verification.photo.tips.title": "Conseils photo utiles",
+  "id.verification.photo.tips.description": "Ensuite, nous aurons besoin de vous preniez une photo de votre visage. Veuillez consulter les conseils utiles ci-dessous.",
+  "id.verification.photo.tips.list.title": "Conseils photo",
+  "id.verification.photo.tips.list.description": "Pour prendre une bonne photo, assurez-vous que: ",
+  "id.verification.photo.tips.list.well.lit": "Votre visage est bien éclairé",
+  "id.verification.photo.tips.list.inside.frame": " Votre visage est entièrement dans le cadre.",
+  "id.verification.portrait.photo.title.camera": "Prenez une photo de vous",
+  "id.verification.portrait.photo.instructions.camera": "Lorsque votre visage est en position, utilisez le bouton Prendre une photo ci-dessous pour prendre votre photo.",
+  "id.verification.camera.help.sight.question": "Que faire si je ne peux pas voir l'image de la caméra ou si je ne peux pas voir ma photo pour déterminer quel côté est visible?",
+  "id.verification.camera.help.sight.answer.portrait": "Vous pourrez peut-être terminer la procédure de capture d'image sans aide, mais cela peut prendre quelques tentatives de soumission pour obtenir le bon positionnement de la caméra. Le positionnement optimal de la caméra varie avec chaque ordinateur, mais généralement la meilleure position pour une prise de vue de la tête est d'environ 12-18 pouces (30-45 centimètres) de la caméra, la tête étant centrée par rapport à l'écran de l'ordinateur. Si les photos que vous soumettez sont rejetées, essayez de déplacer l’orientation de l’ordinateur ou de l’appareil photo pour modifier l’angle d’éclairage.",
+  "id.verification.camera.help.sight.answer.id": "Vous pourrez peut-être terminer la procédure de capture d'image sans aide, mais cela peut prendre quelques tentatives de soumission pour obtenir le bon positionnement de la caméra. Le positionnement optimal de la caméra varie avec chaque ordinateur, mais généralement, la meilleure position pour une photo d'une carte d'identité est de 8-12 pouces (20-30 centimètres) de la caméra, la carte d'identité étant centrée par rapport à la caméra. Si les photos que vous soumettez sont rejetées, essayez de déplacer l’orientation de l’ordinateur ou de l’appareil photo pour modifier l’angle d’éclairage. La raison la plus courante de rejet est l'incapacité de lire le texte sur la carte d'identité.",
+  "id.verification.camera.help.difficulty.question.portrait": "Que faire si j'ai des difficultés à maintenir ma tête en position par rapport à la caméra ?",
+  "id.verification.camera.help.difficulty.question.id": "Que faire si j'ai des difficultés à tenir ma carte d'identité en position par rapport à la caméra ?",
+  "id.verification.camera.help.difficulty.answer": "Si vous avez besoin d'aide pour prendre une photo à soumettre, contactez le support {siteName} pour des suggestions supplémentaires.",
+  "id.verification.id.photo.unclear.question": "L'image de votre carte d'identité n'est pas claire ou trop floue ?",
+  "id.verification.id.tips.title": "Conseils utiles pour les cartes d'identité",
+  "id.verification.id.tips.description": "Ensuite, nous vous demanderons de prendre une photo d'une carte d'identité valide comportant votre nom complet et votre photo, comme un permis de conduire ou un passeport. Veuillez préparer votre carte d'identité.",
+  "id.verification.id.tips.list.well.lit": "Votre carte d'identité est bien éclairée.",
+  "id.verification.id.tips.list.clear": "Assurez-vous que vous pouvez voir votre photo et lire clairement votre nom.",
+  "id.verification.id.photo.title.camera": "Prenez une photo de votre carte d'identité",
+  "id.verification.id.photo.title.upload": "Téléversez une photo de votre carte d'identité",
+  "id.verification.id.photo.preview.alt": "Aperçu de la pièce d'identité avec photo.",
+  "id.verification.id.photo.instructions.camera": "Lorsque votre pièce d'identité est en place, utilisez le bouton Prendre une photo ci-dessous pour prendre votre photo. Veuillez utiliser un passeport, un permis de conduire ou une autre carte d'identité comportant votre nom complet et une photo de votre visage.",
+  "id.verification.id.photo.instructions.upload": "Veuillez téléverser une photo de votre carte d'identité. Assurez-vous que la totalité de la carte d'identité rentre dans le cadre et qu'elle est bien éclairée. La taille du fichier doit être inférieure à 10 Mo. Formats pris en charge : ",
+  "id.verification.id.photo.instructions.upload.error.invalidFileType": "Le fichier que vous avez sélectionné n'est pas un type d'image pris en charge. Veuillez choisir parmi les formats suivants :",
+  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "Le fichier que vous avez sélectionné est trop volumineux. Veuillez réessayer avec un fichier de moins de 10 Mo.",
+  "id.verification.name.check.title": "Vérifiez votre nom",
+  "id.verification.name.check.instructions": "Le nom ci-dessous correspond-il au nom sur votre pièce d'identité avec photo ? Si ce n'est pas le cas, mettez à jour le nom ci-dessous pour qu'il corresponde à votre pièce d'identité avec photo.",
+  "id.verification.name.check.mismatch.information": "Si le nom ci-dessous ne correspond pas à votre pièce d'identité avec photo, votre vérification d'identité sera refusée.",
+  "id.verification.name.error": "Veuillez entrer votre nom tel qu'il apparaît sur votre pièce d'identité avec photo.",
+  "id.verification.account.name.warning.prefix": "Veuillez noter:",
+  "id.verification.account.name.settings": "Paramètres du compte",
+  "id.verification.name.label": "Nom",
+  "id.verification.account.name.photo.alt": "Photo de votre pièce d'identité à soumettre.",
+  "id.verification.review.title": "Vérifiez vos photos",
+  "id.verification.review.description": "Assurez-vous que nous pourrons vérifier votre identité avec les photos et les informations fournies.",
+  "id.verification.review.portrait.label": "Votre portrait",
+  "id.verification.review.portrait.alt": "Photo de votre visage à soumettre.",
+  "id.verification.review.portrait.retake": "Reprendre la photo de portrait",
+  "id.verification.review.id.label": "Votre carte d'identité",
+  "id.verification.review.id.alt": "Photo de votre carte d'identité à présenter.",
+  "id.verification.review.id.retake": "Reprendre la photo de la pièce d'identité",
+  "id.verification.review.confirm": "Envoyez",
+  "id.verification.submission.alert.error.face": "Une photo de votre visage est requise. Veuillez reprendre votre photo de portrait.",
+  "id.verification.submission.alert.error.id": "Une photo de votre pièce d'identité est requise. Veuillez reprendre votre photo d'identité.",
+  "id.verification.submission.alert.error.name": "Un nom de compte valide est requis. Veuillez mettre à jour le nom de votre compte pour qu'il corresponde au nom sur votre pièce d'identité.",
+  "id.verification.submission.alert.error.unsupported": "Un ou plusieurs des fichiers que vous avez téléchargés sont dans un format non pris en charge. Veuillez choisir parmi les formats suivants :",
+  "id.verification.review.error": "Page de Support {siteName}",
+  "id.verification.submitted.title": "Vérification d'identité en cours",
+  "id.verification.submitted.text": "Nous avons reçu vos informations et vérifions votre identité. Vous serez averti lorsque le processus de vérification sera terminé (généralement dans les 5 jours). En attendant, vous pouvez toujours accéder à tous les contenus de cours disponibles.",
+  "id.verification.return.dashboard": "Retour au Tableau de bord",
+  "id.verification.return.course": "Revenir au cours",
+  "id.verification.return.generic": "Retour",
+  "id.verification.photo.upload.help.title": "Téléchargez une photo à la place",
+  "id.verification.photo.camera.help.title": "Utilisez votre appareil photo à la place",
+  "id.verification.photo.upload.help.text": "Si vous rencontrez des difficultés lors de l'utilisation de la capture de photo ci-dessus, vous souhaiterez peut-être télécharger une photo à la place. Pour télécharger une photo, cliquez sur le bouton ci-dessous.",
+  "id.verification.photo.camera.help.text": "Si vous rencontrez des difficultés pour télécharger une photo ci-dessus, vous pouvez utiliser votre appareil photo à la place. Pour utiliser votre appareil photo, cliquez sur le bouton ci-dessous.",
+  "id.verification.upload.help.button": "Passer en mode de téléchargement",
+  "id.verification.camera.help.button": "Passer en mode caméra",
+  "id.verification.request.camera.access.instructions": "Afin de prendre une photo à l'aide de votre webcam, vous pouvez recevoir une invite du navigateur pour accéder à votre caméra. {clickAllow}",
+  "id.verification.requirements.account.managed.alert": "Les paramètres de votre compte sont gérés par {managerTitle}. Si le nom sur votre pièce d'identité avec photo ne correspond pas au nom de votre compte, veuillez contacter votre administrateur {profileDataManager} ou {support} pour obtenir de l'aide avant de terminer le processus de vérification des photos.",
+  "id.verification.requirements.card.device.text": "Vous avez besoin d'un appareil équipé d'une caméra. Si vous recevez une invite du navigateur pour accéder à votre caméra, assurez-vous de cliquer sur {allow}.",
+  "id.verification.account.name.summary.alert": "Les paramètres de votre compte sont gérés par {managerTitle}. Si le nom sur votre pièce d'identité avec photo ne correspond pas au nom de votre compte, veuillez contacter votre administrateur {profileDataManager} ou {support} pour obtenir de l'aide.",
+  "idv.submission.alert.error": "\n          Nous avons rencontré une erreur technique en essayant de soumettre la vérification d'identité.\n          Il peut s'agir d'un problème temporaire. Veuillez réessayer dans quelques minutes.\n          Si le problème persiste, veuillez consulter {support_link} pour obtenir de l'aide.\n        ",
+  "id.verification.account.name.edit": "Modifier {sr}"
 }

src/i18n/messages/zh_CN.json

@@ -1,5 +1,5 @@
 {
-  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another edX account.",
+  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
   "account.settings.message.managed.settings": "Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help.",
   "account.settings.message.managed.settings.support": "support",
   "account.settings.page.heading": "Account Settings",
@@ -14,16 +14,40 @@
   "account.settings.section.demographics.information": "Optional Information",
   "account.settings.section.site.preferences": "Site Preferences",
   "account.settings.section.linked.accounts": "Linked Accounts",
-  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to edX.",
+  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to {siteName}.",
   "account.settings.field.username": "Username",
-  "account.settings.field.username.help.text": "The name that identifies you on edX. You cannot change your username.",
+  "account.settings.field.username.help.text": "The name that identifies you on {siteName}. You cannot change your username.",
   "account.settings.field.full.name": "Full name",
   "account.settings.field.full.name.empty": "Add name",
   "account.settings.field.full.name.help.text": "The name that is used for ID verification and that appears on your certificates.",
+  "account.settings.field.full.name.help.text.default": "The name that appears on your public profile.",
+  "account.settings.field.full.name.help.text.default.certificate": "This name is selected to appear on your certificates and public-facing records.",
+  "account.settings.field.name.verified": "Verified name",
+  "account.settings.field.name.verified.help.text.verified": "This name has been verified by photo ID.",
+  "account.settings.field.name.verified.help.text.verified.proctored": "This name has been verified by proctoring.",
+  "account.settings.field.name.verified.help.text.verified.certificate": "This name has been verified by photo ID, and is selected to appear on your certificates and public-facing records.",
+  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "This name has been verified by proctoring, and is selected to appear on your certificates and public-facing records.",
+  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
+  "account.settings.field.name.verified.help.text.submitted.proctored": "Your proctored exam has been submitted. Verified name cannot be changed at this time. Please check back in 2-5 days.",
+  "account.settings.field.name.verified.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Verified name cannot be changed at this time.",
+  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "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.",
+  "account.settings.field.name.verified.verification.help": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
+  "account.settings.field.full.name.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Full name cannot be changed at this time.",
+  "account.settings.field.full.name.help.text.submitted.proctored": "Your proctored exam has been submitted. Full name cannot be changed at this time. Please check back in 2-5 days.",
+  "account.settings.field.full.name.help.text.submitted.certificate": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
+  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "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.",
+  "account.settings.field.name.verified.success.message": "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.",
+  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
+  "account.settings.field.name.verified.failure.message": "Your most recent identity verification attempt did not pass. Related account settings have been restored.",
+  "account.settings.field.name.verified.failure.message.header": "We were not able to verify your identity.",
+  "account.settings.field.name.verified.failure.message.help.link": "Learn more about ID verification",
+  "account.settings.field.name.verified.submitted.message": "Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete.",
+  "account.settings.field.name.verified.submitted.message.certificate": "When your request is approved, your updated name will appear on all associated certificates and public-facing records.",
+  "account.settings.field.name.verified.submitted.message.header": "Your name change request is almost complete!",
   "account.settings.field.email": "Email address (Sign in)",
   "account.settings.field.email.empty": "Add email address",
   "account.settings.field.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your email address.",
-  "account.settings.field.email.help.text": "You receive messages from edX and course teams at this address.",
+  "account.settings.field.email.help.text": "You receive messages from {siteName} and course teams at this address.",
   "account.settings.field.secondary.email": "Recovery email address",
   "account.settings.field.secondary.email.empty": "Add a recovery email address",
   "account.settings.field.secondary.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your recovery email address.",
@@ -57,7 +81,7 @@
   "account.settings.field.gender.options.f": "Female",
   "account.settings.field.gender.options.m": "Male",
   "account.settings.field.gender.options.o": "Other",
-  "account.settings.field.language.proficiencies": "Spoken languages",
+  "account.settings.field.language.proficiencies": "Spoken language",
   "account.settings.field.language.proficiencies.empty": "Add a spoken language",
   "account.settings.field.language_proficiencies.options.empty": "Select a Language",
   "account.settings.field.time.zone": "Time zone",
@@ -67,7 +91,7 @@
   "account.settings.field.time.zone.all": "All time zones",
   "account.settings.field.time.zone.country": "Country time zones",
   "account.settings.section.social.media": "Social Media Links",
-  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your edX profile.",
+  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
   "account.settings.field.social.platform.name.linkedin": "LinkedIn",
   "account.settings.field.social.platform.name.linkedin.empty": "Add LinkedIn profile",
   "account.settings.jump.nav.delete.account": "Delete My Account",
@@ -80,6 +104,12 @@
   "account.settings.editable.field.action.edit": "Edit",
   "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
   "account.settings.static.field.empty.no.admin": "No value set.",
+  "account.settings.field.name.certificate.select": "If checked, this name will appear on your certificates and public-facing records.",
+  "account.settings.field.name.modal.certificate.title": "Choose a preferred name for certificates and public-facing records",
+  "account.settings.field.name.modal.certificate.select": "Select a name",
+  "account.settings.field.name.modal.certificate.option.full": "Full Name",
+  "account.settings.field.name.modal.certificate.option.verified": "Verified Name",
+  "account.settings.field.name.modal.certificate.button.choose": "Choose name",
   "account.settings.coaching.consent.welcome.header": "Let’s get started.",
   "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
   "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
@@ -101,17 +131,20 @@
   "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
   "account.settings.delete.account.header": "Delete My Account",
   "account.settings.delete.account.subheader": "We're sorry to see you go!",
-  "account.settings.delete.account.text.1": "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.",
-  "account.settings.delete.account.text.2": "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.",
-  "account.settings.delete.account.text.3.link": "follow the instructions for printing or downloading a certificate",
-  "account.settings.delete.account.text.warning": "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.",
+  "account.settings.delete.account.text.1": "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.",
+  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on {siteName}.",
+  "account.settings.delete.account.text.2.edX": "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.",
+  "account.settings.delete.account.text.3.link": "Follow these instructions for printing or downloading a certificate",
+  "account.settings.delete.account.text.warning": "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}.",
   "account.settings.delete.account.text.change.instead": "Want to change your email, name, or password instead?",
   "account.settings.delete.account.button": "Delete My Account",
   "account.settings.delete.account.please.activate": "activate your account",
+  "account.settings.delete.account.please.confirm": "confirm your account",
   "account.settings.delete.account.please.unlink": "unlink all social media accounts",
   "account.settings.delete.account.modal.header": "Are you sure?",
-  "account.settings.delete.account.modal.text.1": "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.",
-  "account.settings.delete.account.modal.text.2": "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.",
+  "account.settings.delete.account.modal.text.1": "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.",
+  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on {siteName}.",
+  "account.settings.delete.account.modal.text.2.edX": "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.",
   "account.settings.delete.account.modal.enter.password": "If you still wish to continue and delete your account, please enter your account password:",
   "account.settings.delete.account.modal.confirm.delete": "Yes, Delete",
   "account.settings.delete.account.modal.confirm.cancel": "Cancel",
@@ -122,7 +155,8 @@
   "account.settings.delete.account.modal.after.header": "We're sorry to see you go!  Your account will be deleted shortly.",
   "account.settings.delete.account.modal.after.text": "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.",
   "account.settings.delete.account.modal.after.button": "Close",
-  "account.settings.delete.account.text.3": "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}.",
+  "account.settings.delete.account.text.3.edX": "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}.",
+  "account.settings.delete.account.text.3": "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.",
   "account.settings.message.demographics.service.issue": "An error occurred attempting to retrieve or save your account information. Please try again later.",
   "account.settings.field.demographics.gender": "Gender identity",
   "account.settings.field.demographics.gender.empty": "Add gender identity",
@@ -153,7 +187,17 @@
   "account.settings.field.demographics.future_work_sector": "Future work industry",
   "account.settings.field.demographics.future_work_sector.empty": "Add work industry",
   "account.settings.field.demographics.work_sector.options.empty": "Select work industry",
-  "account.settings.section.demographics.why": "Why does edX collect this information?",
+  "account.settings.section.demographics.why": "Why does {siteName} collect this information?",
+  "account.settings.name.change.title.id": "This name change requires identity verification",
+  "account.settings.name.change.title.begin": "Before we begin",
+  "account.settings.name.change.warning.one": "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.",
+  "account.settings.name.change.warning.two": "This action cannot be undone without verifying your identity.",
+  "account.settings.name.change.id.name.label": "Enter your name as it appears on your unexpired student, work, or government-issued identification card.",
+  "account.settings.name.change.id.name.placeholder": "Enter the name on your photo ID",
+  "account.settings.name.change.error.valid.name": "Please enter a valid name.",
+  "account.settings.name.change.error.general": "A technical error occurred. Please try again.",
+  "account.settings.name.change.continue": "Continue",
+  "account.settings.name.change.cancel": "Cancel",
   "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
   "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
   "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
@@ -165,23 +209,26 @@
   "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
   "account.settings.sso.unlink.account": "Unlink {name} account",
   "account.settings.sso.no.providers": "No accounts can be linked at this time.",
-  "id.verification.existing.request.denied.text": "You cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
+  "id.verification.access.blocked.denied": "We cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
   "id.verification.next": "Next",
+  "id.verification.support": "support",
+  "id.verification.example.card.alt": "Example of a valid identification card with a full name and photo.",
   "id.verification.requirements.title": "Photo Verification Requirements",
-  "id.verification.requirements.description": "In order to complete Photo Verification online, you will need the following:",
+  "id.verification.requirements.description": "In order to complete Photo Verification, you will need the following:",
   "id.verification.requirements.card.device.title": "Device with Camera",
   "id.verification.requirements.card.device.allow": "Allow",
-  "id.verification.requirements.card.id.title": "Photo Identification",
-  "id.verification.requirements.card.id.text": "You need a valid ID that contains your full name and photo.",
+  "id.verification.requirements.card.id.title": "Photo Identification Card",
+  "id.verification.requirements.card.id.text": "You need a valid identification card that contains your full name and photo, such as a driver’s license or passport.",
   "id.verification.privacy.title": "Privacy Information",
-  "id.verification.privacy.need.photo.question": "Why does edX need my photo?",
+  "id.verification.privacy.need.photo.question": "Why does {siteName} need my photo?",
   "id.verification.privacy.need.photo.answer": "We use your verification photos to confirm your identity and ensure the validity of your certificate.",
-  "id.verification.privacy.do.with.photo.question": "What does edX do with this photo?",
-  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on edX after the verification process is complete.",
-  "id.verification.existing.request.title": "Identity Verification",
-  "id.verification.existing.request.pending.text": "You have already submitted your verification information. You will see a message on your dashboard when the verification process is complete (usually within 5 days).",
+  "id.verification.privacy.do.with.photo.question": "What does {siteName} do with this photo?",
+  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.",
+  "id.verification.access.blocked.title": "Identity Verification",
+  "id.verification.access.blocked.enrollment": "You are not currently enrolled in a course that requires identity verification.",
+  "id.verification.access.blocked.pending": "You have already submitted your verification information. You will see a message on your dashboard when the verification process is complete (usually within 5 days).",
   "id.verification.photo.take": "Take Photo",
-  "id.verification.photo.retake": "Retake Photo",
+  "id.verification.photo.retake": "Retake Photo?",
   "id.verification.photo.enable.detection": "Enable Face Detection",
   "id.verification.photo.enable.detection.portrait.help.text": "If checked, a box will appear around your face. Your face can be seen clearly if the box around it is blue. If your face is not in a good position or undetectable, the box will be red.",
   "id.verification.photo.enable.detection.id.help.text": "If checked, a box will appear around the face on your ID card. The face can be seen clearly if the box around it is blue. If the face is not in a good position or undetectable, the box will be red.",
@@ -232,6 +279,9 @@
   "id.verification.camera.access.failure.temporary.safari.step2": "Click on the Safari app menu, then select \"Preferences.\" You can also use Command+, as a keyboard shortcut.",
   "id.verification.camera.access.failure.temporary.safari.step3": "Select the \"Websites\" tab and then select \"Camera.\"",
   "id.verification.camera.access.failure.temporary.safari.step4": "Select \"edx.org\" and change the camera permissions to \"Allow.\"",
+  "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": "Helpful Photo Tips",
   "id.verification.photo.tips.description": "Next, we'll need you to take a photo of your face. Please review the helpful tips below.",
   "id.verification.photo.tips.list.title": "Photo Tips",
@@ -239,54 +289,62 @@
   "id.verification.photo.tips.list.well.lit": "Your face is well-lit.",
   "id.verification.photo.tips.list.inside.frame": "Your entire face fits inside the frame.",
   "id.verification.portrait.photo.title.camera": "Take a Photo of Yourself",
-  "id.verification.portrait.photo.title.upload": "Upload a Photo of Yourself",
-  "id.verification.portrait.photo.preview.alt": "Preview of photo of user's face.",
   "id.verification.portrait.photo.instructions.camera": "When your face is in position, use the Take Photo button below to take your photo.",
-  "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: .jpg, .jpeg, .png)",
   "id.verification.camera.help.sight.question": "What if I can't see the camera image or if I can't see my photo to determine which side is visible?",
   "id.verification.camera.help.sight.answer.portrait": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally the best position for a headshot is approximately 12-18 inches (30-45 centimeters) from the camera, with your head centered relative to the computer screen. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle.",
   "id.verification.camera.help.sight.answer.id": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally, the best position for a photo of an ID card is 8-12 inches (20-30 centimeters) from the camera, with the ID card centered relative to the camera. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle. The most common reason for rejection is inability to read the text on the ID card.",
   "id.verification.camera.help.difficulty.question.portrait": "What if I have difficulty holding my head in position relative to the camera?",
   "id.verification.camera.help.difficulty.question.id": "What if I have difficulty holding my ID in position relative to the camera?",
-  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact edX support for additional suggestions.",
-  "id.verification.id.photo.unclear.question": "Is your ID image not clear or too blurry?",
-  "id.verification.id.tips.title": "Helpful ID Tips",
-  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid ID that includes your name. Please have your ID ready.",
-  "id.verification.id.tips.list.well.lit": "Your ID is well-lit.",
+  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
+  "id.verification.id.photo.unclear.question": "Is your ID card image not clear or too blurry?",
+  "id.verification.id.tips.title": "Helpful Identification Card Tips",
+  "id.verification.id.tips.description": "Next, we'll need you to take a photo of a valid identification card that includes your full name and photo, such as a driver’s license or passport. Please have your ID ready.",
+  "id.verification.id.tips.list.well.lit": "Your identification card is well-lit.",
   "id.verification.id.tips.list.clear": "Ensure that you can see your photo and clearly read your name.",
-  "id.verification.id.photo.title.camera": "Take a Photo of Your ID",
-  "id.verification.id.photo.title.upload": "Upload a Photo of Your ID",
+  "id.verification.id.photo.title.camera": "Take a Photo of Your Identification Card",
+  "id.verification.id.photo.title.upload": "Upload a Photo of Your Identification Card",
   "id.verification.id.photo.preview.alt": "Preview of photo ID.",
-  "id.verification.id.photo.instructions.camera": "When your ID is in position, use the Take Photo button below to take your photo.",
-  "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: .jpg, .jpeg, .png)",
-  "id.verification.id.photo.instructions.upload.error": "The file you have selected is too large. Please try again with a file less than 10MB.",
-  "id.verification.account.name.title": "Account Name Check",
-  "id.verification.account.name.instructions": "The name on your account and the name on your ID must be an exact match. If not, please click \"No\" to update your account name.",
-  "id.verification.account.name.radio.label": "Does the name on your ID match the Account Name below?",
-  "id.verification.account.name.radio.yes": "Yes",
-  "id.verification.account.name.radio.no": "No",
-  "id.verification.account.name.error": "Please update account name to match the name on your ID.",
+  "id.verification.id.photo.instructions.camera": "When your ID is in position, use the Take Photo button below to take your photo. Please use a passport, driver’s license, or another identification card that includes your full name and a picture of your face.",
+  "id.verification.id.photo.instructions.upload": "Please upload a photo of your identification card. 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.name.check.title": "Double-Check Your Name",
+  "id.verification.name.check.instructions": "Does the name below match the name on your photo ID? If not, update the name below to match your photo ID.",
+  "id.verification.name.check.mismatch.information": "If the name below does not match your photo ID, your identity verification will be denied.",
+  "id.verification.name.error": "Please enter your name as it appears on your photo ID.",
   "id.verification.account.name.warning.prefix": "Please Note:",
   "id.verification.account.name.settings": "Account Settings",
-  "id.verification.account.name.label": "Account Name",
+  "id.verification.name.label": "Name",
   "id.verification.account.name.photo.alt": "Photo of your ID to be submitted.",
-  "id.verification.account.name.save": "Save and Next",
   "id.verification.review.title": "Review Your Photos",
   "id.verification.review.description": "Make sure we can verify your identity with the photos and information you have provided.",
   "id.verification.review.portrait.label": "Your Portrait",
   "id.verification.review.portrait.alt": "Photo of your face to be submitted.",
   "id.verification.review.portrait.retake": "Retake Portrait Photo",
-  "id.verification.review.id.label": "Your Photo ID",
-  "id.verification.review.id.alt": "Photo of your ID to be submitted.",
+  "id.verification.review.id.label": "Your Identification Card",
+  "id.verification.review.id.alt": "Photo of your identification card to be submitted.",
   "id.verification.review.id.retake": "Retake ID Photo",
   "id.verification.review.confirm": "Submit",
-  "id.verification.review.error": "edX Support Page",
+  "id.verification.submission.alert.error.face": "A photo of your face is required. Please retake your portrait photo.",
+  "id.verification.submission.alert.error.id": "A photo of your ID card is required. Please retake your ID photo.",
+  "id.verification.submission.alert.error.name": "A valid account name is required. Please update your account name to match the name on your ID.",
+  "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": "{siteName} Support Page",
   "id.verification.submitted.title": "Identity Verification in Progress",
-  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will see a message on your dashboard when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
+  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will be notified when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
   "id.verification.return.dashboard": "Return to Your Dashboard",
   "id.verification.return.course": "Return to Course",
+  "id.verification.return.generic": "Return",
+  "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.request.camera.access.instructions": "In order to take a photo using your webcam, you may receive a browser prompt for access to your camera. {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": "You need a device that has a camera. If you receive a browser prompt for access to your camera, please make sure to click {allow}.",
-  "idv.submission.alert.error": "\n            We encountered a technical error while trying to submit ID verification.\n            This might be a temporary issue, so please try again in a few minutes.\n            If the problem persists,\n            please go to {support_link} for help.\n          ",
-  "id.verification.account.name.edit": "Edit{sr}"
+  "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          We encountered a technical error while trying to submit ID verification.\n          This might be a temporary issue, so please try again in a few minutes.\n          If the problem persists, please go to {support_link} for help.\n        ",
+  "id.verification.account.name.edit": "Edit {sr}"
 }

src/id-verification/AccessBlocked.jsx

@@ -0,0 +1,49 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { getConfig } from '@edx/frontend-platform';
+import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
+
+import messages from './IdVerification.messages';
+import { ERROR_REASONS } from './IdVerificationContext';
+
+function AccessBlocked({ error, intl }) {
+  const handleMessage = () => {
+    if (error === ERROR_REASONS.COURSE_ENROLLMENT) {
+      return <p>{intl.formatMessage(messages['id.verification.access.blocked.enrollment'])}</p>;
+    }
+    if (error === ERROR_REASONS.EXISTING_REQUEST) {
+      return <p>{intl.formatMessage(messages['id.verification.access.blocked.pending'])}</p>;
+    }
+    return (
+      <FormattedMessage
+        id="id.verification.access.blocked.denied"
+        defaultMessage="We cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}."
+        description="Text that displays when user is denied from making a request, and to check their email for an activation email."
+        values={{
+          email: <strong>no-reply@registration.edx.org</strong>,
+        }}
+      />
+    );
+  };
+
+  return (
+    <div>
+      <h3 aria-level="1" tabIndex="-1">
+        {intl.formatMessage(messages['id.verification.access.blocked.title'])}
+      </h3>
+      {handleMessage()}
+      <div className="action-row">
+        <a className="btn btn-primary mt-3" href={`${getConfig().LMS_BASE_URL}/dashboard`}>
+          {intl.formatMessage(messages['id.verification.return.dashboard'])}
+        </a>
+      </div>
+    </div>
+  );
+}
+
+AccessBlocked.propTypes = {
+  intl: intlShape.isRequired,
+  error: PropTypes.string.isRequired,
+};
+
+export default injectIntl(AccessBlocked);

src/id-verification/Camera.jsx

@@ -1,6 +1,9 @@
+/* eslint-disable jsx-a11y/media-has-caption */
+/* eslint-disable jsx-a11y/no-access-key */
 import React from 'react';
 import PropTypes from 'prop-types';
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
+// eslint-disable-next-line import/no-unresolved
 import * as blazeface from '@tensorflow-models/blazeface';
 import CameraPhoto, { FACING_MODES } from 'jslib-html5-camera-photo';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
@@ -38,25 +41,9 @@ class Camera extends React.Component {
     this.cameraPhoto.stopCamera();
   }
 
-  sendEvent() {
-    let eventName = 'edx.id_verification';
-    if (this.props.isPortrait) {
-      eventName += '.user_photo';
-    } else {
-      eventName += '.id_photo';
-    }
-
-    if (this.state.shouldDetect) {
-      eventName += '.face_detection_enabled';
-    } else {
-      eventName += '.face_detection_disabled';
-    }
-    sendTrackEvent(eventName);
-  }
-
   setDetection() {
     this.setState(
-      { shouldDetect: !this.state.shouldDetect },
+      (state) => ({ shouldDetect: !state.shouldDetect }),
       () => {
         if (this.state.shouldDetect) {
           this.setState({ isFinishedLoadingDetection: false });
@@ -67,21 +54,65 @@ class Camera extends React.Component {
     );
   }
 
-  startDetection() {
-    setTimeout(() => {
-      if (this.state.videoHasLoaded) {
-        const loadModelPromise = blazeface.load();
-        Promise.all([loadModelPromise])
-          .then((values) => {
-            this.setState({ isFinishedLoadingDetection: true });
-            this.detectFromVideoFrame(values[0], this.videoRef.current);
-          });
-      } else {
-        this.setState({ isFinishedLoadingDetection: true });
-        this.setState({ shouldDetect: false });
-        // TODO: add error message
+  setVideoHasLoaded() {
+    this.setState({ videoHasLoaded: 'true' });
+  }
+
+  getGridPosition(coordinates) {
+    // Used to determine where a face is (i.e. top-left, center-right, bottom-center, etc.)
+
+    const x = coordinates[0];
+    const y = coordinates[1];
+
+    let messageBase = 'id.verification.photo.feedback';
+
+    const heightUpperLimit = 320;
+    const heightMiddleLimit = 160;
+
+    if (y < heightMiddleLimit) {
+      messageBase += '.top';
+    } else if (y < heightUpperLimit && y >= heightMiddleLimit) {
+      messageBase += '.center';
+    } else {
+      messageBase += '.bottom';
+    }
+
+    const widthRightLimit = 213;
+    const widthMiddleLimit = 427;
+
+    if (x < widthRightLimit) {
+      messageBase += '.right';
+    } else if (x >= widthRightLimit && x < widthMiddleLimit) {
+      messageBase += '.center';
+    } else {
+      messageBase += '.left';
+    }
+
+    return messageBase;
+  }
+
+  getSizeFactor() {
+    let sizeFactor = 1;
+    const settings = this.cameraPhoto.getCameraSettings();
+    if (settings) {
+      const videoWidth = settings.width;
+      const videoHeight = settings.height;
+      // need to multiply by 3 because each pixel contains 3 bytes
+      const currentSize = videoWidth * videoHeight * 3;
+      // chose a limit of 9,999,999 (bytes) so that result will
+      // always be less than 10MB
+      const ratio = 9999999 / currentSize;
+
+      if (ratio < 1) {
+        // if the current resolution creates an image larger than 10 MB, adjust sizeFactor (resolution)
+        // to ensure that image will have a file size of less than 10 MB.
+        sizeFactor = ratio;
+      } else if (videoWidth === 640 && videoHeight === 480) {
+        // otherwise increase the resolution to try and prevent blurry images.
+        sizeFactor = 2;
       }
-    }, 1000);
+    }
+    return sizeFactor;
   }
 
   detectFromVideoFrame = (model, video) => {
@@ -146,6 +177,39 @@ class Camera extends React.Component {
     }
   }
 
+  startDetection() {
+    setTimeout(() => {
+      if (this.state.videoHasLoaded) {
+        const loadModelPromise = blazeface.load();
+        Promise.all([loadModelPromise])
+          .then((values) => {
+            this.setState({ isFinishedLoadingDetection: true });
+            this.detectFromVideoFrame(values[0], this.videoRef.current);
+          });
+      } else {
+        this.setState({ isFinishedLoadingDetection: true });
+        this.setState({ shouldDetect: false });
+        // TODO: add error message
+      }
+    }, 1000);
+  }
+
+  sendEvent() {
+    let eventName = 'edx.id_verification';
+    if (this.props.isPortrait) {
+      eventName += '.user_photo';
+    } else {
+      eventName += '.id_photo';
+    }
+
+    if (this.state.shouldDetect) {
+      eventName += '.face_detection_enabled';
+    } else {
+      eventName += '.face_detection_disabled';
+    }
+    sendTrackEvent(eventName);
+  }
+
   giveFeedback(numFaces, rightEye, isCorrect) {
     if (this.state.shouldGiveFeedback) {
       const currentFeedback = this.state.feedback;
@@ -176,39 +240,6 @@ class Camera extends React.Component {
     }
   }
 
-  getGridPosition(coordinates) {
-    // Used to determine where a face is (i.e. top-left, center-right, bottom-center, etc.)
-
-    const x = coordinates[0];
-    const y = coordinates[1];
-
-    let messageBase = 'id.verification.photo.feedback';
-
-    const heightUpperLimit = 320;
-    const heightMiddleLimit = 160;
-
-    if (y < heightMiddleLimit) {
-      messageBase += '.top';
-    } else if (y < heightUpperLimit && y >= heightMiddleLimit) {
-      messageBase += '.center';
-    } else {
-      messageBase += '.bottom';
-    }
-
-    const widthRightLimit = 213;
-    const widthMiddleLimit = 427;
-
-    if (x < widthRightLimit) {
-      messageBase += '.right';
-    } else if (x >= widthRightLimit && x < widthMiddleLimit) {
-      messageBase += '.center';
-    } else {
-      messageBase += '.left';
-    }
-
-    return messageBase;
-  }
-
   isInRangeForPortrait(x, y) {
     return x > 47 && x < 570 && y > 100 && y < 410;
   }
@@ -217,13 +248,10 @@ class Camera extends React.Component {
     return x > 120 && x < 470 && y > 120 && y < 350;
   }
 
-  setVideoHasLoaded() {
-    this.setState({ videoHasLoaded: 'true' });
-  }
-
   takePhoto() {
     if (this.state.dataUri) {
-      return this.reset();
+      this.reset();
+      return;
     }
 
     const config = {
@@ -236,30 +264,6 @@ class Camera extends React.Component {
     this.props.onImageCapture(dataUri);
   }
 
-  getSizeFactor() {
-    let sizeFactor = 1;
-    const settings = this.cameraPhoto.getCameraSettings();
-    if (settings) {
-      const videoWidth = settings.width;
-      const videoHeight = settings.height;
-      // need to multiply by 3 because each pixel contains 3 bytes
-      const currentSize = videoWidth * videoHeight * 3;
-      // chose a limit of 9,999,999 (bytes) so that result will
-      // always be less than 10MB
-      const ratio = 9999999 / currentSize;
-
-      if (ratio < 1) {
-        // if the current resolution creates an image larger than 10 MB, adjust sizeFactor (resolution)
-        // to ensure that image will have a file size of less than 10 MB.
-        sizeFactor = ratio;
-      } else if (videoWidth === 640 && videoHeight === 480) {
-        // otherwise increase the resolution to try and prevent blurry images.
-        sizeFactor = 2;
-      }
-    }
-    return sizeFactor;
-  }
-
   playShutterClick() {
     const audio = new Audio(`data:audio/mp3;base64,${shutter.base64}`);
     audio.play();
@@ -278,7 +282,7 @@ class Camera extends React.Component {
       : 'camera-flash';
     return (
       <div className="camera-outer-wrapper shadow">
-        <Form.Group style={{ textAlign: 'left', padding: '0.5rem', marginBottom: '0.5rem' }} >
+        <Form.Group style={{ textAlign: 'left', padding: '0.5rem', marginBottom: '0.5rem' }}>
           <Form.Check
             id="videoDetection"
             name="videoDetection"
@@ -332,9 +336,10 @@ class Camera extends React.Component {
           <div role="status" className="sr-only">{this.state.feedback}</div>
         </div>
         <button
+          type="button"
           className={`btn camera-btn ${
-            this.state.dataUri ?
-              'btn-outline-primary'
+            this.state.dataUri
+              ? 'btn-outline-primary'
               : 'btn-primary'
           }`}
           accessKey="c"

src/id-verification/CameraHelp.jsx

@@ -1,9 +1,9 @@
-
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Collapsible } from '@edx/paragon';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
+import { getConfig } from '@edx/frontend-platform';
 import messages from './IdVerification.messages';
 
 function CameraHelp(props) {
@@ -26,7 +26,10 @@ function CameraHelp(props) {
         defaultOpen={props.isOpen}
       >
         <p>
-          {props.intl.formatMessage(messages['id.verification.camera.help.difficulty.answer'])}
+          {props.intl.formatMessage(
+            messages['id.verification.camera.help.difficulty.answer'],
+            { siteName: getConfig().SITE_NAME },
+          )}
         </p>
       </Collapsible>
     </div>

src/id-verification/CameraHelpWithUpload.jsx

@@ -6,8 +6,9 @@ import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 
 import messages from './IdVerification.messages';
 import ImageFileUpload from './ImageFileUpload';
-import { IdVerificationContext } from './IdVerificationContext';
+import IdVerificationContext from './IdVerificationContext';
 import ImagePreview from './ImagePreview';
+import SupportedMediaTypes from './SupportedMediaTypes';
 
 function CameraHelpWithUpload(props) {
   const { setIdPhotoFile, idPhotoFile, userId } = useContext(IdVerificationContext);
@@ -34,6 +35,7 @@ function CameraHelpWithUpload(props) {
         {idPhotoFile && hasUploadedImage && <ImagePreview src={idPhotoFile} alt={props.intl.formatMessage(messages['id.verification.id.photo.preview.alt'])} />}
         <p>
           {props.intl.formatMessage(messages['id.verification.id.photo.instructions.upload'])}
+          <SupportedMediaTypes />
         </p>
         <ImageFileUpload onFileChange={setAndTrackIdPhotoFile} intl={props.intl} />
       </Collapsible>

src/id-verification/CollapsibleImageHelp.jsx

@@ -0,0 +1,56 @@
+import React, { useContext } from 'react';
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { Button, Collapsible } from '@edx/paragon';
+
+import IdVerificationContext from './IdVerificationContext';
+import messages from './IdVerification.messages';
+
+function CollapsibleImageHelp(props) {
+  const {
+    userId, useCameraForId, setUseCameraForId,
+  } = useContext(IdVerificationContext);
+
+  function handleClick() {
+    const toggleTo = useCameraForId ? 'upload' : 'camera';
+    const eventName = `edx.id_verification.toggle_to.${toggleTo}`;
+    sendTrackEvent(eventName, {
+      category: 'id_verification',
+      user_id: userId,
+    });
+    setUseCameraForId(!useCameraForId);
+  }
+
+  return (
+    <Collapsible
+      styling="card"
+      title={useCameraForId
+        ? props.intl.formatMessage(messages['id.verification.photo.upload.help.title'])
+        : props.intl.formatMessage(messages['id.verification.photo.camera.help.title'])}
+      className="mb-4 shadow"
+      defaultOpen
+    >
+      <p data-testid="help-text">
+        {useCameraForId
+          ? props.intl.formatMessage(messages['id.verification.photo.upload.help.text'])
+          : props.intl.formatMessage(messages['id.verification.photo.camera.help.text'])}
+      </p>
+      <Button
+        title={useCameraForId ? 'Upload Photo' : 'Take Photo'} // TO-DO: translation
+        data-testid="toggle-button"
+        onClick={handleClick}
+        style={{ marginTop: '0.5rem' }}
+      >
+        {useCameraForId
+          ? props.intl.formatMessage(messages['id.verification.photo.upload.help.button'])
+          : props.intl.formatMessage(messages['id.verification.photo.camera.help.button'])}
+      </Button>
+    </Collapsible>
+  );
+}
+
+CollapsibleImageHelp.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(CollapsibleImageHelp);

src/id-verification/ExistingRequest.jsx

@@ -1,37 +0,0 @@
-import React from 'react';
-import { getConfig } from '@edx/frontend-platform';
-import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
-
-import messages from './IdVerification.messages';
-
-function ExistingRequest(props) {
-  return (
-    <div>
-      <h3 aria-level="1" tabIndex="-1">
-        {props.intl.formatMessage(messages['id.verification.existing.request.title'])}
-      </h3>
-      {props.status === 'pending' || props.status === 'approved'
-        ? <p>{props.intl.formatMessage(messages['id.verification.existing.request.pending.text'])}</p>
-        : <FormattedMessage
-          id="id.verification.existing.request.denied.text"
-          defaultMessage="You cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}."
-          description="Text that displays when user is denied from making a request, and to check their email for an activation email."
-          values={{
-            email: <strong>no-reply@registration.edx.org</strong>,
-          }}
-        />
-        }
-      <div className="action-row">
-        <a className="btn btn-primary mt-3" href={`${getConfig().LMS_BASE_URL}/dashboard`}>
-          {props.intl.formatMessage(messages['id.verification.return.dashboard'])}
-        </a>
-      </div>
-    </div>
-  );
-}
-
-ExistingRequest.propTypes = {
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(ExistingRequest);

src/id-verification/IdVerification.messages.js

@@ -6,6 +6,16 @@ const messages = defineMessages({
     defaultMessage: 'Next',
     description: 'Next button.',
   },
+  'id.verification.support': {
+    id: 'id.verification.support',
+    defaultMessage: 'support',
+    description: 'Website support.',
+  },
+  'id.verification.example.card.alt': {
+    id: 'id.verification.example.card.alt',
+    defaultMessage: 'Example of a valid identification card with a full name and photo.',
+    description: 'Alt text for an example identification card.',
+  },
   'id.verification.requirements.title': {
     id: 'id.verification.requirements.title',
     defaultMessage: 'Photo Verification Requirements',
@@ -13,7 +23,7 @@ const messages = defineMessages({
   },
   'id.verification.requirements.description': {
     id: 'id.verification.requirements.description',
-    defaultMessage: 'In order to complete Photo Verification online, you will need the following:',
+    defaultMessage: 'In order to complete Photo Verification, you will need the following:',
     description: 'Description for the Photo Verification Requirements page.',
   },
   'id.verification.requirements.card.device.title': {
@@ -28,12 +38,12 @@ const messages = defineMessages({
   },
   'id.verification.requirements.card.id.title': {
     id: 'id.verification.requirements.card.id.title',
-    defaultMessage: 'Photo Identification',
+    defaultMessage: 'Photo Identification Card',
     description: 'Title for the Photo Identification requirement card.',
   },
   'id.verification.requirements.card.id.text': {
     id: 'id.verification.requirements.card.id.text',
-    defaultMessage: 'You need a valid ID that contains your full name and photo.',
+    defaultMessage: 'You need a valid identification card that contains your full name and photo, such as a driver’s license or passport.',
     description: 'Text that explains that the user needs a photo ID.',
   },
   'id.verification.privacy.title': {
@@ -43,31 +53,36 @@ const messages = defineMessages({
   },
   'id.verification.privacy.need.photo.question': {
     id: 'id.verification.privacy.need.photo.question',
-    defaultMessage: 'Why does edX need my photo?',
-    description: 'Question about why edX needs a verification photo.',
+    defaultMessage: 'Why does {siteName} need my photo?',
+    description: 'Question about why the platform needs a verification photo.',
   },
   'id.verification.privacy.need.photo.answer': {
     id: 'id.verification.privacy.need.photo.answer',
     defaultMessage: 'We use your verification photos to confirm your identity and ensure the validity of your certificate.',
-    description: 'Answering why edX needs a verification photo.',
+    description: 'Answering why the platform needs a verification photo.',
   },
   'id.verification.privacy.do.with.photo.question': {
     id: 'id.verification.privacy.do.with.photo.question',
-    defaultMessage: 'What does edX do with this photo?',
-    description: 'Question about what edX does with the verification photo.',
+    defaultMessage: 'What does {siteName} do with this photo?',
+    description: 'Question about what the platform does with the verification photo.',
   },
   'id.verification.privacy.do.with.photo.answer': {
     id: 'id.verification.privacy.do.with.photo.answer',
-    defaultMessage: 'We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on edX after the verification process is complete.',
-    description: 'Answering what edX does with the verification photo.',
+    defaultMessage: 'We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.',
+    description: 'Answering what the platform does with the verification photo.',
   },
-  'id.verification.existing.request.title': {
-    id: 'id.verification.existing.request.title',
+  'id.verification.access.blocked.title': {
+    id: 'id.verification.access.blocked.title',
     defaultMessage: 'Identity Verification',
-    description: 'Title for text that displays when user has already made a request.',
+    description: 'Title for text that displays when a user is blocked from ID verification.',
   },
-  'id.verification.existing.request.pending.text': {
-    id: 'id.verification.existing.request.pending.text',
+  'id.verification.access.blocked.enrollment': {
+    id: 'id.verification.access.blocked.enrollment',
+    defaultMessage: 'You are not currently enrolled in a course that requires identity verification.',
+    description: 'Text that displays when user is trying to verify while not enrolled in a course that requires ID verification.',
+  },
+  'id.verification.access.blocked.pending': {
+    id: 'id.verification.access.blocked.pending',
     defaultMessage: 'You have already submitted your verification information. You will see a message on your dashboard when the verification process is complete (usually within 5 days).',
     description: 'Text that displays when user has a pending or approved request.',
   },
@@ -78,7 +93,7 @@ const messages = defineMessages({
   },
   'id.verification.photo.retake': {
     id: 'id.verification.photo.retake',
-    defaultMessage: 'Retake Photo',
+    defaultMessage: 'Retake Photo?',
     description: 'Button to retake photo.',
   },
   'id.verification.photo.enable.detection': {
@@ -331,6 +346,21 @@ const messages = defineMessages({
     defaultMessage: 'Select "edx.org" and change the camera permissions to "Allow."',
     description: 'Text for step four of enabling camera access.',
   },
+  'id.verification.camera.access.failure.unsupported': {
+    id: 'id.verification.camera.access.failure.unsupported',
+    defaultMessage: 'It looks like your browser does not support camera access.',
+    description: 'Text indicating that the user\'s browser does not support camera access.',
+  },
+  'id.verification.camera.access.failure.unsupported.chrome.explanation': {
+    id: 'id.verification.camera.access.failure.unsupported.chrome.explanation',
+    defaultMessage: 'The Chrome browser currently does not support camera access on iOS devices, such as iPhones and iPads.',
+    description: 'Explanation for why certain web browsers, like Chrome, do not support accessing the user\'s camera.',
+  },
+  'id.verification.camera.access.failure.unsupported.instructions': {
+    id: 'id.verification.camera.access.failure.unsupported.instructions',
+    defaultMessage: 'Please use another browser to complete Identity Verification.',
+    description: 'Instructions for the user to user another web browser to complete the process.',
+  },
   'id.verification.photo.tips.title': {
     id: 'id.verification.photo.tips.title',
     defaultMessage: 'Helpful Photo Tips',
@@ -366,26 +396,11 @@ const messages = defineMessages({
     defaultMessage: 'Take a Photo of Yourself',
     description: 'Title for the Portrait Photo page if camera access is enabled.',
   },
-  'id.verification.portrait.photo.title.upload': {
-    id: 'id.verification.portrait.photo.title.upload',
-    defaultMessage: 'Upload a Photo of Yourself',
-    description: 'Title for the Portrait Photo page if camera access is disabled.',
-  },
-  'id.verification.portrait.photo.preview.alt': {
-    id: 'id.verification.portrait.photo.preview.alt',
-    defaultMessage: 'Preview of photo of user\'s face.',
-    description: 'Alt text for the portrait photo preview.',
-  },
   'id.verification.portrait.photo.instructions.camera': {
     id: 'id.verification.portrait.photo.instructions.camera',
     defaultMessage: 'When your face is in position, use the Take Photo button below to take your photo.',
     description: 'Instructions to use the camera to take a portrait photo..',
   },
-  'id.verification.portrait.photo.instructions.upload': {
-    id: 'id.verification.portrait.photo.instructions.upload',
-    defaultMessage: 'Please upload a portrait photo. Ensure your entire face fits inside the frame and is well-lit. (Supported formats: .jpg, .jpeg, .png)',
-    description: 'Instructions for portrait photo upload.',
-  },
   'id.verification.camera.help.sight.question': {
     id: 'id.verification.camera.help.sight.question',
     defaultMessage: 'What if I can\'t see the camera image or if I can\'t see my photo to determine which side is visible?',
@@ -413,27 +428,27 @@ const messages = defineMessages({
   },
   'id.verification.camera.help.difficulty.answer': {
     id: 'id.verification.camera.help.difficulty.answer',
-    defaultMessage: 'If you require assistance with taking a photo for submission, contact edX support for additional suggestions.',
+    defaultMessage: 'If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.',
     description: 'Confirming what to do if the user has difficult holding their head relative to the camera.',
   },
   'id.verification.id.photo.unclear.question': {
     id: 'id.verification.id.photo.unclear.question',
-    defaultMessage: 'Is your ID image not clear or too blurry?',
+    defaultMessage: 'Is your ID card image not clear or too blurry?',
     description: 'Question on what to do if the user\'s ID image is unclear',
   },
   'id.verification.id.tips.title': {
     id: 'id.verification.id.tips.title',
-    defaultMessage: 'Helpful ID Tips',
+    defaultMessage: 'Helpful Identification Card Tips',
     description: 'Title for the ID Tips page.',
   },
   'id.verification.id.tips.description': {
     id: 'id.verification.id.tips.description',
-    defaultMessage: 'Next, we\'ll need you to take a photo of a valid ID that includes your name. Please have your ID ready.',
+    defaultMessage: 'Next, we\'ll need you to take a photo of a valid identification card that includes your full name and photo, such as a driver’s license or passport. Please have your ID ready.',
     description: 'Description for the ID Tips page.',
   },
   'id.verification.id.tips.list.well.lit': {
     id: 'id.verification.id.tips.list.well.lit',
-    defaultMessage: 'Your ID is well-lit.',
+    defaultMessage: 'Your identification card is well-lit.',
     description: 'Tip to ensure ID is well lit.',
   },
   'id.verification.id.tips.list.clear': {
@@ -443,12 +458,12 @@ const messages = defineMessages({
   },
   'id.verification.id.photo.title.camera': {
     id: 'id.verification.id.photo.title.camera',
-    defaultMessage: 'Take a Photo of Your ID',
+    defaultMessage: 'Take a Photo of Your Identification Card',
     description: 'Title for the ID Photo page if camera access is enabled.',
   },
   'id.verification.id.photo.title.upload': {
     id: 'id.verification.id.photo.title.upload',
-    defaultMessage: 'Upload a Photo of Your ID',
+    defaultMessage: 'Upload a Photo of Your Identification Card',
     description: 'Title for the ID Photo page if camera access is disabled.',
   },
   'id.verification.id.photo.preview.alt': {
@@ -458,48 +473,43 @@ const messages = defineMessages({
   },
   'id.verification.id.photo.instructions.camera': {
     id: 'id.verification.id.photo.instructions.camera',
-    defaultMessage: 'When your ID is in position, use the Take Photo button below to take your photo.',
+    defaultMessage: 'When your ID is in position, use the Take Photo button below to take your photo. Please use a passport, driver’s license, or another identification card that includes your full name and a picture of your face.',
     description: 'Instructions to use the camera to take an ID photo.',
   },
   'id.verification.id.photo.instructions.upload': {
     id: 'id.verification.id.photo.instructions.upload',
-    defaultMessage: '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: .jpg, .jpeg, .png)',
+    defaultMessage: 'Please upload a photo of your identification card. Ensure the entire ID fits inside the frame and is well-lit. The file size must be under 10 MB. Supported formats: ',
     description: 'Instructions for ID photo upload.',
   },
-  'id.verification.id.photo.instructions.upload.error': {
-    id: 'id.verification.id.photo.instructions.upload.error',
+  'id.verification.id.photo.instructions.upload.error.invalidFileType': {
+    id: 'id.verification.id.photo.instructions.upload.error.invalidFileType',
+    defaultMessage: 'The file you have selected is not a supported image type. Please choose from the following formats: ',
+    description: 'Error message for file upload that is not a supported image type.',
+  },
+  'id.verification.id.photo.instructions.upload.error.fileTooLarge': {
+    id: 'id.verification.id.photo.instructions.upload.error.fileTooLarge',
     defaultMessage: 'The file you have selected is too large. Please try again with a file less than 10MB.',
     description: 'Error message for file upload that is larger than 10MB.',
   },
-  'id.verification.account.name.title': {
-    id: 'id.verification.account.name.title',
-    defaultMessage: 'Account Name Check',
-    description: 'Title for the Account Name Check page.',
+  'id.verification.name.check.title': {
+    id: 'id.verification.name.check.title',
+    defaultMessage: 'Double-Check Your Name',
+    description: 'Title for the page where a user double-checks that their name is correct.',
   },
-  'id.verification.account.name.instructions': {
-    id: 'id.verification.account.name.instructions',
-    defaultMessage: 'The name on your account and the name on your ID must be an exact match. If not, please click "No" to update your account name.',
-    description: 'Text to verify that the account name matches the name on the ID photo.',
+  'id.verification.name.check.instructions': {
+    id: 'id.verification.name.check.instructions',
+    defaultMessage: 'Does the name below match the name on your photo ID? If not, update the name below to match your photo ID.',
+    description: 'Text to instruct the user to check that the name displayed on the page matches what is on their photo ID.',
   },
-  'id.verification.account.name.radio.label': {
-    id: 'id.verification.account.name.radio.label',
-    defaultMessage: 'Does the name on your ID match the Account Name below?',
-    description: 'Question to ask the user whether their account name match the name on their ID card.',
+  'id.verification.name.check.mismatch.information': {
+    id: 'id.verification.name.check.mismatch.information',
+    defaultMessage: 'If the name below does not match your photo ID, your identity verification will be denied.',
+    description: 'Text to inform the user that if the name displayed on the page does not match what is on their photo ID, identity verification will be denied.',
   },
-  'id.verification.account.name.radio.yes': {
-    id: 'id.verification.account.name.radio.yes',
-    defaultMessage: 'Yes',
-    description: 'The radio button that says the account name matches.',
-  },
-  'id.verification.account.name.radio.no': {
-    id: 'id.verification.account.name.radio.no',
-    defaultMessage: 'No',
-    description: 'The radio button that says the account name does not match.',
-  },
-  'id.verification.account.name.error': {
-    id: 'id.verification.account.name.error',
-    defaultMessage: 'Please update account name to match the name on your ID.',
-    description: 'Error that shows when the user needs to update their account name to match the name on their ID.',
+  'id.verification.name.error': {
+    id: 'id.verification.name.error',
+    defaultMessage: 'Please enter your name as it appears on your photo ID.',
+    description: 'Error that shows when the user needs to update their name to match the name on their ID.',
   },
   'id.verification.account.name.warning.prefix': {
     id: 'id.verification.account.name.warning.prefix',
@@ -511,21 +521,16 @@ const messages = defineMessages({
     defaultMessage: 'Account Settings',
     description: 'Link to Account Settings.',
   },
-  'id.verification.account.name.label': {
-    id: 'id.verification.account.name.label',
-    defaultMessage: 'Account Name',
-    description: 'Label for account name input.',
+  'id.verification.name.label': {
+    id: 'id.verification.name.label',
+    defaultMessage: 'Name',
+    description: 'Label for name input.',
   },
   'id.verification.account.name.photo.alt': {
     id: 'id.verification.account.name.photo.alt',
     defaultMessage: 'Photo of your ID to be submitted.',
     description: 'Alt text for the photo of the user\'s ID.',
   },
-  'id.verification.account.name.save': {
-    id: 'id.verification.account.name.save',
-    defaultMessage: 'Save and Next',
-    description: 'Button to save the account name.',
-  },
   'id.verification.review.title': {
     id: 'id.verification.review.title',
     defaultMessage: 'Review Your Photos',
@@ -553,12 +558,12 @@ const messages = defineMessages({
   },
   'id.verification.review.id.label': {
     id: 'id.verification.review.id.label',
-    defaultMessage: 'Your Photo ID',
+    defaultMessage: 'Your Identification Card',
     description: 'Label for the Photo ID card.',
   },
   'id.verification.review.id.alt': {
     id: 'id.verification.review.id.alt',
-    defaultMessage: 'Photo of your ID to be submitted.',
+    defaultMessage: 'Photo of your identification card to be submitted.',
     description: 'Alt text for the ID photo.',
   },
   'id.verification.review.id.retake': {
@@ -571,10 +576,30 @@ const messages = defineMessages({
     defaultMessage: 'Submit',
     description: 'Button to confirm all information is correct and submit.',
   },
+  'id.verification.submission.alert.error.face': {
+    id: 'id.verification.submission.alert.error.face',
+    defaultMessage: 'A photo of your face is required. Please retake your portrait photo.',
+    description: 'Error message displayed when the user\'s portrait photo is missing.',
+  },
+  'id.verification.submission.alert.error.id': {
+    id: 'id.verification.submission.alert.error.id',
+    defaultMessage: 'A photo of your ID card is required. Please retake your ID photo.',
+    description: 'Error message displayed when the user\'s ID photo is missing.',
+  },
+  'id.verification.submission.alert.error.name': {
+    id: 'id.verification.submission.alert.error.name',
+    defaultMessage: 'A valid account name is required. Please update your account name to match the name on your ID.',
+    description: 'Error message displayed when the user\'s account name is missing.',
+  },
+  'id.verification.submission.alert.error.unsupported': {
+    id: 'id.verification.submission.alert.error.unsupported',
+    defaultMessage: 'One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ',
+    description: 'Error message displayed when the user uploads an unsupported file type.',
+  },
   'id.verification.review.error': {
     id: 'id.verification.review.error',
-    defaultMessage: 'edX Support Page',
-    description: 'Text linking to the support page.',
+    defaultMessage: '{siteName} Support Page',
+    description: 'Text linking to the platform support page.',
   },
   'id.verification.submitted.title': {
     id: 'id.verification.submitted.title',
@@ -583,7 +608,7 @@ const messages = defineMessages({
   },
   'id.verification.submitted.text': {
     id: 'id.verification.submitted.text',
-    defaultMessage: 'We have received your information and are verifying your identity. You will see a message on your dashboard when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.',
+    defaultMessage: 'We have received your information and are verifying your identity. You will be notified when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.',
     description: 'Text confirming that ID verification request has been received.',
   },
   'id.verification.return.dashboard': {
@@ -596,6 +621,41 @@ const messages = defineMessages({
     defaultMessage: 'Return to Course',
     description: 'Return to the course which ID verification was accessed from.',
   },
+  'id.verification.return.generic': {
+    id: 'id.verification.return.generic',
+    defaultMessage: 'Return',
+    description: 'Button to return to the user\'s original location.',
+  },
+  'id.verification.photo.upload.help.title': {
+    id: 'id.verification.photo.upload.help.title',
+    defaultMessage: 'Upload a Photo Instead',
+    description: 'Title for section that allows switching to photo upload mode.',
+  },
+  'id.verification.photo.camera.help.title': {
+    id: 'id.verification.photo.camera.help.title',
+    defaultMessage: 'Use Your Camera Instead',
+    description: 'Title for section that allows switching to camera mode.',
+  },
+  'id.verification.photo.upload.help.text': {
+    id: 'id.verification.photo.upload.help.text',
+    defaultMessage: '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.',
+    description: 'Help text for switching to upload mode.',
+  },
+  'id.verification.photo.camera.help.text': {
+    id: 'id.verification.photo.camera.help.text',
+    defaultMessage: '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.',
+    description: 'Help text for switching to camera mode.',
+  },
+  'id.verification.photo.upload.help.button': {
+    id: 'id.verification.upload.help.button',
+    defaultMessage: 'Switch to Upload Mode',
+    description: 'Button used to switch to upload mode.',
+  },
+  'id.verification.photo.camera.help.button': {
+    id: 'id.verification.camera.help.button',
+    defaultMessage: 'Switch to Camera Mode',
+    description: 'Button used to switch to camera mode.',
+  },
 });
 
 export default messages;

src/id-verification/IdVerificationContext.jsx

@@ -1,11 +1,4 @@
-import React, { useState, useContext, useEffect } from 'react';
-import PropTypes from 'prop-types';
-import { AppContext } from '@edx/frontend-platform/react';
-
-import { hasGetUserMediaSupport } from './getUserMediaShim';
-import { getExistingIdVerification } from './data/service';
-import PageLoading from '../account-settings/PageLoading';
-import ExistingRequest from './ExistingRequest';
+import React from 'react';
 
 const IdVerificationContext = React.createContext({});
 
@@ -16,83 +9,17 @@ const MEDIA_ACCESS = {
   GRANTED: 'granted',
 };
 
-function IdVerificationContextProvider({ children }) {
-  const [existingIdVerification, setExistingIdVerification] = useState(null);
-  const [facePhotoFile, setFacePhotoFile] = useState(null);
-  const [idPhotoFile, setIdPhotoFile] = useState(null);
-  const [idPhotoName, setIdPhotoName] = useState(null);
-  const [mediaStream, setMediaStream] = useState(null);
-  const [mediaAccess, setMediaAccess] = useState(hasGetUserMediaSupport ?
-    MEDIA_ACCESS.PENDING :
-    MEDIA_ACCESS.UNSUPPORTED);
-  const { authenticatedUser } = useContext(AppContext);
-
-  const contextValue = {
-    existingIdVerification,
-    facePhotoFile,
-    idPhotoFile,
-    idPhotoName,
-    mediaStream,
-    mediaAccess,
-    userId: authenticatedUser.userId,
-    nameOnAccount: authenticatedUser.name,
-    setExistingIdVerification,
-    setFacePhotoFile,
-    setIdPhotoFile,
-    setIdPhotoName,
-    tryGetUserMedia: async () => {
-      try {
-        const stream = await navigator.mediaDevices.getUserMedia({ video: true });
-        setMediaAccess(MEDIA_ACCESS.GRANTED);
-        setMediaStream(stream);
-        // stop the stream, as we are not using it yet
-        const tracks = stream.getTracks();
-        tracks.forEach(track => track.stop());
-      } catch (err) {
-        setMediaAccess(MEDIA_ACCESS.DENIED);
-      }
-    },
-    stopUserMedia: () => {
-      if (mediaStream) {
-        const tracks = mediaStream.getTracks();
-        tracks.forEach(track => track.stop());
-        setMediaStream(null);
-      }
-    },
-  };
-
-  // Call verification status endpoint to check whether we can verify.
-  useEffect(() => {
-    (async () => {
-      const existingIdV = await getExistingIdVerification();
-      setExistingIdVerification(existingIdV);
-    })();
-  }, []);
-
-  // If we are waiting for verification status endpoint, show spinner.
-  if (!existingIdVerification) {
-    return <PageLoading srMessage="Loading verification status" />;
-  }
-
-  if (!existingIdVerification.canVerify) {
-    const { status } = existingIdVerification;
-    return (
-      <ExistingRequest status={status} />
-    );
-  }
-
-  return (
-    <IdVerificationContext.Provider value={contextValue}>
-      {children}
-    </IdVerificationContext.Provider>
-  );
-}
-IdVerificationContextProvider.propTypes = {
-  children: PropTypes.node.isRequired,
+const ERROR_REASONS = {
+  COURSE_ENROLLMENT: 'course_enrollment',
+  EXISTING_REQUEST: 'existing_request',
+  CANNOT_VERIFY: 'cannot_verify',
 };
 
+const VERIFIED_MODES = ['verified', 'professional', 'masters', 'executive_education'];
+
+export default IdVerificationContext;
 export {
-  IdVerificationContext,
-  IdVerificationContextProvider,
   MEDIA_ACCESS,
+  ERROR_REASONS,
+  VERIFIED_MODES,
 };

src/id-verification/IdVerificationContextProvider.jsx

@@ -0,0 +1,132 @@
+import React, { useState, useContext, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { AppContext } from '@edx/frontend-platform/react';
+
+import { getProfileDataManager } from '../account-settings/data/service';
+import PageLoading from '../account-settings/PageLoading';
+import { useAsyncCall } from '../hooks';
+import { IDLE_STATUS, LOADING_STATUS, SUCCESS_STATUS } from '../constants';
+
+import { getExistingIdVerification, getEnrollments } from './data/service';
+import AccessBlocked from './AccessBlocked';
+import { hasGetUserMediaSupport } from './getUserMediaShim';
+import IdVerificationContext, { MEDIA_ACCESS, ERROR_REASONS, VERIFIED_MODES } from './IdVerificationContext';
+import { VerifiedNameContext } from './VerifiedNameContext';
+
+export default function IdVerificationContextProvider({ children }) {
+  const { authenticatedUser } = useContext(AppContext);
+  const { verifiedNameHistoryCallStatus, verifiedName } = useContext(VerifiedNameContext);
+
+  const idVerificationData = useAsyncCall(getExistingIdVerification);
+  const enrollmentsData = useAsyncCall(getEnrollments);
+
+  const [facePhotoFile, setFacePhotoFile] = useState(null);
+  const [idPhotoFile, setIdPhotoFile] = useState(null);
+  const [idPhotoName, setIdPhotoName] = useState(null);
+  const [mediaStream, setMediaStream] = useState(null);
+  const [mediaAccess, setMediaAccess] = useState(
+    hasGetUserMediaSupport ? MEDIA_ACCESS.PENDING : MEDIA_ACCESS.UNSUPPORTED,
+  );
+
+  const [profileDataManager, setProfileDataManager] = useState(null);
+  useEffect(() => {
+    // Determine if the user's profile data is managed by a third-party identity provider.
+    // If so, they cannot update their account name manually.
+    if (authenticatedUser.roles.length > 0) {
+      (async () => {
+        const thirdPartyManager = await getProfileDataManager(
+          authenticatedUser.username,
+          authenticatedUser.roles,
+        );
+        if (thirdPartyManager) {
+          setProfileDataManager(thirdPartyManager);
+        }
+      })();
+    }
+  }, [authenticatedUser]);
+
+  // Default to upload for the ID image
+  const [useCameraForId, setUseCameraForId] = useState(false);
+
+  // If the user reaches the end of the flow and goes back to retake their photos,
+  // this flag ensures that they are directed straight back to the summary panel
+  const [reachedSummary, setReachedSummary] = useState(false);
+
+  let canVerify = true;
+  let error = '';
+  let existingIdVerification;
+
+  if (idVerificationData?.data) {
+    existingIdVerification = idVerificationData.data;
+  }
+
+  if (enrollmentsData.status === SUCCESS_STATUS && enrollmentsData?.data) {
+    const verifiedEnrollments = enrollmentsData.data.filter((enrollment) => (
+      VERIFIED_MODES.includes(enrollment.mode)
+    ));
+    if (verifiedEnrollments.length === 0) {
+      canVerify = false;
+      error = ERROR_REASONS.COURSE_ENROLLMENT;
+    }
+  }
+
+  const contextValue = {
+    existingIdVerification,
+    facePhotoFile,
+    idPhotoFile,
+    idPhotoName,
+    mediaStream,
+    mediaAccess,
+    userId: authenticatedUser.userId,
+    // If the learner has an applicable verified name, then this should override authenticatedUser.name
+    // when determining the context value nameOnAccount.
+    nameOnAccount: verifiedName || authenticatedUser.name,
+    profileDataManager,
+    useCameraForId,
+    reachedSummary,
+    setFacePhotoFile,
+    setIdPhotoFile,
+    setIdPhotoName,
+    setUseCameraForId,
+    setReachedSummary,
+    tryGetUserMedia: async () => {
+      try {
+        const stream = await navigator.mediaDevices.getUserMedia({ video: true });
+        setMediaAccess(MEDIA_ACCESS.GRANTED);
+        setMediaStream(stream);
+        // stop the stream, as we are not using it yet
+        const tracks = stream.getTracks();
+        tracks.forEach(track => track.stop());
+      } catch (err) {
+        setMediaAccess(MEDIA_ACCESS.DENIED);
+      }
+    },
+    stopUserMedia: () => {
+      if (mediaStream) {
+        const tracks = mediaStream.getTracks();
+        tracks.forEach(track => track.stop());
+        setMediaStream(null);
+      }
+    },
+  };
+
+  const loadingStatuses = [IDLE_STATUS, LOADING_STATUS];
+  // If we are waiting for verification status or verified name history endpoint, show spinner.
+  if (loadingStatuses.includes(idVerificationData.status) || loadingStatuses.includes(verifiedNameHistoryCallStatus)) {
+    return <PageLoading srMessage="Loading verification status" />;
+  }
+
+  if (!canVerify) {
+    return <AccessBlocked error={error} />;
+  }
+
+  return (
+    <IdVerificationContext.Provider value={contextValue}>
+      {children}
+    </IdVerificationContext.Provider>
+  );
+}
+
+IdVerificationContextProvider.propTypes = {
+  children: PropTypes.node.isRequired,
+};

src/id-verification/IdVerificationPage.jsx

@@ -1,12 +1,18 @@
 import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
-import { Route, Switch, Redirect, useRouteMatch, useLocation } from 'react-router-dom';
+import {
+  Route, Switch, Redirect, useRouteMatch, useLocation,
+} from 'react-router-dom';
+import camelCase from 'lodash.camelcase';
+import qs from 'qs';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Modal, Button } from '@edx/paragon';
+import { getConfig } from '@edx/frontend-platform';
 import { idVerificationSelector } from './data/selectors';
 import './getUserMediaShim';
 
-import { IdVerificationContextProvider } from './IdVerificationContext';
+import IdVerificationContextProvider from './IdVerificationContextProvider';
+import { VerifiedNameContextProvider } from './VerifiedNameContext';
 import ReviewRequirementsPanel from './panels/ReviewRequirementsPanel';
 import RequestCameraAccessPanel from './panels/RequestCameraAccessPanel';
 import PortraitPhotoContextPanel from './panels/PortraitPhotoContextPanel';
@@ -26,10 +32,16 @@ function IdVerificationPage(props) {
 
   const [isModalOpen, setIsModalOpen] = useState(false);
 
-  // Course run key is passed as a query string
+  // Save query params in order to route back to the correct location later
   useEffect(() => {
     if (search) {
-      sessionStorage.setItem('courseRunKey', search.substring(1));
+      const parsedQueryParams = qs.parse(search, {
+        ignoreQueryPrefix: true,
+        interpretNumericEntities: true,
+      });
+      Object.entries(parsedQueryParams).forEach(([key, value]) => {
+        sessionStorage.setItem(camelCase(key), value);
+      });
     }
   }, [search]);
 
@@ -40,42 +52,57 @@ function IdVerificationPage(props) {
       <div className="page__id-verification container-fluid py-5">
         <div className="row">
           <div className="col-lg-6 col-md-8">
-            <IdVerificationContextProvider>
-              <Switch>
-                <Route path={`${path}/review-requirements`} component={ReviewRequirementsPanel} />
-                <Route path={`${path}/request-camera-access`} component={RequestCameraAccessPanel} />
-                <Route path={`${path}/portrait-photo-context`} component={PortraitPhotoContextPanel} />
-                <Route path={`${path}/take-portrait-photo`} component={TakePortraitPhotoPanel} />
-                <Route path={`${path}/id-context`} component={IdContextPanel} />
-                <Route path={`${path}/get-name-id`} component={GetNameIdPanel} />
-                <Route path={`${path}/take-id-photo`} component={TakeIdPhotoPanel} />
-                <Route path={`${path}/summary`} component={SummaryPanel} />
-                <Route path={`${path}/submitted`} component={SubmittedPanel} />
-              </Switch>
-            </IdVerificationContextProvider>
+            <VerifiedNameContextProvider>
+              <IdVerificationContextProvider>
+                <Switch>
+                  <Route path={`${path}/review-requirements`} component={ReviewRequirementsPanel} />
+                  <Route path={`${path}/request-camera-access`} component={RequestCameraAccessPanel} />
+                  <Route path={`${path}/portrait-photo-context`} component={PortraitPhotoContextPanel} />
+                  <Route path={`${path}/take-portrait-photo`} component={TakePortraitPhotoPanel} />
+                  <Route path={`${path}/id-context`} component={IdContextPanel} />
+                  <Route path={`${path}/get-name-id`} component={GetNameIdPanel} />
+                  <Route path={`${path}/take-id-photo`} component={TakeIdPhotoPanel} />
+                  <Route path={`${path}/summary`} component={SummaryPanel} />
+                  <Route path={`${path}/submitted`} component={SubmittedPanel} />
+                </Switch>
+              </IdVerificationContextProvider>
+            </VerifiedNameContextProvider>
           </div>
           <div className="col-lg-6 col-md-4 pt-md-0 pt-4 text-right">
-            <Button className="btn-link px-0" onClick={() => setIsModalOpen(true)}>
-            Privacy Information
+            <Button variant="link" className="px-0" onClick={() => setIsModalOpen(true)}>
+              Privacy Information
             </Button>
           </div>
         </div>
 
-
         <Modal
           open={isModalOpen}
           title={props.intl.formatMessage(messages['id.verification.privacy.title'])}
           body={(
             <div>
-              <h6>{props.intl.formatMessage(messages['id.verification.privacy.need.photo.question'])}</h6>
+              <h6>
+                {props.intl.formatMessage(
+                  messages['id.verification.privacy.need.photo.question'],
+                  { siteName: getConfig().SITE_NAME },
+                )}
+              </h6>
               <p>{props.intl.formatMessage(messages['id.verification.privacy.need.photo.answer'])}</p>
-              <h6>{props.intl.formatMessage(messages['id.verification.privacy.do.with.photo.question'])}</h6>
-              <p>{props.intl.formatMessage(messages['id.verification.privacy.do.with.photo.answer'])}</p>
+              <h6>
+                {props.intl.formatMessage(
+                  messages['id.verification.privacy.do.with.photo.question'],
+                  { siteName: getConfig().SITE_NAME },
+                )}
+              </h6>
+              <p>
+                {props.intl.formatMessage(
+                  messages['id.verification.privacy.do.with.photo.answer'],
+                  { siteName: getConfig().SITE_NAME },
+                )}
+              </p>
             </div>
           )}
           onClose={() => setIsModalOpen(false)}
         />
-
       </div>
     </>
   );
@@ -85,6 +112,4 @@ IdVerificationPage.propTypes = {
   intl: intlShape.isRequired,
 };
 
-export default connect(idVerificationSelector, {
-})(injectIntl(IdVerificationPage));
-
+export default connect(idVerificationSelector, {})(injectIntl(IdVerificationPage));

src/id-verification/ImageFileUpload.jsx

@@ -3,10 +3,14 @@ import { intlShape } from '@edx/frontend-platform/i18n';
 import PropTypes from 'prop-types';
 import { Alert } from '@edx/paragon';
 import messages from './IdVerification.messages';
-
+import SupportedMediaTypes from './SupportedMediaTypes';
 
 export default function ImageFileUpload({ onFileChange, intl }) {
-  const [fileTooLargeError, setFileTooLargeError] = useState(false);
+  const [error, setError] = useState(null);
+  const errorTypes = {
+    invalidFileType: 'invalidFileType',
+    fileTooLarge: 'fileTooLarge',
+  };
   const maxFileSize = 10000000;
 
   const handleChange = useCallback((e) => {
@@ -15,12 +19,17 @@ export default function ImageFileUpload({ onFileChange, intl }) {
     }
 
     const fileObject = e.target.files[0];
-    if (fileObject.size < maxFileSize) {
-      const fileReader = new FileReader();
-      fileReader.addEventListener('load', () => onFileChange(fileReader.result));
-      fileReader.readAsDataURL(fileObject);
+    if (!fileObject.type.startsWith('image')) {
+      setError(errorTypes.invalidFileType);
+    } else if (fileObject.size >= maxFileSize) {
+      setError(errorTypes.fileTooLarge);
     } else {
-      setFileTooLargeError(true);
+      setError(null);
+      const fileReader = new FileReader();
+      fileReader.addEventListener('load', () => {
+        onFileChange(fileReader.result);
+      });
+      fileReader.readAsDataURL(fileObject);
     }
   }, []);
 
@@ -32,14 +41,15 @@ export default function ImageFileUpload({ onFileChange, intl }) {
         data-testid="fileUpload"
         onChange={handleChange}
       />
-      {fileTooLargeError && (
+      {error && (
       <Alert
-        id="fileTooLargeError"
+        id="fileError"
         variant="danger"
         tabIndex="-1"
         style={{ marginTop: '1rem' }}
       >
-        {intl.formatMessage(messages['id.verification.id.photo.instructions.upload.error'])}
+        {intl.formatMessage(messages[`id.verification.id.photo.instructions.upload.error.${error}`])}
+        <SupportedMediaTypes />
       </Alert>
       )}
     </>

src/id-verification/ImagePreview.jsx

@@ -16,3 +16,7 @@ ImagePreview.propTypes = {
   alt: PropTypes.string.isRequired,
   id: PropTypes.string,
 };
+
+ImagePreview.defaultProps = {
+  id: undefined,
+};

src/id-verification/SupportedMediaTypes.jsx

@@ -0,0 +1,14 @@
+import React from 'react';
+
+export default function SupportedMediaTypes() {
+  const SUPPORTED_TYPES = ['.png', '.jpeg', '.jpg', '.bmp', '.webp', '.tiff'];
+
+  const getSupportedTypes = () => SUPPORTED_TYPES.map((type, index) => {
+    if (index === SUPPORTED_TYPES.length - 1) {
+      return type;
+    }
+    return `${type}, `;
+  });
+
+  return <span>{getSupportedTypes()}</span>;
+}

src/id-verification/VerifiedNameContext.jsx

@@ -0,0 +1,31 @@
+import React, { createContext } from 'react';
+import PropTypes from 'prop-types';
+
+import { getVerifiedNameHistory } from '../account-settings/data/service';
+import { getMostRecentApprovedOrPendingVerifiedName } from '../utils';
+import { useAsyncCall } from '../hooks';
+import { SUCCESS_STATUS } from '../constants';
+
+export const VerifiedNameContext = createContext();
+
+export function VerifiedNameContextProvider({ children }) {
+  const verifiedNameHistoryData = useAsyncCall(getVerifiedNameHistory);
+
+  let verifiedName = '';
+  const { status, data } = verifiedNameHistoryData;
+  if (status === SUCCESS_STATUS && data) {
+    const { results } = data;
+    verifiedName = getMostRecentApprovedOrPendingVerifiedName(results);
+  }
+
+  const value = {
+    verifiedNameHistoryCallStatus: status,
+    verifiedName,
+  };
+
+  return (<VerifiedNameContext.Provider value={value}>{children}</VerifiedNameContext.Provider>);
+}
+
+VerifiedNameContextProvider.propTypes = {
+  children: PropTypes.node.isRequired,
+};

src/id-verification/_id-verification.scss

@@ -1,5 +1,8 @@
 .page__id-verification {
   .verification-panel {
+    img {
+      max-width: 100%;
+    }
     .card.accent {
       border-top: solid 4px theme-color('warning');
     }
@@ -8,18 +11,9 @@
       max-width: 20rem;
       img {
         display: block;
-        max-width: 100%;
         max-height: 10rem;
       }
     }
-    .form-check {
-      padding: 0.5rem 0.5rem 1rem;
-      .form-check-label {
-        margin-left: 0.5rem;
-        padding-top: 0.2rem;
-        font-weight: normal;
-      }
-    }
   }
   .action-row {
     display: flex;