feat: make password reset support URL configurable (#746 )

* feat: make password reset support URL configurable Replace the hardcoded `support.edx.org` value with the one from the env vars. * fix: linting error
chore(deps): update dependency @edx/frontend-build to v12.0.6
2023-03-02 12:26:32 +05:00 · 2022-10-10 07:24:33 +00:00 · 2022-10-10 07:16:08 +00:00 · 2022-10-04 18:23:56 +05:00 · 2022-10-04 17:55:30 +05:00 · 2022-10-02 17:05:49 -04:00
113 changed files with 31578 additions and 12391 deletions
--- a/.env
+++ b/.env
@@ -25,3 +25,9 @@ SITE_NAME=''
 STUDIO_BASE_URL=''
 SUPPORT_URL=''
 USER_INFO_COOKIE_NAME=''
+ENABLE_COPPA_COMPLIANCE=''
+ENABLE_DOB_UPDATE=''
+MARKETING_EMAILS_OPT_IN=''
+APP_ID=
+MFE_CONFIG_API_URL=
+PASSWORD_RESET_SUPPORT_LINK=''
--- a/.env.development
+++ b/.env.development
@@ -26,3 +26,10 @@ SITE_NAME=localhost
 STUDIO_BASE_URL=''
 SUPPORT_URL='http://localhost:18000/support'
 USER_INFO_COOKIE_NAME='edx-user-info'
+ENABLE_COPPA_COMPLIANCE=''
+ENABLE_DOB_UPDATE=''
+MARKETING_EMAILS_OPT_IN=''
+APP_ID=
+MFE_CONFIG_API_URL=
+PASSWORD_RESET_SUPPORT_LINK='mailto:support@example.com'
+
--- a/.env.test
+++ b/.env.test
@@ -25,3 +25,8 @@ SITE_NAME=localhost
 STUDIO_BASE_URL=''
 SUPPORT_URL='http://localhost:18000/support'
 USER_INFO_COOKIE_NAME='edx-user-info'
+ENABLE_COPPA_COMPLIANCE=''
+ENABLE_DOB_UPDATE=''
+MARKETING_EMAILS_OPT_IN=''
+APP_ID=
+MFE_CONFIG_API_URL=
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 const { createConfig } = require('@edx/frontend-build');

 module.exports = createConfig('eslint');
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +0,0 @@
-* @edx/community-engineering
--- a/.github/workflows/add-depr-ticket-to-depr-board.yml
+++ b/.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 }}
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,3 @@
---
 name: ci
 on:
  push:
@@ -6,27 +5,26 @@ on:
    - master
  pull_request:
 jobs:
-  build:
+  tests:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        node-version:
-        - 12
+        node: [16]
+        npm: [8.5.0]
        npm-test:
        - i18n_extract
-        - is-es5
        - lint
        - test
    steps:
    - uses: actions/checkout@v2
    - uses: actions/setup-node@v2
      with:
-        node-version: ${{ matrix.node-version }}
-    - run: npm install -g npm@6
+        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
+      uses: codecov/codecov-action@v3
      with:
        fail_ci_if_error: false
--- a/.github/workflows/commitlint.yml
+++ b/.github/workflows/commitlint.yml
@@ -7,4 +7,4 @@ on:

 jobs:
  commitlint:
-    uses: edx/.github/.github/workflows/commitlint.yml@master
+    uses: openedx/.github/.github/workflows/commitlint.yml@master
--- a/.github/workflows/lockfileversion-check.yml
+++ b/.github/workflows/lockfileversion-check.yml
@@ -0,0 +1,14 @@
+#check package-lock file version
+
+name: Lockfile Version check
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+
+jobs:
+  version-check:
+    uses: openedx/.github/.github/workflows/lockfileversion-check.yml@master
+    
--- a/.github/workflows/update-browserlist.yml
+++ b/.github/workflows/update-browserlist.yml
@@ -0,0 +1,41 @@
+name: Update Browserlist DB
+on:
+  schedule:
+    - cron:  '0 0 * * 1'
+  workflow_dispatch:
+
+jobs:
+  update-dep:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [16]
+        npm: [8.5.x]
+
+    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
+
+    - name: Update dependencies
+      run: npx browserslist@latest --update-db
+
+    - name: setup testeng-ci
+      run: |
+        git clone https://github.com/edx/testeng-ci.git
+        cd $GITHUB_WORKSPACE/testeng-ci
+        pip install -r requirements/base.txt
+    - name: create pull request
+      id: createpullrequest
+      env:
+        GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }}
+        GITHUB_USER_EMAIL: ${{ secrets.requirements_bot_github_email }}
+      run: |
+        cd $GITHUB_WORKSPACE/testeng-ci
+        python -m jenkins.pull_request_creator --repo-root=$GITHUB_WORKSPACE \
+        --target-branch="master" --base-branch-name="update-browserslist" \
+        --commit-message="chore: update browserslist" --pr-title="Update browserslist DB" \
+        --pr-body="Updated browserlist DB" --delete-old-pull-requests --output-pr-url-for-github-action
--- a/.nvmrc
+++ b/.nvmrc
@@ -0,0 +1 @@
+v16
--- a/.tx/config
+++ b/.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
+
--- a/11
+++ b/11
@@ -1,3 +1,4 @@
+export TRANSIFEX_RESOURCE = frontend-app-account
 transifex_resource = frontend-app-account
 transifex_langs = "ar,fr,es_419,zh_CN"

@@ -10,7 +11,7 @@ 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

-NPM_TESTS=build i18n_extract lint test is-es5
+NPM_TESTS=build i18n_extract lint test

 .PHONY: test
 test: $(addprefix test.npm.,$(NPM_TESTS))  ## validate ci suite
@@ -45,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:
--- a/README.rst
+++ b/README.rst
@@ -12,7 +12,7 @@ This is a micro-frontend application responsible for the display and updating of

 What is the domain of this MFE?

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

 - Account settings page

@@ -23,9 +23,9 @@ In this MFE: Private user settings UIs. Public facing profile is in a `separate
 Installation
 ------------

-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.
+This MFE is bundled with `Devstack <https://github.com/openedx/devstack>`_, see the `Getting Started <https://github.com/openedx/devstack#getting-started>`_ section for setup instructions.

-1. Install Devstack using the `Getting Started <https://github.com/edx/devstack#getting-started>`_ instructions.
+1. Install Devstack using the `Getting Started <https://github.com/openedx/devstack#getting-started>`_ instructions.

 2. Start up Devstack, if it's not already started.

@@ -55,6 +55,16 @@ Example: ``https://support.example.com``

 The fully-qualified URL to the support page in the target environment.

+``PASSWORD_RESET_SUPPORT_LINK``
+
+Examples:
+
+- ``https://support.edx.org/hc/en-us/articles/206212088-What-if-I-did-not-receive-a-password-reset-message-``
+
+- ``mailto:support@example.com``
+
+The fully-qualified URL to the support page or email to request the support from in the target environment.
+
 edX-specific Environment Variables
 **********************************

@@ -102,8 +112,8 @@ In the future, it's possible that demographics could be modeled as a plugin rath

 ==============================

-.. |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
+.. |ci-badge| image:: https://github.com/openedx/edx-developer-docs/actions/workflows/ci.yml/badge.svg
+   :target: https://github.com/openedx/edx-developer-docs/actions/workflows/ci.yml
   :alt: Continuous Integration
 .. |Codecov| image:: https://img.shields.io/codecov/c/github/edx/frontend-app-account
   :target: https://codecov.io/gh/edx/frontend-app-account
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -6,50 +6,49 @@
  "license": "AGPL-3.0",
  "repository": {
    "type": "git",
-    "url": "git+https://github.com/edx/frontend-app-account.git"
+    "url": "git+https://github.com/openedx/frontend-app-account.git"
  },
  "scripts": {
    "build": "fedx-scripts webpack",
    "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
-    "is-es5": "es-check es5 ./dist/*.js",
    "lint": "fedx-scripts eslint --ext .js --ext .jsx .",
    "snapshot": "fedx-scripts jest --updateSnapshot",
    "start": "fedx-scripts webpack-dev-server --progress",
-    "test": "fedx-scripts jest --coverage --passWithNoTests"
+    "test": "TZ=UTC fedx-scripts jest --coverage --passWithNoTests"
  },
  "bugs": {
-    "url": "https://github.com/edx/frontend-app-account/issues"
+    "url": "https://github.com/openedx/frontend-app-account/issues"
  },
-  "homepage": "https://github.com/edx/frontend-app-account#readme",
+  "homepage": "https://github.com/openedx/frontend-app-account#readme",
  "publishConfig": {
    "access": "public"
  },
  "browserslist": [
-    "last 2 versions",
-    "ie 11"
+    "extends @edx/browserslist-config"
  ],
  "dependencies": {
    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
-    "@edx/frontend-component-footer": "10.1.6",
-    "@edx/frontend-component-header": "2.3.0",
-    "@edx/frontend-platform": "1.12.7",
-    "@edx/paragon": "16.1.0",
+    "@edx/frontend-component-footer": "11.2.1",
+    "@edx/frontend-component-header": "3.2.1",
+    "@edx/frontend-platform": "2.6.2",
+    "@edx/paragon": "19.20.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.15",
+    "@fortawesome/react-fontawesome": "0.1.16",
    "@tensorflow-models/blazeface": "0.0.7",
-    "@tensorflow/tfjs-converter": "1.7.4",
-    "@tensorflow/tfjs-core": "1.7.4",
+    "@tensorflow/tfjs-converter": "3.18.0",
+    "@tensorflow/tfjs-core": "3.18.0",
    "bowser": "2.11.0",
-    "classnames": "2.3.1",
-    "core-js": "3.18.2",
+    "classnames": "2.3.2",
+    "core-js": "3.19.3",
    "font-awesome": "4.7.0",
    "form-urlencoded": "4.0.1",
    "formdata-polyfill": "4.0.10",
    "history": "4.10.1",
    "jslib-html5-camera-photo": "3.1.8",
+    "lodash.camelcase": "4.3.0",
    "lodash.debounce": "4.0.8",
    "lodash.findindex": "4.6.0",
    "lodash.get": "4.4.2",
@@ -58,18 +57,20 @@
    "lodash.omit": "4.5.0",
    "lodash.pick": "4.4.0",
    "lodash.pickby": "4.6.0",
+    "long": "5.2.0",
    "memoize-one": "5.2.1",
    "prop-types": "15.7.2",
-    "qs": "6.10.1",
+    "qs": "6.10.3",
    "react": "16.14.0",
    "react-dom": "16.14.0",
-    "react-redux": "7.2.5",
+    "react-helmet": "6.1.0",
+    "react-redux": "7.2.8",
    "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.4.2",
-    "redux": "4.1.1",
+    "react-transition-group": "4.4.5",
+    "redux": "4.1.2",
    "redux-devtools-extension": "2.13.9",
    "redux-logger": "3.0.6",
    "redux-saga": "1.1.3",
@@ -79,15 +80,15 @@
    "universal-cookie": "4.0.4"
  },
  "devDependencies": {
-    "@edx/frontend-build": "8.0.4",
-    "@testing-library/jest-dom": "5.14.1",
-    "@testing-library/react": "12.1.2",
-    "codecov": "3.8.3",
+    "@edx/browserslist-config": "1.1.1",
+    "@edx/frontend-build": "12.0.6",
+    "@edx/reactifex": "1.1.0",
+    "@testing-library/jest-dom": "5.16.5",
+    "@testing-library/react": "12.1.5",
    "enzyme": "3.11.0",
    "enzyme-adapter-react-16": "1.15.6",
-    "es-check": "6.0.0",
    "react-test-renderer": "16.14.0",
    "reactifex": "1.1.1",
    "redux-mock-store": "1.5.4"
  }
-}
+}
--- a/src/account-settings/AccountSettingsPage.jsx
+++ b/src/account-settings/AccountSettingsPage.jsx
@@ -37,11 +37,13 @@ import ThirdPartyAuth from './third-party-auth';
 import BetaLanguageBanner from './BetaLanguageBanner';
 import EmailField from './EmailField';
 import OneTimeDismissibleAlert from './OneTimeDismissibleAlert';
+import DOBModal from './DOBForm';
 import {
  YEAR_OF_BIRTH_OPTIONS,
  EDUCATION_LEVELS,
  GENDER_OPTIONS,
  COUNTRY_WITH_STATES,
+  COPPA_COMPLIANCE_YEAR,
  getStatesList,
 } from './data/constants';
 import { fetchSiteLanguages } from './site-language';
@@ -146,28 +148,13 @@ 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')) {
@@ -195,7 +182,7 @@ class AccountSettingsPage extends React.Component {
    } else {
      this.props.saveSettings(formId, values);
    }
-  }
+  };

  isEditable(fieldName) {
    return !this.props.staticFields.includes(fieldName);
@@ -259,27 +246,28 @@ class AccountSettingsPage extends React.Component {
    );
  }

-  renderFullNameHelpText = (status) => {
-    if (
-      !this.props.verifiedNameHistory
-      || !this.props.verifiedNameEnabled
-    ) {
+  renderFullNameHelpText = (status, proctoredExamId) => {
+    if (!this.props.verifiedNameHistory) {
      return this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text']);
    }

-    switch (status) {
-      case 'submitted':
-        if (this.props.committedValues.useVerifiedNameForCerts) {
-          return this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text.submitted']);
-        }
-        return this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text.submitted.certificate']);
-      default:
-        if (this.props.committedValues.useVerifiedNameForCerts) {
-          return this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text.non.certificate']);
-        }
-        return this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text.certificate']);
+    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();
@@ -294,7 +282,7 @@ class AccountSettingsPage extends React.Component {
        body={this.props.intl.formatMessage(messages['account.settings.field.name.verified.success.message'])}
      />
    );
-  }
+  };

  renderVerifiedNameFailureMessage = (verifiedName, created) => {
    const dateValue = new Date(created).valueOf();
@@ -325,7 +313,7 @@ class AccountSettingsPage extends React.Component {
        }
      />
    );
-  }
+  };

  renderVerifiedNameSubmittedMessage = (willCertNameChange) => (
    <Alert
@@ -343,7 +331,7 @@ class AccountSettingsPage extends React.Component {
        }
      </p>
    </Alert>
-  )
+  );

  renderVerifiedNameMessage = verifiedNameRecord => {
    const {
@@ -351,6 +339,7 @@ class AccountSettingsPage extends React.Component {
      status,
      profile_name: profileName,
      verified_name: verifiedName,
+      proctored_exam_attempt_id: proctoredExamId,
    } = verifiedNameRecord;
    let willCertNameChange = false;

@@ -369,6 +358,10 @@ class AccountSettingsPage extends React.Component {
      willCertNameChange = true;
    }

+    if (proctoredExamId) {
+      return null;
+    }
+
    switch (status) {
      case 'approved':
        return this.renderVerifiedNameSuccessMessage(verifiedName, created);
@@ -379,7 +372,7 @@ class AccountSettingsPage extends React.Component {
      default:
        return null;
    }
-  }
+  };

  renderVerifiedNameIcon = (status) => {
    switch (status) {
@@ -390,24 +383,32 @@ class AccountSettingsPage extends React.Component {
      default:
        return null;
    }
-  }
+  };

-  renderVerifiedNameHelpText = (status) => {
-    switch (status) {
-      case 'approved':
-        if (this.props.committedValues.useVerifiedNameForCerts) {
-          return this.props.intl.formatMessage(messages['account.settings.field.name.verified.help.text.certificate']);
-        }
-        return this.props.intl.formatMessage(messages['account.settings.field.name.verified.help.text.verified']);
-      case 'submitted':
-        if (this.props.committedValues.useVerifiedNameForCerts) {
-          return this.props.intl.formatMessage(messages['account.settings.field.name.verified.help.text.submitted.certificate']);
-        }
-        return this.props.intl.formatMessage(messages['account.settings.field.name.verified.help.text.submitted']);
-      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()) {
@@ -471,7 +472,7 @@ class AccountSettingsPage extends React.Component {
    // Show State field only if the country is US (could include Canada later)
    const showState = this.props.formValues.country === COUNTRY_WITH_STATES;

-    const { verifiedName, verifiedNameEnabled } = this.props;
+    const { verifiedName } = this.props;

    const timeZoneOptions = this.getLocalizedTimeZoneOptions(
      this.props.timeZoneOptions,
@@ -480,15 +481,39 @@ class AccountSettingsPage extends React.Component {
    );

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

-          <h2 className="section-heading">
+          <h2 className="section-heading h4 mb-3">
            {this.props.intl.formatMessage(messages['account.settings.section.account.information'])}
          </h2>
          <p>{this.props.intl.formatMessage(messages['account.settings.section.account.information.description'])}</p>
@@ -512,8 +537,7 @@ class AccountSettingsPage extends React.Component {
            name="name"
            type="text"
            value={
-              verifiedNameEnabled
-              && verifiedName?.status === 'submitted'
+              verifiedName?.status === 'submitted'
              && this.props.formValues.pending_name_change
                ? this.props.formValues.pending_name_change
                : this.props.formValues.name
@@ -525,22 +549,22 @@ class AccountSettingsPage extends React.Component {
                : this.renderEmptyStaticFieldMessage()
            }
            helpText={
-              verifiedNameEnabled && verifiedName
-                ? this.renderFullNameHelpText(verifiedName.status)
+              verifiedName
+                ? this.renderFullNameHelpText(verifiedName.status, verifiedName.proctored_exam_attempt_id)
                : this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text'])
            }
            isEditable={
-              verifiedNameEnabled && verifiedName
+              verifiedName
                ? this.isEditable('verifiedName') && this.isEditable('name')
                : this.isEditable('name')
            }
            isGrayedOut={
-              verifiedNameEnabled && verifiedName && !this.isEditable('verifiedName')
+              verifiedName && !this.isEditable('verifiedName')
            }
            onChange={this.handleEditableFieldChange}
            onSubmit={this.handleSubmitProfileName}
          />
-          {verifiedNameEnabled && verifiedName
+          {verifiedName
            && (
            <EditableField
              name="verified_name"
@@ -556,7 +580,7 @@ class AccountSettingsPage extends React.Component {
                  </div>
                )
              }
-              helpText={this.renderVerifiedNameHelpText(verifiedName.status)}
+              helpText={this.renderVerifiedNameHelpText(verifiedName.status, verifiedName.proctored_exam_attempt_id)}
              isEditable={this.isEditable('verifiedName')}
              isGrayedOut={!this.isEditable('verifiedName')}
              onChange={this.handleEditableFieldChange}
@@ -583,15 +607,18 @@ class AccountSettingsPage extends React.Component {
          />
          {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"
@@ -625,8 +652,8 @@ class AccountSettingsPage extends React.Component {
            )}
        </div>

-        <div className="account-section" id="profile-information" ref={this.navLinkRefs['#profile-information']}>
-          <h2 className="section-heading">
+        <div className="account-section pt-3 mb-5" id="profile-information" ref={this.navLinkRefs['#profile-information']}>
+          <h2 className="section-heading h4 mb-3">
            {this.props.intl.formatMessage(messages['account.settings.section.profile.information'])}
          </h2>

@@ -668,8 +695,8 @@ class AccountSettingsPage extends React.Component {
            )}
        </div>
        {getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && this.renderDemographicsSection()}
-        <div className="account-section" id="social-media">
-          <h2 className="section-heading">
+        <div className="account-section pt-3 mb-5" id="social-media">
+          <h2 className="section-heading h4 mb-3">
            {this.props.intl.formatMessage(messages['account.settings.section.social.media'])}
          </h2>
          <p>
@@ -705,8 +732,8 @@ class AccountSettingsPage extends React.Component {
          />
        </div>

-        <div className="account-section" id="site-preferences" ref={this.navLinkRefs['#site-preferences']}>
-          <h2 className="section-heading">
+        <div className="account-section pt-3 mb-5" id="site-preferences" ref={this.navLinkRefs['#site-preferences']}>
+          <h2 className="section-heading h4 mb-3">
            {this.props.intl.formatMessage(messages['account.settings.section.site.preferences'])}
          </h2>

@@ -736,8 +763,8 @@ class AccountSettingsPage extends React.Component {
          />
        </div>

-        <div className="account-section" id="linked-accounts" ref={this.navLinkRefs['#linked-accounts']}>
-          <h2 className="section-heading">{this.props.intl.formatMessage(messages['account.settings.section.linked.accounts'])}</h2>
+        <div className="account-section pt-3 mb-5" id="linked-accounts" ref={this.navLinkRefs['#linked-accounts']}>
+          <h2 className="section-heading h4 mb-3">{this.props.intl.formatMessage(messages['account.settings.section.linked.accounts'])}</h2>
          <p>
            {this.props.intl.formatMessage(
              messages['account.settings.section.linked.accounts.description'],
@@ -747,7 +774,7 @@ class AccountSettingsPage extends React.Component {
          <ThirdPartyAuth />
        </div>

-        <div className="account-section" id="delete-account" ref={this.navLinkRefs['#delete-account']}>
+        <div className="account-section pt-3 mb-5" id="delete-account" ref={this.navLinkRefs['#delete-account']}>
          <DeleteAccount
            isVerifiedAccount={this.props.isActive}
            hasLinkedTPA={hasLinkedTPA}
@@ -884,19 +911,21 @@ AccountSettingsPage.propTypes = {
  nameChangeModal: PropTypes.shape({
    formId: PropTypes.string,
  }),
-  verifiedNameEnabled: PropTypes.bool,
  verifiedName: PropTypes.shape({
    verified_name: PropTypes.string,
    status: PropTypes.string,
+    proctored_exam_attempt_id: PropTypes.number,
  }),
  mostRecentVerifiedName: PropTypes.shape({
    verified_name: PropTypes.string,
    status: PropTypes.string,
+    proctored_exam_attempt_id: PropTypes.number,
  }),
  verifiedNameHistory: PropTypes.arrayOf(
    PropTypes.shape({
      verified_name: PropTypes.string,
      status: PropTypes.string,
+      proctored_exam_attempt_id: PropTypes.number,
    }),
  ),
 };
@@ -921,7 +950,6 @@ AccountSettingsPage.defaultProps = {
  isActive: true,
  secondary_email_enabled: false,
  nameChangeModal: {},
-  verifiedNameEnabled: false,
  verifiedName: null,
  mostRecentVerifiedName: {},
  verifiedNameHistory: [],
--- a/src/account-settings/AccountSettingsPage.messages.jsx
+++ b/src/account-settings/AccountSettingsPage.messages.jsx
@@ -91,13 +91,13 @@ 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.non.certificate': {
-    id: 'account.settings.field.full.name.help.text.non.certificate',
+  '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.certificate': {
-    id: 'account.settings.field.full.name.help.text.certificate',
+  '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.',
  },
@@ -108,27 +108,47 @@ const messages = defineMessages({
  },
  'account.settings.field.name.verified.help.text.verified': {
    id: 'account.settings.field.name.verified.help.text.verified',
-    defaultMessage: 'This name has been verified by government ID.',
+    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.certificate': {
-    id: 'account.settings.field.name.verified.help.text.certificate',
-    defaultMessage: 'This name has been verified by government ID and selected to appear on your certificates and public-facing records.',
+  '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 government-issued ID.',
+    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': {
@@ -136,11 +156,21 @@ const messages = defineMessages({
    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.',
@@ -236,6 +266,46 @@ const messages = defineMessages({
    defaultMessage: 'Select a year of birth',
    description: 'Option for empty value on account settings year of birth field.',
  },
+  'account.settings.field.dob.month': {
+    id: 'account.settings.field.dob.month',
+    defaultMessage: 'Month',
+    description: 'Label for account settings month of birth field.',
+  },
+  'account.settings.field.dob.year': {
+    id: 'account.settings.field.dob.year',
+    defaultMessage: 'Year',
+    description: 'Label for account settings year of birth field.',
+  },
+  'account.settings.field.dob.form.button': {
+    id: 'account.settings.field.dob.form.button',
+    defaultMessage: 'Please confirm your date of birth',
+    description: 'Message to prompt user to enter dob',
+  },
+  'account.settings.field.dob.form.title': {
+    id: 'account.settings.field.dob.form.title',
+    defaultMessage: 'Confirm your date of birth',
+    description: 'Title of DOB form',
+  },
+  'account.settings.field.dob.form.help.text': {
+    id: 'account.settings.field.dob.form.help.text',
+    defaultMessage: 'We ask for birth date information to help us comply with our legal obligations.',
+    description: 'Help text for DOB form',
+  },
+  'account.settings.field.dob.form.success': {
+    id: 'account.settings.field.dob.form.success',
+    defaultMessage: 'Thank you for entering your birth date information.',
+    description: 'Title of banner when date of birth is successfully entered',
+  },
+  'account.settings.field.month_of_birth.options.empty': {
+    id: 'account.settings.field.month_of_birth.options.empty',
+    defaultMessage: 'Select a month of birth',
+    description: 'Option for empty value on account settings month of birth field.',
+  },
+  'account.settingsfield.dob.error.general': {
+    id: 'account.settingsfield.dob.error.general',
+    defaultMessage: 'A technical error occurred. Please try again.',
+    description: 'Generic error message.',
+  },
  'account.settings.field.country': {
    id: 'account.settings.field.country',
    defaultMessage: 'Country',
--- a/src/account-settings/DOBForm.jsx
+++ b/src/account-settings/DOBForm.jsx
@@ -0,0 +1,148 @@
+import PropTypes from 'prop-types';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import {
+  Form, StatefulButton, ModalDialog, ActionRow, useToggle, Button,
+} from '@edx/paragon';
+import React, { useCallback, useEffect } from 'react';
+import { connect, useDispatch } from 'react-redux';
+import messages from './AccountSettingsPage.messages';
+import { YEAR_OF_BIRTH_OPTIONS } from './data/constants';
+import { editableFieldSelector } from './data/selectors';
+import { saveSettingsReset } from './data/actions';
+
+function DOBModal(props) {
+  const {
+    saveState,
+    error,
+    onSubmit,
+    intl,
+  } = props;
+
+  const dispatch = useDispatch();
+
+  // eslint-disable-next-line no-unused-vars
+  const [isOpen, open, close, toggle] = useToggle(true, {});
+
+  const handleSubmit = (e) => {
+    e.preventDefault();
+
+    const month = e.target.month.value;
+    const year = e.target.year.value;
+    const data = month !== '' && year !== '' ? [{ field_name: 'DOB', field_value: `${year}-${month}` }] : [];
+    onSubmit('extended_profile', data);
+  };
+
+  const handleComplete = useCallback(() => {
+    localStorage.setItem('submittedDOB', 'true');
+    close();
+    dispatch(saveSettingsReset());
+  }, [dispatch, close]);
+
+  const handleClose = useCallback(() => {
+    close();
+    dispatch(saveSettingsReset());
+  }, [dispatch, close]);
+
+  function renderErrors() {
+    if (saveState === 'error' || error) {
+      return (
+        <Form.Control.Feedback type="invalid" key="general-error">
+          {intl.formatMessage(messages['account.settingsfield.dob.error.general'])}
+        </Form.Control.Feedback>
+      );
+    }
+    return null;
+  }
+
+  useEffect(() => {
+    if (saveState === 'complete' && isOpen) {
+      handleComplete();
+    }
+  }, [handleComplete, saveState, isOpen]);
+
+  return (
+    <>
+      <Button variant="primary" onClick={open}>
+        {intl.formatMessage(messages['account.settings.field.dob.form.button'])}
+      </Button>
+      <ModalDialog
+        title={intl.formatMessage(messages['account.settings.field.dob.form.title'])}
+        isOpen={isOpen}
+        onClose={handleClose}
+        hasCloseButton={false}
+        variant="default"
+      >
+        <form onSubmit={handleSubmit}>
+
+          <ModalDialog.Header>
+            <ModalDialog.Title>
+              {intl.formatMessage(messages['account.settings.field.dob.form.title'])}
+            </ModalDialog.Title>
+          </ModalDialog.Header>
+
+          <ModalDialog.Body className="overflow-hidden" style={{ padding: '1.5rem' }}>
+            <p>{intl.formatMessage(messages['account.settings.field.dob.form.help.text'])}</p>
+            <Form.Group>
+              <Form.Label>
+                {intl.formatMessage(messages['account.settings.field.dob.month'])}
+              </Form.Label>
+              <Form.Control
+                as="select"
+                name="month"
+              >
+                {[...Array(12).keys()].map(month => (
+                  <option key={month + 1} value={month + 1}>{month + 1}</option>
+                ))}
+              </Form.Control>
+            </Form.Group>
+            <Form.Group>
+              <Form.Label>
+                {intl.formatMessage(messages['account.settings.field.dob.year'])}
+              </Form.Label>
+              <Form.Control
+                as="select"
+                name="year"
+              >
+                {YEAR_OF_BIRTH_OPTIONS.map(year => (
+                  <option key={year.value} value={year.value}>{year.label}</option>
+                ))}
+              </Form.Control>
+            </Form.Group>
+            {renderErrors()}
+          </ModalDialog.Body>
+
+          <ModalDialog.Footer>
+            <ActionRow>
+              <ModalDialog.CloseButton variant="tertiary">
+                Cancel
+              </ModalDialog.CloseButton>
+              <StatefulButton
+                type="submit"
+                state={saveState}
+                labels={{
+                  default: intl.formatMessage(messages['account.settings.editable.field.action.save']),
+                }}
+                disabledStates={[]}
+              />
+            </ActionRow>
+          </ModalDialog.Footer>
+
+        </form>
+      </ModalDialog>
+    </>
+  );
+}
+
+DOBModal.propTypes = {
+  saveState: PropTypes.oneOf(['default', 'pending', 'complete', 'error']),
+  error: PropTypes.string,
+  onSubmit: PropTypes.func.isRequired,
+  intl: intlShape.isRequired,
+};
+
+DOBModal.defaultProps = {
+  saveState: undefined,
+  error: undefined,
+};
+
+export default connect(editableFieldSelector)(injectIntl(DOBModal));
--- a/src/account-settings/EditableField.jsx
+++ b/src/account-settings/EditableField.jsx
@@ -1,6 +1,8 @@
+/* eslint-disable react/jsx-no-useless-fragment */
 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,
@@ -43,6 +45,10 @@ function EditableField(props) {
    ...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();
@@ -120,7 +126,7 @@ function EditableField(props) {
                  type={type}
                  value={value}
                  onChange={handleChange}
-                  options={options}
+                  options={inputOptions}
                  {...others}
                />
                <>{others.children}</>
--- a/src/account-settings/JumpNav.jsx
+++ b/src/account-settings/JumpNav.jsx
@@ -1,15 +1,20 @@
-import React from 'react';
+import { getConfig } from '@edx/frontend-platform';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { breakpoints, useWindowSize } from '@edx/paragon';
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { NavHashLink } from 'react-router-hash-link';
 import Scrollspy from 'react-scrollspy';
-
-import { getConfig } from '@edx/frontend-platform';
-import PropTypes from 'prop-types';
 import messages from './AccountSettingsPage.messages';

-function JumpNav({ intl, displayDemographicsLink }) {
+function JumpNav({
+  intl,
+  displayDemographicsLink,
+}) {
+  const stickToTop = useWindowSize().width > breakpoints.small.minWidth;
  return (
-    <div className="jump-nav">
+    <div className={classNames('jump-nav', { 'jump-nav-sm position-sticky pt-3': stickToTop })}>
      <Scrollspy
        items={[
          'basic-information',
--- a/src/account-settings/NotFoundPage.jsx
+++ b/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>
--- a/src/account-settings/_style.scss
+++ b/src/account-settings/_style.scss
@@ -14,12 +14,11 @@
    display: inline-block;
  }

+  .jump-nav-sm {
+    top: 1rem;
+  }
+
  .jump-nav {
-    @media (min-width: map-get($grid-breakpoints, "sm")) {
-      padding-top: 1rem;
-      position: sticky;
-      top: 1rem;
-    }

    li {
      margin-bottom: .5rem;
@@ -30,16 +29,6 @@
    }
  }

-  .section-heading {
-    @extend .h4;
-    margin-bottom: map-get($spacers, 3);
-  }
-
-  .account-section {
-    // These properties together will shift the hashlink position
-    margin-bottom: map-get($spacers, 5);
-    padding-top: 1rem;
-  }

  .custom-switch {
    padding: 0;
--- a/src/account-settings/certificate-preference/CertificatePreference.jsx
+++ b/src/account-settings/certificate-preference/CertificatePreference.jsx
@@ -28,19 +28,13 @@ function CertificatePreference({
  originalVerifiedName,
  saveState,
  useVerifiedNameForCerts,
-  verifiedNameEnabled,
 }) {
-  if (!verifiedNameEnabled || !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() {
+  const handleCheckboxChange = () => {
    if (!checked) {
      if (fieldName === 'verified_name') {
        dispatch(updateDraft(formId, true));
@@ -50,22 +44,22 @@ function CertificatePreference({
    } else {
      setModalIsOpen(true);
    }
-  }
+  };

-  function handleCancel() {
+  const handleCancel = () => {
    setModalIsOpen(false);
    dispatch(resetDrafts());
-  }
+  };

-  function handleModalChange(e) {
+  const handleModalChange = (e) => {
    if (e.target.value === 'fullName') {
      dispatch(updateDraft(formId, false));
    } else {
      dispatch(updateDraft(formId, true));
    }
-  }
+  };

-  function handleSubmit(e) {
+  const handleSubmit = (e) => {
    e.preventDefault();

    if (saveState === 'pending') {
@@ -73,24 +67,30 @@ function CertificatePreference({
    }

    dispatch(saveSettings(formId, useVerifiedNameForCerts));
-  }
+  };

  useEffect(() => {
-    if (fieldName === 'verified_name') {
-      setChecked(useVerifiedNameForCerts);
-    } else {
-      setChecked(!useVerifiedNameForCerts);
+    if (originalVerifiedName) {
+      if (fieldName === 'verified_name') {
+        setChecked(useVerifiedNameForCerts);
+      } else {
+        setChecked(!useVerifiedNameForCerts);
+      }
    }
-  }, [useVerifiedNameForCerts]);
+  }, [originalVerifiedName, fieldName, useVerifiedNameForCerts]);

  useEffect(() => {
-    if (modalIsOpen && saveState === 'complete') {
-      setModalIsOpen(false);
-      dispatch(closeForm(fieldName));
+    if (originalVerifiedName) {
+      if (modalIsOpen && saveState === 'complete') {
+        setModalIsOpen(false);
+        dispatch(closeForm(fieldName));
+      }
    }
-  }, [modalIsOpen, saveState]);
+  }, [dispatch, originalVerifiedName, fieldName, modalIsOpen, saveState]);

-  return (
+  // If the user doesn't have an approved verified name, do not display this component
+
+  return originalVerifiedName ? (
    <>
      <Form.Checkbox className="mt-1 mb-4" checked={checked} onChange={handleCheckboxChange}>
        {intl.formatMessage(messages['account.settings.field.name.checkbox.certificate.select'])}
@@ -151,7 +151,7 @@ function CertificatePreference({
        </Form>
      </ModalDialog>
    </>
-  );
+  ) : null;
 }

 CertificatePreference.propTypes = {
@@ -161,7 +161,6 @@ CertificatePreference.propTypes = {
  originalVerifiedName: PropTypes.string,
  saveState: PropTypes.string,
  useVerifiedNameForCerts: PropTypes.bool,
-  verifiedNameEnabled: PropTypes.bool,
 };

 CertificatePreference.defaultProps = {
@@ -169,7 +168,6 @@ CertificatePreference.defaultProps = {
  originalVerifiedName: '',
  saveState: null,
  useVerifiedNameForCerts: false,
-  verifiedNameEnabled: false,
 };

 export default connect(certPreferenceSelector)(injectIntl(CertificatePreference));
--- a/src/account-settings/certificate-preference/test/CertificatePreference.test.jsx
+++ b/src/account-settings/certificate-preference/test/CertificatePreference.test.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable no-import-assign */
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
@@ -56,7 +57,6 @@ describe('NameChange', () => {
      originalVerifiedName: 'edX Verified',
      saveState: null,
      useVerifiedNameForCerts: false,
-      verifiedNameEnabled: true,
      intl: {},
    };

--- a/src/account-settings/coaching/CoachingConsent.jsx
+++ b/src/account-settings/coaching/CoachingConsent.jsx
@@ -17,27 +17,28 @@ import LogoSVG from '../../logo.svg';
 import { fetchSettings } from '../data/actions';
 import { coachingConsentPageSelector } from '../data/selectors';

-const Logo = ({ src, alt, ...attributes }) => (
-  <>
-    <img src={src} alt={alt} {...attributes} />
-  </>
-);
+function Logo({ src, alt, ...attributes }) {
+  return <img src={src} alt={alt} {...attributes} />;
+}

-const SuccessMessage = props => (
-  <div className="col-12 col-lg-6 shadow-lg mx-auto mt-4 p-5">
-    <FontAwesomeIcon className="text-success" icon={faCheck} size="5x" />
-    <div className="h3">{props.header}</div>
-    <div>{props.message}</div>
-    <Hyperlink destination={props.continueUrl} className="d-block p-2 my-3 text-center text-white bg-primary rounded">
-      {props.continue}
-    </Hyperlink>
-  </div>
-);
+function SuccessMessage(props) {
+  return (
+    <div className="col-12 col-lg-6 shadow-lg mx-auto mt-4 p-5">
+      <FontAwesomeIcon className="text-success" icon={faCheck} size="5x" />
+      <div className="h3">{props.header}</div>
+      <div>{props.message}</div>
+      <Hyperlink destination={props.continueUrl} className="d-block p-2 my-3 text-center text-white bg-primary rounded">
+        {props.continue}
+      </Hyperlink>
+    </div>
+  );
+}

-const AutoRedirect = (props) => {
+function AutoRedirect(props) {
  window.location.href = props.redirectUrl;
+  // eslint-disable-next-line react/jsx-no-useless-fragment
  return <></>;
-};
+}

 const VIEWS = {
  NOT_LOADED: 'NOT_LOADED',
@@ -71,6 +72,23 @@ class CoachingConsent extends React.Component {
    this.props.fetchSettings();
  }

+  handleSubmit(e) {
+    e.preventDefault();
+    const fullName = e.target.fullName.value;
+    const phoneNumber = e.target.phoneNumber.value;
+    const body = {
+      coaching_consent: true,
+      consent_form_seen: true,
+      phone_number: phoneNumber,
+      full_name: fullName,
+    };
+    this.setState({
+      formErrors: {},
+      formSubmitted: true,
+      declineSubmitted: false,
+    }, () => this.patchUsingCoachingConsentForm(body));
+  }
+
  sanitizeForwardingUrl(url) {
    // Redirect to root of MFE if invalid next param is sent
    return url && url.startsWith(getConfig().LMS_BASE_URL) ? url : `${getConfig().LMS_BASE_URL}/dashboard/`;
@@ -99,23 +117,6 @@ class CoachingConsent extends React.Component {
    }
  }

-  handleSubmit(e) {
-    e.preventDefault();
-    const fullName = e.target.fullName.value;
-    const phoneNumber = e.target.phoneNumber.value;
-    const body = {
-      coaching_consent: true,
-      consent_form_seen: true,
-      phone_number: phoneNumber,
-      full_name: fullName,
-    };
-    this.setState({
-      formErrors: {},
-      formSubmitted: true,
-      declineSubmitted: false,
-    }, () => this.patchUsingCoachingConsentForm(body));
-  }
-
  declineCoaching(e) {
    e.preventDefault();
    const body = {
@@ -160,6 +161,7 @@ class CoachingConsent extends React.Component {
      case VIEWS.DECLINED:
        return <AutoRedirect redirectUrl={this.state.redirectUrl} />;
      default:
+        // eslint-disable-next-line react/jsx-no-useless-fragment
        return <></>;
    }
  }
@@ -253,12 +255,12 @@ CoachingConsent.propTypes = {
    }),
  }).isRequired,
  formErrors: PropTypes.shape({
-    coaching: PropTypes.object,
+    coaching: PropTypes.shape({}),
  }).isRequired,
  confirmationValues: PropTypes.shape({
-    coaching: PropTypes.object,
-    name: PropTypes.object,
-    phone_number: PropTypes.object,
+    coaching: PropTypes.shape({}),
+    name: PropTypes.shape({}),
+    phone_number: PropTypes.shape({}),
  }).isRequired,
  fetchSettings: PropTypes.func.isRequired,
  profileDataManager: PropTypes.string,
--- a/src/account-settings/coaching/CoachingConsentForm.jsx
+++ b/src/account-settings/coaching/CoachingConsentForm.jsx
@@ -8,82 +8,86 @@ import PropTypes from 'prop-types';
 import Alert from '../Alert';
 import messages from './CoachingConsent.messages';

-const ErrorMessage = props => (
-  <div className="alert-warning mb-2">{props.message}</div>
-);
+function ErrorMessage(props) {
+  return <div className="alert-warning mb-2">{props.message}</div>;
+}

-const ManagedProfileAlert = ({ profileDataManager }) => (
-  <Alert className="alert alert-primary" role="alert">
-    <FormattedMessage
-      id="account.settings.coaching.managed.alert"
-      defaultMessage="Your name is managed by {managerTitle}. Contact your administrator for help."
-      description="alert message informing the user their account data is managed by a third party"
-      values={{
-        managerTitle: <b>{profileDataManager}</b>,
-      }}
-    />
-  </Alert>
-);
-const CoachingForm = props => (
-  <div className="col-12 col-md-6 col-xl-5 mx-auto mt-4 p-5 shadow-lg">
-    <h2 className="h2">
-      {props.intl.formatMessage(messages['account.settings.coaching.consent.welcome.header'])}
-    </h2>
-    <p>{props.intl.formatMessage(messages['account.settings.coaching.consent.description'])}</p>
-    <div>
-      <form onSubmit={props.onSubmit}>
-        <div className="py-3">
-          {!!props.profileDataManager && (
-            <ManagedProfileAlert profileDataManager={props.profileDataManager} />
-          )}
-          <ErrorMessage message={props.formErrors.full_name} />
-          <label className="h6" htmlFor="fullName">
-            {props.intl.formatMessage(messages['account.settings.coaching.consent.label.name'])}
-          </label>
-          <Input
-            type="text"
-            name="full-name"
-            id="fullName"
-            disabled={!!props.profileDataManager}
-            defaultValue={props.formValues.name}
-          />
-        </div>
-        <div className="py-3">
-          <ErrorMessage message={props.formErrors.phone_number} />
-          <label className="h6" htmlFor="phoneNumber">
-            {props.intl.formatMessage(messages['account.settings.coaching.consent.label.phone-number'])}
-          </label>
-          <Input
-            type="text"
-            name="phone_number"
-            id="phoneNumber"
-            defaultValue={props.formValues.phone_number}
-          />
-        </div>
-        <div className=" py-3">
-          <p className="small font-italic">
-            {props.intl.formatMessage(messages['account.settings.coaching.consent.text-messaging.disclaimer'])}
-          </p>
-        </div>
-        <ErrorMessage message={props.formErrors.coaching} />
-        <div className="d-flex flex-column align-items-center">
-          <Button variant="outline-primary" className="w-100" type="submit">
-            {props.intl.formatMessage(messages['account.settings.coaching.consent.accept-coaching'])}
-          </Button>
-        </div>
-        <div className="mt-3">
-          <Hyperlink
-            className="mt-3 text-dark btn-link small"
-            destination={props.redirectUrl}
-            onClick={props.declineCoaching}
-          >
-            {props.intl.formatMessage(messages['account.settings.coaching.consent.decline-coaching'])}
-          </Hyperlink>
-        </div>
-      </form>
+function ManagedProfileAlert({ profileDataManager }) {
+  return (
+    <Alert className="alert alert-primary" role="alert">
+      <FormattedMessage
+        id="account.settings.coaching.managed.alert"
+        defaultMessage="Your name is managed by {managerTitle}. Contact your administrator for help."
+        description="Alert message informing the user their account data is managed by a third party"
+        values={{
+          managerTitle: <b>{profileDataManager}</b>,
+        }}
+      />
+    </Alert>
+  );
+}
+function CoachingForm(props) {
+  return (
+    <div className="col-12 col-md-6 col-xl-5 mx-auto mt-4 p-5 shadow-lg">
+      <h2 className="h2">
+        {props.intl.formatMessage(messages['account.settings.coaching.consent.welcome.header'])}
+      </h2>
+      <p>{props.intl.formatMessage(messages['account.settings.coaching.consent.description'])}</p>
+      <div>
+        <form onSubmit={props.onSubmit}>
+          <div className="py-3">
+            {!!props.profileDataManager && (
+              <ManagedProfileAlert profileDataManager={props.profileDataManager} />
+            )}
+            <ErrorMessage message={props.formErrors.full_name} />
+            <label className="h6" htmlFor="fullName">
+              {props.intl.formatMessage(messages['account.settings.coaching.consent.label.name'])}
+            </label>
+            <Input
+              type="text"
+              name="full-name"
+              id="fullName"
+              disabled={!!props.profileDataManager}
+              defaultValue={props.formValues.name}
+            />
+          </div>
+          <div className="py-3">
+            <ErrorMessage message={props.formErrors.phone_number} />
+            <label className="h6" htmlFor="phoneNumber">
+              {props.intl.formatMessage(messages['account.settings.coaching.consent.label.phone-number'])}
+            </label>
+            <Input
+              type="text"
+              name="phone_number"
+              id="phoneNumber"
+              defaultValue={props.formValues.phone_number}
+            />
+          </div>
+          <div className=" py-3">
+            <p className="small font-italic">
+              {props.intl.formatMessage(messages['account.settings.coaching.consent.text-messaging.disclaimer'])}
+            </p>
+          </div>
+          <ErrorMessage message={props.formErrors.coaching} />
+          <div className="d-flex flex-column align-items-center">
+            <Button variant="outline-primary" className="w-100" type="submit">
+              {props.intl.formatMessage(messages['account.settings.coaching.consent.accept-coaching'])}
+            </Button>
+          </div>
+          <div className="mt-3">
+            <Hyperlink
+              className="mt-3 text-dark btn-link small"
+              destination={props.redirectUrl}
+              onClick={props.declineCoaching}
+            >
+              {props.intl.formatMessage(messages['account.settings.coaching.consent.decline-coaching'])}
+            </Hyperlink>
+          </div>
+        </form>
+      </div>
    </div>
-  </div>
-);
+  );
+}

 CoachingForm.defaultProps = {
  formErrors: {
--- a/src/account-settings/coaching/CoachingToggle.jsx
+++ b/src/account-settings/coaching/CoachingToggle.jsx
@@ -8,66 +8,69 @@ import { editableFieldSelector } from '../data/selectors';
 import { saveSettings, updateDraft, saveMultipleSettings } from '../data/actions';
 import EditableField from '../EditableField';

-const CoachingToggle = props => (
-  <>
-    <EditableField
-      name="phone_number"
-      type="text"
-      value={props.phone_number}
-      label={props.intl.formatMessage(messages['account.settings.field.phone_number'])}
-      emptyLabel={props.intl.formatMessage(messages['account.settings.field.phone_number.empty'])}
-      onChange={props.updateDraft}
-      onSubmit={() => {
-        const { coaching } = props;
-        if (coaching.coaching_consent === true) {
-          return props.saveMultipleSettings([
-            {
-              formId: 'coaching',
-              commitValues: {
-                ...coaching,
-                phone_number: props.phone_number,
+function CoachingToggle(props) {
+  return (
+    <>
+      <EditableField
+        name="phone_number"
+        type="text"
+        value={props.phone_number}
+        label={props.intl.formatMessage(messages['account.settings.field.phone_number'])}
+        emptyLabel={props.intl.formatMessage(messages['account.settings.field.phone_number.empty'])}
+        onChange={props.updateDraft}
+        onSubmit={() => {
+          const { coaching } = props;
+          if (coaching.coaching_consent === true) {
+            return props.saveMultipleSettings([
+              {
+                formId: 'coaching',
+                commitValues: {
+                  ...coaching,
+                  phone_number: props.phone_number,
+                },
              },
-            },
-            {
-              formId: 'phone_number',
-              commitValues: props.phone_number,
-            },
-          ], 'phone_number');
-        }
-        return props.saveSettings('phone_number', props.phone_number);
-      }}
-    />
-    <ValidationFormGroup
-      for="coachingConsent"
-      helpText={props.intl.formatMessage(messages['account.settings.field.coaching_consent.tooltip'])}
-      invalid={!!props.error}
-      invalidMessage={props.intl.formatMessage(messages['account.settings.field.coaching_consent.error'])}
-      className="custom-control custom-switch"
-    >
-      <Input
-        name={props.name}
-        className="custom-control-input"
-        disabled={props.saveState === 'pending'}
-        type="checkbox"
-        id="coachingConsent"
-        checked={props.coaching.coaching_consent}
-        value={props.coaching.coaching_consent}
-        onChange={async (e) => {
-          const { name } = e.target;
-          // eslint-disable-next-line camelcase
-          const { user, eligible_for_coaching } = props.coaching;
-          const value = {
-            user,
-            eligible_for_coaching,
-            coaching_consent: e.target.checked,
-          };
-          props.saveSettings(name, value);
+              {
+                formId: 'phone_number',
+                commitValues: props.phone_number,
+              },
+            ], 'phone_number');
+          }
+          return props.saveSettings('phone_number', props.phone_number);
        }}
      />
-      <label className="custom-control-label" htmlFor="coachingConsent">{props.intl.formatMessage(messages['account.settings.field.coaching_consent'])}</label>
-    </ValidationFormGroup>
-  </>
-);
+      <ValidationFormGroup
+        for="coachingConsent"
+        helpText={props.intl.formatMessage(messages['account.settings.field.coaching_consent.tooltip'])}
+        invalid={!!props.error}
+        invalidMessage={props.intl.formatMessage(messages['account.settings.field.coaching_consent.error'])}
+        className="custom-control custom-switch"
+      >
+        <Input
+          name={props.name}
+          className="custom-control-input"
+          disabled={props.saveState === 'pending'}
+          type="checkbox"
+          id="coachingConsent"
+          checked={props.coaching.coaching_consent}
+          value={props.coaching.coaching_consent}
+          onChange={async (e) => {
+            const { name } = e.target;
+            // eslint-disable-next-line camelcase
+            const { user, eligible_for_coaching } = props.coaching;
+            const value = {
+              user,
+              // eslint-disable-next-line camelcase
+              eligible_for_coaching,
+              coaching_consent: e.target.checked,
+            };
+            props.saveSettings(name, value);
+          }}
+        />
+        <label className="custom-control-label" htmlFor="coachingConsent">{props.intl.formatMessage(messages['account.settings.field.coaching_consent'])}</label>
+      </ValidationFormGroup>
+    </>
+  );
+}

 CoachingToggle.defaultProps = {
  phone_number: '',
--- a/src/account-settings/coaching/test/CoachingConsent.test.jsx
+++ b/src/account-settings/coaching/test/CoachingConsent.test.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable no-import-assign */
 import React from 'react';
 import { Provider } from 'react-redux';
 import renderer from 'react-test-renderer';
--- a/src/account-settings/coaching/test/snapshots/CoachingConsent.test.jsx.snap
+++ b/src/account-settings/coaching/test/snapshots/CoachingConsent.test.jsx.snap
@@ -34,13 +34,11 @@ exports[`CoachingConsent disables name field on enterprise user 1`] = `
          >
            <div />
            <div>
-              <span>
-                Your name is managed by 
-                <b>
-                  test person
-                </b>
-                . Contact your administrator for help.
-              </span>
+              Your name is managed by 
+              <b>
+                test person
+              </b>
+              . Contact your administrator for help.
            </div>
          </div>
          <div
@@ -114,7 +112,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"
@@ -263,7 +261,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"
--- a/src/account-settings/data/constants.js
+++ b/src/account-settings/data/constants.js
@@ -10,6 +10,11 @@ export const YEAR_OF_BIRTH_OPTIONS = (() => {
  return years.reverse();
 })();

+export const COPPA_COMPLIANCE_YEAR = (() => {
+  const currentYear = new Date().getFullYear();
+  return currentYear - 13;
+})();
+
 export const EDUCATION_LEVELS = [
  '',
  'p',
--- a/src/account-settings/data/reducers.js
+++ b/src/account-settings/data/reducers.js
@@ -39,10 +39,9 @@ export const defaultState = {
  verifiedName: null,
  mostRecentVerifiedName: {},
  verifiedNameHistory: {},
-  verifiedNameEnabled: false,
 };

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

  switch (action.type) {
--- a/src/account-settings/data/selectors.js
+++ b/src/account-settings/data/selectors.js
@@ -12,7 +12,6 @@ const verifiedNameSettingsSelector = createSelector(
  accountSettingsSelector,
  accountSettings => ({
    history: accountSettings.verifiedNameHistory.results,
-    verifiedNameEnabled: accountSettings?.verifiedNameHistory.verified_name_enabled,
    useVerifiedNameForCerts: accountSettings?.verifiedNameHistory.use_verified_name_for_certs,
  }),
 );
@@ -180,7 +179,7 @@ const formValuesSelector = createSelector(

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

 const timeZonesSelector = createSelector(
@@ -229,7 +228,6 @@ export const accountSettingsPageSelector = createSelector(
  mostRecentApprovedVerifiedNameValueSelector,
  mostRecentVerifiedNameSelector,
  sortedVerifiedNameHistorySelector,
-  verifiedNameSettingsSelector,
  (
    accountSettings,
    siteLanguageOptions,
@@ -247,7 +245,6 @@ export const accountSettingsPageSelector = createSelector(
    verifiedName,
    mostRecentVerifiedName,
    verifiedNameHistory,
-    verifiedNameSettings,
  ) => ({
    siteLanguageOptions,
    siteLanguage,
@@ -268,19 +265,16 @@ export const accountSettingsPageSelector = createSelector(
    verifiedName,
    mostRecentVerifiedName,
    verifiedNameHistory,
-    verifiedNameEnabled: verifiedNameSettings?.verifiedNameEnabled,
  }),
 );

 export const certPreferenceSelector = createSelector(
-  verifiedNameSettingsSelector,
  valuesSelector,
  formValuesSelector,
  mostRecentApprovedVerifiedNameValueSelector,
  saveStateSelector,
  errorSelector,
  (
-    verifiedNameSettings,
    committedValues,
    formValues,
    mostRecentApprovedVerifiedNameValue,
@@ -291,7 +285,6 @@ export const certPreferenceSelector = createSelector(
    originalVerifiedName: mostRecentApprovedVerifiedNameValue?.verified_name || '',
    useVerifiedNameForCerts: formValues.useVerifiedNameForCerts || false,
    saveState,
-    verifiedNameEnabled: verifiedNameSettings.verifiedNameEnabled || false,
    formErrors: errors,
  }),
 );
--- a/src/account-settings/data/service.js
+++ b/src/account-settings/data/service.js
@@ -177,19 +177,6 @@ export async function shouldDisplayDemographicsQuestions() {
  return false;
 }

-export async function getVerifiedNameEnabled() {
-  let data;
-  const client = getAuthenticatedHttpClient();
-  try {
-    const requestUrl = `${getConfig().LMS_BASE_URL}/api/edx_name_affirmation/v1/verified_name_enabled`;
-    ({ data } = await client.get(requestUrl));
-  } catch (error) {
-    return {};
-  }
-
-  return data;
-}
-
 export async function getVerifiedName() {
  let data;
  const client = getAuthenticatedHttpClient();
--- a/src/account-settings/delete-account/BeforeProceedingBanner.jsx
+++ b/src/account-settings/delete-account/BeforeProceedingBanner.jsx
@@ -12,7 +12,7 @@ import messages from './messages';
 // Components
 import Alert from '../Alert';

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

  return (
@@ -35,7 +35,7 @@ const BeforeProceedingBanner = (props) => {
      />
    </Alert>
  );
-};
+}

 BeforeProceedingBanner.propTypes = {
  instructionMessageId: PropTypes.string.isRequired,
--- a/src/account-settings/delete-account/DeleteAccount.jsx
+++ b/src/account-settings/delete-account/DeleteAccount.jsx
@@ -66,9 +66,13 @@ export class DeleteAccount extends React.Component {
      ? 'account.settings.delete.account.text.2.edX'
      : 'account.settings.delete.account.text.2';

+    const optInInstructionMessageId = getConfig().MARKETING_EMAILS_OPT_IN
+      ? 'account.settings.delete.account.please.confirm'
+      : 'account.settings.delete.account.please.activate';
+
    return (
      <div>
-        <h2 className="section-heading">
+        <h2 className="section-heading h4 mb-3">
          {intl.formatMessage(messages['account.settings.delete.account.header'])}
        </h2>
        <p>{intl.formatMessage(messages['account.settings.delete.account.subheader'])}</p>
@@ -88,8 +92,10 @@ export class DeleteAccount extends React.Component {
          <PrintingInstructions />
        </p>
        <p className="text-danger h6">
-          {intl.formatMessage(messages['account.settings.delete.account.text.warning'],
-            { siteName: getConfig().SITE_NAME })}
+          {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">
@@ -108,8 +114,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-"
          />
        )}

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

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

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

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

--- a/src/account-settings/delete-account/PrintingInstructions.jsx
+++ b/src/account-settings/delete-account/PrintingInstructions.jsx
@@ -5,7 +5,7 @@ import { Hyperlink } from '@edx/paragon';
 import { getConfig } from '@edx/frontend-platform';
 import messages from './messages';

-const PrintingInstructions = (props) => {
+function PrintingInstructions(props) {
  const actionLink = (
    <Hyperlink
      // TODO: What would a generic version of this link look like?  Should
@@ -38,7 +38,7 @@ const PrintingInstructions = (props) => {
      values={{ actionLink }}
    />
  );
-};
+}

 PrintingInstructions.propTypes = {
  intl: intlShape.isRequired,
--- a/src/account-settings/delete-account/SuccessModal.jsx
+++ b/src/account-settings/delete-account/SuccessModal.jsx
@@ -5,7 +5,7 @@ import { Modal } from '@edx/paragon';

 import messages from './messages';

-export const SuccessModal = (props) => {
+export function SuccessModal(props) {
  const { status, intl, onClose } = props;
  return (
    <Modal
@@ -23,7 +23,7 @@ export const SuccessModal = (props) => {
      onClose={onClose}
    />
  );
-};
+}

 SuccessModal.propTypes = {
  status: PropTypes.oneOf(['confirming', 'pending', 'deleted', 'failed']),
--- a/src/account-settings/delete-account/snapshots/ConfirmationModal.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/ConfirmationModal.test.jsx.snap
@@ -16,21 +16,6 @@ Array [
      className=""
      role="dialog"
    >
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
      <div
        data-focus-guard={true}
        style={
@@ -101,9 +86,7 @@ Array [
                    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>
+                    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
                  </p>
                </div>
              </div>
@@ -207,21 +190,6 @@ Array [
        }
        tabIndex={0}
      />
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={1}
-      />
      <div
        data-focus-lock-disabled={false}
        onBlur={[Function]}
@@ -312,9 +280,7 @@ Array [
                    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>
+                    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
                  </p>
                </div>
              </div>
@@ -416,31 +382,14 @@ Array [
            "width": "1px",
          }
        }
-        tabIndex={0}
+        tabIndex={-1}
      />
      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={1}
-      />
-      <div
-        data-focus-lock-disabled={false}
+        data-focus-lock-disabled="disabled"
        onBlur={[Function]}
        onFocus={[Function]}
-        onMouseDown={[Function]}
        onScrollCapture={[Function]}
        onTouchMoveCapture={[Function]}
-        onTouchStart={[Function]}
        onWheelCapture={[Function]}
      >
        <div
@@ -490,9 +439,7 @@ Array [
                    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>
+                    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
                  </p>
                </div>
              </div>
@@ -558,7 +505,7 @@ Array [
            "width": "1px",
          }
        }
-        tabIndex={0}
+        tabIndex={-1}
      />
    </div>
  </div>,
--- a/src/account-settings/delete-account/snapshots/DeleteAccount.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/DeleteAccount.test.jsx.snap
@@ -3,7 +3,7 @@
 exports[`DeleteAccount should match default section snapshot 1`] = `
 <div>
  <h2
-    className="section-heading"
+    className="section-heading h4 mb-3"
  >
    Delete My Account
  </h2>
@@ -17,9 +17,7 @@ exports[`DeleteAccount should match default section snapshot 1`] = `
    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. You can make a copy of these for your records before proceeding with deletion.
-    </span>
+    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
  </p>
  <p
    className="text-danger h6"
@@ -28,7 +26,7 @@ exports[`DeleteAccount should match default section snapshot 1`] = `
  </p>
  <p>
    <a
-      className="default-link standalone-link"
+      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"
@@ -52,7 +50,7 @@ exports[`DeleteAccount should match default section snapshot 1`] = `
 exports[`DeleteAccount should match unverified account section snapshot 1`] = `
 <div>
  <h2
-    className="section-heading"
+    className="section-heading h4 mb-3"
  >
    Delete My Account
  </h2>
@@ -66,9 +64,7 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
    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. You can make a copy of these for your records before proceeding with deletion.
-    </span>
+    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
  </p>
  <p
    className="text-danger h6"
@@ -77,7 +73,7 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
  </p>
  <p>
    <a
-      className="default-link standalone-link"
+      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"
@@ -118,18 +114,16 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
      </svg>
    </div>
    <div>
-      <span>
-        Before proceeding, please 
-        <a
-          className="default-link standalone-link"
-          href="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-activate-my-account-"
-          onClick={[Function]}
-          target="_self"
-        >
-          activate your account
-        </a>
-        .
-      </span>
+      Before proceeding, please 
+      <a
+        className="pgn__hyperlink default-link standalone-link"
+        href="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-confirm-my-email-"
+        onClick={[Function]}
+        target="_self"
+      >
+        activate your account
+      </a>
+      .
    </div>
  </div>
 </div>
@@ -138,7 +132,7 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
 exports[`DeleteAccount should match unverified account section snapshot 2`] = `
 <div>
  <h2
-    className="section-heading"
+    className="section-heading h4 mb-3"
  >
    Delete My Account
  </h2>
@@ -152,9 +146,7 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
    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. You can make a copy of these for your records before proceeding with deletion.
-    </span>
+    You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
  </p>
  <p
    className="text-danger h6"
@@ -163,7 +155,7 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
  </p>
  <p>
    <a
-      className="default-link standalone-link"
+      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"
@@ -204,18 +196,16 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
      </svg>
    </div>
    <div>
-      <span>
-        Before proceeding, please 
-        <a
-          className="default-link standalone-link"
-          href="https://support.edx.org/hc/en-us/articles/207206067"
-          onClick={[Function]}
-          target="_self"
-        >
-          unlink all social media accounts
-        </a>
-        .
-      </span>
+      Before proceeding, please 
+      <a
+        className="pgn__hyperlink default-link standalone-link"
+        href="https://support.edx.org/hc/en-us/articles/207206067"
+        onClick={[Function]}
+        target="_self"
+      >
+        unlink all social media accounts
+      </a>
+      .
    </div>
  </div>
 </div>
--- a/src/account-settings/delete-account/snapshots/SuccessModal.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/SuccessModal.test.jsx.snap
@@ -16,21 +16,6 @@ Array [
      className=""
      role="dialog"
    >
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
      <div
        data-focus-guard={true}
        style={
@@ -128,21 +113,6 @@ Array [
      className=""
      role="dialog"
    >
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
      <div
        data-focus-guard={true}
        style={
@@ -240,21 +210,6 @@ Array [
      className=""
      role="dialog"
    >
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
      <div
        data-focus-guard={true}
        style={
@@ -352,21 +307,6 @@ Array [
      className=""
      role="dialog"
    >
-      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={-1}
-      />
      <div
        data-focus-guard={true}
        style={
@@ -477,31 +417,14 @@ Array [
            "width": "1px",
          }
        }
-        tabIndex={0}
+        tabIndex={-1}
      />
      <div
-        data-focus-guard={true}
-        style={
-          Object {
-            "height": "0px",
-            "left": "1px",
-            "overflow": "hidden",
-            "padding": 0,
-            "position": "fixed",
-            "top": "1px",
-            "width": "1px",
-          }
-        }
-        tabIndex={1}
-      />
-      <div
-        data-focus-lock-disabled={false}
+        data-focus-lock-disabled="disabled"
        onBlur={[Function]}
        onFocus={[Function]}
-        onMouseDown={[Function]}
        onScrollCapture={[Function]}
        onTouchMoveCapture={[Function]}
-        onTouchStart={[Function]}
        onWheelCapture={[Function]}
      >
        <div
@@ -555,7 +478,7 @@ Array [
            "width": "1px",
          }
        }
-        tabIndex={0}
+        tabIndex={-1}
      />
    </div>
  </div>,
--- a/src/account-settings/delete-account/index.js
+++ b/src/account-settings/delete-account/index.js
@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-restricted-exports
 export { default } from './DeleteAccount';
 export { default as reducer } from './data/reducers';
 export { default as saga } from './data/sagas';
--- a/src/account-settings/delete-account/messages.js
+++ b/src/account-settings/delete-account/messages.js
@@ -51,6 +51,11 @@ const messages = defineMessages({
    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',
--- a/src/account-settings/demographics/Checkboxes.jsx
+++ b/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';

-const Checkboxes = (props) => {
+function Checkboxes(props) {
  const {
    id,
    options,
@@ -14,7 +14,7 @@ const Checkboxes = (props) => {
  const [selected, setSelected] = useState(values);
  useEffect(() => {
    onChange(id, selected);
-  }, [selected]);
+  }, [id, onChange, selected]);

  const handleToggle = (value, option) => {
    // If the user checked 'declined', uncheck all other options
@@ -59,7 +59,7 @@ const Checkboxes = (props) => {
      {renderCheckboxes()}
    </div>
  );
-};
+}

 Checkboxes.propTypes = {
  id: PropTypes.string.isRequired,
--- a/src/account-settings/demographics/DemographicsSection.jsx
+++ b/src/account-settings/demographics/DemographicsSection.jsx
@@ -75,7 +75,7 @@ class DemographicsSection extends React.Component {
      const matchingOption = demographicsEthnicityOptions.filter(option => option.value === e)[0];
      return matchingOption && matchingOption.label;
    }).join(', ');
-  }
+  };

  handleEditableFieldChange = (name, value) => {
    this.props.updateDraft(name, value);
@@ -162,8 +162,8 @@ class DemographicsSection extends React.Component {
    const showWorkStatusDescribe = this.props.formValues.demographics_work_status === OTHER;

    return (
-      <div className="account-section" id="demographics-information" ref={this.props.forwardRef}>
-        <h2 className="section-heading">
+      <div className="account-section pt-3 mb-5" id="demographics-information" ref={this.props.forwardRef}>
+        <h2 className="section-heading h4 mb-3">
          {this.props.intl.formatMessage(messages['account.settings.section.demographics.information'])}
        </h2>
        <p>
@@ -317,7 +317,7 @@ DemographicsSection.propTypes = {
  intl: intlShape.isRequired,
  formValues: PropTypes.shape({
    demographics_gender: PropTypes.string,
-    demographics_user_ethnicity: PropTypes.array,
+    demographics_user_ethnicity: PropTypes.shape([]),
    demographics_income: PropTypes.string,
    demographics_military_history: PropTypes.string,
    demographics_learner_education_level: PropTypes.string,
@@ -327,11 +327,11 @@ DemographicsSection.propTypes = {
    demographics_future_work_sector: PropTypes.string,
    demographics_work_status_description: PropTypes.string,
    demographics_gender_description: PropTypes.string,
-    demographicsOptions: PropTypes.object,
+    demographicsOptions: PropTypes.shape({}),
  }).isRequired,
  drafts: PropTypes.shape({
    demographics_gender: PropTypes.string,
-    demographics_user_ethnicity: PropTypes.array,
+    demographics_user_ethnicity: PropTypes.shape([]),
    demographics_income: PropTypes.string,
    demographics_military_history: PropTypes.string,
    demographics_learner_education_level: PropTypes.string,
@@ -341,7 +341,7 @@ DemographicsSection.propTypes = {
    demographics_future_work_sector: PropTypes.string,
    demographics_work_status_description: PropTypes.string,
    demographics_gender_description: PropTypes.string,
-    demographicsOptions: PropTypes.object,
+    demographicsOptions: PropTypes.shape({}),
  }).isRequired,
  formErrors: PropTypes.shape({
    demographicsError: PropTypes.string,
--- a/src/account-settings/demographics/test/DemographicsSection.test.jsx
+++ b/src/account-settings/demographics/test/DemographicsSection.test.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable no-import-assign */
 import * as auth from '@edx/frontend-platform/auth';

 import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';
--- a/src/account-settings/demographics/test/snapshots/DemographicsSection.test.jsx.snap
+++ b/src/account-settings/demographics/test/snapshots/DemographicsSection.test.jsx.snap
@@ -2,27 +2,27 @@

 exports[`DemographicsSection should render 1`] = `
 <div
-  className="account-section"
+  className="account-section pt-3 mb-5"
  id="demographics-information"
 >
  <h2
-    className="section-heading"
+    className="section-heading h4 mb-3"
  >
    Optional Information
  </h2>
  <p>
    <a
-      className="default-link standalone-link"
+      className="pgn__hyperlink default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
-      rel="noopener noopener noreferrer"
+      rel="noopener noreferrer"
      target="_blank"
    >
      Why does localhost collect this information?
      <span
-        className="d-inline-block align-text-top"
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
      >
-         
        <span
          className="pgn__icon"
          style={
@@ -34,7 +34,6 @@ exports[`DemographicsSection should render 1`] = `
        >
          <svg
            aria-hidden={true}
-            aria-label=""
            fill="none"
            focusable={false}
            height={24}
@@ -48,6 +47,11 @@ exports[`DemographicsSection should render 1`] = `
              fill="currentColor"
            />
          </svg>
+          <span
+            className="sr-only"
+          >
+            in a new tab
+          </span>
        </span>
      </span>
    </a>
@@ -644,27 +648,27 @@ exports[`DemographicsSection should render 1`] = `

 exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
 <div
-  className="account-section"
+  className="account-section pt-3 mb-5"
  id="demographics-information"
 >
  <h2
-    className="section-heading"
+    className="section-heading h4 mb-3"
  >
    Optional Information
  </h2>
  <p>
    <a
-      className="default-link standalone-link"
+      className="pgn__hyperlink default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
-      rel="noopener noopener noreferrer"
+      rel="noopener noreferrer"
      target="_blank"
    >
      Why does localhost collect this information?
      <span
-        className="d-inline-block align-text-top"
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
      >
-         
        <span
          className="pgn__icon"
          style={
@@ -676,7 +680,6 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
        >
          <svg
            aria-hidden={true}
-            aria-label=""
            fill="none"
            focusable={false}
            height={24}
@@ -690,6 +693,11 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
              fill="currentColor"
            />
          </svg>
+          <span
+            className="sr-only"
+          >
+            in a new tab
+          </span>
        </span>
      </span>
    </a>
@@ -702,9 +710,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
    >
      <div />
      <div>
-        <span>
-          An error occurred attempting to retrieve or save your account information. Please try again later.
-        </span>
+        An error occurred attempting to retrieve or save your account information. Please try again later.
      </div>
    </div>
  </div>
@@ -1300,27 +1306,27 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `

 exports[`DemographicsSection should render an Alert when demographicsOptions props are empty 1`] = `
 <div
-  className="account-section"
+  className="account-section pt-3 mb-5"
  id="demographics-information"
 >
  <h2
-    className="section-heading"
+    className="section-heading h4 mb-3"
  >
    Optional Information
  </h2>
  <p>
    <a
-      className="default-link standalone-link"
+      className="pgn__hyperlink default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
-      rel="noopener noopener noreferrer"
+      rel="noopener noreferrer"
      target="_blank"
    >
      Why does localhost collect this information?
      <span
-        className="d-inline-block align-text-top"
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
      >
-         
        <span
          className="pgn__icon"
          style={
@@ -1332,7 +1338,6 @@ exports[`DemographicsSection should render an Alert when demographicsOptions pro
        >
          <svg
            aria-hidden={true}
-            aria-label=""
            fill="none"
            focusable={false}
            height={24}
@@ -1346,6 +1351,11 @@ exports[`DemographicsSection should render an Alert when demographicsOptions pro
              fill="currentColor"
            />
          </svg>
+          <span
+            className="sr-only"
+          >
+            in a new tab
+          </span>
        </span>
      </span>
    </a>
@@ -1358,9 +1368,7 @@ exports[`DemographicsSection should render an Alert when demographicsOptions pro
    >
      <div />
      <div>
-        <span>
-          An error occurred attempting to retrieve or save your account information. Please try again later.
-        </span>
+        An error occurred attempting to retrieve or save your account information. Please try again later.
      </div>
    </div>
  </div>
@@ -1369,27 +1377,27 @@ exports[`DemographicsSection should render an Alert when demographicsOptions pro

 exports[`DemographicsSection should render ethnicity correctly when multiple options are selected 1`] = `
 <div
-  className="account-section"
+  className="account-section pt-3 mb-5"
  id="demographics-information"
 >
  <h2
-    className="section-heading"
+    className="section-heading h4 mb-3"
  >
    Optional Information
  </h2>
  <p>
    <a
-      className="default-link standalone-link"
+      className="pgn__hyperlink default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
-      rel="noopener noopener noreferrer"
+      rel="noopener noreferrer"
      target="_blank"
    >
      Why does localhost collect this information?
      <span
-        className="d-inline-block align-text-top"
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
      >
-         
        <span
          className="pgn__icon"
          style={
@@ -1401,7 +1409,6 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
        >
          <svg
            aria-hidden={true}
-            aria-label=""
            fill="none"
            focusable={false}
            height={24}
@@ -1415,6 +1422,11 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
              fill="currentColor"
            />
          </svg>
+          <span
+            className="sr-only"
+          >
+            in a new tab
+          </span>
        </span>
      </span>
    </a>
@@ -2004,27 +2016,27 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt

 exports[`DemographicsSection should render ethnicity text correctly 1`] = `
 <div
-  className="account-section"
+  className="account-section pt-3 mb-5"
  id="demographics-information"
 >
  <h2
-    className="section-heading"
+    className="section-heading h4 mb-3"
  >
    Optional Information
  </h2>
  <p>
    <a
-      className="default-link standalone-link"
+      className="pgn__hyperlink default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
-      rel="noopener noopener noreferrer"
+      rel="noopener noreferrer"
      target="_blank"
    >
      Why does localhost collect this information?
      <span
-        className="d-inline-block align-text-top"
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
      >
-         
        <span
          className="pgn__icon"
          style={
@@ -2036,7 +2048,6 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
        >
          <svg
            aria-hidden={true}
-            aria-label=""
            fill="none"
            focusable={false}
            height={24}
@@ -2050,6 +2061,11 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
              fill="currentColor"
            />
          </svg>
+          <span
+            className="sr-only"
+          >
+            in a new tab
+          </span>
        </span>
      </span>
    </a>
@@ -2639,27 +2655,27 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `

 exports[`DemographicsSection should set user input correctly when user provides answers to work_status question 1`] = `
 <div
-  className="account-section"
+  className="account-section pt-3 mb-5"
  id="demographics-information"
 >
  <h2
-    className="section-heading"
+    className="section-heading h4 mb-3"
  >
    Optional Information
  </h2>
  <p>
    <a
-      className="default-link standalone-link"
+      className="pgn__hyperlink default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
-      rel="noopener noopener noreferrer"
+      rel="noopener noreferrer"
      target="_blank"
    >
      Why does localhost collect this information?
      <span
-        className="d-inline-block align-text-top"
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
      >
-         
        <span
          className="pgn__icon"
          style={
@@ -2671,7 +2687,6 @@ exports[`DemographicsSection should set user input correctly when user provides
        >
          <svg
            aria-hidden={true}
-            aria-label=""
            fill="none"
            focusable={false}
            height={24}
@@ -2685,6 +2700,11 @@ exports[`DemographicsSection should set user input correctly when user provides
              fill="currentColor"
            />
          </svg>
+          <span
+            className="sr-only"
+          >
+            in a new tab
+          </span>
        </span>
      </span>
    </a>
@@ -3281,27 +3301,27 @@ exports[`DemographicsSection should set user input correctly when user provides

 exports[`DemographicsSection should set user input correctly when user provides gender self-description 1`] = `
 <div
-  className="account-section"
+  className="account-section pt-3 mb-5"
  id="demographics-information"
 >
  <h2
-    className="section-heading"
+    className="section-heading h4 mb-3"
  >
    Optional Information
  </h2>
  <p>
    <a
-      className="default-link standalone-link"
+      className="pgn__hyperlink default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
-      rel="noopener noopener noreferrer"
+      rel="noopener noreferrer"
      target="_blank"
    >
      Why does localhost collect this information?
      <span
-        className="d-inline-block align-text-top"
+        className="pgn__hyperlink__external-icon"
+        title="Opens in a new tab"
      >
-         
        <span
          className="pgn__icon"
          style={
@@ -3313,7 +3333,6 @@ exports[`DemographicsSection should set user input correctly when user provides
        >
          <svg
            aria-hidden={true}
-            aria-label=""
            fill="none"
            focusable={false}
            height={24}
@@ -3327,6 +3346,11 @@ exports[`DemographicsSection should set user input correctly when user provides
              fill="currentColor"
            />
          </svg>
+          <span
+            className="sr-only"
+          >
+            in a new tab
+          </span>
        </span>
      </span>
    </a>
--- a/src/account-settings/index.js
+++ b/src/account-settings/index.js
@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-restricted-exports
 export { default } from './AccountSettingsPage';
 export { default as reducer } from './data/reducers';
 export { default as saga } from './data/sagas';
--- a/src/account-settings/name-change/NameChange.jsx
+++ b/src/account-settings/name-change/NameChange.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { connect, useDispatch } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import PropTypes from 'prop-types';
@@ -34,22 +34,22 @@ function NameChangeModal({
  const [verifiedNameInput, setVerifiedNameInput] = useState(formValues.verified_name || '');
  const [confirmedWarning, setConfirmedWarning] = useState(false);

-  function resetLocalState() {
+  const resetLocalState = useCallback(() => {
    setConfirmedWarning(false);
    dispatch(requestNameChangeReset());
-  }
+  }, [dispatch]);

-  function handleChange(e) {
+  const handleChange = (e) => {
    setVerifiedNameInput(e.target.value);
-  }
+  };

-  function handleClose() {
+  const handleClose = useCallback(() => {
    resetLocalState();
    dispatch(closeForm(targetFormId));
    dispatch(saveSettingsReset());
-  }
+  }, [dispatch, resetLocalState, targetFormId]);

-  function handleSubmit(e) {
+  const handleSubmit = (e) => {
    e.preventDefault();

    if (saveState === 'pending') {
@@ -64,14 +64,14 @@ function NameChangeModal({
      const draftProfileName = targetFormId === 'name' ? formValues.name : null;
      dispatch(requestNameChange(username, draftProfileName, verifiedNameInput));
    }
-  }
+  };

  useEffect(() => {
    if (saveState === 'complete') {
      handleClose();
-      push('/id-verification');
+      push(`/id-verification?next=${encodeURIComponent('account/settings')}`);
    }
-  }, [saveState]);
+  }, [handleClose, push, saveState]);

  function renderErrors() {
    if (Object.keys(errors).length > 0) {
--- a/src/account-settings/name-change/index.js
+++ b/src/account-settings/name-change/index.js
@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-restricted-exports
 export { default } from './NameChange';
 export { default as reducer } from './data/reducers';
 export { default as saga } from './data/sagas';
--- a/src/account-settings/name-change/messages.js
+++ b/src/account-settings/name-change/messages.js
@@ -23,12 +23,12 @@ const messages = defineMessages({
  },
  'account.settings.name.change.id.name.label': {
    id: 'account.settings.name.change.id.name.label',
-    defaultMessage: 'Enter your name as it appears on your government-issued ID.',
+    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 government ID',
+    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': {
--- a/src/account-settings/name-change/test/NameChange.test.jsx
+++ b/src/account-settings/name-change/test/NameChange.test.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable no-import-assign */
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
@@ -70,7 +71,7 @@ describe('NameChange', () => {
  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 government ID');
+    const getInput = () => screen.queryByPlaceholderText('Enter the name on your photo ID');

    render(reduxWrapper(<IntlNameChange {...props} />));
    expect(getInput()).toBeNull();
@@ -82,7 +83,7 @@ describe('NameChange', () => {
  });

  it('renders empty input after clicking continue if verified_name not in form data', async () => {
-    const getInput = () => screen.queryByPlaceholderText('Enter the name on your government ID');
+    const getInput = () => screen.queryByPlaceholderText('Enter the name on your photo ID');
    const formProps = {
      ...props,
      formValues: {
@@ -112,7 +113,7 @@ describe('NameChange', () => {
    const continueButton = screen.getByText('Continue');
    fireEvent.click(continueButton);

-    const input = screen.getByPlaceholderText('Enter the name on your government ID');
+    const input = screen.getByPlaceholderText('Enter the name on your photo ID');
    fireEvent.change(input, { target: { value: 'Verified Name' } });

    const submitButton = screen.getByText('Continue');
@@ -139,7 +140,7 @@ describe('NameChange', () => {
    const continueButton = screen.getByText('Continue');
    fireEvent.click(continueButton);

-    const input = screen.getByPlaceholderText('Enter the name on your government ID');
+    const input = screen.getByPlaceholderText('Enter the name on your photo ID');
    fireEvent.change(input, { target: { value: 'Verified Name' } });

    const submitButton = screen.getByText('Continue');
@@ -155,7 +156,7 @@ describe('NameChange', () => {
    const continueButton = screen.getByText('Continue');
    fireEvent.click(continueButton);

-    const input = screen.getByPlaceholderText('Enter the name on your government ID');
+    const input = screen.getByPlaceholderText('Enter the name on your photo ID');
    fireEvent.change(input, { target: { value: 'Verified Name' } });

    const submitButton = screen.getByText('Continue');
--- a/src/account-settings/reset-password/ConfirmationAlert.jsx
+++ b/src/account-settings/reset-password/ConfirmationAlert.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { getConfig } from '@edx/frontend-platform';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 import { Hyperlink } from '@edx/paragon';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -7,12 +8,12 @@ import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';

 import Alert from '../Alert';

-const ConfirmationAlert = (props) => {
+function ConfirmationAlert(props) {
  const { email } = props;

  const technicalSupportLink = (
    <Hyperlink
-      destination="https://support.edx.org/hc/en-us/articles/206212088-What-if-I-did-not-receive-a-password-reset-message-"
+      destination={getConfig().PASSWORD_RESET_SUPPORT_LINK}
    >
      <FormattedMessage
        id="account.settings.editable.field.password.reset.button.confirmation.support.link"
@@ -38,7 +39,7 @@ const ConfirmationAlert = (props) => {
      />
    </Alert>
  );
-};
+}

 ConfirmationAlert.propTypes = {
  email: PropTypes.string.isRequired,
--- a/src/account-settings/reset-password/RequestInProgressAlert.jsx
+++ b/src/account-settings/reset-password/RequestInProgressAlert.jsx
@@ -5,17 +5,19 @@ import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';

 import Alert from '../Alert';

-const RequestInProgressAlert = () => (
-  <Alert
-    className="alert-warning mt-n2"
-    icon={<FontAwesomeIcon className="mr-2" icon={faExclamationTriangle} />}
-  >
-    <FormattedMessage
-      id="account.settings.editable.field.password.reset.button.forbidden"
-      defaultMessage="Your previous request is in progress, please try again in few moments."
-      description="A message displayed when a previous password reset request is still in progress."
-    />
-  </Alert>
-);
+function RequestInProgressAlert() {
+  return (
+    <Alert
+      className="alert-warning mt-n2"
+      icon={<FontAwesomeIcon className="mr-2" icon={faExclamationTriangle} />}
+    >
+      <FormattedMessage
+        id="account.settings.editable.field.password.reset.button.forbidden"
+        defaultMessage="Your previous request is in progress, please try again in few moments."
+        description="A message displayed when a previous password reset request is still in progress."
+      />
+    </Alert>
+  );
+}

 export default RequestInProgressAlert;
--- a/src/account-settings/reset-password/ResetPassword.jsx
+++ b/src/account-settings/reset-password/ResetPassword.jsx
@@ -9,7 +9,7 @@ import messages from './messages';
 import ConfirmationAlert from './ConfirmationAlert';
 import RequestInProgressAlert from './RequestInProgressAlert';

-const ResetPassword = (props) => {
+function ResetPassword(props) {
  const { email, intl, status } = props;
  return (
    <div className="form-group">
@@ -47,7 +47,7 @@ const ResetPassword = (props) => {
      {status === 'forbidden' ? <RequestInProgressAlert /> : null}
    </div>
  );
-};
+}

 ResetPassword.propTypes = {
  email: PropTypes.string,
--- a/src/account-settings/reset-password/index.js
+++ b/src/account-settings/reset-password/index.js
@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-restricted-exports
 export { default } from './ResetPassword';
 export { default as reducer } from './data/reducers';
 export { RESET_PASSWORD } from './data/actions';
--- a/src/account-settings/test/snapshots/JumpNav.test.jsx.snap
+++ b/src/account-settings/test/snapshots/JumpNav.test.jsx.snap
@@ -2,7 +2,7 @@

 exports[`JumpNav should not render Optional Information link 1`] = `
 <div
-  className="jump-nav"
+  className="jump-nav jump-nav-sm position-sticky pt-3"
 >
  <ul
    className="list-unstyled"
@@ -92,7 +92,7 @@ exports[`JumpNav should not render Optional Information link 1`] = `

 exports[`JumpNav should render Optional Information link 1`] = `
 <div
-  className="jump-nav"
+  className="jump-nav jump-nav-sm position-sticky pt-3"
 >
  <ul
    className="list-unstyled"
--- a/src/account-settings/third-party-auth/ThirdPartyAuth.jsx
+++ b/src/account-settings/third-party-auth/ThirdPartyAuth.jsx
@@ -16,7 +16,7 @@ class ThirdPartyAuth extends Component {
    }
    const disconnectUrl = e.currentTarget.getAttribute('data-disconnect-url');
    this.props.disconnectAuth(disconnectUrl, providerId);
-  }
+  };

  renderUnconnectedProvider(url, name) {
    return (
--- a/src/account-settings/third-party-auth/index.js
+++ b/src/account-settings/third-party-auth/index.js
@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-restricted-exports
 export { default } from './ThirdPartyAuth';
 export { default as reducer } from './data/reducers';
 export { default as saga } from './data/sagas';
--- a/src/constants.js
+++ b/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';
--- a/src/head/Head.jsx
+++ b/src/head/Head.jsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { Helmet } from 'react-helmet';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { getConfig } from '@edx/frontend-platform';
+
+import messages from './messages';
+
+function Head({ intl }) {
+  return (
+    <Helmet>
+      <title>
+        {intl.formatMessage(messages['account.page.title'], { siteName: getConfig().SITE_NAME })}
+      </title>
+      <link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
+    </Helmet>
+  );
+}
+
+Head.propTypes = {
+  intl: intlShape.isRequired,
+};
+
+export default injectIntl(Head);
--- a/src/head/Head.test.jsx
+++ b/src/head/Head.test.jsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { Helmet } from 'react-helmet';
+import { mount } from 'enzyme';
+import { getConfig } from '@edx/frontend-platform';
+import Head from './Head';
+
+describe('Head', () => {
+  const props = {};
+  it('should match render title tag and fivicon with the site configuration values', () => {
+    mount(<IntlProvider locale="en"><Head {...props} /></IntlProvider>);
+    const helmet = Helmet.peek();
+    expect(helmet.title).toEqual(`Account | ${getConfig().SITE_NAME}`);
+    expect(helmet.linkTags[0].rel).toEqual('shortcut icon');
+    expect(helmet.linkTags[0].href).toEqual(getConfig().FAVICON_URL);
+  });
+});
--- a/src/head/messages.js
+++ b/src/head/messages.js
@@ -0,0 +1,11 @@
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+  'account.page.title': {
+    id: 'account.page.title',
+    defaultMessage: 'Account | {siteName}',
+    description: 'Title tag',
+  },
+});
+
+export default messages;
--- a/src/hooks.js
+++ b/src/hooks.js
@@ -1,23 +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) {
-  const [isLoading, setIsLoading] = useState();
-  const [data, setData] = useState();
+  // 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 () => {
-        setIsLoading(true);
+        setData(currData => ({ ...currData, status: LOADING_STATUS }));
        const response = await asyncFunc();
-        setIsLoading(false);
-        if (response) {
-          setData(response);
+
+        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 [isLoading, data];
+  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;
 }
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -1,73 +1,87 @@
 {
-  "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.duplicate.tpa.provider": "حساب {provider} الذي حددته موصول من قبل بحساب آخر على {siteName}.",
+  "account.settings.message.managed.settings": "إعدادات ملفك الشخصي يديرها {ManagerTitle}. اتصل بمديرك أو ب{support} للحصول على المساعدة.",
  "account.settings.message.managed.settings.support": "الدعم",
  "account.settings.page.heading": "إعدادات الحساب",
-  "account.settings.loading.message": "جاري التحميل...",
+  "account.settings.loading.message": "التحميل جارٍ...",
  "account.settings.loading.error": "خطأ: {error}",
-  "account.settings.banner.beta.language": "لقد قمت بتعيين لغتك الى {beta_language}، والتي لم تتم ترجمتها بالكامل حاليًا. يمكنك مساعدتنا في ترجمة هذه اللغة بالكامل من خلال الانضمام إلى مجتمع Transifex وإضافة ترجمات من الإنجليزية للمتعلمين الذين يتحدثون {beta_language}.",
-  "account.settings.banner.beta.language.action.switch.back": "العودة لـِ {previous_language}",
-  "account.settings.banner.beta.language.action.help.translate": "المساعدة في الترجمة إلى {beta_language}",
+  "account.settings.banner.beta.language": "لقد قمت بضبط لغتك على {beta_language}، وهي حاليا غير مترجمة بالكامل. يمكنك مساعدتنا في إتمام ترجمة هذه اللغة من خلال الانضمام إلى مجتمع Transifex وإضافة ترجمات من الإنجليزية للمتعلمين الذين يتحدثون {beta_language}.",
+  "account.settings.banner.beta.language.action.switch.back": "العودة إلى {previous_language}",
+  "account.settings.banner.beta.language.action.help.translate": "ساعد في الترجمة إلى {beta_language}",
  "account.settings.section.account.information": "معلومات الحساب",
  "account.settings.section.account.information.description": "تتضمن هذه الإعدادات معلومات أساسية عن حسابك.",
  "account.settings.section.profile.information": "معلومات الملف الشخصي",
  "account.settings.section.demographics.information": "معلومات اختيارية",
  "account.settings.section.site.preferences": "تفضيلات الموقع",
-  "account.settings.section.linked.accounts": "الحسابات المرتبطة",
-  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to {siteName}.",
+  "account.settings.section.linked.accounts": "الحسابات الموصولة",
+  "account.settings.section.linked.accounts.description": "يمكنك وصل حسابات هويتك لتبسيط تسجيل دخولك إلى {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.username.help.text": "الاسم الذي يعرّفك على {siteName}. لا يمكنك تغيير اسم المستخدم الخاص بك.",
  "account.settings.field.full.name": "الاسم الكامل",
-  "account.settings.field.full.name.empty": "إضافة اسم",
-  "account.settings.field.full.name.help.text": "الاسم المستخدم للتحقق من هويتك والذي سوف يظهر على الشهادات الخاصة بك.",
-  "account.settings.field.full.name.help.text.non.certificate": "The name that appears on your public profile.",
-  "account.settings.field.full.name.help.text.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 government ID.",
-  "account.settings.field.name.verified.help.text.certificate": "This name has been verified by government ID and 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.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.verification.help": "Enter your name as it appears on your government-issued ID.",
-  "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.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.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.full.name.empty": "إضافة الاسم",
+  "account.settings.field.full.name.help.text": "الاسم المستعمل للتحقق من هويتك والذي يظهر في شهاداتك.",
+  "account.settings.field.full.name.help.text.default": "الاسم الذي يظهر في ملفك الشخصي العامّ.",
+  "account.settings.field.full.name.help.text.default.certificate": "سيظهر هذا الاسم في شهاداتك و سجلّاتك العامّة.",
+  "account.settings.field.name.verified": "اسم متحقَّق منه",
+  "account.settings.field.name.verified.help.text.verified": "تم التحقق من هذا الاسم عن طريق بطاقة تعريف ذات صورة.",
+  "account.settings.field.name.verified.help.text.verified.proctored": "تم التحقق من هذا الاسم عن طريق المراقبة.",
+  "account.settings.field.name.verified.help.text.verified.certificate": "تم التحقق من هذا الاسم عن طريق بطاقة هوية ذات صورة، وتم اختياره للظهور في الشهادات والسجلات العامة.",
+  "account.settings.field.name.verified.help.text.verified.proctored.certificate": "تم التحقق من هذا الاسم من خلال المراقبة، وتم تحديده للظهور في الشهادات والسجلات العامة.",
+  "account.settings.field.name.verified.help.text.submitted": "تم تسليم طلب التحقق. في العادة يستغرق هذا 48 ساعة أو أقل. لا يمكن تغيير الاسم المتحقَّق منه في هذا الوقت.",
+  "account.settings.field.name.verified.help.text.submitted.proctored": "تم تسليم امتحانك المراقَب. لا يمكن تغيير الاسم المتحقَّق منه في هذا الوقت. رجاءً أعد التفقد بعد 2-5 أيام.",
+  "account.settings.field.name.verified.help.text.submitted.certificate": "عند نجاح التحقق من الهوية، سيظهر هذا الاسم على شهاداتك و سجلاتك العامة. لا يمكن تغيير الاسم المتحقَّق منه في هذا الوقت.",
+  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "بمجرد اجتياز امتحانك المراقب للمراجعة، سيظهر هذا الاسم في شهادتك و سجلاتك العامة. لا يمكن تغيير الاسم المتحقَّق منه في هذا الوقت.",
+  "account.settings.field.name.verified.verification.help": "أدخل اسمك كما يظهر في بطاقة تعريف الطالب أو الموظف الخاصة بك، أو بطاقة تعريفك الصادرة عن الحكومة.",
+  "account.settings.field.full.name.help.text.submitted": "تم تسليم طلب التحقق. يستغرق هذا عادةً 48 ساعة أو أقل. لا يمكن تغيير الاسم الكامل في هذا الوقت.",
+  "account.settings.field.full.name.help.text.submitted.proctored": "تم تسليم امتحانك المراقب. لا يمكن تغيير الاسم الكامل في هذا الوقت. يرجى التحقق مرة أخرى خلال 2-5 أيام.",
+  "account.settings.field.full.name.help.text.submitted.certificate": "عند نجاح التحقق من الهوية، سيظهر هذا الاسم على الشهادات والسجلات العامة. لا يمكن تغيير الاسم الكامل في هذا الوقت.",
+  "account.settings.field.full.name.help.text.submitted.proctored.certificate": "بمجرد اجتياز امتحانك المراقب للمراجعة، سيظهر هذا الاسم في شهاداتك وسجلاتك العامة. لا يمكن تغيير الاسم الكامل في هذا الوقت.",
+  "account.settings.field.name.verified.success.message": "اكتمل طلب التحقق من هويتك بنجاح. لديك الآن خيار تحديد الاسم الذي تفضل ظهوره على شهاداتك وسجلاتك العامة.",
+  "account.settings.field.name.verified.success.message.header": "اكتمل طلب تغيير اسمك!",
+  "account.settings.field.name.verified.failure.message": "لم تنجح آخر محاولاتك للتحقق من هويتك. تم إرجاع إعدادات الحساب ذات الصلة إلى وضعها السابق.",
+  "account.settings.field.name.verified.failure.message.header": "لم نستطع التحقق من هويتك.",
+  "account.settings.field.name.verified.failure.message.help.link": "اعرف المزيد عن التحقق من الهوية.",
+  "account.settings.field.name.verified.submitted.message": "تم تسليم طلب التحقق من هويتك و عادة ما يستغرق إكماله ما بين 24 و 48 ساعة.",
+  "account.settings.field.name.verified.submitted.message.certificate": "عند الموافقة على طلبك، سيظهر اسمك المحدَّث على جميع الشهادات السجلات العامة ذات الصلة.",
+  "account.settings.field.name.verified.submitted.message.header": "طلب تغيير اسمك يكاد يكتمل!",
+  "account.settings.field.email": "البريد الالكتروني (تسجيل الدخول)",
  "account.settings.field.email.empty": "إضافة عنوان البريد الإلكتروني",
-  "account.settings.field.email.confirmation": "لقد أرسلنا رسالة تأكيد إلى {value}. انقر فوق الرابط في الرسالة لتحديث عنوان بريدك الإلكتروني.",
-  "account.settings.field.email.help.text": "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.field.email.confirmation": "لقد أرسلنا رسالة تأكيد إلى {value}. انقر على الرابط في الرسالة لتحديث عنوان بريدك الإلكتروني.",
+  "account.settings.field.email.help.text": "على هذا العنوان تصلك الرسائل من {siteName} و من فرق المساقات.",
+  "account.settings.field.secondary.email": "عنوان بريد الاستعادة الإلكتروني.",
+  "account.settings.field.secondary.email.empty": "إضافة عنوان بريد إلكتروني لاستعادة حسابك",
+  "account.settings.field.secondary.email.confirmation": "لقد أرسلنا رسالة تأكيد إلى {value}. انقر على الرابط في الرسالة لتحديث عنوان بريد الاستعادة الإلكتروني الخاص بك.",
  "account.settings.email.field.confirmation.header": "تعليق عملية التأكيد",
  "account.settings.field.dob": "سنة الميلاد",
  "account.settings.field.dob.empty": "إضافة سنة الميلاد",
-  "account.settings.field.year_of_birth.options.empty": "اختر سنة ميلاد",
-  "account.settings.field.country": "الدولة",
+  "account.settings.field.year_of_birth.options.empty": "تحديد سنة الميلاد",
+  "account.settings.field.dob.month": "الشهر",
+  "account.settings.field.dob.year": "السنة",
+  "account.settings.field.dob.form.button": "يرجى تأكيد تاريخ ميلادك",
+  "account.settings.field.dob.form.title": "تأكيد تاريخ ميلادك",
+  "account.settings.field.dob.form.help.text": "نطلب معلومة تاريخ الميلاد لمساعدتنا على الالتزام بواجباتنا القانونية.",
+  "account.settings.field.dob.form.success": "شكرا لك على إدخال تاريخ ميلادك.",
+  "account.settings.field.month_of_birth.options.empty": "تحديد شهر الميلاد",
+  "account.settingsfield.dob.error.general": "حدث خطأ تقني. رجاءً حاول مجددا.",
+  "account.settings.field.country": "البلد",
  "account.settings.field.country.empty": "إضافة البلد ",
-  "account.settings.field.country.options.empty": "اختر دولة",
-  "account.settings.field.state": "الحالة",
-  "account.settings.field.state.empty": "إضافة منطقة",
-  "account.settings.field.state.options.empty": "اختر منطقة",
+  "account.settings.field.country.options.empty": "اختر البلد",
+  "account.settings.field.state": "المنطقة / الولاية / المحافظة",
+  "account.settings.field.state.empty": "إضافة المنطقة / الولاية / المحافظة",
+  "account.settings.field.state.options.empty": "حدد المنطقة",
  "account.settings.field.site.language": "لغة الموقع",
  "account.settings.field.site.language.help.text": "اللغة المستخدمة في كافة أقسام هذا الموقع. يتوفّر هذا الموقع حاليًا بعدد محدود من اللغات.",
  "account.settings.field.education": "المستوى التعليمي",
  "account.settings.field.education.empty": "إضافة المستوى التعليمي",
-  "account.settings.field.education.levels.empty": "اختر المستوى التعليمي",
+  "account.settings.field.education.levels.empty": "اختر مستوى تعليميًّا",
  "account.settings.field.education.levels.p": "دكتوراه",
-  "account.settings.field.education.levels.m": "ماجستير أو شهادة مهنيّة",
-  "account.settings.field.education.levels.b": "بكالوريوس",
-  "account.settings.field.education.levels.a": "زمالة",
-  "account.settings.field.education.levels.hs": "شهادة الثانوية العامة",
-  "account.settings.field.education.levels.jhs": "شهادة الثانوية الصغرى/الإعدادية/المرحلة المتوسّطة",
-  "account.settings.field.education.levels.el": "شهادة المدرسة الابتدائية",
-  "account.settings.field.education.levels.none": "لا يوجد تعليم رسمي",
+  "account.settings.field.education.levels.m": "ماجستير / ماستر أو شهادة مهنيّة",
+  "account.settings.field.education.levels.b": "بكالوريوس / ليسانس",
+  "account.settings.field.education.levels.a": "درجة الزمالة / دبلوم الدراسات الجامعية",
+  "account.settings.field.education.levels.hs": "الثانوية العامة / البكالوريا",
+  "account.settings.field.education.levels.jhs": "المدرسة الإعدادية / المتوسطة",
+  "account.settings.field.education.levels.el": "المدرسة الابتدائية / الأساسية",
+  "account.settings.field.education.levels.none": "دون تعليم رسمي",
  "account.settings.field.education.levels.o": "نوع آخر من التعليم",
  "account.settings.field.gender": "الجنس",
  "account.settings.field.gender.empty": "إضافة الجنس",
@@ -80,183 +94,184 @@
  "account.settings.field.language_proficiencies.options.empty": "اختر لغة",
  "account.settings.field.time.zone": "المنطقة الزمنية",
  "account.settings.field.time.zone.empty": "ضبط المنطقة الزمنية",
-  "account.settings.field.time.zone.description": "حدد المنطقة الزمنية لعرض تواريخ المساق. إذا لم تحدد منطقة زمنية، فسيتم عرض تواريخ المساق، بما في ذلك المواعيد النهائية للواجب في المنطقة الزمنية المحلية في المتصفح.",
-  "account.settings.field.time.zone.default": "الافتراضي (منطقة التوقيت المحلي)",
+  "account.settings.field.time.zone.description": "حدد المنطقة الزمنية لعرض تواريخ المساقات. إذا لم تحدد منطقة زمنية، فسيتم عرض تواريخ المساق، بما في ذلك المواعيد النهائية للواجبات بالتوقيت المحلّي للمتصفح.",
+  "account.settings.field.time.zone.default": "الافتراضي (المنطقة الزمنية المحلية)",
  "account.settings.field.time.zone.all": "جميع المناطق الزمنية",
-  "account.settings.field.time.zone.country": "المنطقة الزمنية للدولة",
-  "account.settings.section.social.media": "روابط منصات التواصل الإجتماعي",
-  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
+  "account.settings.field.time.zone.country": "المناطق الزمنية للبلدان",
+  "account.settings.section.social.media": "روابط التواصل الإجتماعي",
+  "account.settings.section.social.media.description": "اختياريًا، اربط حساباتك الشخصية بأيقونات التواصل الاجتماعي في ملفك على {siteName}.",
  "account.settings.field.social.platform.name.linkedin": "لينكد إن",
-  "account.settings.field.social.platform.name.linkedin.empty": "إضافة عنوان ملف لينكد إن ",
-  "account.settings.jump.nav.delete.account": "احذف حسابي",
+  "account.settings.field.social.platform.name.linkedin.empty": "إضافة سيرة لينكد إن",
+  "account.settings.jump.nav.delete.account": "حذف حسابي",
  "account.settings.field.social.platform.name.twitter": "تويتر",
-  "account.settings.field.social.platform.name.twitter.empty": "إضافة عنوان صفحة تويتر",
+  "account.settings.field.social.platform.name.twitter.empty": "إضافة صفحة تويتر",
  "account.settings.field.social.platform.name.facebook": "فيسبوك",
-  "account.settings.field.social.platform.name.facebook.empty": "إضافة عنوان صفحة فيسبوك",
+  "account.settings.field.social.platform.name.facebook.empty": "إضافة حساب فيسبوك",
  "account.settings.editable.field.action.save": "حفظ",
  "account.settings.editable.field.action.cancel": "إلغاء",
-  "account.settings.editable.field.action.edit": "تحرير",
-  "account.settings.static.field.empty": "لم يتم تحديد قيمة، فضلًا اتصل بمدير  {enterprise} لتعيين بعض التغييرات.",
-  "account.settings.static.field.empty.no.admin": "لم يتم تحديد قيمة",
-  "account.settings.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.editable.field.action.edit": "تعديل",
+  "account.settings.static.field.empty": "لا قيمة محددة. رجاءً اتصل بمديرك في {enterprise} ليقوم بالتعديلات.",
+  "account.settings.static.field.empty.no.admin": "لا قيمة محددة.",
+  "account.settings.field.name.certificate.select": "في حال التأشير، سيظهر هذا الاسم في شهاداتك و سجلاتك العامة.",
+  "account.settings.field.name.modal.certificate.title": "اختر اسمًا مفضلًا للشهادات والسجلات العامة",
+  "account.settings.field.name.modal.certificate.select": "اختر اسمًا",
+  "account.settings.field.name.modal.certificate.option.full": "الاسم الكامل",
+  "account.settings.field.name.modal.certificate.option.verified": "اسم متحقَّق منه",
+  "account.settings.field.name.modal.certificate.button.choose": "اختيار الاسم",
+  "account.settings.coaching.consent.welcome.header": "لنبدأ.",
  "account.settings.coaching.consent.welcome.subheader": "نحن هنا لأجلك من البداية حتى النهاية",
-  "account.settings.coaching.consent.description": "تتضمن برامج البكالوريوس التدريب الذي يركز على مهنتك وتعليمك وكيفية تحقيق نتائج مبهرة من خلال التواصل الشخصي مع خبراء متمرسين. إذا كنت مهتمًا، فقدّم المعلومات أدناه وانقر فوق \"إرسال\"، وسيتصل بك شريكنا في التدريب عبر البريد الإلكتروني و/أو الرسائل النصية لمساعدتك على المضي قدمًا. تنطبق الشروط والأحكام.*",
-  "account.settings.coaching.consent.text-messaging.disclaimer": "* يتم تضمين خدمات التدريب بدون أي تكلفة إضافية للمتعلمين الذين لديهم أرقام هواتف أمريكية. يتضمن التدريب رسائل نصية متكررة. قد تنطبق أسعار الرسائل والبيانات. إيقاف النص لإلغاء الاشتراك.",
-  "account.settings.coaching.consent.accept-coaching": "سجّل للاستفادة من خدمات التدريب",
-  "account.settings.coaching.consent.decline-coaching": "أفضّل عدم الاتصال بخدمات التدريب المجانية",
-  "account.settings.coaching.consent.label.name": "يرجى تأكيد الاسم",
-  "account.settings.coaching.consent.label.phone-number": "فضلًا أدخل رقم الهاتف ",
-  "account.settings.coaching.consent.success.header": "تمت العملية بنجاح",
-  "account.settings.coaching.consent.success.message": "لقد اشتركت في التدريب. يمكنك توقع استلام رسالة عبر البريد الإلكتروني أو الرسائل القصيرة في الأيام المقبلة.",
+  "account.settings.coaching.consent.description": "تتضمن برامج MicroBachelors مرافقة تركز على مهنتك و تعليمك و كيفية تحقيقك للنتائج، و ذلك من خلال التواصل الفردي مع خبير متمرس. إن كنت مهتمًا، فيرجى تزويدنا بالمعلومات أدناه و النقر على \"إرسال\"، و سيتصل بك شريكنا في المرافقة عبر البريد الإلكتروني و/أو الرسائل النصية لمساعدتك على المضي قدمًا. تنطبق الشروط والأحكام.*",
+  "account.settings.coaching.consent.text-messaging.disclaimer": "* خدمات المرافقة مشمولة دون تكاليف إضافية للمتعلمين الذين لديهم أرقام هواتف أمريكية. تتضمن المرافقة رسائل نصية دورية. قد تنطبق أسعار على الرسائل والبيانات. أرسل STOP للانسحاب.",
+  "account.settings.coaching.consent.accept-coaching": "سجّل للاستفادة من خدمات المرافقة",
+  "account.settings.coaching.consent.decline-coaching": "أفضّل ألا يٌتصَل بي بخصوص خدمات المرافقة المجانية",
+  "account.settings.coaching.consent.label.name": "رجاءً أكّد اسمك",
+  "account.settings.coaching.consent.label.phone-number": "أدخل رقم هاتفك الجوّال",
+  "account.settings.coaching.consent.success.header": "نجحت العملية!",
+  "account.settings.coaching.consent.success.message": "أنت الآن مشترك في المرافقة. ترقّب رسالة عبر البريد الإلكتروني أو خدمة الرسائل القصيرة في في الأيام المقبلة.",
  "account.settings.coaching.consent.success.continue": "البدء في مساقي",
  "account.settings.coaching.managed.support": "الدعم",
-  "account.settings.coaching.managed.alert": "تتم إدارة اسمك بواسطة {ManagerTitle}. اتصل بالمسؤول للحصول على المساعدة.",
+  "account.settings.coaching.managed.alert": "اسمك يديره {ManagerTitle}. اتصل بمديرك للحصول على المساعدة.",
  "account.settings.field.phone_number": "رقم الهاتف",
-  "account.settings.field.phone_number.empty": "إضافة رقم الهاتف",
-  "account.settings.field.coaching_consent": "اتفاقية التدريب",
-  "account.settings.field.coaching_consent.tooltip": "تتضمن برامج البكالوريوس التدريب القائم على الرسائل النصية الذي يساعدك على إقران التجارب التعليمية مع أهدافك المهنية من خلال النصائح الشخصية. يتم تضمين خدمات التدريب بدون أي تكلفة إضافية، وهي متوفرة للمتعلمين الذين لديهم أرقام هواتف نقالة أمريكية. تنطبق أسعار المراسلة القياسية. أرسل \"قف\" في أي وقت لإلغاء الرسائل.",
-  "account.settings.field.coaching_consent.error": "مطلوب رقم هاتف أمريكي صالح للدخول في التدريب",
+  "account.settings.field.phone_number.empty": "إضافة رقم هاتف",
+  "account.settings.field.coaching_consent": "الموافقة على المرافقة",
+  "account.settings.field.coaching_consent.tooltip": "تتضمن برامج MicroBachelors مرافقة قائمة على الرسائل النصية، تساعدك على إقران تجاربك التعلّمية مع أهدافك المهنية من خلال النصائح الفردية. خدمات المرافقة مشمولة دون تكاليف إضافية، وهي متوفرة للمتعلمين الذين لديهم أرقام هواتف جوالة أمريكية. تنطبق أسعار المراسلة القياسية. أرسل 'STOP' في أي وقت للانسحاب من الرسائل.",
+  "account.settings.field.coaching_consent.error": "مطلوب رقم هاتف أمريكي صحيح للتسجيل في المرافقة",
  "account.settings.delete.account.before.proceeding": "قبل المتابعة، يرجى {actionLink}.",
-  "account.settings.delete.account.header": "احذف حسابي",
+  "account.settings.delete.account.header": "حذف حسابي",
  "account.settings.delete.account.subheader": "نأسف لذهابك!",
-  "account.settings.delete.account.text.1": "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.unlink": "إلغاء ربط جميع حسابات التواصل الاجتماعي",
+  "account.settings.delete.account.text.1": "ترجى الملاحظة: إن حذف حسابك وبياناتك الشخصية له أثر دائم و لا يمكن التراجع عنه. لن يكون بمقدور {siteName} استعادة حسابك ولا البيانات التي يتم حذفها.",
+  "account.settings.delete.account.text.2": "بمجرد حذف حسابك، فإنك لن تستطيع استخدامه لمتابعة المساقات على {siteName}.",
+  "account.settings.delete.account.text.2.edX": "بمجرد حذف حسابك، فإنك لن تستطيع استخدامه لمتابعة المساقات على تطبيق edX ولا edx.org ولا أي موقع آخر تستضيفه edX. وهذا يشمل الوصول إلى edx.org من نظام صاحب العمل أو الجامعة و الوصول إلى المواقع الخاصة التي تقدمها MIT Open Learning و Wharton Executive Education و Harvard Medical School.",
+  "account.settings.delete.account.text.3.link": "اتّبع هذه التعليمات لطباعة أو تحميل شهادة",
+  "account.settings.delete.account.text.warning": "تحذير: حذف الحساب أثره دائم. يرجى قراءة ما ورد أعلاه بعناية قبل المتابعة. هذا إجراء غير رجعي، و لن تتمكن بعده من استخدام نفس البريد الإلكتروني على {siteName}.",
+  "account.settings.delete.account.text.change.instead": "هل تريد بدلاً من ذلك تغيير بريدك الإلكتروني أو اسمك أو كلمة المرور الخاصة بك؟",
+  "account.settings.delete.account.button": "حذف حسابي",
+  "account.settings.delete.account.please.activate": "تفعيل حسابك",
+  "account.settings.delete.account.please.confirm": "تأكيد حسابك",
+  "account.settings.delete.account.please.unlink": "فصل جميع حسابات التواصل الاجتماعي",
  "account.settings.delete.account.modal.header": "هل أنت متأكد؟",
-  "account.settings.delete.account.modal.text.1": "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.modal.text.1": "لقد اخترت \"حذف حسابي\". إن حذف حسابك وبياناتك الشخصية ذو أثر دائم لا يمكن التراجع عنه. لن يكون بمقدور {siteName} استعادة حسابك و لا البيانات التي حذفت.",
+  "account.settings.delete.account.modal.text.2": "إن واصلت، فلن تستطيع استخدام هذا الحساب لمتابعة المساقات على {siteName}.",
+  "account.settings.delete.account.modal.text.2.edX": "إن واصلت، فلن تستطيع استخدام هذا الحساب لمتابعة المساقات على على تطبيق edX و لا edx.org و لا أي موقع آخر تستضيفه edX. وهذا يشمل الوصول إلى edx.org من نظام صاحب العمل أو الجامعة و الوصول إلى المواقع الخاصة التي يقدمها MIT Open Learning و Wharton Executive Education و Harvard Medical School.",
+  "account.settings.delete.account.modal.enter.password": "إن كنت لا تزال ترغب في المتابعة و حذف حسابك، فيرجى إدخال كلمة المرور:",
+  "account.settings.delete.account.modal.confirm.delete": "تعم، احذف",
+  "account.settings.delete.account.modal.confirm.cancel": "لا",
+  "account.settings.delete.account.error.unable.to.delete": "لم نستطع حذف الحساب",
  "account.settings.delete.account.error.no.password": "كلمة المرور مطلوبة",
-  "account.settings.delete.account.error.invalid.password": "كلمة المرور المدخلة غير صحيحة",
-  "account.settings.delete.account.error.unable.to.delete.details": "عذراً ، حدث خطأ أثناء محاولة معالجة طلبك. الرجاء معاودة المحاولة في وقت لاحق.",
-  "account.settings.delete.account.modal.after.header": "نأسف لذهابك! سيتم حذف حسابك قريبا.",
-  "account.settings.delete.account.modal.after.text": "قد يستغرق حذف الحساب ، بما في ذلك الإزالة من قوائم البريد الإلكتروني ، بضعة أسابيع حتى تتم معالجته بالكامل من خلال نظامنا. إذا كنت ترغب في إلغاء الاشتراك في رسائل البريد الإلكتروني قبل ذلك الحين ، يرجى إلغاء الاشتراك من تذييل أي بريد إلكتروني.",
+  "account.settings.delete.account.error.invalid.password": "كلمة المرور غير صحيحة",
+  "account.settings.delete.account.error.unable.to.delete.details": "عذراً، حدث خطأ أثناء محاولة معالجة طلبك. رجاءً أعد المحاولة لاحقًا.",
+  "account.settings.delete.account.modal.after.header": "نأسف لذهابك! سيُحذف حسابك في ظرف وجيز.",
+  "account.settings.delete.account.modal.after.text": "حذف الحساب، بما في ذلك من إزالة من القوائم البريدية، إجراء قد يستغرق بضعة أسابيع حتى يكتمل عبر نظامنا. إن كنت تريد قبل ذلك الحين إيقاف تلقي البريد الإلكتروني، فيرجى إلغاء الاشتراك من تذييل أي بريد إلكتروني.",
  "account.settings.delete.account.modal.after.button": "إغلاق ",
-  "account.settings.delete.account.text.3.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.delete.account.text.3.edX": "قد تفقد كذلك إمكانية الوصول إلى الشهادات الموثقة و كذا مؤهلات البرامج الأخرى مثل شهادات MicroMasters. يمكنك الاحتفاظ بنسخة عنها لديك قبل المواصلة إلى الحذف. {actionLink}.",
+  "account.settings.delete.account.text.3": "قد تفقد كذلك إمكانية الوصول إلى الشهادات الموثقة و كذا مؤهلات البرامج الأخرى. يمكنك الاحتفاظ بنسخة عنها لديك قبل المواصلة إلى الحذف.",
+  "account.settings.message.demographics.service.issue": "حدث خطأ أثناء محاولة استخراج أو حفظ معلومات حسابك. رجاءً أعد المحاولة لاحقًا.",
  "account.settings.field.demographics.gender": "هوية الجنس",
  "account.settings.field.demographics.gender.empty": "إضافة هوية الجنس",
  "account.settings.field.demographics.gender.options.empty": "حدد هوية الجنس",
  "account.settings.field.demographics.gender_description": "وصف هوية الجنس",
-  "account.settings.field.demographics.gender_description.empty": "أدخل وصفًا",
+  "account.settings.field.demographics.gender_description.empty": "أدخل الوصف",
  "account.settings.field.demographics.ethnicity": "هوية العرق/ الأصل",
-  "account.settings.field.demographics.ethnicity.empty": "إضافة هوية العرق/الأصل",
-  "account.settings.field.demographics.ethnicity.options.empty": "فضلًا اختر جميع ما ينطبق",
-  "account.settings.field.demographics.income": "الدخل المادي الأسري",
-  "account.settings.field.demographics.income.empty": "إضافة الدخل المادي الأسري",
-  "account.settings.field.demographics.income.options.empty": "حدد نطاق الدخل المادي للأسرة",
-  "account.settings.field.demographics.military_history": "حالة الخدمة العسكرية في الولايات المتحدة الأمريكية",
-  "account.settings.field.demographics.military_history.empty": "إضافة حالة الخدمة العسكرية",
-  "account.settings.field.demographics.military_history.options.empty": "اختر حالة الخدمة العسكرية",
-  "account.settings.field.demographics.learner_education_level": "مؤهلك التعليمي",
-  "account.settings.field.demographics.learner_education_level.empty": "إضافة مؤهلك التعليمي",
-  "account.settings.field.demographics.parent_education_level": "مؤهل الوالدين/الآوصياء التعليمي",
-  "account.settings.field.demographics.parent_education_level.empty": "إضافة المؤهل التعليمي",
-  "account.settings.field.demographics.education_level.options.empty": "حدد موهلاً تعليميًا",
+  "account.settings.field.demographics.ethnicity.empty": "إضافة هوية العرق / الأصل",
+  "account.settings.field.demographics.ethnicity.options.empty": "اختر كل ما ينطبق",
+  "account.settings.field.demographics.income": "دخل الأسرة",
+  "account.settings.field.demographics.income.empty": "إضافة دخل الأسرة",
+  "account.settings.field.demographics.income.options.empty": "حدد نطاقًا لدخل الأسرة",
+  "account.settings.field.demographics.military_history": "الوضعية إزاء الخدمة العسكرية في الولايات المتحدة",
+  "account.settings.field.demographics.military_history.empty": "إضافة الوضعية إزاء الخدمة العسكرية",
+  "account.settings.field.demographics.military_history.options.empty": "اختر الوضعية إزاء الخدمة العسكرية",
+  "account.settings.field.demographics.learner_education_level": "مستواك التعليمي",
+  "account.settings.field.demographics.learner_education_level.empty": "إضافة المستوى التعليمي",
+  "account.settings.field.demographics.parent_education_level": "مستوى الوالدين/الأولياء التعليمي",
+  "account.settings.field.demographics.parent_education_level.empty": "إضافة المستوى التعليمي",
+  "account.settings.field.demographics.education_level.options.empty": "حدد المستوى التعليمي",
  "account.settings.field.demographics.work_status": "الحالة الوظيفية",
  "account.settings.field.demographics.work_status.empty": "إضافة الحالة الوظيفية",
-  "account.settings.field.demographics.work_status.options.empty": "فضلًا حدد حالتك الوظيفية",
+  "account.settings.field.demographics.work_status.options.empty": "حدد الحالة الوظيفية",
  "account.settings.field.demographics.work_status_description": "وصف الحالة الوظيفية",
-  "account.settings.field.demographics.work_status_description.empty": "أدخل وصفًا",
+  "account.settings.field.demographics.work_status_description.empty": "أدخل الوصف",
  "account.settings.field.demographics.current_work_sector": "مجال العمل الحالي",
  "account.settings.field.demographics.current_work_sector.empty": "إضافة مجال العمل",
  "account.settings.field.demographics.future_work_sector": "مجال العمل المستقبلي",
  "account.settings.field.demographics.future_work_sector.empty": "إضافة مجال العمل",
  "account.settings.field.demographics.work_sector.options.empty": "حدد مجال العمل",
-  "account.settings.section.demographics.why": "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 government-issued ID.",
-  "account.settings.name.change.id.name.placeholder": "Enter the name on your government 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.section.demographics.why": "ما هي غاية {siteName} من جمع هذه المعلومات؟",
+  "account.settings.name.change.title.id": "تغيير الاسم هذا يتطلب التحقق من الهوية",
+  "account.settings.name.change.title.begin": "قبل أن نبدأ",
+  "account.settings.name.change.warning.one": "تحذير: يقوم هذا الإجراء بتحديث الاسم الذي يظهر على جميع الشهادات التي تم الحصول عليها على هذا الحساب في الماضي و أي شهادات تحصل عليها حاليا أو مستقبلاً.",
+  "account.settings.name.change.warning.two": "لا يمكن التراجع عن هذا الإجراء دون التحقق من هويتك.",
+  "account.settings.name.change.id.name.label": "أدخل اسمك كما يظهر في بطاقة تعريف الطالب أو العمل أو بطاقة الهوية الصادرة عن الحكومة.",
+  "account.settings.name.change.id.name.placeholder": "أدخل الاسم الموجود في بطاقة تعريفك ذات الصورة.",
+  "account.settings.name.change.error.valid.name": "رجاءً أدخل اسما صحيحا.",
+  "account.settings.name.change.error.general": "حدث خطأ تقني. رجاءً حاول مجددًا.",
+  "account.settings.name.change.continue": "مواصلة",
+  "account.settings.name.change.cancel": "إلغاء",
+  "error.notfound.message": "الصفحة التي تبحث عنها غير متوفرة أو هناك خطأ في العنوان. رجاءً تحقق من العنوان و حاول مجددًا.",
  "account.settings.editable.field.password.reset.button.confirmation.support.link": "الدعم الفني",
-  "account.settings.editable.field.password.reset.button.confirmation": "لقد أرسلنا رسالة إلى {email}. انقر فوق الرابط في الرسالة لإعادة تعيين كلمة المرور. إذا لم يتم استلام الرسالة؟ اتصل بـ {technicalSupportLink}.",
-  "account.settings.editable.field.password.reset.button": "تغيير كلمة المرور",
-  "account.settings.editable.field.password.reset.button.forbidden": "طلبك السابق قيد التقدم، يرجى إعادة المحاولة بعد لحظات قليلة.",
+  "account.settings.editable.field.password.reset.button.confirmation": "لقد أرسلنا رسالة إلى {email}. انقر على الرابط في الرسالة لإعادة ضبط كلمة المرور الخاصة بك. لم تصلك الرسالة؟ اتصل بـ{technicalSupportLink}.",
+  "account.settings.editable.field.password.reset.button": "إعادة ضبط كلمة المرور",
+  "account.settings.editable.field.password.reset.button.forbidden": "طلبك السابق في تقدّم، رجاءً حاول مجددًا بعد لحظات قليلة.",
  "account.settings.editable.field.password.reset.label": "كلمة المرور",
-  "account.settings.sso.link.account": "تسجيل الدخول كـ  {name}",
-  "account.settings.sso.account.connected": "مربوط",
-  "account.settings.sso.account.disconnect.error": "حدثت مشكلة أثناء قطع اتصال هذا الحساب، اتصل بالدعم عند استمرار المشكلة.",
-  "account.settings.sso.unlink.account": "إلغاء ربط حساب {name} ",
-  "account.settings.sso.no.providers": "لا يمكن ربط أية حسابات حاليًا",
-  "id.verification.access.blocked.denied": "لا يمكنك التحقق من هويتك في الوقت الحالي. إذا لم تقم بعد بتنشيط حسابك، فيرجى التحقق من مجلد البريد المهمل للحصول على رسالة التفعيل من {email}.",
+  "account.settings.sso.link.account": "تسجيل الدخول باستخدام {name}",
+  "account.settings.sso.account.connected": "موصول",
+  "account.settings.sso.account.disconnect.error": "حدثت مشكلة أثناء فصل هذا الحساب، اتصل بالدعم إن استمرت المشكلة.",
+  "account.settings.sso.unlink.account": "فصل حساب {name}",
+  "account.settings.sso.no.providers": "لا يمكن وصل أي حسابات في الوقت الراهن.",
+  "account.page.title": "الحساب | {siteName}",
+  "id.verification.access.blocked.denied": "لا يمكننا التحقق من هويتك في الوقت الراهن. إن لم تكن قد فعّلت حسابك بعد، فيرجى تفقد مجلد الرسائل غير المرغوب فيها بحثًا عن بريد التفعيل الإلكتروني من {email}.",
  "id.verification.next": "التالي",
-  "id.verification.support": "support",
-  "id.verification.continue.upload": "Continue with Upload",
-  "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.support": "الدعم",
+  "id.verification.example.card.alt": "مثال بطاقة تعريف صحيحة بالاسم الكامل والصورة.",
+  "id.verification.requirements.title": "متطلبات التحقق باستخدام الصورة",
+  "id.verification.requirements.description": "لإكمال التحقق بالصورة، ستحتاج ما يلي:",
  "id.verification.requirements.card.device.title": "جهاز مزود بكاميرا",
-  "id.verification.requirements.card.device.allow": "موافق",
-  "id.verification.requirements.card.id.title": "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.requirements.card.device.allow": "السماح",
+  "id.verification.requirements.card.id.title": "بطاقة تعريف بها صورة",
+  "id.verification.requirements.card.id.text": "تحتاج إلى بطاقة تعريف صالحة تحتوي اسمك الكامل وصورتك، كرخصة القيادة أو جواز السفر مثلاً.",
+  "id.verification.privacy.title": "معلومات الخصوصية",
+  "id.verification.privacy.need.photo.question": "ما حاجة {siteName} لصورتي؟",
+  "id.verification.privacy.need.photo.answer": "نستخدم صور التحقق الخاصة بك لتأكيد هويتك ولضمان صحة شهادتك.",
+  "id.verification.privacy.do.with.photo.question": "ماذا يُفعَل بهذه الصورة في {siteName}؟",
+  "id.verification.privacy.do.with.photo.answer": "نقوم بتشفير صورتك بشكل آمن وإرسالها إلى خدمة الترخيص الخاصة بنا للمراجعة. صورتك و معلوماتك لا تُحفَظ و لا تظهر في أي مكان على {siteName} بعد اكتمال عملية التحقق.",
  "id.verification.access.blocked.title": "التحقق من الهوية",
-  "id.verification.access.blocked.enrollment": "أنت الآن ملتحق بمساق يتطلب التحقق من الهوية.",
-  "id.verification.access.blocked.pending": "لقد قمت بالفعل بإرسال معلومات التحقق الخاصة بك. ستصلك رسالة على لوحة المعلومات عند اكتمال عملية التحقق (عادةً خلال 5 أيام).",
+  "id.verification.access.blocked.enrollment": "أنت حاليا غير ملتحق بأي مساق يتطلب التحقق من الهوية.",
+  "id.verification.access.blocked.pending": "لقد سلّمت من قبل معلومات التحقق الخاصة بك. ستصلك رسالة على لوحة المعلومات الخاصة بك عند اكتمال عملية التحقق (عادةً في ظرف 5 أيام).",
  "id.verification.photo.take": "التقاط صورة ",
-  "id.verification.photo.retake": "Retake Photo?",
-  "id.verification.photo.enable.detection": "تمكين خاصية التعرف على الوجه",
-  "id.verification.photo.enable.detection.portrait.help.text": "عند تحديد هذا الخيار، فسيظهر مربع حول وجهك. يمكن رؤية وجهك بوضوح إذا كان المربع المحيط به أزرق. إذا لم يكن وجهك في وضع جيد أو إذا لم يكن قابلاً للاكتشاف، فسيكون المربع باللون الأحمر.",
-  "id.verification.photo.enable.detection.id.help.text": "عند تحديد هذا الخيار، فسيظهر مربع حول صورة وجهك في بطاقة الهوية. يمكن رؤية وجهك بوضوح إذا كان المربع المحيط به أزرق. إذا لم يكن وجهك في وضع جيد أو إذا لم يكن قابلاً للاكتشاف، فسيكون المربع باللون الأحمر.",
-  "id.verification.photo.feedback.correct": "وضع الوجه جيد.",
-  "id.verification.photo.feedback.two.faces": "تم تحديد أكثر من وجه.",
-  "id.verification.photo.feedback.no.faces": "لم يتم تحديد أي وجه.",
-  "id.verification.photo.feedback.top.left": "وضع خاطئ. أعلى اليسار.",
-  "id.verification.photo.feedback.top.center": "وضع خاطئ. أعلى الوسط.",
-  "id.verification.photo.feedback.top.right": "وضع خاطئ. أعلى اليمين.",
-  "id.verification.photo.feedback.center.left": "وضع خاطئ. وسط اليسار.",
-  "id.verification.photo.feedback.center.center": "وضع خاطئ. قريب جدًا من الكاميرا.",
-  "id.verification.photo.feedback.center.right": "وضع خاطئ. وسط اليمين.",
-  "id.verification.photo.feedback.bottom.left": "وضع خاطئ. أسفل اليسار.",
-  "id.verification.photo.feedback.bottom.center": "وضع خاطئ. أسفل الوسط.",
-  "id.verification.photo.feedback.bottom.right": "وضع خاطئ. أسفل اليمين.",
+  "id.verification.photo.retake": "إعادة التقاط الصورة؟",
+  "id.verification.photo.enable.detection": "تفعيل اكتشاف الوجوه",
+  "id.verification.photo.enable.detection.portrait.help.text": "في حال التأشير، سيبرز مربع حول وجهك. يمكن رؤية وجهك بوضوح إن كان المربع المحيط به أزرق اللون. أما إن كان وجهك في وضع غير جيد أو غير قابل للاكتشاف، فسيكون المربع أحمر اللون.",
+  "id.verification.photo.enable.detection.id.help.text": "في حال التأشير، سيظهر مربع حول صورة وجهك في بطاقة الهوية. يمكن رؤية وجهك بوضوح إن كان المربع المحيط به أزرق اللون. أما إن كان وجهك في وضع غير جيد أو غير قابل للاكتشاف، فسيكون المربع أحمر اللون.",
+  "id.verification.photo.feedback.correct": "موضع الوجه جيد.",
+  "id.verification.photo.feedback.two.faces": "تم اكتشاف أكثر من وجه واحد.",
+  "id.verification.photo.feedback.no.faces": "لم يتم اكتشاف أي وجه.",
+  "id.verification.photo.feedback.top.left": "الموضع خاطئ. أعلى اليسار.",
+  "id.verification.photo.feedback.top.center": "الموضع خاطئ. أعلى الوسط.",
+  "id.verification.photo.feedback.top.right": "الموضع خاطئ. أعلى اليمين.",
+  "id.verification.photo.feedback.center.left": "الموضع خاطئ. وسط اليسار.",
+  "id.verification.photo.feedback.center.center": "الموضع خاطئ. قريب جدًا من الكاميرا.",
+  "id.verification.photo.feedback.center.right": "الموضع خاطئ. وسط اليمين.",
+  "id.verification.photo.feedback.bottom.left": "الموضع خاطئ. أسفل اليسار.",
+  "id.verification.photo.feedback.bottom.center": "الموضع خاطئ. أسفل الوسط.",
+  "id.verification.photo.feedback.bottom.right": "الموضع خاطئ. أسفل اليمين.",
  "id.verification.camera.access.title": "صلاحيات الكاميرا",
-  "id.verification.camera.access.title.success": "تمكين الوصول للكاميرا",
+  "id.verification.camera.access.title.success": "الوصول للكاميرا ممكن",
  "id.verification.camera.access.title.failed": "تعذّر الوصول للكاميرا.",
-  "id.verification.camera.access.click.allow": "فضلًا تأكد من اختيار الأمر \"السماح\"",
-  "id.verification.camera.access.enable": "تمكين الكاميرا",
-  "id.verification.camera.access.problems": "هل تواجه أية مشكلة؟",
-  "id.verification.camera.access.skip": "قم بتخطي ملفات الصور وتحميلها بدلاً من ذلك",
-  "id.verification.camera.access.success": "يبدو أن الكاميرا تعمل وجاهزة.",
-  "id.verification.camera.access.failure": "يبدو أننا غير قادرين على الوصول إلى الكاميرا. ستحتاج إلى تحميل ملفات الصور الخاصة بك و معرّف الصور الخاص بك.",
-  "id.verification.camera.access.failure.temporary": "يبدو أننا غير قادرين على الوصول إلى الكاميرا. يرجى التحقق من أن كاميرا الويب متصلة ومن أنك سمحت للمتصفح بالوصول إليها.",
-  "id.verification.camera.access.failure.temporary.chrome": "تمكين الوصول للكاميرا في متصفّح كروم: ",
-  "id.verification.camera.access.failure.temporary.chrome.step1": "فتح متصفّح كروم.",
+  "id.verification.camera.access.click.allow": "رجاءً تأكد من النقر على \"السماح\"",
+  "id.verification.camera.access.enable": "تفعيل الكاميرا",
+  "id.verification.camera.access.problems": "لديك مشاكل؟",
+  "id.verification.camera.access.skip": "تَخَطَّ و قم برفع ملفات صور بدلاً من ذلك.",
+  "id.verification.camera.access.success": "يبدو أن كاميرا جهازك جاهزة و تعمل.",
+  "id.verification.camera.access.failure": "يبدو أننا غير قادرين على الوصول إلى كاميرا جهازك. ستحتاج لرفع ملف صورتك و صورة بطاقة هويتك.",
+  "id.verification.camera.access.failure.temporary": "يبدو أننا غير قادرين على الوصول إلى الكاميرا. رجاءً تحقق من أن كاميرا جهازك متصلة ومن أنك قد سمحت للمتصفح بالوصول إليها.",
+  "id.verification.camera.access.failure.temporary.chrome": "لتفعيل الوصول للكاميرا في متصفح كروم:",
+  "id.verification.camera.access.failure.temporary.chrome.step1": "افتح كروم.",
  "id.verification.camera.access.failure.temporary.chrome.step2": "توجه إلى المزيد > الإعدادات.",
  "id.verification.camera.access.failure.temporary.chrome.step2.windows": "لنظام ويندوز: Alt+F أو Alt+E أو F10 متبوعاً بـ SPACEBAR",
  "id.verification.camera.access.failure.temporary.chrome.step2.mac": "لنظام ماك: Command+,",
-  "id.verification.camera.access.failure.temporary.chrome.step3": "ضمن علامة التبويب \"الخصوصية والأمان\"، حدد \"إعدادات الموقع\" ثم \"الكاميرا\".",
+  "id.verification.camera.access.failure.temporary.chrome.step3": "تحت علامة التبويب \"الخصوصية والأمان\"، اختر \"إعدادات الموقع\" ثم \"الكاميرا\".",
  "id.verification.camera.access.failure.temporary.chrome.step4": "ضمن \"قائمة الحظر\"، ابحث عن \"edx.org\" وحدده.",
-  "id.verification.camera.access.failure.temporary.chrome.step5": "في القسم \"الصلاحيات\"، قم بتحديث صلاحيات الكاميرا إلى \"السماح\".",
-  "id.verification.camera.access.failure.temporary.ie11": "تمكين الوصول للكاميرا في متصفح انترنت إكسبلورر:",
+  "id.verification.camera.access.failure.temporary.chrome.step5": "في قسم \"الصلاحيات\"، قم بتحديث صلاحيات الكاميرا إلى \"السماح\".",
+  "id.verification.camera.access.failure.temporary.ie11": "لتفعيل الوصول للكاميرا في متصفح انترنت إكسبلورر:",
  "id.verification.camera.access.failure.temporary.ie11.step1": "افتح إدارة إعدادات Flash Player عن طريق الانتقال إلى إعدادات Windows > لوحة التحكم > Flash Player.",
  "id.verification.camera.access.failure.temporary.ie11.step2": "حدد علامة التبويب \"Camera and Mic\" (الكاميرا والميكروفون)، ثم حدد الزر \"Camera and Microphone Settings by Site\" (إعدادات الكاميرا والميكروفون حسب الموقع).",
  "id.verification.camera.access.failure.temporary.ie11.step3": "اختر \"edx.org\" من قائمة مواقع ويب وقم بتغيير الصلاحيات من خلال تحديد \"السماح\" في القائمة المنسدلة.",
@@ -270,94 +285,75 @@
  "id.verification.camera.access.failure.temporary.firefox.step7": "اختر \"حفظ التغييرات.\"",
  "id.verification.camera.access.failure.temporary.safari": "تمكين الوصول للكاميرا في متصفّح سفاري: ",
  "id.verification.camera.access.failure.temporary.safari.step1": "فتح متصفّح سفاري.",
-  "id.verification.camera.access.failure.temporary.safari.step2": "انقر فوق قائمة تطبيق سفاري، ثم حدد \"Preferences\" (التفضيلات). يمكنك أيضاً استخدام الأمرCommand+ كاختصار للوحة المفاتيح",
-  "id.verification.camera.access.failure.temporary.safari.step3": "حدد علامة التبويب \"مواقع ويب\" ثم حدد \"كاميرا\".",
+  "id.verification.camera.access.failure.temporary.safari.step2": "انقر فوق قائمة تطبيق سفاري، ثم حدد \"Preferences\" (التفضيلات). يمكنك أيضاً استخدام الأمرCommand+, كاختصار للوحة المفاتيح",
+  "id.verification.camera.access.failure.temporary.safari.step3": "حدد علامة التبويب \"مواقع الويب\" ثم حدد \"كاميرا\".",
  "id.verification.camera.access.failure.temporary.safari.step4": "حدد \"edx.org\" وقم بتغيير صلاحيات الكاميرا إلى \"السماح\".",
-  "id.verification.camera.access.failure.unsupported": "It looks like your browser does not support camera access.",
-  "id.verification.camera.access.failure.unsupported.chrome.explanation": "The Chrome browser currently does not support camera access on iOS devices, such as iPhones and iPads.",
-  "id.verification.camera.access.failure.unsupported.instructions": "Please use another browser to complete Identity Verification.",
-  "id.verification.photo.tips.title": "تلميحات مفيدة للصورة",
-  "id.verification.photo.tips.description": "بعد ذلك، سنحتاج منك التقاط صورة لوجهك. يرجى مراجعة التلميحات المفيدة أدناه.",
-  "id.verification.photo.tips.list.title": "تلميحات الصورة",
+  "id.verification.camera.access.failure.unsupported": "يبدو أن متصفحك لا يدعم الوصول إلى الكاميرا.",
+  "id.verification.camera.access.failure.unsupported.chrome.explanation": "لا يدعم متصفح Chrome حاليًا الوصول إلى الكاميرا على أجهزة iOS مثل أجهزة iPhone و iPad.",
+  "id.verification.camera.access.failure.unsupported.instructions": "رجاءً استخدم متصفحًا آخر لإكمال التحقق من الهوية.",
+  "id.verification.photo.tips.title": "نصائح مفيدة بخصوص الصورة",
+  "id.verification.photo.tips.description": "بعد ذلك، سنحتاج منك التقاط صورة لوجهك. يرجى مراجعة النصائح المفيدة أدناه.",
+  "id.verification.photo.tips.list.title": "نصائح بخصوص الصورة",
  "id.verification.photo.tips.list.description": "لالتقاط صورة ناجحة، يُرجى التأكّد ممّا يلي:",
-  "id.verification.photo.tips.list.well.lit": "أنّ الإضاءة جيّدة على وجهك.",
-  "id.verification.photo.tips.list.inside.frame": "أنّ وجهك داخل إطار الصورة بالكامل.",
+  "id.verification.photo.tips.list.well.lit": "أنّ وجهك مُضاء جيدًا.",
+  "id.verification.photo.tips.list.inside.frame": "أنّ وجهك كلَّه داخل إطار الصورة.",
  "id.verification.portrait.photo.title.camera": "التقط صورة لنفسك",
-  "id.verification.portrait.photo.title.upload": "ارفع صورتك",
-  "id.verification.portrait.photo.preview.alt": "معاينة صورة وجه المستخدم.",
-  "id.verification.portrait.photo.instructions.camera": "عندما يكون وجهك في موضعه، استخدم زر التقاط صورة أدناه لالتقاط الصورة.",
-  "id.verification.portrait.photo.instructions.upload": "Please upload a portrait photo. Ensure your entire face fits inside the frame and is well-lit. Supported formats: ",
-  "id.verification.camera.help.sight.question": "ماذا لو لم أتمكن من رؤية صورة الكاميرا ؟ أو إذا لم أتمكن من رؤية صورتي لتحديد أي جانب مرئي؟",
-  "id.verification.camera.help.sight.answer.portrait": "قد تتمكن من إكمال إجراء التقاط الصور من دون مساعدة، ولكن قد يتطلب الأمر بضع محاولات ضبط وضع الكاميرا بشكل صحيح. يختلف وضع الكاميرا المثالي باختلاف الكمبيوتر، ولكن بشكل عام، يكون أفضل موضع للتصوير في الرأس هو 12 إلى 18 بوصة (30-45 سم) تقريبًا من الكاميرا، مع وضع الرأس في المنتصف بالنسبة إلى شاشة الكمبيوتر. إذا تم رفض الصور التي ترسلها، فحاول تحريك اتجاه الكمبيوتر أو الكاميرا لتغيير زاوية الإضاءة.",
-  "id.verification.camera.help.sight.answer.id": "قد تتمكن من إكمال إجراء التقاط الصور من دون مساعدة، ولكن قد يتطلب الأمر بضع محاولات لضبط وضع الكاميرا بشكل صحيح. يختلف الوضع الأمثل للكاميرا باختلاف جهاز الكمبيوتر، ولكن بشكل عام، يكون أفضل وضع لصورة بطاقة تعريف من 8 إلى 12 بوصة (من 20 إلى 30 سم) عن الكاميرا، مع وضع بطاقة الهوية في الوسط بالنسبة للكاميرا. إذا تم رفض الصور التي ترسلها، فحاول تحريك اتجاه الكمبيوتر أو الكاميرا لتغيير زاوية الإضاءة. إن السبب الأكثر شيوعاً للرفض هو عدم القدرة على قراءة النص الموجود على بطاقة الهوية.",
+  "id.verification.portrait.photo.instructions.camera": "عندما يكون وجهك في موضعه، استخدم زر 'التقاط صورة' أدناه لالتقاط صورتك.",
+  "id.verification.camera.help.sight.question": "ماذا إن لم أتمكن من رؤية صورة الكاميرا أو إن لم أتمكن من رؤية صورتي لتحديد أي جانب مرئي؟",
+  "id.verification.camera.help.sight.answer.portrait": "قد تتمكن من إكمال إجراء التقاط الصور دون مساعدة، لكن قد يتطلب الأمر بضع محاولات لضبط موضع الكاميرا بشكل صحيح.يختلف موضع الكاميرا المثالي من حاسوب ﻵخر، لكن عمومًا يكون أفضل موضع لتصوير الرأس تقريبًا على بعد 12-18 بوصة (30-45 سنتمترًا) من الكاميرا، مع وضع رأسك في المنتصف بالنسبة إلى شاشة الحاسوب. إن تم رفض الصور التي ترسلها، فحاول تغيير اتجاه الكمبيوتر أو الكاميرا لتغيير زاوية الإضاءة.",
+  "id.verification.camera.help.sight.answer.id": "قد تتمكن من إكمال إجراء التقاط الصور دون مساعدة، لكن قد يتطلب الأمر بضع محاولات لضبط موضع الكاميرا بشكل صحيح.يختلف موضع الكاميرا المثالي من حاسوب ﻵخر، لكن عمومًا يكون أفضل موضع لتصوير بطاقة تعريف تقريبًا على بعد 8-12 بوصة (20-30 سنتمترًا) من الكاميرا، مع وضع البطاقة في المنتصف بالنسبة للكاميرا. إن تم رفض الصور التي ترسلها، فحاول تغيير اتجاه الكمبيوتر أو الكاميرا لتغيير زاوية الإضاءة. إن أكثر سبب للرفض هو عدم القدرة على قراءة نص بطاقة التعريف.",
  "id.verification.camera.help.difficulty.question.portrait": "ماذا لو واجهت صعوبة في تثبيت رأسي في الموضع المناسب للكاميرا؟",
  "id.verification.camera.help.difficulty.question.id": "ماذا لو واجهت صعوبة في تثبيت بطاقة هويتي في الموضع المناسب للكاميرا؟",
-  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
-  "id.verification.camera.help.upload.question": "What if I want to upload a photo instead?",
-  "id.verification.camera.help.upload.answer": "On the next page you will have the option to switch to upload mode. By selecting that option, you will be able to upload a photo instead.",
-  "id.verification.id.photo.unclear.question": "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.camera.help.difficulty.answer": "إن احتجت لمساعدة في التقاط صورة لإرسالها، فاتصل بدعم {siteName} للحصول على اقتراحات إضافية.",
+  "id.verification.id.photo.unclear.question": "هل صورة بطاقة تعريفك غير واضحة أو ضبابية جدًا؟",
+  "id.verification.id.tips.title": "نصائح مفيدة بخصوص بطاقة التعريف",
+  "id.verification.id.tips.description": "بعد ذلك، عليك التقاط صورة لبطاقة تعريف صالحة تتضمن اسمك الكامل مع صورة، مثل رخصة القيادة أو جواز السفر.يرجى منك تجهيز بطاقة تعريفك.",
+  "id.verification.id.tips.list.well.lit": "أن تكون بطاقة تعريفك مضاءة جيدًا.",
  "id.verification.id.tips.list.clear": "تأكد من قدرتك على رؤية صورتك وقراءة اسمك بوضوح.",
-  "id.verification.id.photo.title.camera": "Take a Photo of Your Identification Card",
-  "id.verification.id.photo.title.upload": "Upload a Photo of Your Identification Card",
+  "id.verification.id.photo.title.camera": "التقط صورة لبطاقة تعريفك",
+  "id.verification.id.photo.title.upload": "ارفع صورة لبطاقة تعريفك",
  "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.account.name.title": "التحقق من اسم الحساب",
-  "id.verification.name.check.title": "Double-Check Your Name",
-  "id.verification.account.name.instructions": "يجب أن يكون الاسم الموجود على حسابك والاسم الموجود على المعرّف الخاص بك متطابقًا تمامًا. إذا لم يكن الأمر كذلك، فيرجى النقر فوق \"لا\" لتحديث اسم حسابك.",
-  "id.verification.name.check.instructions": "Does the name below match the name on your government-issued ID? If not, update the name below to match your goverment-issued ID.",
-  "id.verification.name.check.mismatch.information": "If the name below does not match your government-issued ID, your identity verification will be denied.",
-  "id.verification.account.name.radio.label": "هل يتطابق الاسم الموجود على هويتك مع اسم الحساب أدناه؟",
-  "id.verification.name.check.radio.label": "Select an option",
-  "id.verification.account.name.radio.yes": "نعم",
-  "id.verification.name.check.radio.yes": "Yes, the name below matches my ID",
-  "id.verification.account.name.radio.no": "لا",
-  "id.verification.name.check.radio.no": "No, the name below does not match my ID",
-  "id.verification.account.name.error": "يرجى تحديث اسم الحساب لمطابقة الاسم على بطاقة الهوية.",
-  "id.verification.account.name.warning.prefix": "يُرجى الملاحظة:",
+  "id.verification.id.photo.instructions.camera": "عندما تكون بطاقتك في موضعها، استخدم زر 'التقاط صورة' أدناه لالتقاط صورتك. يرجى استخدام جواز سفر أو رخصة قيادة أو بطاقة تعريف أخرى تتضمن اسمك الكامل وصورة لوجهك.",
+  "id.verification.id.photo.instructions.upload": "يرجى رفع صورة لبطاقة تعريفك. تأكد من أن البطاقة كاملة داخل الإطار و أنها مضاءة جيدًا. يجب أن يكون حجم الملف أقل من 10 ميجابايت. الأنساق المدعومة:",
+  "id.verification.id.photo.instructions.upload.error.invalidFileType": "الملف الذي حددته ليس ضمن أنواع الصورة المدعومة. اختر رجاءً من بين الأنساق التالية:",
+  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "الملف الذي حددته كبير جداً. رجاءً أعد المحاولة باستخدام ملف ذي حجم أقل من 10 ميجابايت.",
+  "id.verification.name.check.title": "تحقق مرة أخرى من اسمك",
+  "id.verification.name.check.instructions": "هل الاسم أدناه يطابق الاسم الموجود في بطاقة تعريفك ذات الصورة. إن لم يكن كذلك، فقم بتحديث الاسم أدناه ليطابق بطاقة تعريفك.",
+  "id.verification.name.check.mismatch.information": "إن كان الاسم أدناه لا يطابق بطاقة تعريفك، فسيتم رفض تأكيد هويتك.",
+  "id.verification.name.error": "رجاءً أدخل اسمك كما يظهر في بطاقة تعريفك ذات الصورة.",
+  "id.verification.account.name.warning.prefix": "تُرجى الملاحظة:",
  "id.verification.account.name.settings": "إعدادات الحساب",
-  "id.verification.account.name.label": "اسم الحساب",
-  "id.verification.name.label": "Name",
-  "id.verification.account.name.photo.alt": "صورة من هويتك للتقديم.",
-  "id.verification.account.name.save": "حفظ ثم التالي",
+  "id.verification.name.label": "الاسم",
+  "id.verification.account.name.photo.alt": "صورة بطاقة هويتك التي ستُسلَّم.",
  "id.verification.review.title": "مراجعة صورك",
  "id.verification.review.description": "يُرجى التأكّد من أنّ الصور والمعلومات التي قدّمتها تمكّننا من التحقّق من هويّتك. ",
  "id.verification.review.portrait.label": "صورتك الشخصية",
-  "id.verification.review.portrait.alt": "صورة شخصية للتقديم.",
-  "id.verification.review.portrait.retake": "إعادة التقاط الصورة شخصية",
-  "id.verification.review.id.label": "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": "لقد تلقينا معلوماتك وجاري الآن العمل على التحقق من هويتك. ستصلك رسالة على لوحة المعلومات عند اكتمال عملية التحقق (عادةً خلال 5 أيام). في غضون ذلك، لا يزال بإمكانك الوصول إلى كل محتوى المساق المتوفر.",
-  "id.verification.return.dashboard": "العودة إلى لوحة المعلومات",
+  "id.verification.review.portrait.alt": "صورة وجهك التي ستُسلَّم.",
+  "id.verification.review.portrait.retake": "إعادة التقاط الصورة الشخصية",
+  "id.verification.review.id.label": "بطاقة تعريفك",
+  "id.verification.review.id.alt": "صورة بطاقة تعريفك التي ستُسلَّم.",
+  "id.verification.review.id.retake": "إعادة التقاط صورة بطاقة الهوية",
+  "id.verification.review.confirm": "تسليم",
+  "id.verification.submission.alert.error.face": "مطلوبة صورة لوجهك. رجاءً أعد التقاط صورتك الشخصية.",
+  "id.verification.submission.alert.error.id": "مطلوبة صورة لبطاقة تعريفك. رجاءً أعد التقاط صورة لبطاقة تعريفك.",
+  "id.verification.submission.alert.error.name": "مطلوب اسم حساب صحيح. يرجى تحديث اسم حسابك لمطابقة الاسم على بطاقة تعريفك.",
+  "id.verification.submission.alert.error.unsupported": "واحد أو أكثر من الملفات التي قمت برفعها في نَسقٍ غير مدعوم. رجاءً اختر مما يلي:",
+  "id.verification.review.error": "{siteName} صفحة دعم",
+  "id.verification.submitted.title": "التحقق من الهوية جارٍ",
+  "id.verification.submitted.text": "لقد تلقينا معلوماتك و نحن الآن نتحقق من هويتك. سيتم إخطارك عند اكتمال عملية التحقق (عادةً في ظرف 5 أيام). إلى ذلكم الحين، لا يزال يمكنك الوصول لجميع محتويات المساق المتاحة.",
+  "id.verification.return.dashboard": "العودة للوحة المعلومات",
  "id.verification.return.course": "العودة للمساق",
-  "id.verification.photo.upload.help.title": "Upload a Photo Instead",
-  "id.verification.photo.camera.help.title": "Use Your Camera Instead",
-  "id.verification.photo.upload.help.text": "If you are having trouble using the photo capture above, you may want to upload a photo instead. To upload a photo, click the button below.",
-  "id.verification.photo.camera.help.text": "If you are having trouble uploading a photo above, you may want to use your camera instead. To use your camera, click the button below.",
-  "id.verification.upload.help.button": "Switch to Upload Mode",
-  "id.verification.camera.help.button": "Switch to Camera Mode",
-  "id.verification.choose.mode.title": "Photo Requirements Options",
-  "id.verification.choose.mode.hep.text": "To complete verification, please select one of the following options to submit photos. You will be able to switch between these options throughout the process if needed.",
-  "id.verification.choose.mode.radio.upload": "Upload photos from my device",
-  "id.verification.choose.mode.radio.camera": "Take pictures using my camera",
-  "id.verification.account.name.managed.alert": "Your profile settings are managed by {managerTitle}, so you are not allowed to update your name. Please contact your {profileDataManager} administrator or {support} for help.",
-  "id.verification.request.camera.access.instructions": "لالتقاط صورة باستخدام كاميرا الويب، قد تتلقى طلب المتصفح للوصول إلى الكاميرا. {clickAllow}",
-  "id.verification.requirements.account.managed.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help before completing the Photo Verification process.",
-  "id.verification.requirements.card.device.text": "أنت بحاجة إلى جهاز مزود بكاميرا. إذا تلقيت طلب المتصفح للوصول إلى الكاميرا، فيرجى التأكد من النقر فوق {السماح}.",
-  "id.verification.account.name.summary.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help.",
-  "idv.submission.alert.error": "\nواجهنا خطأ فني أثناء محاولة رفع طلب التحقق من الهوية\nقد تكون هذه مشكلة مؤقتة، لذا يرجى المحاولة مرة أخرى بعد بضع دقائق\nعند استمرار المشكلة يرجى الانتقال إلى {support_link} للحصول على المساعدة",
-  "id.verification.account.name.edit": "Edit {sr}"
+  "id.verification.return.generic": "العودة",
+  "id.verification.photo.upload.help.title": "قم يدلا من هذا برفع صورة",
+  "id.verification.photo.camera.help.title": "استخدم الكاميرا بدلاً من هذا",
+  "id.verification.photo.upload.help.text": "إن واجهتك مشكلة في استخدام مُلتقط الصور أعلاه، فقد ترغب بدﻷ من ذلك في رفع صورة. لرفع صورة، انقر على الزر أدناه.",
+  "id.verification.photo.camera.help.text": "إن واجهتك مشكلة في رفع صورة أعلاه، فقد ترغب بدلا من ذلك في استخدام كاميرا جهازك. لاستخدام الكاميرا، انقر على الزر أدناه.",
+  "id.verification.upload.help.button": "انتقل إلى وضع الرفع",
+  "id.verification.camera.help.button": "انتقل إلى وضع الكاميرا",
+  "id.verification.request.camera.access.instructions": "حتى تلتقط صورة باستخدام الكاميرا، قد تتلقى طلبًا من المتصفح للوصول إلى الكاميرا. {clickAllow}",
+  "id.verification.requirements.account.managed.alert": "إعدادات حسابك يديرها {managerTitle}. إن لم يكن الاسم في بطاقة هويتك ذات الصورة. مطابقًا للاسم الذي في حسابك، فيرجى الاتصال بالمسؤول {profileDataManager} أو ب{support} للحصول على المساعدة قبل إتمام عملية التحقق من الصورة..",
+  "id.verification.requirements.card.device.text": "أنت بحاجة إلى جهاز مزود بكاميرا. إذا تلقيت طلبًا من المتصفح للوصول إلى كاميرا جهازك، فتأكد رجاءً من النقر على {السماح}.",
+  "id.verification.account.name.summary.alert": "إعدادات حسابك يديرها {managerTitle}. إن لم يكن الاسم في بطاقة هويتك ذات الصورة. مطابقًا للاسم الذي في حسابك، فيرجى الاتصال بالمسؤول {profileDataManager} أو ب{support} للحصول على المساعدة قبل إتمام عملية التحقق من الصورة..",
+  "idv.submission.alert.error": "\nواجهنا خطأ فني أثناء محاولة رفع طلب التحقق من الهوية\nقد تكون هذه مشكلة مؤقتة، لذا يرجى المحاولة مجددًا بعد بضع دقائق\nإن استمرت المشكلة، فيرجى الذهاب إلى {support_link} للحصول على المساعدة.",
+  "id.verification.account.name.edit": "تعديل {sr}"
 }
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -1,5 +1,5 @@
 {
-  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
+  "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,34 +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": "You can link your identity accounts to simplify signing in to {siteName}.",
+  "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": "The name that identifies you on {siteName}. You cannot change your username.",
+  "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.non.certificate": "The name that appears on your public profile.",
-  "account.settings.field.full.name.help.text.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 government ID.",
-  "account.settings.field.name.verified.help.text.certificate": "This name has been verified by government ID and 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.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.verification.help": "Enter your name as it appears on your government-issued ID.",
-  "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.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.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.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": "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.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": "You receive messages from {siteName} and course teams at this address.",
+  "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.",
@@ -49,6 +55,14 @@
  "account.settings.field.dob": "Año de nacimiento",
  "account.settings.field.dob.empty": "Agregar año de nacimiento",
  "account.settings.field.year_of_birth.options.empty": "Selecciona año de nacimiento",
+  "account.settings.field.dob.month": "Mes",
+  "account.settings.field.dob.year": "Año",
+  "account.settings.field.dob.form.button": "Por favor confirme su fecha de nacimiento",
+  "account.settings.field.dob.form.title": "Confirma tu fecha de nacimiento",
+  "account.settings.field.dob.form.help.text": "Solicitamos información sobre la fecha de nacimiento para ayudarnos a cumplir con nuestras obligaciones legales.",
+  "account.settings.field.dob.form.success": "Gracias por ingresar la información de su fecha de nacimiento.",
+  "account.settings.field.month_of_birth.options.empty": "Seleccione un mes de nacimiento",
+  "account.settingsfield.dob.error.general": "Ha ocurrido un error técnico. Por favor intentalo de nuevo.",
  "account.settings.field.country": "País",
  "account.settings.field.country.empty": "Agregar país",
  "account.settings.field.country.options.empty": "Seleccionar un país",
@@ -85,7 +99,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": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
+  "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",
@@ -98,12 +112,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": "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.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.*",
@@ -125,18 +139,19 @@
  "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": "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.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": "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.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": "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.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",
@@ -148,8 +163,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.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.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",
@@ -180,17 +195,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": "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 government-issued ID.",
-  "account.settings.name.change.id.name.placeholder": "Enter the name on your government 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",
+  "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": "Ingrese el nombre en su identificación con foto",
+  "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}.",
@@ -202,22 +217,22 @@
  "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.access.blocked.denied": "No puedes verificar tu identidad en este momento. Si aún tienes que activar tu cuenta, revisa tu carpeta de correo no deseado y busca el correo electrónico de activación de {email}.",
+  "account.page.title": "Cuenta | {siteName}",
+  "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.continue.upload": "Continue with Upload",
  "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": "In order to complete Photo Verification, you will need the following:",
+  "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": "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.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": "Why does {siteName} need my photo?",
+  "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": "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.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).",
@@ -273,9 +288,9 @@
  "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": "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.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": "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",
@@ -283,81 +298,62 @@
  "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.title.upload": "Sube una foto tuya",
-  "id.verification.portrait.photo.preview.alt": "Previsualización de la foto con el rostro del usuario",
  "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.portrait.photo.instructions.upload": "Please upload a portrait photo. Ensure your entire face fits inside the frame and is well-lit. Supported formats: ",
  "id.verification.camera.help.sight.question": "¿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": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
-  "id.verification.camera.help.upload.question": "What if I want to upload a photo instead?",
-  "id.verification.camera.help.upload.answer": "On the next page you will have the option to switch to upload mode. By selecting that option, you will be able to upload a photo instead.",
-  "id.verification.id.photo.unclear.question": "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.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": "Take a Photo of Your Identification Card",
-  "id.verification.id.photo.title.upload": "Upload a Photo of Your Identification Card",
+  "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": "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.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.account.name.title": "Verificación de nombre de cuenta",
-  "id.verification.name.check.title": "Double-Check Your Name",
-  "id.verification.account.name.instructions": "El nombre de tu cuenta y el nombre de tu identificación deben coincidir exactamente. De lo contrario, haz clic en \"No\" para actualizar el nombre de tu cuenta.",
-  "id.verification.name.check.instructions": "Does the name below match the name on your government-issued ID? If not, update the name below to match your goverment-issued ID.",
-  "id.verification.name.check.mismatch.information": "If the name below does not match your government-issued ID, your identity verification will be denied.",
-  "id.verification.account.name.radio.label": "¿El nombre de tu identificación coincide con el nombre de la cuenta a continuación?",
-  "id.verification.name.check.radio.label": "Select an option",
-  "id.verification.account.name.radio.yes": "Si",
-  "id.verification.name.check.radio.yes": "Yes, the name below matches my ID",
-  "id.verification.account.name.radio.no": "No",
-  "id.verification.name.check.radio.no": "No, the name below does not match my ID",
-  "id.verification.account.name.error": "Actualiza el nombre de la cuenta para que coincida con el nombre de tu identificación.",
+  "id.verification.name.check.title": "Revisa nuevamente tu nombre",
+  "id.verification.name.check.instructions": "¿El nombre a continuación coincide con el nombre en su identificación con foto? De lo contrario, actualice el nombre a continuación para que coincida con su identificación con foto.",
+  "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.account.name.label": "Nombre de la cuenta",
-  "id.verification.name.label": "Name",
+  "id.verification.name.label": "Nombre",
  "id.verification.account.name.photo.alt": "Foto de tu identificación a enviar.",
-  "id.verification.account.name.save": "Guardar y siguiente",
  "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": "Your Identification Card",
-  "id.verification.review.id.alt": "Photo of your identification card to be submitted.",
+  "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": "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.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 tu información y estamos verificando tu identidad. Verás un mensaje en tu tablero cuando se complete el proceso de verificación (generalmente en un periodo de 5 días). Mientras tanto, aún puedes acceder a todo el contenido del curso disponible.",
+  "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.photo.upload.help.title": "Upload a Photo Instead",
-  "id.verification.photo.camera.help.title": "Use Your Camera Instead",
-  "id.verification.photo.upload.help.text": "If you are having trouble using the photo capture above, you may want to upload a photo instead. To upload a photo, click the button below.",
-  "id.verification.photo.camera.help.text": "If you are having trouble uploading a photo above, you may want to use your camera instead. To use your camera, click the button below.",
-  "id.verification.upload.help.button": "Switch to Upload Mode",
-  "id.verification.camera.help.button": "Switch to Camera Mode",
-  "id.verification.choose.mode.title": "Photo Requirements Options",
-  "id.verification.choose.mode.hep.text": "To complete verification, please select one of the following options to submit photos. You will be able to switch between these options throughout the process if needed.",
-  "id.verification.choose.mode.radio.upload": "Upload photos from my device",
-  "id.verification.choose.mode.radio.camera": "Take pictures using my camera",
-  "id.verification.account.name.managed.alert": "Your profile settings are managed by {managerTitle}, so you are not allowed to update your name. Please contact your {profileDataManager} administrator or {support} for help.",
+  "id.verification.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": "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.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": "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.",
+  "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}"
 }
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -20,16 +20,22 @@
  "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.non.certificate": "Le nom qui apparaît sur votre profile public.",
-  "account.settings.field.full.name.help.text.certificate": "Ce nom va apparaître sur vos attestations et dossiers publics.",
+  "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é gouvernementale.",
-  "account.settings.field.name.verified.help.text.certificate": "This name has been verified by government ID and selected to appear on your certificates and public-facing records.",
+  "account.settings.field.name.verified.help.text.verified": "Ce nom a été vérifié par une pièce d&#39;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&#39;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.verification.help": "Enter your name as it appears on your government-issued ID.",
+  "account.settings.field.name.verified.help.text.submitted.proctored.certificate": "Une fois que votre examen surveillé a réussi l&#39;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&#39;il apparaît sur votre carte d&#39;étudiant, de travail ou d&#39;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&#39;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.",
@@ -49,6 +55,14 @@
  "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.dob.month": "Month",
+  "account.settings.field.dob.year": "Year",
+  "account.settings.field.dob.form.button": "Please confirm your date of birth",
+  "account.settings.field.dob.form.title": "Confirm your date of birth",
+  "account.settings.field.dob.form.help.text": "We ask for birth date information to help us comply with our legal obligations.",
+  "account.settings.field.dob.form.success": "Thank you for entering your birth date information.",
+  "account.settings.field.month_of_birth.options.empty": "Select a month of birth",
+  "account.settingsfield.dob.error.general": "A technical error occurred. Please try again.",
  "account.settings.field.country": "Pays",
  "account.settings.field.country.empty": "Ajouter un pays",
  "account.settings.field.country.options.empty": "Sélectionnez un pays",
@@ -133,6 +147,7 @@
  "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.",
@@ -185,8 +200,8 @@
  "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": "Enter your name as it appears on your government-issued ID.",
-  "account.settings.name.change.id.name.placeholder": "Enter the name on your government ID",
+  "account.settings.name.change.id.name.label": "Entrez votre nom tel qu&#39;il apparaît sur votre carte d&#39;étudiant, de travail ou d&#39;identité émise par le gouvernement.",
+  "account.settings.name.change.id.name.placeholder": "Entrez le nom sur votre pièce d&#39;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",
@@ -202,10 +217,10 @@
  "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": "Vous 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}.",
+  "account.page.title": "Account | {siteName}",
+  "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.continue.upload": "Continuer avec le téléchargement",
  "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 :",
@@ -283,18 +298,13 @@
  "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.title.upload": "Téléchargez une photo de vous",
-  "id.verification.portrait.photo.preview.alt": "Aperçu de la photo du visage de l'utilisateur.",
  "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.portrait.photo.instructions.upload": "Veuillez télécharger une photo de portrait. Assurez-vous que tout votre visage s'insère dans le cadre et est bien éclairé. Formats pris en charge :",
  "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.camera.help.upload.question": "Et si je souhaite télécharger une photo à la place ?",
-  "id.verification.camera.help.upload.answer": "Sur la page suivante, vous aurez la possibilité de passer en mode téléchargement. En sélectionnant cette option, vous pourrez télécharger une photo à la place.",
  "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é.",
@@ -307,24 +317,14 @@
  "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.account.name.title": "Vérification du nom du compte",
  "id.verification.name.check.title": "Vérifiez votre nom",
-  "id.verification.account.name.instructions": "Le nom de votre compte et le nom de votre pièce d'identité doivent correspondre exactement. Sinon, cliquez sur \"Non\" pour mettre à jour le nom de votre compte.",
-  "id.verification.name.check.instructions": "Le nom ci-dessous correspond-il au nom figurant sur votre pièce d'identité officielle ? Si ce n'est pas le cas, mettez à jour le nom ci-dessous afin qu'il corresponde à votre pièce d'identité.",
-  "id.verification.name.check.mismatch.information": "Si le nom ci-dessous ne correspond pas à votre pièce d'identité, la vérification de votre identité sera refusée.",
-  "id.verification.account.name.radio.label": "Le nom sur votre pièce d'identité correspond-il au nom du compte ci-dessous?",
-  "id.verification.name.check.radio.label": "Sélectionnez une option",
-  "id.verification.account.name.radio.yes": "Oui",
-  "id.verification.name.check.radio.yes": "Oui, le nom ci-dessous correspond à mon ID",
-  "id.verification.account.name.radio.no": "Non",
-  "id.verification.name.check.radio.no": "Non, le nom ci-dessous ne correspond pas à mon ID",
-  "id.verification.account.name.error": "Veuillez mettre à jour le nom de votre compte pour qu'il corresponde au nom sur votre pièce d'identité.",
+  "id.verification.name.check.instructions": "Le nom ci-dessous correspond-il au nom sur votre pièce d&#39;identité avec photo ? Si ce n&#39;est pas le cas, mettez à jour le nom ci-dessous pour qu&#39;il corresponde à votre pièce d&#39;identité avec photo.",
+  "id.verification.name.check.mismatch.information": "Si le nom ci-dessous ne correspond pas à votre pièce d&#39;identité avec photo, votre vérification d&#39;identité sera refusée.",
+  "id.verification.name.error": "Veuillez entrer votre nom tel qu&#39;il apparaît sur votre pièce d&#39;identité avec photo.",
  "id.verification.account.name.warning.prefix": "Veuillez noter:",
  "id.verification.account.name.settings": "Paramètres du compte",
-  "id.verification.account.name.label": "Nom du compte",
  "id.verification.name.label": "Nom",
  "id.verification.account.name.photo.alt": "Photo de votre pièce d'identité à soumettre.",
-  "id.verification.account.name.save": "Enregistrer et suivant",
  "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",
@@ -340,20 +340,16 @@
  "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 verrez un message sur votre tableau de bord 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.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.choose.mode.title": "Options d'exigences relatives aux photos",
-  "id.verification.choose.mode.hep.text": "Pour terminer la vérification, veuillez sélectionner l'une des options suivantes pour soumettre des photos. Vous pourrez basculer entre ces options tout au long du processus si nécessaire.",
-  "id.verification.choose.mode.radio.upload": "Télécharger des photos depuis mon appareil",
-  "id.verification.choose.mode.radio.camera": "Prendre des photos avec mon appareil photo",
-  "id.verification.account.name.managed.alert": "Les paramètres de votre profil sont gérés par {managerTitle}, vous n'êtes donc pas autorisé à mettre à jour votre nom. Veuillez contacter votre administrateur {profileDataManager} ou {support} pour obtenir de l'aide.",
  "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}.",
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -20,16 +20,22 @@
  "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.non.certificate": "The name that appears on your public profile.",
-  "account.settings.field.full.name.help.text.certificate": "This name is selected to appear on your certificates and public-facing records.",
+  "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 government ID.",
-  "account.settings.field.name.verified.help.text.certificate": "This name has been verified by government ID and selected to appear on your certificates and public-facing records.",
+  "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.verification.help": "Enter your name as it appears on your government-issued ID.",
+  "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.",
@@ -49,6 +55,14 @@
  "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.dob.month": "Month",
+  "account.settings.field.dob.year": "Year",
+  "account.settings.field.dob.form.button": "Please confirm your date of birth",
+  "account.settings.field.dob.form.title": "Confirm your date of birth",
+  "account.settings.field.dob.form.help.text": "We ask for birth date information to help us comply with our legal obligations.",
+  "account.settings.field.dob.form.success": "Thank you for entering your birth date information.",
+  "account.settings.field.month_of_birth.options.empty": "Select a month of birth",
+  "account.settingsfield.dob.error.general": "A technical error occurred. Please try again.",
  "account.settings.field.country": "Country",
  "account.settings.field.country.empty": "Add country",
  "account.settings.field.country.options.empty": "Select a Country",
@@ -133,6 +147,7 @@
  "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. {siteName} will not be able to recover your account or the data that is deleted.",
@@ -185,8 +200,8 @@
  "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 government-issued ID.",
-  "account.settings.name.change.id.name.placeholder": "Enter the name on your government ID",
+  "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",
@@ -202,10 +217,10 @@
  "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.access.blocked.denied": "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}.",
+  "account.page.title": "Account | {siteName}",
+  "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.continue.upload": "Continue with Upload",
  "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, you will need the following:",
@@ -283,18 +298,13 @@
  "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: ",
  "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 {siteName} support for additional suggestions.",
-  "id.verification.camera.help.upload.question": "What if I want to upload a photo instead?",
-  "id.verification.camera.help.upload.answer": "On the next page you will have the option to switch to upload mode. By selecting that option, you will be able to upload a photo instead.",
  "id.verification.id.photo.unclear.question": "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.",
@@ -307,24 +317,14 @@
  "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.account.name.title": "Account Name Check",
  "id.verification.name.check.title": "Double-Check Your Name",
-  "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.name.check.instructions": "Does the name below match the name on your government-issued ID? If not, update the name below to match your goverment-issued ID.",
-  "id.verification.name.check.mismatch.information": "If the name below does not match your government-issued ID, your identity verification will be denied.",
-  "id.verification.account.name.radio.label": "Does the name on your ID match the Account Name below?",
-  "id.verification.name.check.radio.label": "Select an option",
-  "id.verification.account.name.radio.yes": "Yes",
-  "id.verification.name.check.radio.yes": "Yes, the name below matches my ID",
-  "id.verification.account.name.radio.no": "No",
-  "id.verification.name.check.radio.no": "No, the name below does not match my ID",
-  "id.verification.account.name.error": "Please update account name to match the name on your ID.",
+  "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",
@@ -340,20 +340,16 @@
  "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.choose.mode.title": "Photo Requirements Options",
-  "id.verification.choose.mode.hep.text": "To complete verification, please select one of the following options to submit photos. You will be able to switch between these options throughout the process if needed.",
-  "id.verification.choose.mode.radio.upload": "Upload photos from my device",
-  "id.verification.choose.mode.radio.camera": "Take pictures using my camera",
-  "id.verification.account.name.managed.alert": "Your profile settings are managed by {managerTitle}, so you are not allowed to update your name. Please contact your {profileDataManager} administrator or {support} for help.",
  "id.verification.request.camera.access.instructions": "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}.",
--- a/src/id-verification/AccessBlocked.jsx
+++ b/src/id-verification/AccessBlocked.jsx
@@ -17,7 +17,7 @@ function AccessBlocked({ error, intl }) {
    return (
      <FormattedMessage
        id="id.verification.access.blocked.denied"
-        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}."
+        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>,
--- a/src/id-verification/Camera.jsx
+++ b/src/id-verification/Camera.jsx
@@ -175,7 +175,7 @@ class Camera extends React.Component {
    if (predictions.length === 0) {
      this.giveFeedback(predictions.length, [], false);
    }
-  }
+  };

  startDetection() {
    setTimeout(() => {
@@ -262,7 +262,6 @@ class Camera extends React.Component {
    const dataUri = this.cameraPhoto.getDataUri(config);
    this.setState({ dataUri });
    this.props.onImageCapture(dataUri);
-    this.props.setPhotoMode('camera');
  }

  playShutterClick() {
@@ -360,7 +359,6 @@ class Camera extends React.Component {
 Camera.propTypes = {
  intl: intlShape.isRequired,
  onImageCapture: PropTypes.func.isRequired,
-  setPhotoMode: PropTypes.func.isRequired,
  isPortrait: PropTypes.bool.isRequired,
 };

--- a/src/id-verification/CameraHelp.jsx
+++ b/src/id-verification/CameraHelp.jsx
@@ -1,30 +1,14 @@
-import React, { useContext } from 'react';
+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';
-import IdVerificationContext from './IdVerificationContext';

 function CameraHelp(props) {
-  const { optimizelyExperimentName } = useContext(IdVerificationContext);
-
  return (
    <div>
-      { optimizelyExperimentName
-        && (
-        <Collapsible
-          styling="card"
-          title={props.intl.formatMessage(messages['id.verification.camera.help.upload.question'])}
-          className="mb-4 shadow"
-          defaultOpen={props.isOpen}
-        >
-          <p>
-            {props.intl.formatMessage(messages['id.verification.camera.help.upload.answer'])}
-          </p>
-        </Collapsible>
-        )}
      <Collapsible
        styling="card"
        title={props.intl.formatMessage(messages['id.verification.camera.help.sight.question'])}
--- a/src/id-verification/CameraHelpWithUpload.jsx
+++ b/src/id-verification/CameraHelpWithUpload.jsx
@@ -14,14 +14,14 @@ function CameraHelpWithUpload(props) {
  const { setIdPhotoFile, idPhotoFile, userId } = useContext(IdVerificationContext);
  const [hasUploadedImage, setHasUploadedImage] = useState(false);

-  function setAndTrackIdPhotoFile(image) {
+  const setAndTrackIdPhotoFile = (image) => {
    sendTrackEvent('edx.id_verification.upload_id', {
      category: 'id_verification',
      user_id: userId,
    });
    setHasUploadedImage(true);
    setIdPhotoFile(image);
-  }
+  };

  return (
    <div>
--- a/src/id-verification/CollapsibleImageHelp.jsx
+++ b/src/id-verification/CollapsibleImageHelp.jsx
@@ -2,72 +2,55 @@ 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 { Link } from 'react-router-dom';
-import PropTypes from 'prop-types';

-import IdVerificationContext, { MEDIA_ACCESS } from './IdVerificationContext';
+import IdVerificationContext from './IdVerificationContext';
 import messages from './IdVerification.messages';

 function CollapsibleImageHelp(props) {
  const {
-    userId, shouldUseCamera, setShouldUseCamera, optimizelyExperimentName, mediaAccess,
+    userId, useCameraForId, setUseCameraForId,
  } = useContext(IdVerificationContext);

-  function handleClick() {
-    const toggleTo = shouldUseCamera ? 'upload' : 'camera';
+  const handleClick = () => {
+    const toggleTo = useCameraForId ? 'upload' : 'camera';
    const eventName = `edx.id_verification.toggle_to.${toggleTo}`;
    sendTrackEvent(eventName, {
      category: 'id_verification',
      user_id: userId,
    });
-    setShouldUseCamera(!shouldUseCamera);
-  }
+    setUseCameraForId(!useCameraForId);
+  };

-  if (optimizelyExperimentName && mediaAccess !== MEDIA_ACCESS.DENIED && mediaAccess !== MEDIA_ACCESS.UNSUPPORTED) {
-    return (
-      <Collapsible
-        styling="card"
-        title={shouldUseCamera ? 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
+  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' }}
      >
-        <p data-testid="help-text">
-          {shouldUseCamera
-            ? props.intl.formatMessage(messages['id.verification.photo.upload.help.text'])
-            : props.intl.formatMessage(messages['id.verification.photo.camera.help.text'])}
-        </p>
-        { (mediaAccess === MEDIA_ACCESS.PENDING && !shouldUseCamera)
-          ? (
-            // if a user has not enabled camera access yet, and they are trying to switch
-            // to camera mode, direct them to panel that requests camera access
-            <Link
-              to={{ pathname: 'request-camera-access', state: { fromPortraitCapture: props.isPortrait, fromIdCapture: !props.isPortrait } }}
-              className="btn btn-primary"
-              data-testid="access-link"
-            >
-              {props.intl.formatMessage(messages['id.verification.photo.camera.help.button'])}
-            </Link>
-          )
-          : (
-            <Button
-              title={shouldUseCamera ? 'Upload Portrait Photo' : 'Take Portrait Photo'}
-              data-testid="toggle-button"
-              onClick={handleClick}
-              style={{ marginTop: '0.5rem' }}
-            >
-              {shouldUseCamera ? props.intl.formatMessage(messages['id.verification.photo.upload.help.button']) : props.intl.formatMessage(messages['id.verification.photo.camera.help.button'])}
-            </Button>
-          )}
-      </Collapsible>
-    );
-  }
-
-  return null;
+        {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,
-  isPortrait: PropTypes.bool.isRequired,
 };

 export default injectIntl(CollapsibleImageHelp);
--- a/src/id-verification/IdVerification.messages.js
+++ b/src/id-verification/IdVerification.messages.js
@@ -11,11 +11,6 @@ const messages = defineMessages({
    defaultMessage: 'support',
    description: 'Website support.',
  },
-  'id.verification.continue.upload': {
-    id: 'id.verification.continue.upload',
-    defaultMessage: 'Continue with Upload',
-    description: 'Button to continue with upload.',
-  },
  'id.verification.example.card.alt': {
    id: 'id.verification.example.card.alt',
    defaultMessage: 'Example of a valid identification card with a full name and photo.',
@@ -401,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: ',
-    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?',
@@ -451,16 +431,6 @@ const messages = defineMessages({
    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.camera.help.upload.question': {
-    id: 'id.verification.camera.help.upload.question',
-    defaultMessage: 'What if I want to upload a photo instead?',
-    description: 'Question on what to do if the user would like to upload a photo instead.',
-  },
-  'id.verification.camera.help.upload.answer': {
-    id: 'id.verification.camera.help.upload.answer',
-    defaultMessage: 'On the next page you will have the option to switch to upload mode. By selecting that option, you will be able to upload a photo instead.',
-    description: 'Confirming what to do if the user would like to upload a photo.',
-  },
  'id.verification.id.photo.unclear.question': {
    id: 'id.verification.id.photo.unclear.question',
    defaultMessage: 'Is your ID card image not clear or too blurry?',
@@ -521,65 +491,25 @@ const messages = defineMessages({
    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 government-issued ID? If not, update the name below to match your goverment-issued ID.',
-    description: 'Text to instruct the user to check that the name displayed on the page matches what is on their government-issued ID.',
+    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.name.check.mismatch.information': {
    id: 'id.verification.name.check.mismatch.information',
-    defaultMessage: 'If the name below does not match your government-issued 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 government-issued ID, identity verification will be denied.',
+    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.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.radio.label': {
-    id: 'id.verification.name.check.radio.label',
-    defaultMessage: 'Select an option',
-    description: 'Label for a radio button group where the user needs to choose one of two options.',
-  },
-  '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.name.check.radio.yes': {
-    id: 'id.verification.name.check.radio.yes',
-    defaultMessage: 'Yes, the name below matches my ID',
-    description: 'Label for a radio button that indicates that the name displayed on the page matches the name on the user\'s ID.',
-  },
-  '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.name.check.radio.no': {
-    id: 'id.verification.name.check.radio.no',
-    defaultMessage: 'No, the name below does not match my ID',
-    description: 'Label for a radio button that indicates that the name displayed on the page does not match the name on the user\'s ID.',
-  },
-  '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',
@@ -591,11 +521,6 @@ 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',
@@ -606,11 +531,6 @@ const messages = defineMessages({
    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',
@@ -688,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': {
@@ -701,6 +621,11 @@ 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',
@@ -731,26 +656,6 @@ const messages = defineMessages({
    defaultMessage: 'Switch to Camera Mode',
    description: 'Button used to switch to camera mode.',
  },
-  'id.verification.choose.mode.title': {
-    id: 'id.verification.choose.mode.title',
-    defaultMessage: 'Photo Requirements Options',
-    description: 'Title for section that allows user to choose photo mode.',
-  },
-  'id.verification.choose.mode.help.text': {
-    id: 'id.verification.choose.mode.hep.text',
-    defaultMessage: 'To complete verification, please select one of the following options to submit photos. You will be able to switch between these options throughout the process if needed.',
-    description: 'Help text for section that allows user to choose photo mode.',
-  },
-  'id.verification.choose.mode.radio.upload': {
-    id: 'id.verification.choose.mode.radio.upload',
-    defaultMessage: 'Upload photos from my device',
-    description: 'Radio button to choose to upload photos.',
-  },
-  'id.verification.choose.mode.radio.camera': {
-    id: 'id.verification.choose.mode.radio.camera',
-    defaultMessage: 'Take pictures using my camera',
-    description: 'Radio button to choose to use camera for photos.',
-  },
 });

 export default messages;
--- a/src/id-verification/IdVerificationContextProvider.jsx
+++ b/src/id-verification/IdVerificationContextProvider.jsx
@@ -1,10 +1,13 @@
-import React, { useState, useContext, useEffect } from 'react';
+import React, {
+  useState, useContext, useEffect, useMemo,
+} 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';
@@ -14,17 +17,10 @@ import { VerifiedNameContext } from './VerifiedNameContext';

 export default function IdVerificationContextProvider({ children }) {
  const { authenticatedUser } = useContext(AppContext);
-  const { isVerifiedNameHistoryLoading, verifiedName, verifiedNameEnabled } = useContext(VerifiedNameContext);
+  const { verifiedNameHistoryCallStatus, verifiedName } = useContext(VerifiedNameContext);

-  // Call verification status endpoint to check whether we can verify.
-  const [existingIdVerification, setExistingIdVerification] = useState(null);
-  const [isIDVerificationLoading, idVerificationData] = useAsyncCall(getExistingIdVerification);
-  const [isEnrollmentsLoading, enrollmentsData] = useAsyncCall(getEnrollments);
-  useEffect(() => {
-    if (idVerificationData) {
-      setExistingIdVerification(idVerificationData);
-    }
-  }, [idVerificationData]);
+  const idVerificationData = useAsyncCall(getExistingIdVerification);
+  const enrollmentsData = useAsyncCall(getEnrollments);

  const [facePhotoFile, setFacePhotoFile] = useState(null);
  const [idPhotoFile, setIdPhotoFile] = useState(null);
@@ -34,36 +30,6 @@ export default function IdVerificationContextProvider({ children }) {
    hasGetUserMediaSupport ? MEDIA_ACCESS.PENDING : MEDIA_ACCESS.UNSUPPORTED,
  );

-  const [canVerify, setCanVerify] = useState(true);
-  const [error, setError] = useState('');
-  useEffect(() => {
-    // With verified name we can redo verification multiple times
-    // if not a successful request prevents re-verification
-    if (!verifiedNameEnabled && existingIdVerification && !existingIdVerification.canVerify) {
-      const { status } = existingIdVerification;
-      setCanVerify(false);
-      if (status === 'pending' || status === 'approved') {
-        setError(ERROR_REASONS.EXISTING_REQUEST);
-      } else {
-        setError(ERROR_REASONS.CANNOT_VERIFY);
-      }
-    } else if (verifiedNameEnabled) {
-      setCanVerify(true);
-    }
-  }, [existingIdVerification, verifiedNameEnabled]);
-
-  useEffect(() => {
-    if (!isEnrollmentsLoading && enrollmentsData) {
-      const verifiedEnrollments = enrollmentsData.filter((enrollment) => (
-        VERIFIED_MODES.includes(enrollment.mode)
-      ));
-      if (verifiedEnrollments.length === 0) {
-        setCanVerify(false);
-        setError(ERROR_REASONS.COURSE_ENROLLMENT);
-      }
-    }
-  }, [enrollmentsData]);
-
  const [profileDataManager, setProfileDataManager] = useState(null);
  useEffect(() => {
    // Determine if the user's profile data is managed by a third-party identity provider.
@@ -81,18 +47,32 @@ export default function IdVerificationContextProvider({ children }) {
    }
  }, [authenticatedUser]);

-  const [optimizelyExperimentName, setOptimizelyExperimentName] = useState('');
-  const [shouldUseCamera, setShouldUseCamera] = useState(false);
-
-  // The following are used to keep track of how a user has submitted photos
-  const [portraitPhotoMode, setPortraitPhotoMode] = useState('');
-  const [idPhotoMode, setIdPhotoMode] = useState('');
+  // 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);

-  const contextValue = {
+  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 = useMemo(() => ({
    existingIdVerification,
    facePhotoFile,
    idPhotoFile,
@@ -104,32 +84,23 @@ export default function IdVerificationContextProvider({ children }) {
    // when determining the context value nameOnAccount.
    nameOnAccount: verifiedName || authenticatedUser.name,
    profileDataManager,
-    optimizelyExperimentName,
-    shouldUseCamera,
-    portraitPhotoMode,
-    idPhotoMode,
+    useCameraForId,
    reachedSummary,
-    setExistingIdVerification,
    setFacePhotoFile,
    setIdPhotoFile,
    setIdPhotoName,
-    setOptimizelyExperimentName,
-    setShouldUseCamera,
-    setPortraitPhotoMode,
-    setIdPhotoMode,
+    setUseCameraForId,
    setReachedSummary,
    tryGetUserMedia: async () => {
      try {
        const stream = await navigator.mediaDevices.getUserMedia({ video: true });
        setMediaAccess(MEDIA_ACCESS.GRANTED);
        setMediaStream(stream);
-        setShouldUseCamera(true);
        // 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);
-        setShouldUseCamera(false);
      }
    },
    stopUserMedia: () => {
@@ -139,10 +110,13 @@ export default function IdVerificationContextProvider({ children }) {
        setMediaStream(null);
      }
    },
-  };
+  }), [authenticatedUser.name, authenticatedUser.userId, existingIdVerification, facePhotoFile,
+    idPhotoFile, idPhotoName, mediaAccess, mediaStream, profileDataManager, reachedSummary,
+    useCameraForId, verifiedName]);

-  // If we are waiting for verification status endpoint, show spinner.
-  if (isIDVerificationLoading || isVerifiedNameHistoryLoading) {
+  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" />;
  }

--- a/src/id-verification/IdVerificationPage.jsx
+++ b/src/id-verification/IdVerificationPage.jsx
@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 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';
@@ -13,7 +14,6 @@ import './getUserMediaShim';
 import IdVerificationContextProvider from './IdVerificationContextProvider';
 import { VerifiedNameContextProvider } from './VerifiedNameContext';
 import ReviewRequirementsPanel from './panels/ReviewRequirementsPanel';
-import ChooseModePanel from './panels/ChooseModePanel';
 import RequestCameraAccessPanel from './panels/RequestCameraAccessPanel';
 import PortraitPhotoContextPanel from './panels/PortraitPhotoContextPanel';
 import TakePortraitPhotoPanel from './panels/TakePortraitPhotoPanel';
@@ -32,16 +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) {
-      const parsed = qs.parse(search, {
+      const parsedQueryParams = qs.parse(search, {
        ignoreQueryPrefix: true,
        interpretNumericEntities: true,
      });
-      if (Object.prototype.hasOwnProperty.call(parsed, 'course_id') && parsed.course_id) {
-        sessionStorage.setItem('courseRunKey', parsed.course_id);
-      }
+      Object.entries(parsedQueryParams).forEach(([key, value]) => {
+        sessionStorage.setItem(camelCase(key), value);
+      });
    }
  }, [search]);

@@ -56,7 +56,6 @@ function IdVerificationPage(props) {
              <IdVerificationContextProvider>
                <Switch>
                  <Route path={`${path}/review-requirements`} component={ReviewRequirementsPanel} />
-                  <Route path={`${path}/choose-mode`} component={ChooseModePanel} />
                  <Route path={`${path}/request-camera-access`} component={RequestCameraAccessPanel} />
                  <Route path={`${path}/portrait-photo-context`} component={PortraitPhotoContextPanel} />
                  <Route path={`${path}/take-portrait-photo`} component={TakePortraitPhotoPanel} />
--- a/src/id-verification/ImageFileUpload.jsx
+++ b/src/id-verification/ImageFileUpload.jsx
@@ -5,7 +5,7 @@ import { Alert } from '@edx/paragon';
 import messages from './IdVerification.messages';
 import SupportedMediaTypes from './SupportedMediaTypes';

-export default function ImageFileUpload({ onFileChange, setPhotoMode, intl }) {
+export default function ImageFileUpload({ onFileChange, intl }) {
  const [error, setError] = useState(null);
  const errorTypes = {
    invalidFileType: 'invalidFileType',
@@ -28,11 +28,10 @@ export default function ImageFileUpload({ onFileChange, setPhotoMode, intl }) {
      const fileReader = new FileReader();
      fileReader.addEventListener('load', () => {
        onFileChange(fileReader.result);
-        setPhotoMode('upload');
      });
      fileReader.readAsDataURL(fileObject);
    }
-  }, []);
+  }, [errorTypes.fileTooLarge, errorTypes.invalidFileType, onFileChange]);

  return (
    <>
@@ -59,6 +58,5 @@ export default function ImageFileUpload({ onFileChange, setPhotoMode, intl }) {

 ImageFileUpload.propTypes = {
  onFileChange: PropTypes.func.isRequired,
-  setPhotoMode: PropTypes.func.isRequired,
  intl: intlShape.isRequired,
 };
--- a/src/id-verification/VerifiedNameContext.jsx
+++ b/src/id-verification/VerifiedNameContext.jsx
@@ -1,34 +1,27 @@
-import React, { createContext, useEffect, useState } from 'react';
+import React, { createContext, useMemo } 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 [verifiedNameEnabled, setVerifiedNameEnabled] = useState(false);
-  const [verifiedName, setVerifiedName] = useState('');
-  const [isVerifiedNameHistoryLoading, verifiedNameHistory] = useAsyncCall(getVerifiedNameHistory);
+  const verifiedNameHistoryData = useAsyncCall(getVerifiedNameHistory);

-  useEffect(() => {
-    if (verifiedNameHistory) {
-      const { verified_name_enabled: verifiedNameFeatureEnabled, results } = verifiedNameHistory;
-      setVerifiedNameEnabled(verifiedNameFeatureEnabled);
+  let verifiedName = '';
+  const { status, data } = verifiedNameHistoryData;
+  if (status === SUCCESS_STATUS && data) {
+    const { results } = data;
+    verifiedName = getMostRecentApprovedOrPendingVerifiedName(results);
+  }

-      if (verifiedNameFeatureEnabled) {
-        const applicableVerifiedName = getMostRecentApprovedOrPendingVerifiedName(results);
-        setVerifiedName(applicableVerifiedName);
-      }
-    }
-  }, [verifiedNameHistory]);
-
-  const value = {
-    isVerifiedNameHistoryLoading,
-    verifiedNameEnabled,
+  const value = useMemo(() => ({
+    verifiedNameHistoryCallStatus: status,
    verifiedName,
-  };
+  }), [status, verifiedName]);

  return (<VerifiedNameContext.Provider value={value}>{children}</VerifiedNameContext.Provider>);
 }
--- a/src/id-verification/_id-verification.scss
+++ b/src/id-verification/_id-verification.scss
@@ -4,7 +4,8 @@
      max-width: 100%;
    }
    .card.accent {
-      border-top: solid 4px theme-color('warning');
+      border-top-width: 4px;
+      border-top-style: solid;
    }
    .image-preview {
      margin-bottom: 1rem;
--- a/src/id-verification/data/service.js
+++ b/src/id-verification/data/service.js
@@ -44,7 +44,7 @@ export async function getEnrollments() {
    const { data } = await getAuthenticatedHttpClient().get(url, requestConfig);
    return data;
  } catch (e) {
-    return [];
+    return {};
  }
 }

@@ -64,9 +64,6 @@ export async function submitIdVerification(verificationData) {
    facePhotoFile: 'face_image',
    idPhotoFile: 'photo_id_image',
    idPhotoName: 'full_name',
-    optimizelyExperimentName: 'experiment_name',
-    portraitPhotoMode: 'portrait_photo_mode',
-    idPhotoMode: 'id_photo_mode',
  };
  const postData = {};
  // Don't include blank/null/undefined values.
--- a/src/id-verification/index.js
+++ b/src/id-verification/index.js
@@ -1 +1,2 @@
+// eslint-disable-next-line no-restricted-exports
 export { default } from './IdVerificationPage';
--- a/src/id-verification/panels/BasePanel.jsx
+++ b/src/id-verification/panels/BasePanel.jsx
@@ -16,7 +16,7 @@ export default function BasePanel({
    if (focusOnMount && headingRef.current) {
      headingRef.current.focus();
    }
-  }, [headingRef.current]);
+  }, [focusOnMount]);

  const redirectSlug = useVerificationRedirectSlug(name);
  if (redirectSlug) {
--- a/src/id-verification/panels/ChooseModePanel.jsx
+++ b/src/id-verification/panels/ChooseModePanel.jsx
@@ -1,67 +0,0 @@
-import React, { useContext } from 'react';
-import { Link } from 'react-router-dom';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
-import { Form } from '@edx/paragon';
-
-import { useNextPanelSlug } from '../routing-utilities';
-import BasePanel from './BasePanel';
-import IdVerificationContext from '../IdVerificationContext';
-import messages from '../IdVerification.messages';
-
-function ChooseModePanel(props) {
-  const panelSlug = 'choose-mode';
-  const { userId, shouldUseCamera, setShouldUseCamera } = useContext(IdVerificationContext);
-
-  function onPhotoModeChange(value) {
-    setShouldUseCamera(value);
-    const mode = value ? 'camera' : 'upload';
-    const eventName = `edx.id_verification.choose.${mode}`;
-    sendTrackEvent(eventName, {
-      category: 'id_verification',
-      user_id: userId,
-    });
-  }
-
-  return (
-    <BasePanel
-      name={panelSlug}
-      title={props.intl.formatMessage(messages['id.verification.choose.mode.title'])}
-    >
-      <p>
-        {props.intl.formatMessage(messages['id.verification.choose.mode.help.text'])}
-      </p>
-      <fieldset>
-        <Form.Group controlId="formChoosePhotoOption" style={{ marginLeft: '1.25rem' }}>
-          <Form.Check
-            type="radio"
-            id="useUploadMode"
-            label={props.intl.formatMessage(messages['id.verification.choose.mode.radio.upload'])}
-            name="photoMode"
-            checked={!shouldUseCamera}
-            onChange={() => onPhotoModeChange(false)}
-          />
-          <Form.Check
-            type="radio"
-            id="useCameraMode"
-            label={props.intl.formatMessage(messages['id.verification.choose.mode.radio.camera'])}
-            name="photoMode"
-            checked={shouldUseCamera}
-            onChange={() => onPhotoModeChange(true)}
-          />
-        </Form.Group>
-      </fieldset>
-      <div className="action-row">
-        <Link to={useNextPanelSlug(panelSlug)} className="btn btn-primary" data-testid="next-button">
-          {props.intl.formatMessage(messages['id.verification.next'])}
-        </Link>
-      </div>
-    </BasePanel>
-  );
-}
-
-ChooseModePanel.propTypes = {
-  intl: intlShape.isRequired,
-};
-
-export default injectIntl(ChooseModePanel);
--- a/src/id-verification/panels/EnableCameraDirectionsPanel.jsx
+++ b/src/id-verification/panels/EnableCameraDirectionsPanel.jsx
@@ -63,6 +63,7 @@ export function EnableCameraDirectionsPanel(props) {
      </>
    );
  }
+  // eslint-disable-next-line react/jsx-no-useless-fragment
  return <></>;
 }

--- a/src/id-verification/panels/GetNameIdPanel.jsx
+++ b/src/id-verification/panels/GetNameIdPanel.jsx
@@ -1,175 +1,77 @@
 import React, {
-  useContext, useState, useEffect, useRef,
+  useContext, useEffect, useRef,
 } from 'react';
-import { getConfig } from '@edx/frontend-platform';
-import { Hyperlink, Form } from '@edx/paragon';
+import { Form } from '@edx/paragon';
 import { Link, useHistory } from 'react-router-dom';
-import { sendTrackEvent } from '@edx/frontend-platform/analytics';
-import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

 import { useNextPanelSlug } from '../routing-utilities';
 import BasePanel from './BasePanel';
 import IdVerificationContext from '../IdVerificationContext';
-import { VerifiedNameContext } from '../VerifiedNameContext';

 import messages from '../IdVerification.messages';

 function GetNameIdPanel(props) {
-  const { push } = useHistory();
-  const panelSlug = 'get-name-id';
-  const [nameMatches, setNameMatches] = useState(true);
+  const { push, location } = useHistory();
  const nameInputRef = useRef();
+  const panelSlug = 'get-name-id';
  const nextPanelSlug = useNextPanelSlug(panelSlug);

-  const {
-    nameOnAccount, userId, profileDataManager, idPhotoName, setIdPhotoName,
-  } = useContext(IdVerificationContext);
-  const { verifiedNameEnabled } = useContext(VerifiedNameContext);
+  const { nameOnAccount, idPhotoName, setIdPhotoName } = useContext(IdVerificationContext);
  const nameOnAccountValue = nameOnAccount || '';
-  const invalidName = !nameMatches && (!idPhotoName || idPhotoName === nameOnAccount);
-  const blankName = !nameOnAccount && !idPhotoName;

  useEffect(() => {
-    setIdPhotoName(null);
-  }, []);
+    if (idPhotoName === null) {
+      setIdPhotoName(nameOnAccountValue);
+    }

-  useEffect(() => {
-    if (!nameMatches && nameInputRef.current) {
+    if (location.state?.fromSummary && nameInputRef.current) {
      nameInputRef.current.focus();
    }
-    if (!nameMatches) {
-      sendTrackEvent('edx.id_verification.name_change', {
-        category: 'id_verification',
-        user_id: userId,
-      });
-    }
-    if (blankName) {
-      setNameMatches(false);
-    }
-  }, [nameMatches, blankName]);
+  }, [idPhotoName, location.state, nameOnAccountValue, setIdPhotoName]);

-  function getNameValue() {
-    if (!nameMatches) {
-      // Explicitly check for null, as an empty string should still be used here
-      if (idPhotoName === null) {
-        return nameOnAccountValue;
-      }
-      return idPhotoName;
-    }
-    return nameOnAccountValue;
-  }
-
-  function getErrorMessage() {
-    if (profileDataManager) {
-      return (
-        <FormattedMessage
-          id="id.verification.account.name.managed.alert"
-          defaultMessage="Your profile settings are managed by {managerTitle}, so you are not allowed to update your name. Please contact your {profileDataManager} administrator or {support} for help."
-          description="Alert message informing the user their account name is managed by a third party."
-          values={{
-            managerTitle: <strong>{profileDataManager}</strong>,
-            profileDataManager,
-            support: (
-              <Hyperlink destination={getConfig().SUPPORT_URL} target="_blank">
-                {props.intl.formatMessage(messages['id.verification.support'])}
-              </Hyperlink>
-            ),
-          }}
-        />
-      );
-    }
-    return props.intl.formatMessage(messages['id.verification.account.name.error']);
-  }
-
-  function handleSubmit(e) {
+  const handleSubmit = (e) => {
    e.preventDefault();
-    // If the input is empty, or if no changes have been made to the
-    // mismatching name, the user should not be able to proceed.
-    if (!invalidName && !blankName) {
+    if (idPhotoName) {
      push(nextPanelSlug);
    }
-  }
+  };

  return (
    <BasePanel
      name={panelSlug}
-      title={
-        verifiedNameEnabled
-          ? props.intl.formatMessage(messages['id.verification.name.check.title'])
-          : props.intl.formatMessage(messages['id.verification.account.name.title'])
-      }
+      title={props.intl.formatMessage(messages['id.verification.name.check.title'])}
    >
      <p>
-        {
-          verifiedNameEnabled
-            ? props.intl.formatMessage(messages['id.verification.name.check.instructions'])
-            : props.intl.formatMessage(messages['id.verification.account.name.instructions'])
-        }
+        {props.intl.formatMessage(messages['id.verification.name.check.instructions'])}
      </p>
      <p>
-        {verifiedNameEnabled && props.intl.formatMessage(messages['id.verification.name.check.mismatch.information'])}
+        {props.intl.formatMessage(messages['id.verification.name.check.mismatch.information'])}
      </p>

      <Form onSubmit={handleSubmit}>
-        <Form.Group>
-          <Form.Label className="font-weight-bold" htmlFor="nameMatchesYes">
-            {
-              verifiedNameEnabled
-                ? props.intl.formatMessage(messages['id.verification.name.check.radio.label'])
-                : props.intl.formatMessage(messages['id.verification.account.name.radio.label'])
-            }
-          </Form.Label>
-          <Form.Check
-            type="radio"
-            id="nameMatchesYes"
-            name="nameMatches"
-            data-testid="name-matches-yes"
-            label={verifiedNameEnabled ? props.intl.formatMessage(messages['id.verification.name.check.radio.yes']) : props.intl.formatMessage(messages['id.verification.account.name.radio.yes'])}
-            checked={nameMatches}
-            disabled={!nameOnAccount}
-            onChange={() => {
-              setNameMatches(true);
-              setIdPhotoName(null);
-            }}
-          />
-          <Form.Check
-            type="radio"
-            id="nameMatchesNo"
-            name="nameMatches"
-            data-testid="name-matches-no"
-            label={verifiedNameEnabled ? props.intl.formatMessage(messages['id.verification.name.check.radio.no']) : props.intl.formatMessage(messages['id.verification.account.name.radio.no'])}
-            checked={!nameMatches}
-            disabled={!nameOnAccount}
-            onChange={() => setNameMatches(false)}
-          />
-        </Form.Group>
        <Form.Group>
          <Form.Label className="font-weight-bold" htmlFor="photo-id-name">
-            {
-              verifiedNameEnabled
-                ? props.intl.formatMessage(messages['id.verification.name.label'])
-                : props.intl.formatMessage(messages['id.verification.account.name.label'])
-            }
+            {props.intl.formatMessage(messages['id.verification.name.label'])}
          </Form.Label>
          <Form.Control
            controlId="photo-id-name"
            size="lg"
            type="text"
            ref={nameInputRef}
-            readOnly={nameMatches || !!profileDataManager}
-            isInvalid={invalidName || blankName}
+            isInvalid={!idPhotoName}
            aria-describedby="photo-id-name-feedback"
-            value={getNameValue()}
+            value={idPhotoName}
            onChange={e => setIdPhotoName(e.target.value)}
            data-testid="name-input"
          />
-          {(invalidName || !!profileDataManager) && (
+          {!idPhotoName && (
            <Form.Control.Feedback
              id="photo-id-name-feedback"
              data-testid="id-name-feedback-message"
              type="invalid"
            >
-              {getErrorMessage()}
+              {props.intl.formatMessage(messages['id.verification.name.error'])}
            </Form.Control.Feedback>
          )}
        </Form.Group>
@@ -178,15 +80,11 @@ function GetNameIdPanel(props) {
      <div className="action-row">
        <Link
          to={nextPanelSlug}
-          className={`btn btn-primary ${(invalidName || blankName) && 'disabled'}`}
+          className={`btn btn-primary ${!idPhotoName && 'disabled'}`}
          data-testid="next-button"
-          aria-disabled={invalidName || blankName}
+          aria-disabled={!idPhotoName}
        >
-          {
-            !nameMatches
-              ? props.intl.formatMessage(messages['id.verification.account.name.save'])
-              : props.intl.formatMessage(messages['id.verification.next'])
-          }
+          {props.intl.formatMessage(messages['id.verification.next'])}
        </Link>
      </div>
    </BasePanel>
--- a/src/id-verification/panels/IdContextPanel.jsx
+++ b/src/id-verification/panels/IdContextPanel.jsx
@@ -17,7 +17,7 @@ function IdContextPanel(props) {
      title={props.intl.formatMessage(messages['id.verification.id.tips.title'])}
    >
      <p>{props.intl.formatMessage(messages['id.verification.id.tips.description'])}</p>
-      <div className="card mb-4 shadow accent">
+      <div className="card mb-4 shadow accent border-warning">
        <div className="card-body">
          <h6>
            {props.intl.formatMessage(messages['id.verification.photo.tips.list.title'])}
--- a/src/id-verification/panels/PortraitPhotoContextPanel.jsx
+++ b/src/id-verification/panels/PortraitPhotoContextPanel.jsx
@@ -18,7 +18,7 @@ function PortraitPhotoContextPanel(props) {
      <p>
        {props.intl.formatMessage(messages['id.verification.photo.tips.description'])}
      </p>
-      <div className="card mb-4 shadow accent">
+      <div className="card mb-4 shadow accent border-warning">
        <div className="card-body">
          <h6>
            {props.intl.formatMessage(messages['id.verification.photo.tips.list.title'])}
--- a/src/id-verification/panels/RequestCameraAccessPanel.jsx
+++ b/src/id-verification/panels/RequestCameraAccessPanel.jsx
@@ -1,10 +1,11 @@
-import React, { useState, useEffect, useContext } from 'react';
+import React, { useEffect, useContext } from 'react';
 import { Link } from 'react-router-dom';
 import Bowser from 'bowser';
 import { getConfig } from '@edx/frontend-platform';
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';

+import { useRedirect } from '../../hooks';
 import { useNextPanelSlug } from '../routing-utilities';
 import BasePanel from './BasePanel';
 import IdVerificationContext, { MEDIA_ACCESS } from '../IdVerificationContext';
@@ -14,12 +15,11 @@ import { UnsupportedCameraDirectionsPanel } from './UnsupportedCameraDirectionsP
 import messages from '../IdVerification.messages';

 function RequestCameraAccessPanel(props) {
-  const [returnUrl, setReturnUrl] = useState('dashboard');
-  const [returnText, setReturnText] = useState('id.verification.return.dashboard');
+  const { location: returnUrl, text: returnText } = useRedirect();
  const panelSlug = 'request-camera-access';
  const nextPanelSlug = useNextPanelSlug(panelSlug);
  const {
-    tryGetUserMedia, mediaAccess, userId, optimizelyExperimentName,
+    tryGetUserMedia, mediaAccess, userId,
  } = useContext(IdVerificationContext);
  const browserName = Bowser.parse(window.navigator.userAgent).browser.name;

@@ -38,15 +38,6 @@ function RequestCameraAccessPanel(props) {
    }
  }, [mediaAccess, userId]);

-  // If the user accessed IDV through a course,
-  // link back to that course rather than the dashboard
-  useEffect(() => {
-    if (sessionStorage.getItem('courseRunKey')) {
-      setReturnUrl(`courses/${sessionStorage.getItem('courseRunKey')}`);
-      setReturnText('id.verification.return.course');
-    }
-  }, []);
-
  const getTitle = () => {
    if (mediaAccess === MEDIA_ACCESS.GRANTED) {
      return props.intl.formatMessage(messages['id.verification.camera.access.title.success']);
@@ -57,18 +48,12 @@ function RequestCameraAccessPanel(props) {
    return props.intl.formatMessage(messages['id.verification.camera.access.title']);
  };

-  const returnToDashboardLink = (
+  const returnLink = (
    <a className="btn btn-primary" href={`${getConfig().LMS_BASE_URL}/${returnUrl}`}>
      {props.intl.formatMessage(messages[returnText])}
    </a>
  );

-  const nextButtonLink = (
-    <Link to={nextPanelSlug} className="btn btn-primary" data-testid="next-button">
-      {props.intl.formatMessage(messages['id.verification.continue.upload'])}
-    </Link>
-  );
-
  return (
    <BasePanel
      name={panelSlug}
@@ -114,7 +99,7 @@ function RequestCameraAccessPanel(props) {
          </p>
          <EnableCameraDirectionsPanel browserName={browserName} intl={props.intl} />
          <div className="action-row">
-            {optimizelyExperimentName ? nextButtonLink : returnToDashboardLink}
+            {returnLink}
          </div>
        </div>
      )}
@@ -126,7 +111,7 @@ function RequestCameraAccessPanel(props) {
          </p>
          <UnsupportedCameraDirectionsPanel browserName={browserName} intl={props.intl} />
          <div className="action-row">
-            {optimizelyExperimentName ? nextButtonLink : returnToDashboardLink}
+            {returnLink}
          </div>
        </div>
      )}
--- a/src/id-verification/panels/ReviewRequirementsPanel.jsx
+++ b/src/id-verification/panels/ReviewRequirementsPanel.jsx
@@ -13,31 +13,15 @@ import messages from '../IdVerification.messages';
 import exampleCard from '../assets/example-card.png';

 function ReviewRequirementsPanel(props) {
-  const {
-    userId, profileDataManager, setOptimizelyExperimentName,
-  } = useContext(IdVerificationContext);
+  const { userId, profileDataManager } = useContext(IdVerificationContext);
  const panelSlug = 'review-requirements';
  const nextPanelSlug = useNextPanelSlug(panelSlug);

-  const getExperiments = () => {
-    const {
-      experimentVariables: {
-        experimentName = '',
-      } = {},
-    } = window;
-
-    if (experimentName) {
-      setOptimizelyExperimentName(experimentName);
-    }
-  };
-
  useEffect(() => {
    sendTrackEvent('edx.id_verification.started', {
      category: 'id_verification',
      user_id: userId,
    });
-
-    getExperiments();
  }, [userId]);

  function renderManagedProfileMessage() {
@@ -77,7 +61,7 @@ function ReviewRequirementsPanel(props) {
      <p>
        {props.intl.formatMessage(messages['id.verification.requirements.description'])}
      </p>
-      <div className="card mb-4 shadow accent">
+      <div className="card mb-4 shadow accent border-warning">
        <div className="card-body">
          <h6 aria-level="3">
            {props.intl.formatMessage(messages['id.verification.requirements.card.device.title'])}
@@ -94,7 +78,7 @@ function ReviewRequirementsPanel(props) {
          </p>
        </div>
      </div>
-      <div className="card mb-4 shadow accent">
+      <div className="card mb-4 shadow accent border-warning">
        <div className="card-body">
          <h6 aria-level="3">
            {props.intl.formatMessage(messages['id.verification.requirements.card.id.title'])}
--- a/src/id-verification/panels/SubmittedPanel.jsx
+++ b/src/id-verification/panels/SubmittedPanel.jsx
@@ -1,15 +1,18 @@
-import React, { useEffect, useContext } from 'react';
+import React, { useContext, useEffect } from 'react';
 import { getConfig } from '@edx/frontend-platform';
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

-import BasePanel from './BasePanel';
+import { useRedirect } from '../../hooks';

 import IdVerificationContext from '../IdVerificationContext';
 import messages from '../IdVerification.messages';

+import BasePanel from './BasePanel';
+
 function SubmittedPanel(props) {
  const { userId } = useContext(IdVerificationContext);
+  const { location: returnUrl, text: returnText } = useRedirect();
  const panelSlug = 'submitted';

  useEffect(() => {
@@ -29,10 +32,10 @@ function SubmittedPanel(props) {
      </p>
      <a
        className="btn btn-primary"
-        href={`${getConfig().LMS_BASE_URL}/dashboard`}
+        href={`${getConfig().LMS_BASE_URL}/${returnUrl}`}
        data-testid="return-button"
      >
-        {props.intl.formatMessage(messages['id.verification.return.dashboard'])}
+        {props.intl.formatMessage(messages[returnText])}
      </a>
    </BasePanel>
  );
--- a/src/id-verification/panels/SummaryPanel.jsx
+++ b/src/id-verification/panels/SummaryPanel.jsx
@@ -11,7 +11,6 @@ import { useNextPanelSlug } from '../routing-utilities';
 import BasePanel from './BasePanel';
 import IdVerificationContext from '../IdVerificationContext';
 import ImagePreview from '../ImagePreview';
-import { VerifiedNameContext } from '../VerifiedNameContext';

 import messages from '../IdVerification.messages';
 import CameraHelpWithUpload from '../CameraHelpWithUpload';
@@ -27,17 +26,13 @@ function SummaryPanel(props) {
    nameOnAccount,
    idPhotoName,
    stopUserMedia,
-    optimizelyExperimentName,
    setReachedSummary,
-    portraitPhotoMode,
-    idPhotoMode,
  } = useContext(IdVerificationContext);
-  const { verifiedNameEnabled } = useContext(VerifiedNameContext);
  const nameToBeUsed = idPhotoName || nameOnAccount || '';
  const [isSubmitting, setIsSubmitting] = useState(false);
  const [submissionError, setSubmissionError] = useState(null);

-  useEffect(() => setReachedSummary(true), []);
+  useEffect(() => setReachedSummary(true), [setReachedSummary]);

  function renderManagedProfileMessage() {
    if (!profileDataManager) {
@@ -64,8 +59,9 @@ function SummaryPanel(props) {
    );
  }

+  // eslint-disable-next-line react/no-unstable-nested-components
  function SubmitButton() {
-    async function handleClick() {
+    const handleClick = async () => {
      setIsSubmitting(true);
      const verificationData = {
        facePhotoFile,
@@ -74,25 +70,13 @@ function SummaryPanel(props) {
      };
      if (idPhotoName) {
        verificationData.idPhotoName = idPhotoName;
-      } else if (verifiedNameEnabled) {
+      } else {
        /**
         * If learner has not entered an idPhotoName on the GetNameIdPanel,
-         * and the verified name feature is enabled, use the current nameOnAccount
-         * when submitting IDV. The reason we only do this if the feature is enabled
-         * is that, when the feature is off, the server will change the learner's
-         * profile name to this value. If we send the idPhotoName on all requests,
-         * even ones where the learner does not change the idPhotoName, then the
-         * server will record that the full name on the learner's profile has
-         * a requested change, even if the name is the same. This will pollute
-         * the history.
+         * use the current nameOnAccount when submitting IDV.
         */
        verificationData.idPhotoName = nameOnAccount;
      }
-      if (optimizelyExperimentName) {
-        verificationData.optimizelyExperimentName = optimizelyExperimentName;
-        verificationData.portraitPhotoMode = portraitPhotoMode;
-        verificationData.idPhotoMode = idPhotoMode;
-      }
      const result = await submitIdVerification(verificationData);
      if (result.success) {
        stopUserMedia();
@@ -102,7 +86,7 @@ function SummaryPanel(props) {
        setIsSubmitting(false);
        setSubmissionError(result);
      }
-    }
+    };
    return (
      <Button
        title="Confirmation"
@@ -217,12 +201,10 @@ function SummaryPanel(props) {
          </Link>
        </div>
      </div>
-      {!optimizelyExperimentName && <CameraHelpWithUpload />}
+      <CameraHelpWithUpload />
      <div className="form-group">
        <label htmlFor="name-to-be-used" className="font-weight-bold">
-          {verifiedNameEnabled
-            ? props.intl.formatMessage(messages['id.verification.name.label'])
-            : props.intl.formatMessage(messages['id.verification.account.name.label'])}
+          {props.intl.formatMessage(messages['id.verification.name.label'])}
        </label>
        {renderManagedProfileMessage()}
        <div className="d-flex">
@@ -242,29 +224,14 @@ function SummaryPanel(props) {
                state: { fromSummary: true },
              }}
            >
-              {
-                verifiedNameEnabled
-                  ? (
-                    <FormattedMessage
-                      id="id.verification.account.name.edit"
-                      defaultMessage="Edit {sr}"
-                      description="Button to edit account name, with clarifying information for screen readers."
-                      values={{
-                        sr: <span className="sr-only">Name</span>,
-                      }}
-                    />
-                  )
-                  : (
-                    <FormattedMessage
-                      id="id.verification.account.name.edit"
-                      defaultMessage="Edit {sr}"
-                      description="Button to edit account name, with clarifying information for screen readers."
-                      values={{
-                        sr: <span className="sr-only">Account Name</span>,
-                      }}
-                    />
-                  )
-              }
+              <FormattedMessage
+                id="id.verification.account.name.edit"
+                defaultMessage="Edit {sr}"
+                description="Button to edit name, with clarifying information for screen readers."
+                values={{
+                  sr: <span className="sr-only">Name</span>,
+                }}
+              />
            </Link>
          )}
        </div>
--- a/src/id-verification/panels/TakeIdPhotoPanel.jsx
+++ b/src/id-verification/panels/TakeIdPhotoPanel.jsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

@@ -17,24 +17,36 @@ import SupportedMediaTypes from '../SupportedMediaTypes';
 function TakeIdPhotoPanel(props) {
  const panelSlug = 'take-id-photo';
  const nextPanelSlug = useNextPanelSlug(panelSlug);
-  const {
-    setIdPhotoFile, idPhotoFile, optimizelyExperimentName, shouldUseCamera, setIdPhotoMode,
-  } = useContext(IdVerificationContext);
+  const { setIdPhotoFile, idPhotoFile, useCameraForId } = useContext(IdVerificationContext);
+  const [mounted, setMounted] = useState(false);
+
+  useEffect(() => {
+    // This prevents focus switching to the heading when taking a photo
+    setMounted(true);
+  }, []);

  return (
    <BasePanel
      name={panelSlug}
-      title={shouldUseCamera ? props.intl.formatMessage(messages['id.verification.id.photo.title.camera']) : props.intl.formatMessage(messages['id.verification.id.photo.title.upload'])}
+      focusOnMount={!mounted}
+      title={useCameraForId
+        ? props.intl.formatMessage(messages['id.verification.id.photo.title.camera'])
+        : props.intl.formatMessage(messages['id.verification.id.photo.title.upload'])}
    >
      <div>
-        {idPhotoFile && !shouldUseCamera && <ImagePreview src={idPhotoFile} alt={props.intl.formatMessage(messages['id.verification.id.photo.preview.alt'])} />}
+        {idPhotoFile && !useCameraForId && (
+          <ImagePreview
+            src={idPhotoFile}
+            alt={props.intl.formatMessage(messages['id.verification.id.photo.preview.alt'])}
+          />
+        )}

-        {shouldUseCamera ? (
+        {useCameraForId ? (
          <div>
            <p>
              {props.intl.formatMessage(messages['id.verification.id.photo.instructions.camera'])}
            </p>
-            <Camera onImageCapture={setIdPhotoFile} setPhotoMode={setIdPhotoMode} isPortrait={false} />
+            <Camera onImageCapture={setIdPhotoFile} isPortrait={false} />
          </div>
        ) : (
          <div style={{ marginBottom: '1.25rem' }}>
@@ -42,12 +54,12 @@ function TakeIdPhotoPanel(props) {
              {props.intl.formatMessage(messages['id.verification.id.photo.instructions.upload'])}
              <SupportedMediaTypes />
            </p>
-            <ImageFileUpload onFileChange={setIdPhotoFile} setPhotoMode={setIdPhotoMode} intl={props.intl} />
+            <ImageFileUpload onFileChange={setIdPhotoFile} intl={props.intl} />
          </div>
        )}
      </div>
-      {shouldUseCamera && !optimizelyExperimentName && <CameraHelp />}
-      <CollapsibleImageHelp isPortrait={false} />
+      {useCameraForId && <CameraHelp />}
+      <CollapsibleImageHelp />
      <div className="action-row" style={{ visibility: idPhotoFile ? 'unset' : 'hidden' }}>
        <Link to={nextPanelSlug} className="btn btn-primary" data-testid="next-button">
          {props.intl.formatMessage(messages['id.verification.next'])}
--- a/src/id-verification/panels/TakePortraitPhotoPanel.jsx
+++ b/src/id-verification/panels/TakePortraitPhotoPanel.jsx
@@ -1,53 +1,39 @@
-import React, { useContext } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

 import { useNextPanelSlug } from '../routing-utilities';
 import BasePanel from './BasePanel';
-import ImageFileUpload from '../ImageFileUpload';
-import ImagePreview from '../ImagePreview';
 import Camera from '../Camera';
 import CameraHelp from '../CameraHelp';
 import IdVerificationContext from '../IdVerificationContext';

 import messages from '../IdVerification.messages';
-import CollapsibleImageHelp from '../CollapsibleImageHelp';
-import SupportedMediaTypes from '../SupportedMediaTypes';

 function TakePortraitPhotoPanel(props) {
  const panelSlug = 'take-portrait-photo';
  const nextPanelSlug = useNextPanelSlug(panelSlug);
-  const {
-    setFacePhotoFile, facePhotoFile, shouldUseCamera, optimizelyExperimentName, setPortraitPhotoMode,
-  } = useContext(IdVerificationContext);
+  const { setFacePhotoFile, facePhotoFile } = useContext(IdVerificationContext);
+  const [mounted, setMounted] = useState(false);
+
+  useEffect(() => {
+    // This prevents focus switching to the heading when taking a photo
+    setMounted(true);
+  }, []);

  return (
    <BasePanel
      name={panelSlug}
-      title={shouldUseCamera ? props.intl.formatMessage(messages['id.verification.portrait.photo.title.camera']) : props.intl.formatMessage(messages['id.verification.portrait.photo.title.upload'])}
+      focusOnMount={!mounted}
+      title={props.intl.formatMessage(messages['id.verification.portrait.photo.title.camera'])}
    >
      <div>
-        {facePhotoFile && !shouldUseCamera && <ImagePreview src={facePhotoFile} alt={props.intl.formatMessage(messages['id.verification.portrait.photo.preview.alt'])} />}
-
-        {shouldUseCamera ? (
-          <div>
-            <p>
-              {props.intl.formatMessage(messages['id.verification.portrait.photo.instructions.camera'])}
-            </p>
-            <Camera onImageCapture={setFacePhotoFile} setPhotoMode={setPortraitPhotoMode} isPortrait />
-          </div>
-        ) : (
-          <div style={{ marginBottom: '1.25rem' }}>
-            <p data-testid="upload-text">
-              {props.intl.formatMessage(messages['id.verification.portrait.photo.instructions.upload'])}
-              <SupportedMediaTypes />
-            </p>
-            <ImageFileUpload onFileChange={setFacePhotoFile} setPhotoMode={setPortraitPhotoMode} intl={props.intl} />
-          </div>
-        )}
+        <p>
+          {props.intl.formatMessage(messages['id.verification.portrait.photo.instructions.camera'])}
+        </p>
+        <Camera onImageCapture={setFacePhotoFile} isPortrait />
      </div>
-      {shouldUseCamera && !optimizelyExperimentName && <CameraHelp isPortrait />}
-      <CollapsibleImageHelp isPortrait />
+      <CameraHelp isPortrait />
      <div className="action-row" style={{ visibility: facePhotoFile ? 'unset' : 'hidden' }}>
        <Link to={nextPanelSlug} className="btn btn-primary" data-testid="next-button">
          {props.intl.formatMessage(messages['id.verification.next'])}
--- a/src/id-verification/routing-utilities.js
+++ b/src/id-verification/routing-utilities.js
@@ -1,6 +1,5 @@
 import { useContext } from 'react';
-import { useLocation } from 'react-router-dom';
-import IdVerificationContext, { MEDIA_ACCESS } from './IdVerificationContext';
+import IdVerificationContext from './IdVerificationContext';

 const SLUGS = {
  REVIEW_REQUIREMENTS: 'review-requirements',
@@ -17,7 +16,6 @@ const SLUGS = {

 const panelSteps = [
  SLUGS.REVIEW_REQUIREMENTS,
-  SLUGS.CHOOSE_MODE,
  SLUGS.REQUEST_CAMERA_ACCESS,
  SLUGS.PORTRAIT_PHOTO_CONTEXT,
  SLUGS.TAKE_PORTRAIT_PHOTO,
@@ -31,15 +29,7 @@ const panelSteps = [
 // eslint-disable-next-line import/prefer-default-export
 export const useNextPanelSlug = (originSlug) => {
  // Go back to the summary view if that's where they came from
-  const location = useLocation();
-  const isFromPortrait = location.state && location.state.fromPortraitCapture;
-  const isFromId = location.state && location.state.fromIdCapture;
-  const {
-    mediaAccess,
-    optimizelyExperimentName,
-    reachedSummary,
-    shouldUseCamera,
-  } = useContext(IdVerificationContext);
+  const { reachedSummary } = useContext(IdVerificationContext);

  const canRerouteToSummary = [
    SLUGS.TAKE_PORTRAIT_PHOTO,
@@ -51,32 +41,6 @@ export const useNextPanelSlug = (originSlug) => {
    return SLUGS.SUMMARY;
  }

-  // the following are used as part of an A/B experiment
-  if (isFromPortrait) {
-    if (mediaAccess === MEDIA_ACCESS.GRANTED) {
-      return SLUGS.PORTRAIT_PHOTO_CONTEXT;
-    }
-    return SLUGS.TAKE_PORTRAIT_PHOTO;
-  }
-  if (isFromId) {
-    if (mediaAccess === MEDIA_ACCESS.GRANTED) {
-      return SLUGS.ID_CONTEXT;
-    }
-    return SLUGS.TAKE_ID_PHOTO;
-  }
-  if (originSlug === SLUGS.REVIEW_REQUIREMENTS && !optimizelyExperimentName) {
-    return SLUGS.REQUEST_CAMERA_ACCESS;
-  }
-  if (originSlug === SLUGS.CHOOSE_MODE && !shouldUseCamera) {
-    return SLUGS.TAKE_PORTRAIT_PHOTO;
-  }
-  if (originSlug === SLUGS.TAKE_PORTRAIT_PHOTO && !shouldUseCamera) {
-    return SLUGS.TAKE_ID_PHOTO;
-  }
-  if (originSlug === SLUGS.REQUEST_CAMERA_ACCESS && mediaAccess !== MEDIA_ACCESS.GRANTED) {
-    return SLUGS.TAKE_PORTRAIT_PHOTO;
-  }
-
  const nextIndex = panelSteps.indexOf(originSlug) + 1;
  return nextIndex < panelSteps.length ? panelSteps[nextIndex] : null;
 };
@@ -84,11 +48,8 @@ export const useNextPanelSlug = (originSlug) => {
 // check if the user is too far into the flow and if so, return the slug of the
 // furthest panel they are allow to be.
 export const useVerificationRedirectSlug = (slug) => {
-  const { facePhotoFile, idPhotoFile, optimizelyExperimentName } = useContext(IdVerificationContext);
+  const { facePhotoFile, idPhotoFile } = useContext(IdVerificationContext);
  const indexOfCurrentPanel = panelSteps.indexOf(slug);
-  if (!optimizelyExperimentName && slug === SLUGS.CHOOSE_MODE) {
-    return SLUGS.REVIEW_REQUIREMENTS;
-  }
  if (!facePhotoFile) {
    if (indexOfCurrentPanel > panelSteps.indexOf(SLUGS.TAKE_PORTRAIT_PHOTO)) {
      return SLUGS.PORTRAIT_PHOTO_CONTEXT;
--- a/src/id-verification/tests/AccessBlocked.test.jsx
+++ b/src/id-verification/tests/AccessBlocked.test.jsx
@@ -67,7 +67,7 @@ describe('AccessBlocked', () => {
      </Router>
    )));

-    const text = screen.getByText(/You cannot verify your identity at this time./);
+    const text = screen.getByText(/We cannot verify your identity at this time./);

    expect(text).toBeInTheDocument();
  });
--- a/src/id-verification/tests/Camera.test.jsx
+++ b/src/id-verification/tests/Camera.test.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable no-import-assign */
 import React from 'react';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
@@ -27,7 +28,6 @@ describe('SubmittedPanel', () => {
  const defaultProps = {
    intl: {},
    onImageCapture: jest.fn(),
-    setPhotoMode: jest.fn(),
    isPortrait: true,
  };

@@ -57,7 +57,6 @@ describe('SubmittedPanel', () => {
    expect(button).toHaveTextContent('Take Photo');
    fireEvent.click(button);
    expect(defaultProps.onImageCapture).toHaveBeenCalled();
-    expect(defaultProps.setPhotoMode).toHaveBeenCalledWith('camera');
  });

  it('shows correct help text for portrait photo capture', async () => {
--- a/src/id-verification/tests/CollapsibleImageHelp.test.jsx
+++ b/src/id-verification/tests/CollapsibleImageHelp.test.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
 import {
-  render, cleanup, screen, act, fireEvent,
+  render, cleanup, screen, act,
 } from '@testing-library/react';
 import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import * as analytics from '@edx/frontend-platform/analytics';
@@ -13,6 +13,7 @@ jest.mock('jslib-html5-camera-photo');
 jest.mock('@tensorflow-models/blazeface');
 jest.mock('@edx/frontend-platform/analytics');

+// eslint-disable-next-line no-import-assign
 analytics.sendTrackEvent = jest.fn();

 window.HTMLMediaElement.prototype.play = () => {};
@@ -22,71 +23,18 @@ const IntlCollapsible = injectIntl(CollapsibleImageHelp);
 const history = createMemoryHistory();

 describe('CollapsibleImageHelpPanel', () => {
-  const defaultProps = {
-    intl: {},
-    isPortrait: true,
-  };
+  const defaultProps = { intl: {} };

  const contextValue = {
-    shouldUseCamera: true,
-    setShouldUseCamera: jest.fn(),
-    optimizelyExperimentName: '',
-    mediaAccess: 'granted',
+    useCameraForId: true,
+    setUseCameraForId: jest.fn(),
  };

  afterEach(() => {
    cleanup();
  });

-  it('does not return if not part of experiment', async () => {
-    await act(async () => render((
-      <Router history={history}>
-        <IntlProvider locale="en">
-          <IdVerificationContext.Provider value={contextValue}>
-            <IntlCollapsible {...defaultProps} />
-          </IdVerificationContext.Provider>
-        </IntlProvider>
-      </Router>
-    )));
-
-    const titleText = screen.queryByText('Upload a Photo Instead');
-    expect(titleText).not.toBeInTheDocument();
-  });
-
-  it('does not return if media access denied or unsupported', async () => {
-    let titleText = '';
-    contextValue.mediaAccess = 'denied';
-    await act(async () => render((
-      <Router history={history}>
-        <IntlProvider locale="en">
-          <IdVerificationContext.Provider value={contextValue}>
-            <IntlCollapsible {...defaultProps} />
-          </IdVerificationContext.Provider>
-        </IntlProvider>
-      </Router>
-    )));
-
-    titleText = screen.queryByText('Upload a Photo Instead');
-    expect(titleText).not.toBeInTheDocument();
-
-    contextValue.mediaAccess = 'unsupported';
-    await act(async () => render((
-      <Router history={history}>
-        <IntlProvider locale="en">
-          <IdVerificationContext.Provider value={contextValue}>
-            <IntlCollapsible {...defaultProps} />
-          </IdVerificationContext.Provider>
-        </IntlProvider>
-      </Router>
-    )));
-
-    titleText = screen.queryByText('Upload a Photo Instead');
-    expect(titleText).not.toBeInTheDocument();
-  });
-
  it('shows the correct text if user should switch to upload', async () => {
-    contextValue.optimizelyExperimentName = 'test';
-    contextValue.mediaAccess = 'granted';
    await act(async () => render((
      <Router history={history}>
        <IntlProvider locale="en">
@@ -106,9 +54,7 @@ describe('CollapsibleImageHelpPanel', () => {
  });

  it('shows the correct text if user should switch to camera', async () => {
-    contextValue.optimizelyExperimentName = 'test';
-    contextValue.mediaAccess = 'granted';
-    contextValue.shouldUseCamera = false;
+    contextValue.useCameraForId = false;
    await act(async () => render((
      <Router history={history}>
        <IntlProvider locale="en">
@@ -126,27 +72,4 @@ describe('CollapsibleImageHelpPanel', () => {
    const button = screen.getByTestId('toggle-button');
    expect(button).toHaveTextContent('Switch to Camera Mode');
  });
-
-  it('shows the correct text if user should switch to camera with pending media access', async () => {
-    contextValue.optimizelyExperimentName = 'test';
-    contextValue.mediaAccess = 'pending';
-    contextValue.shouldUseCamera = false;
-    await act(async () => render((
-      <Router history={history}>
-        <IntlProvider locale="en">
-          <IdVerificationContext.Provider value={contextValue}>
-            <IntlCollapsible {...defaultProps} />
-          </IdVerificationContext.Provider>
-        </IntlProvider>
-      </Router>
-    )));
-
-    const titleText = screen.getByText('Use Your Camera Instead');
-    expect(titleText).toBeInTheDocument();
-    const helpText = screen.getByTestId('help-text');
-    expect(helpText.textContent).toContain('If you are having trouble uploading a photo above');
-    const accessLink = screen.getByTestId('access-link');
-    fireEvent.click(accessLink);
-    expect(history.location.pathname).toEqual('/request-camera-access');
-  });
 });
--- a/src/id-verification/tests/IdVerificationContextProvider.test.jsx
+++ b/src/id-verification/tests/IdVerificationContextProvider.test.jsx
@@ -16,8 +16,8 @@ jest.mock('../../account-settings/data/service', () => ({
 }));

 jest.mock('../data/service', () => ({
-  getExistingIdVerification: jest.fn(),
-  getEnrollments: jest.fn(() => []),
+  getExistingIdVerification: jest.fn(() => ({})),
+  getEnrollments: jest.fn(() => ({})),
 }));

 describe('IdVerificationContextProvider', () => {
@@ -32,7 +32,7 @@ describe('IdVerificationContextProvider', () => {

  it('renders correctly and calls getExistingIdVerification + getEnrollments', async () => {
    const appContext = { authenticatedUser: { userId: 3, roles: [] } };
-    const verifiedNameContext = { verifiedName: '', verifiedNameEnabled: false };
+    const verifiedNameContext = { verifiedName: '' };
    await act(async () => render((
      <AppContext.Provider value={appContext}>
        <VerifiedNameContext.Provider value={verifiedNameContext}>
@@ -54,7 +54,7 @@ describe('IdVerificationContextProvider', () => {
        roles: ['enterprise_learner'],
      },
    };
-    const verifiedNameContext = { verifiedName: '', verifiedNameEnabled: false };
+    const verifiedNameContext = { verifiedName: '' };
    await act(async () => render((
      <AppContext.Provider value={appContext}>
        <VerifiedNameContext.Provider value={verifiedNameContext}>
--- a/src/id-verification/tests/IdVerificationPage.test.jsx
+++ b/src/id-verification/tests/IdVerificationPage.test.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable react/jsx-no-useless-fragment */
 import React from 'react';
 import { Provider } from 'react-redux';
 import { Router } from 'react-router-dom';
@@ -18,15 +19,33 @@ jest.mock('../VerifiedNameContext', () => {
    VerifiedNameContextProvider: jest.fn(({ children }) => children),
  };
 });
-jest.mock('../panels/ReviewRequirementsPanel');
-jest.mock('../panels/RequestCameraAccessPanel');
-jest.mock('../panels/PortraitPhotoContextPanel');
-jest.mock('../panels/TakePortraitPhotoPanel');
-jest.mock('../panels/IdContextPanel');
-jest.mock('../panels/GetNameIdPanel');
-jest.mock('../panels/TakeIdPhotoPanel');
-jest.mock('../panels/SummaryPanel');
-jest.mock('../panels/SubmittedPanel');
+jest.mock('../panels/ReviewRequirementsPanel', () => function () {
+  return <></>;
+});
+jest.mock('../panels/RequestCameraAccessPanel', () => function () {
+  return <></>;
+});
+jest.mock('../panels/PortraitPhotoContextPanel', () => function () {
+  return <></>;
+});
+jest.mock('../panels/TakePortraitPhotoPanel', () => function () {
+  return <></>;
+});
+jest.mock('../panels/IdContextPanel', () => function () {
+  return <></>;
+});
+jest.mock('../panels/GetNameIdPanel', () => function () {
+  return <></>;
+});
+jest.mock('../panels/TakeIdPhotoPanel', () => function () {
+  return <></>;
+});
+jest.mock('../panels/SummaryPanel', () => function () {
+  return <></>;
+});
+jest.mock('../panels/SubmittedPanel', () => function () {
+  return <></>;
+});

 const IntlIdVerificationPage = injectIntl(IdVerificationPage);

@@ -41,36 +60,8 @@ describe('IdVerificationPage', () => {
    intl: {},
  };

-  it('does not store irrelevant query params', async () => {
-    history.push('/?test=irrelevant');
-    await act(async () => render((
-      <Router history={history}>
-        <IntlProvider locale="en">
-          <Provider store={store}>
-            <IntlIdVerificationPage {...props} />
-          </Provider>
-        </IntlProvider>
-      </Router>
-    )));
-    expect(sessionStorage.setItem).toHaveBeenCalledTimes(0);
-  });
-
-  it('does not store empty course_id', async () => {
-    history.push('/?course_id=');
-    await act(async () => render((
-      <Router history={history}>
-        <IntlProvider locale="en">
-          <Provider store={store}>
-            <IntlIdVerificationPage {...props} />
-          </Provider>
-        </IntlProvider>
-      </Router>
-    )));
-    expect(sessionStorage.setItem).toHaveBeenCalledTimes(0);
-  });
-
  it('decodes and stores course_id', async () => {
-    history.push('/?course_id=course-v1%3AedX%2BDemoX%2BDemo_Course');
+    history.push(`/?course_id=${encodeURIComponent('course-v1:edX+DemoX+Demo_Course')}`);
    await act(async () => render((
      <Router history={history}>
        <IntlProvider locale="en">
@@ -81,8 +72,25 @@ describe('IdVerificationPage', () => {
      </Router>
    )));
    expect(sessionStorage.setItem).toHaveBeenCalledWith(
-      'courseRunKey',
+      'courseId',
      'course-v1:edX+DemoX+Demo_Course',
    );
  });
+
+  it('stores `next` value', async () => {
+    history.push('/?next=dashboard');
+    await act(async () => render((
+      <Router history={history}>
+        <IntlProvider locale="en">
+          <Provider store={store}>
+            <IntlIdVerificationPage {...props} />
+          </Provider>
+        </IntlProvider>
+      </Router>
+    )));
+    expect(sessionStorage.setItem).toHaveBeenCalledWith(
+      'next',
+      'dashboard',
+    );
+  });
 });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eugene Dyudyunov	c792b0ec65	feat: make password reset support URL configurable (#746 ) * feat: make password reset support URL configurable Replace the hardcoded `support.edx.org` value with the one from the env vars. * fix: linting error	2023-03-02 12:26:32 +05:00
renovate[bot]	d280062fe3	chore(deps): update dependency @edx/frontend-build to v12.0.6	2022-10-10 07:24:33 +00:00
renovate[bot]	f0366a98f4	chore(deps): update dependency @edx/browserslist-config to v1.1.1	2022-10-10 07:16:08 +00:00
Muhammad Abdullah Waheed	9d0577fd93	fix: removed env constants and used them directly (#657 )	2022-10-04 18:23:56 +05:00
Muhammad Abdullah Waheed	dba70b557c	Automate Browserlist DB Update (#642 ) * feat: added cron github action to auto update brwoserlist DB periodically * feat: added workflow_dispatch for manual testing * fix: fixed error * fix: fixed indentation issue * fix: linting issue	2022-10-04 17:55:30 +05:00
Jenkins	f6840bc202	chore(i18n): update translations	2022-10-02 17:05:49 -04:00
renovate[bot]	1af5f0d179	fix(deps): update dependency classnames to v2.3.2	2022-09-26 12:40:22 +00:00
renovate[bot]	b3a91470f8	fix(deps): update dependency @edx/frontend-component-header to v3.2.1	2022-09-26 12:32:19 +00:00
Jenkins	9b18588e26	chore(i18n): update translations	2022-09-25 17:04:29 -04:00
renovate[bot]	3d2e7dc8a4	fix(deps): update dependency @edx/frontend-component-footer to v11.2.1	2022-09-19 12:29:38 +00:00
renovate[bot]	41f1552f9b	chore(deps): update dependency @edx/frontend-build to v12.0.5	2022-09-19 12:22:14 +00:00
Jenkins	ffa8a36ce6	chore(i18n): update translations	2022-09-18 17:01:34 -04:00
alangsto	3505e645e3	Merge pull request #647 from openedx/alangsto/update_dob_language fix: update dob form language	2022-09-14 16:15:01 -04:00
Alie Langston	88db6084df	fix: update dob form language	2022-09-14 15:59:58 -04:00
Sarina Canelake	27c8ab28f3	Merge pull request #643 from openedx/tcril/fix-gh-org-url Fix github url strings (org edx -> openedx)	2022-09-14 10:19:22 -04:00
renovate[bot]	e01b595a0c	fix(deps): update dependency @edx/frontend-platform to v2.6.2	2022-09-12 11:37:36 +00:00
renovate[bot]	0d351f5173	chore(deps): update dependency @edx/frontend-build to v12.0.4	2022-09-12 11:29:56 +00:00
Jenkins	03dbfb5670	chore(i18n): update translations	2022-09-11 17:01:42 -04:00
Sarina Canelake	1e17fc9e32	fix: update path to .github workflows to read from openedx org	2022-09-10 18:05:35 -04:00
Sarina Canelake	da912f1e35	fix: fix github url strings (org edx -> openedx)	2022-09-07 08:57:12 -04:00
renovate[bot]	fb0f832832	fix(deps): update dependency @edx/frontend-component-header to v3.2.0	2022-09-05 18:05:19 +00:00
renovate[bot]	870dd631bb	fix(deps): update dependency @edx/frontend-component-footer to v11.2.0	2022-09-05 17:57:37 +00:00
Jenkins	5b9f251e93	chore(i18n): update translations	2022-09-04 17:01:50 -04:00
renovate[bot]	98c14bbd3b	chore(deps): update dependency @testing-library/jest-dom to v5.16.5	2022-08-29 12:14:47 +00:00
renovate[bot]	00ce8b927f	fix(deps): update dependency react-transition-group to v4.4.5	2022-08-29 12:06:54 +00:00
renovate[bot]	ab215cd909	fix(deps): update dependency react-redux to v7.2.8	2022-08-22 11:04:54 +00:00
renovate[bot]	51e7773207	chore(deps): pin dependencies	2022-08-22 10:57:13 +00:00
Jenkins	6f5a1a8aa9	chore(i18n): update translations	2022-08-21 17:02:10 -04:00
Bilal Qamar	deb48fb9d2	Merge pull request #625 from openedx/bilalqamar95/revert-eslint-fragment-change Reverted changes made to satisfy jsx-no-useless-fragment rule	2022-08-19 18:46:58 +05:00
Bilal Qamar	20b451afb6	refactor: reverted changes made to satisfy jsx-no-useless-fragment rule	2022-08-19 17:25:48 +05:00
alangsto	ad6f812974	Merge pull request #623 from openedx/alangsto/update_dob feat: add DOB month and year field	2022-08-18 13:59:26 -04:00
Alie Langston	9573516b37	feat: add DOB month and year field	2022-08-18 13:40:30 -04:00
Bilal Qamar	f0d6a92ab2	Upgraded frontend-build version to v12 (#613 ) * refactor: upgraded frontend-build version to v12 * refactor: updated frontend-build * refactor: resolved eslint issues * refactor: updated package-lock * refactor: resolved eslint issues after master branch merge	2022-08-16 10:57:43 -04:00
renovate[bot]	dc4d4031e9	fix(deps): update dependency @edx/frontend-component-header to v3.1.3	2022-08-15 09:43:03 +00:00
renovate[bot]	84a5c7aaf1	fix(deps): update dependency @edx/frontend-component-footer to v11.1.2	2022-08-15 09:29:22 +00:00
edx-semantic-release	6ad666342d	chore(i18n): update translations	2022-08-14 17:02:20 -04:00
Diana Olarte	1252498872	feat: allow runtime configuration (#603 )	2022-08-09 13:44:05 -04:00
renovate[bot]	f9d04e4dd4	fix(deps): update dependency @edx/frontend-platform to v1.15.6	2022-08-08 12:23:08 +00:00
renovate[bot]	c96b9bb77d	chore(deps): update dependency @testing-library/react to v12.1.5	2022-08-08 12:13:06 +00:00
edx-semantic-release	f3c672c5ae	chore(i18n): update translations	2022-08-07 17:02:31 -04:00
renovate[bot]	63c396c03a	chore(deps): update dependency node-forge to 1.3.0 [security] (#567 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2022-07-28 11:33:38 +05:00
Maman Khan	0981857062	fix: removed depreciated codecov package (#608 )	2022-07-26 13:27:58 +05:00
Maman Khan	0527c73529	Update packages to remove security vulnerabilities (#605 ) * fix: updated vulnerable packages * fix: fixed failed tests after package update * fix: linting issues failing ci tests * fix: package lock update * fix: snapshot updated to UTC * fix: missing dependency 'long'	2022-07-26 13:05:31 +05:00
renovate[bot]	5c5dbc369b	chore(deps): update dependency lodash to 4.17.21 [security] (#550 ) Co-authored-by: Renovate Bot <bot@renovateapp.com>	2022-07-26 11:51:21 +05:00
Maman Khan	196719963f	Merge pull request #607 from openedx/maman/add-browserslist-config build: use shared browserslist configuration	2022-06-29 15:55:16 +05:00
maman	92ee4dfbb9	fix: removed es5 ci check	2022-06-13 18:11:05 +05:00
maman	9d0b3524cb	feat: made browserslist setting configurable	2022-06-13 17:48:29 +05:00
edX requirements bot	c39fd332b6	chore!: Dropped support for Node 12 (#594 )	2022-05-24 13:45:40 +05:00
Kshitij Sobti	04d515f554	feat: remove usage of scss variables (#601 ) Remove usage of scss variables so that the MFE doesn't need scss variables at build-time.	2022-05-16 15:41:48 -04:00
David Joy	f425e9b94f	build: adding nvmrc, bumping paragon to latest (#602 ) Adding .nvmrc is a nicety. Bumping paragon to latest is necessary to ensure compatiblity with the edX override header (frontend-component-header-edx).	2022-05-09 16:15:50 -04:00
edX requirements bot	7ec147fe6f	feat: Add package-lock file version check (#599 ) * feat: Add package-lock file version check * fix: update name Co-authored-by: Jawayria <39649635+Jawayria@users.noreply.github.com>	2022-05-09 19:19:39 +05:00
edx-semantic-release	7a8ae85b72	chore(i18n): update translations	2022-04-10 17:08:04 -04:00
Mohammad Ahtasham ul Hassan	0f8f5a1e9a	fix: update packagelock (#596 )	2022-04-08 15:05:24 +05:00
Usama Sadiq	757a9ac033	Merge pull request #593 from openedx/update-transifex-pull-translations-command build: update pull_translations command	2022-04-04 14:29:45 +05:00
UsamaSadiq	9efc8d1290	build: update pull_translations command	2022-04-04 14:24:04 +05:00
Usama Sadiq	5f53270148	Merge pull request #591 from openedx/jenkins/transifex-client-migration-bb6390f fix: transifex migration to new client	2022-04-04 14:06:38 +05:00
Ali Adnan	9716495951	Merge pull request #590 from openedx/aadnan/migrate-reactifex feat: migrate translations to reactifex	2022-03-18 14:01:24 +05:00
edX requirements bot	f9b29948e7	fix: transifex migration to new client	2022-03-17 08:48:14 -04:00
aliadnan	bededb3912	feat: migrate translations to reactifex	2022-03-17 15:36:53 +05:00
David Joy	bb6390f9ae	build: Delete CODEOWNERS (#589 ) The community-engineering team no longer exists, so we don't want this CODEOWNERS file anymore.	2022-03-15 14:13:18 -04:00
Jawayria	d2300d2dfd	feat: Added support for Node 16 (#588 ) * feat: Added support for Node 16 * fix: run both npm 6 and 8	2022-03-15 19:15:11 +05:00
Renovate Bot	a501407907	fix(deps): update dependency qs to v6.10.3	2022-03-14 11:35:58 +00:00
Renovate Bot	88e63cd390	chore(deps): update dependency @testing-library/react to v12.1.4	2022-03-14 11:19:33 +00:00
Sarina Canelake	eaebe6980b	Merge DEPR automation workflow Add DEPR workflow automation	2022-02-24 15:21:56 -05:00
Sarina Canelake	d6efba63ca	build: add DEPR workflow automation	2022-02-23 14:37:30 -05:00
edX Transifex Bot	257e425fd9	chore(i18n): update translations	2022-02-20 16:06:24 -05:00
Bianca Severino	02e3364874	Merge pull request #580 from openedx/bseverino/dashboard-language [MST-1372] Remove dashboard reference from IDV submission confirmation	2022-02-16 14:21:07 -05:00
Bianca Severino	9ae74708fb	fix: remove dashboard reference from IDV submitted	2022-02-16 11:40:58 -05:00
alangsto	e946e377c6	Merge pull request #579 from openedx/alangsto/remove_pending_language fix: remove alert and update language if verified name comes from proctored exam attempt	2022-02-16 09:18:59 -05:00
Alie Langston	5dbe649b2c	fix: remove alert if verified name comes from proctored exam attempt	2022-02-16 09:06:19 -05:00
Bianca Severino	2792902975	Merge pull request #577 from openedx/bseverino/idv-camera-language [MST-1269] Change language referring to government ID	2022-02-14 15:11:57 -05:00
Bianca Severino	6f643070ea	fix: change language referring to government ID	2022-02-14 11:45:54 -05:00
edX Transifex Bot	ce946f56b2	chore(i18n): update translations	2022-02-06 16:06:00 -05:00
Bianca Severino	de1e67f68d	Merge pull request #573 from openedx/bseverino/remove-idv-experiment [MST-869] Remove unused IDV experiment paths	2022-02-02 11:13:32 -05:00
Bianca Severino	79001bccd8	feat: remove unused IDV experiment paths	2022-01-27 14:21:43 -05:00
Bianca Severino	963884cc4c	Merge pull request #570 from openedx/bseverino/idv-camera-focus [MST-1075] Prevent focus jump when taking photo	2022-01-24 13:48:53 -05:00
Bianca Severino	e43c1bcc9e	fix: prevent focus jump when taking photo	2022-01-20 17:09:15 -05:00
edX Transifex Bot	32cc2c7835	chore(i18n): update translations	2021-12-26 16:14:50 -05:00
Waheed Ahmed	5c39c279f3	Merge pull request #562 from edx/waheed/update-support-link chore: update help center link for email confirmation	2021-12-07 21:23:40 +05:00
Waheed Ahmed	12bca9b771	chore: update help center link for email confirmation	2021-12-07 19:57:59 +05:00
Renovate Bot	5e10c2bc18	fix(deps): update dependency core-js to v3.19.3	2021-12-06 10:24:35 +00:00
Renovate Bot	f2fe22b8f7	fix(deps): update dependency core-js to v3.19.1	2021-11-29 08:52:52 +00:00
Renovate Bot	d5601a21fd	chore(deps): update dependency @testing-library/jest-dom to v5.15.1	2021-11-29 08:30:03 +00:00
edX Transifex Bot	f3bd7a8589	chore(i18n): update translations	2021-11-29 02:04:09 +05:00
Renovate Bot	7643bbd6ba	fix(deps): update dependency @edx/frontend-platform to v1.14.1	2021-11-22 12:34:37 +00:00
Renovate Bot	fd1044b531	chore(deps): update dependency es-check to v6.1.1	2021-11-22 12:11:24 +00:00
Uzair Rasheed	f25e5db422	Merge pull request #555 from edx/modify-message-text refactor: modify activation text message	2021-11-22 13:02:58 +05:00
uzairr	0d569a060b	refactor: modify activation text message alter text of the activation message which appears when an inactive user tries to delete its profile VAN-778	2021-11-22 11:47:29 +05:00
Renovate Bot	350016cbe0	chore(deps): update dependency @testing-library/jest-dom to v5.15.0	2021-11-15 10:47:31 +00:00
Renovate Bot	1619dade50	chore(deps): update dependency @edx/frontend-build to v8.1.6	2021-11-15 10:22:11 +00:00
Renovate Bot	dafc34f535	chore(deps): update dependency @edx/frontend-build to v8.1.3	2021-11-08 11:11:25 +00:00
Renovate Bot	9bbab2620c	fix(deps): update dependency redux to v4.1.2	2021-11-08 10:43:47 +00:00
edX Transifex Bot	81bef65cc2	chore(i18n): update translations	2021-11-08 02:03:29 +05:00
Michael Roytman	a18daecf8a	Merge pull request #541 from edx/MST-1130-remove-verified-name-waffle-flag feat: Remove Use of Verified Name Enabled Flag	2021-11-01 12:55:52 -04:00
Renovate Bot	449e4c0253	fix(deps): update dependency react-redux to v7.2.6	2021-11-01 10:23:31 +00:00
Renovate Bot	a66ba187ae	fix(deps): update dependency @fortawesome/react-fontawesome to v0.1.16	2021-11-01 10:03:19 +00:00
edX Transifex Bot	2d710f7060	chore(i18n): update translations	2021-11-01 02:03:49 +05:00
michaelroytman	e109e5018e	feat: Remove Use of Verified Name Enabled Flag The VERIFIED_NAME_FLAG was added as part https://github.com/edx/edx-name-affirmation/pull/12, [MST-801](https://openedx.atlassian.net/browse/MST-801) in order to control the release of the Verified Name project. It was used for a phased roll out by percentage of users. The release reached a percentage of 50% before it was observed that, due to the way percentage roll out works in django-waffle, the code to create or update VerifiedName records was not working properly. The code was written such that any change to a SoftwareSecurePhotoVerification model instance sent a signal, which was received and handled by the Name Affirmation application. If the VERIFIED_NAME_FLAG was on for the requesting user, a Celery task was launched from the Name Affirmation application to perform the creation of or update to the appropriate VerifiedName model instances based on the verify_student application signal. However, we observed that when SoftwareSecurePhotoVerification records were moved into the "created" or "ready" status, a Celery task in Name Affirmation was created, but when SoftwareSecurePhotoVerification records were moved into the "submitted" status, the corresponding Celery task in Name Affirmation was not created. This caused VerifiedName records to stay in the "pending" state. The django-waffle waffle flag used by the edx-toggle library implements percentage rollout by setting a cookie in a learner's browser session to assign them to the enabled or disabled group. It turns out that the code that submits a SoftwareSecurePhotoVerification record, which moves it into the "submitted" state, happens as part of a Celery task in the verify_student application in the edx-platform. Therefore, we believe that because there is no request object in a Celery task, the edx-toggle code is defaulting to the case where there is no request object. In this case, the code checks whether the flag is enabled for everyone when determining whether the flag is enabled. Because of the percentage rollout (i.e. waffle flag not enabled for everyone), the Celery task in Name Affirmation is not created. This behavior was confirmed by logging added as part of https://github.com/edx/edx-name-affirmation/pull/62. We have determined that we do not need the waffle flag, as we are comfortable that enabling the waffle flag for everyone will fix the issue and are comfortable releasing the feature to all users. For this reason, we are removing references to the flag. [MST-1130](https://openedx.atlassian.net/browse/MST-1130)	2021-10-29 11:06:55 -04:00
Waheed Ahmed	1444831833	Merge pull request #540 from edx/waheed/VAN-762 feat: remove `primary/elementary` option from education	2021-10-28 14:13:08 +05:00
Waheed Ahmed	4b4f29ae19	feat: remove `primary/elementary` option from education If COPPA compliance feature flag is enabled, remove the `primary/elementary` option from the level of education dropdown field on edit but keep the value showing for the users who have already selected it. VAN-762	2021-10-28 12:34:46 +05:00
Bianca Severino	cbc4123e78	Merge pull request #539 from edx/bseverino/name-change-input [MST-1074] Remove radio buttons from ID name check if verified name is enabled	2021-10-27 09:00:38 -04:00
Bianca Severino	2c896f77d4	feat: remove radio buttons from ID name check if verified name is enabled	2021-10-26 13:19:14 -04:00
Renovate Bot	112ddf80e6	chore(deps): update dependency @edx/frontend-build to v8.0.6	2021-10-25 09:13:08 +00:00
Renovate Bot	6f2a69acc1	fix(deps): pin dependency lodash.camelcase to 4.3.0	2021-10-25 08:52:11 +00:00
edX Transifex Bot	d2c83b82f7	chore(i18n): update translations	2021-10-25 02:03:33 +05:00
Simon Chen	03501a8125	Merge pull request #535 from edx/schen/fix_access_block fix: allow learners to access IDV by default	2021-10-21 11:09:16 -04:00
Simon Chen	6e17214476	fix: allow learners to access IDV by default	2021-10-21 10:58:04 -04:00
Michael Roytman	2c6cec7f8c	Merge pull request #527 from edx/bseverino/idv-redirect [MST-1104] Redirect user to original location after IDV	2021-10-20 14:33:29 -04:00
Michael Roytman	f76797cade	Merge pull request #526 from edx/mroytman/MST-1099-fix-loading-issues [MST-1099] Fix Flickering By Removing Unnecessary Re-Renders	2021-10-20 14:29:02 -04:00
Attiya Ishaque	59325bd412	Merge pull request #531 from edx/attiya/VAN-751/put_year_of_birth_behind_flag feat: [VAN-751] Put user's year of birth behind the feature flag	2021-10-20 15:45:11 +05:00
attiyaIshaque	65a6bc5002	feat: [VAN-751] Put user's year of birth behind the feature flag	2021-10-20 14:56:55 +05:00
edX Transifex Bot	eff28d8b47	chore(i18n): update translations	2021-10-18 02:04:24 +05:00
Bianca Severino	dfb13c4286	fix: convert duplicate useEffects to custom hook	2021-10-08 11:49:06 -04:00
Bianca Severino	aada46f6eb	fix: redirect user to original location after IDV	2021-10-08 10:26:56 -04:00
michaelroytman	9e967ba1ea	perf: Fix Flickering By Removing Unnecessary Re-Renders The use of useState and useEffect hooks in the IDVerificationContextProvider and VerificationContextProvider that were unnecessary was triggering many extra re-renders and inappropriate renders, causing a UI flicker across multiple re-renders.	2021-10-06 16:28:09 -04:00