fix: username suggestions alignment (#1279 )

Co-authored-by: Kyrylo Hudym-Levkovych <kyr.hudym@kyrs-MacBook-Pro.local>
2025-08-08 16:55:59 +05:00
127 changed files with 13980 additions and 19614 deletions
--- a/.env
+++ b/.env
@@ -16,9 +16,6 @@ SITE_NAME=null
 INFO_EMAIL=''
 # ***** Cookies *****
 USER_RETENTION_COOKIE_NAME=null
-# ***** Cohesion Keys *****
-COHESION_WRITE_KEY=''
-COHESION_SOURCE_KEY=''
 # ***** Links *****
 LOGIN_ISSUE_SUPPORT_LINK=''
 AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK=null
@@ -44,6 +41,3 @@ BANNER_IMAGE_EXTRA_SMALL=''
 # ***** Miscellaneous *****
 APP_ID=''
 MFE_CONFIG_API_URL=''
-# Fallback in local style files
-PARAGON_THEME_URLS={}
-RECAPTCHA_SITE_KEY_WEB=''
--- a/.env.development
+++ b/.env.development
@@ -25,9 +25,6 @@ ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN='true'
 # ***** Cookies *****
 SESSION_COOKIE_DOMAIN='localhost'
 USER_INFO_COOKIE_NAME='edx-user-info'
-# ***** Cohesion Keys *****
-COHESION_WRITE_KEY=''
-COHESION_SOURCE_KEY=''
 # ***** Links *****
 LOGIN_ISSUE_SUPPORT_LINK='http://localhost:18000/login-issue-support-url'
 TOS_AND_HONOR_CODE='http://localhost:18000/honor'
@@ -44,6 +41,3 @@ APP_ID=''
 MFE_CONFIG_API_URL=''
 ZENDESK_KEY=''
 ZENDESK_LOGO_URL=''
-# Fallback in local style files
-PARAGON_THEME_URLS={}
-RECAPTCHA_SITE_KEY_WEB=''
--- a/.env.test
+++ b/.env.test
@@ -18,7 +18,3 @@ SEGMENT_KEY=''
 SITE_NAME='Your Platform Name Here'
 APP_ID=''
 MFE_CONFIG_API_URL=''
-COHESION_WRITE_KEY=''
-COHESION_SOURCE_KEY=''
-PARAGON_THEME_URLS={}
-RECAPTCHA_SITE_KEY_WEB=''
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,7 +1,7 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 const { createConfig } = require('@openedx/frontend-build');

-const config = createConfig('eslint', {
+module.exports = createConfig('eslint', {
  rules: {
    // Temporarily update the 'indent', 'template-curly-spacing' and
    // 'no-multiple-empty-lines' rules since they are causing eslint
@@ -50,14 +50,3 @@ const config = createConfig('eslint', {
    'function-paren-newline': 'off',
  },
 });
-
-config.settings = {
-  'import/resolver': {
-    node: {
-      paths: ['src', 'node_modules'],
-      extensions: ['.js', '.jsx'],
-    },
-  },
-};
-
-module.exports = config;
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +0,0 @@
-*   @openedx/2U-infinity
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,7 +0,0 @@
-version: 2
-updates:
-    # Adding new check for github-actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-        interval: "weekly"
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -25,5 +25,5 @@ Include a link to the sandbox for design changes or screenshot for before and af

 #### Post-merge Checklist

-* [ ] Deploy the changes to prod after verifying on stage or ask **@openedx/2u-infinity** to do it. 
+* [ ] Deploy the changes to prod after verifying on stage or ask **@openedx/2u-vanguards** to do it. 
 * [ ] 🎉 🙌 Celebrate! Thanks for your contribution.
--- a/.github/workflows/autoupdate-pull-request.yml
+++ b/.github/workflows/autoupdate-pull-request.yml
@@ -10,7 +10,7 @@ on:
 jobs:
  autoupdate:
    name: autoupdate
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - uses: docker://chinthakagodawita/autoupdate-action:v1
        env:
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,15 +10,17 @@ on:

 jobs:
  tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04

    steps:
    - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
+    - name: Setup Nodejs Env
+      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
    - name: Setup Nodejs
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v3
      with:
-        node-version-file: '.nvmrc'
+        node-version: ${{ env.NODE_VER }}

    - name: Install Dependencies
      run: npm ci
@@ -39,7 +41,4 @@ jobs:
      run: npm run build

    - name: Run Code Coverage
-      uses: codecov/codecov-action@v5
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        fail_ci_if_error: true
+      uses: codecov/codecov-action@v3
--- a/.github/workflows/lockfileversion-check.yml
+++ b/.github/workflows/lockfileversion-check.yml
@@ -10,4 +10,4 @@ on:

 jobs:
  version-check:
-    uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master
+    uses: openedx/.github/.github/workflows/lockfile-check.yml@master
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20
+18
--- a/2
+++ b/2
@@ -0,0 +1,2 @@
+# The following users are the owners of all frontend-app-authn files
+*       @openedx/2u-vanguards
--- a/README.rst
+++ b/README.rst
@@ -29,13 +29,7 @@ Getting Started
 Installation
 ============

-`Tutor`_ is currently recommended as a development environment for your new MFE. Please refer to the `relevant tutor-mfe documentation`_ to get started using it.
-
-.. _Tutor: https://github.com/overhangio/tutor
-.. _relevant tutor-mfe documentation: https://github.com/overhangio/tutor-mfe?tab=readme-ov-file#mfe-development
-
-Devstack (Deprecated) 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/openedx/devstack#getting-started>`_ instructions.

@@ -57,7 +51,7 @@ Devstack (Deprecated) instructions
 Environment Variables/Setup Notes
 =================================

-This MFE is configured via environment variables supplied at build time.  All micro-frontends have a shared set of required environment variables, as documented in the Open edX Developer Guide under `Required Environment Variables <https://github.com/overhangio/tutor-mfe?tab=readme-ov-file#mfe-development>`__.
+This MFE is configured via environment variables supplied at build time.  All micro-frontends have a shared set of required environment variables, as documented in the Open edX Developer Guide under `Required Environment Variables <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.

 The authentication micro-frontend also requires the following additional variable:

@@ -148,13 +142,13 @@ Furthermore, there are several edX-specific environment variables that enable in
     - ``true`` | ``''`` (empty strings are falsy)    

 For more information see the document: `Micro-frontend applications in Open
-edX <https://github.com/overhangio/tutor-mfe?tab=readme-ov-file#mfe-development>`__.
+edX <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.

 How To Contribute
 =================

 Contributions are very welcome, and strongly encouraged! We've
-put together `some documentation that describes our contribution process <https://docs.openedx.org/en/latest/developers/references/developer_guide/process/index.html>`_.
+put together `some documentation that describes our contribution process <https://edx.readthedocs.org/projects/edx-developer-guide/en/latest/process/index.html>`_.

 Even though they were written with edx-platform in mind, the guidelines should be followed for Open edX code in general.

@@ -193,7 +187,7 @@ All community members are expected to follow the `Open edX Code of Conduct <http
 People
 ======
 The assigned maintainers for this component and other project details may be
-found in `Backstage <https://backstage.openedx.org/catalog/default/group/2u-infinity>`_. Backstage pulls this data from the ``catalog-info.yaml``
+found in `Backstage <https://backstage.openedx.org/catalog/default/group/2u-vanguards>`_. Backstage pulls this data from the ``catalog-info.yaml``
 file in this repo.

 Reporting Security Issues
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -12,8 +12,7 @@ metadata:
      icon: 'Article'
  annotations:
    openedx.org/arch-interest-groups: ""
-    openedx.org/release: "master"
 spec:
-  owner: group:2u-infinity
+  owner: group:2u-vanguards
  type: 'service'
  lifecycle: 'production'
--- a/docs/how_tos/enable_social_auth.rst
+++ b/docs/how_tos/enable_social_auth.rst
@@ -3,7 +3,7 @@ Enable Social Auth Locally

 Please follow the steps below to enable social auth (SSO) locally.

-1. Follow `Enabling Third Party Authentication <https://docs.openedx.org/en/latest/site_ops/install_configure_run_guide/configuration/tpa/index.html>`_ for backend configuration.
+1. Follow `Enabling Third Party Authentication <https://edx.readthedocs.io/projects/edx-installing-configuring-and-running/en/latest/configuration/tpa/index.html>`_ for backend configuration.

 2. Authn has a component for rendering Social Auth providers at frontend which goes through each provider.

--- a/example.env.config.js
+++ b/example.env.config.js
@@ -1,60 +0,0 @@
-/*
-Authn MFE is now able to handle JS-based configuration!
-
-For the time being, the `.env.*` files are still made available when cloning down this repo or pulling from
-the master branch. To switch to using `env.config.js`, make a copy of `example.env.config.js` and configure as needed.
-
-For testing with Jest Snapshot, there is a mock in `/src/setupTest.jsx` for `getConfig` that will need to be
-uncommented.
-
-Note: having both .env and env.config.js files will follow a predictable order, in which non-empty values in the
-JS-based config will overwrite the .env environment variables.
-
-frontend-platform's getConfig loads configuration in the following sequence:
- .env file config
- optional handlers (commonly used to merge MFE-specific config in via additional process.env variables)
- env.config.js file config
- runtime config
-*/
-
-module.exports = {
-  NODE_ENV: 'development',
-  NODE_PATH: './src',
-  PORT: 1999,
-  ACCESS_TOKEN_COOKIE_NAME: 'edx-jwt-cookie-header-payload',
-  BASE_URL: 'http://localhost:1999',
-  CREDENTIALS_BASE_URL: 'http://localhost:18150',
-  CSRF_TOKEN_API_PATH: '/csrf/api/v1/token',
-  ECOMMERCE_BASE_URL: 'http://localhost:18130',
-  LANGUAGE_PREFERENCE_COOKIE_NAME: 'openedx-language-preference',
-  LMS_BASE_URL: 'http://localhost:18000',
-  LOGIN_URL: 'http://localhost:1999/login',
-  LOGOUT_URL: 'http://localhost:18000/logout',
-  LOGO_URL: 'https://edx-cdn.org/v3/default/logo.svg',
-  LOGO_TRADEMARK_URL: 'https://edx-cdn.org/v3/default/logo-trademark.svg',
-  LOGO_WHITE_URL: 'https://edx-cdn.org/v3/default/logo-white.svg',
-  FAVICON_URL: 'https://edx-cdn.org/v3/default/favicon.ico',
-  MARKETING_SITE_BASE_URL: 'http://localhost:18000',
-  ORDER_HISTORY_URL: 'http://localhost:1996/orders',
-  REFRESH_ACCESS_TOKEN_ENDPOINT: 'http://localhost:18000/login_refresh',
-  SEGMENT_KEY: '',
-  SITE_NAME: 'Your Platform Name Here',
-  INFO_EMAIL: 'info@example.com',
-  ENABLE_DYNAMIC_REGISTRATION_FIELDS: 'true',
-  ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN: 'true',
-  SESSION_COOKIE_DOMAIN: 'localhost',
-  USER_INFO_COOKIE_NAME: 'edx-user-info',
-  LOGIN_ISSUE_SUPPORT_LINK: 'http://localhost:18000/login-issue-support-url',
-  TOS_AND_HONOR_CODE: 'http://localhost:18000/honor',
-  TOS_LINK: 'http://localhost:18000/tos',
-  PRIVACY_POLICY: 'http://localhost:18000/privacy',
-  AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK: 'http://localhost:1999/welcome',
-  BANNER_IMAGE_LARGE: '',
-  BANNER_IMAGE_MEDIUM: '',
-  BANNER_IMAGE_SMALL: '',
-  BANNER_IMAGE_EXTRA_SMALL: '',
-  APP_ID: '',
-  MFE_CONFIG_API_URL: '',
-  ZENDESK_KEY: '',
-  ZENDESK_LOGO_URL: '',
-};
--- a/openedx.yaml
+++ b/openedx.yaml
@@ -0,0 +1,8 @@
+# This file describes this Open edX repo, as described in OEP-2:
+# http://open-edx-proposals.readthedocs.io/en/latest/oeps/oep-0002.html#specification
+
+nick: Authn MFE
+oeps: {}
+owner: openedx/2u-vanguards
+openedx-release:
+  ref: master
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -13,12 +13,15 @@
    "build": "fedx-scripts webpack",
    "i18n_extract": "fedx-scripts formatjs extract",
    "lint": "fedx-scripts eslint --ext .js --ext .jsx .",
-    "lint:fix": "fedx-scripts eslint --fix --ext .js --ext .jsx .",
    "snapshot": "fedx-scripts jest --updateSnapshot",
    "start": "fedx-scripts webpack-dev-server --progress",
-    "dev": "PUBLIC_PATH=/authn/ MFE_CONFIG_API_URL='http://localhost:8000/api/mfe_config/v1' fedx-scripts webpack-dev-server --progress --host apps.local.openedx.io",
    "test": "fedx-scripts jest --coverage --passWithNoTests"
  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run lint"
+    }
+  },
  "author": "edX",
  "license": "AGPL-3.0",
  "homepage": "https://github.com/openedx/frontend-app-authn#readme",
@@ -30,56 +33,53 @@
  },
  "dependencies": {
    "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
-    "@edx/frontend-platform": "^8.3.1",
+    "@edx/frontend-platform": "7.1.3",
    "@edx/openedx-atlas": "^0.6.0",
-    "@fortawesome/fontawesome-svg-core": "6.7.2",
-    "@fortawesome/free-brands-svg-icons": "6.7.2",
-    "@fortawesome/free-solid-svg-icons": "6.7.2",
-    "@openedx/frontend-plugin-framework": "^1.3.0",
-    "@fortawesome/react-fontawesome": "0.2.6",
-    "@openedx/paragon": "^23.4.2",
+    "@fortawesome/fontawesome-svg-core": "6.5.2",
+    "@fortawesome/free-brands-svg-icons": "6.5.2",
+    "@fortawesome/free-solid-svg-icons": "6.5.2",
+    "@fortawesome/react-fontawesome": "0.2.0",
+    "@openedx/paragon": "^22.1.1",
    "@optimizely/react-sdk": "^2.9.1",
    "@redux-devtools/extension": "3.3.0",
-    "@testing-library/react": "^16.2.0",
+    "@testing-library/react": "^12.1.5",
+    "@testing-library/react-hooks": "^8.0.1",
    "algoliasearch": "^4.14.3",
-    "algoliasearch-helper": "^3.26.0",
+    "algoliasearch-helper": "^3.14.0",
    "classnames": "2.5.1",
-    "core-js": "3.43.0",
+    "core-js": "3.36.1",
    "fastest-levenshtein": "1.0.16",
-    "form-urlencoded": "6.1.6",
+    "form-urlencoded": "6.1.4",
    "prop-types": "15.8.1",
    "query-string": "7.1.3",
-    "react-error-boundary": "^4.0.13",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-google-recaptcha-v3": "^1.11.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
    "react-helmet": "6.1.0",
-    "react-loading-skeleton": "3.5.0",
+    "react-loading-skeleton": "3.4.0",
    "react-redux": "7.2.9",
    "react-responsive": "8.2.0",
-    "react-router": "6.30.1",
-    "react-router-dom": "6.30.1",
+    "react-router": "6.22.3",
+    "react-router-dom": "6.22.3",
    "react-zendesk": "^0.1.13",
-    "redux": "4.2.1",
+    "redux": "4.2.0",
    "redux-logger": "3.0.6",
-    "redux-mock-store": "1.5.5",
+    "redux-mock-store": "1.5.4",
    "redux-saga": "1.3.0",
    "redux-thunk": "2.4.2",
    "regenerator-runtime": "0.14.1",
-    "reselect": "5.1.1",
-    "universal-cookie": "7.2.2"
+    "reselect": "4.1.8",
+    "universal-cookie": "4.0.4"
  },
  "devDependencies": {
    "@edx/browserslist-config": "^1.1.1",
    "@edx/reactifex": "1.1.0",
-    "copy-webpack-plugin": "^11.0.0",
-    "@openedx/frontend-build": "^14.6.2",
-    "babel-plugin-formatjs": "10.5.39",
-    "eslint-plugin-import": "2.32.0",
+    "@openedx/frontend-build": "13.1.4",
+    "babel-plugin-formatjs": "10.5.14",
+    "eslint-plugin-import": "2.29.1",
    "glob": "7.2.3",
    "history": "5.3.0",
-    "jest": "30.1.3",
-    "react-test-renderer": "^18.3.1",
-    "ts-jest": "^29.4.0"
+    "husky": "7.0.4",
+    "jest": "29.7.0",
+    "react-test-renderer": "^17.0.2"
  }
 }
--- a/public/index.html
+++ b/public/index.html
@@ -1,32 +1,25 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-us">
  <head>
-    <title>
-      <%= (process.env.SITE_NAME && process.env.SITE_NAME !='null' ) ?
-      'Authentication | ' + process.env.SITE_NAME : 'Authentication' %>
-    </title>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="robots" content="noindex, nofollow" />
-    <link
-      rel="shortcut icon"
-      href="<%=htmlWebpackPlugin.options.FAVICON_URL%>"
-      type="image/x-icon"
-    />
-    <script defer src="https://www.edx.org/beam-wrapper.js" ></script>
-    <script
-      src="https://cdnjs.cloudflare.com/ajax/libs/iframe-resizer/4.4.4/iframeResizer.contentWindow.min.js"
-      integrity="sha512-IWwZFBvHzN41wNI6etRLLuLrDDj/6AwJcPt7cmKJAzluYTIHHQ1PF8wh0rSy05jxEvvjflVvH2MxeV6riyEEXg=="
-      crossorigin="anonymous"
-      referrerpolicy="no-referrer"
-    ></script>
-    <% if (process.env.OPTIMIZELY_URL) { %>
-    <script src="<%= process.env.OPTIMIZELY_URL %>"></script>
-    <% } else if (process.env.OPTIMIZELY_PROJECT_ID) { %>
-    <script src="<%= process.env.MARKETING_SITE_BASE_URL %>/optimizelyjs/<%= process.env.OPTIMIZELY_PROJECT_ID %>.js"></script>
-    <% } %>
+      <title><%= (process.env.SITE_NAME && process.env.SITE_NAME != 'null') ? 'Authentication | ' + process.env.SITE_NAME : 'Authentication' %></title>    
+      <meta charset="utf-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <link rel="shortcut icon" href="<%=htmlWebpackPlugin.options.FAVICON_URL%>" type="image/x-icon"/>
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/iframe-resizer/4.3.9/iframeResizer.contentWindow.min.js"
+              integrity="sha512-mdT/HQRzoRP4laVz49Mndx6rcCGA3IhuyhP3gaY0E9sZPkwbtDk9ttQIq9o8qGCf5VvJv1Xsy3k2yTjfUoczqw=="
+              crossorigin="anonymous"
+              referrerpolicy="no-referrer">
+      </script>
+      <% if (process.env.OPTIMIZELY_URL) { %>
+        <script
+          src="<%= process.env.OPTIMIZELY_URL %>"
+        ></script>
+      <% } else if (process.env.OPTIMIZELY_PROJECT_ID) { %>
+        <script
+          src="<%= process.env.MARKETING_SITE_BASE_URL %>/optimizelyjs/<%= process.env.OPTIMIZELY_PROJECT_ID %>.js"
+        ></script>
+      <% } %>
  </head>
-
  <body>
    <div id="root"></div>
  </body>
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /
--- a/src/MainApp.jsx
+++ b/src/MainApp.jsx
@@ -2,12 +2,11 @@ import React from 'react';

 import { getConfig } from '@edx/frontend-platform';
 import { AppProvider } from '@edx/frontend-platform/react';
-import { GoogleReCaptchaProvider } from 'react-google-recaptcha-v3';
 import { Helmet } from 'react-helmet';
 import { Navigate, Route, Routes } from 'react-router-dom';

 import {
-  EmbeddedRegistrationRoute, NotFoundPage, registerIcons, RouteTracker, UnAuthOnlyRoute,
+  EmbeddedRegistrationRoute, NotFoundPage, registerIcons, UnAuthOnlyRoute, Zendesk,
 } from './common-components';
 import configureStore from './data/configureStore';
 import {
@@ -23,7 +22,6 @@ import {
 import { updatePathWithQueryParams } from './data/utils';
 import { ForgotPasswordPage } from './forgot-password';
 import Logistration from './logistration/Logistration';
-import MainAppSlot from './plugin-slots/MainAppSlot';
 import { ProgressiveProfiling } from './progressive-profiling';
 import { RecommendationsPage } from './recommendations';
 import { RegistrationPage } from './register';
@@ -33,43 +31,33 @@ import './index.scss';

 registerIcons();

-const MainApp = () => {
-  const recaptchaKey = getConfig().RECAPTCHA_SITE_KEY_WEB;
-
-  return (
-    <GoogleReCaptchaProvider
-      reCaptchaKey={recaptchaKey}
-      useEnterprise
-    >
-      <AppProvider store={configureStore()}>
-        <Helmet>
-          <link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
-        </Helmet>
-        <Routes>
-          <Route path="/" element={<Navigate replace to={updatePathWithQueryParams(REGISTER_PAGE)} />} />
-          <Route
-            path={REGISTER_EMBEDDED_PAGE}
-            element={<EmbeddedRegistrationRoute><RegistrationPage /></EmbeddedRegistrationRoute>}
-          />
-          <Route
-            path={LOGIN_PAGE}
-            element={
-              <UnAuthOnlyRoute><Logistration selectedPage={LOGIN_PAGE} /></UnAuthOnlyRoute>
-            }
-          />
-          <Route path={REGISTER_PAGE} element={<UnAuthOnlyRoute><Logistration /></UnAuthOnlyRoute>} />
-          <Route path={RESET_PAGE} element={<UnAuthOnlyRoute><ForgotPasswordPage /></UnAuthOnlyRoute>} />
-          <Route path={PASSWORD_RESET_CONFIRM} element={<ResetPasswordPage />} />
-          <Route path={AUTHN_PROGRESSIVE_PROFILING} element={<ProgressiveProfiling />} />
-          <Route path={RECOMMENDATIONS} element={<RecommendationsPage />} />
-          <Route path={PAGE_NOT_FOUND} element={<NotFoundPage />} />
-          <Route path="*" element={<Navigate replace to={PAGE_NOT_FOUND} />} />
-        </Routes>
-        <RouteTracker />
-        <MainAppSlot />
-      </AppProvider>
-    </GoogleReCaptchaProvider>
-  );
-};
+const MainApp = () => (
+  <AppProvider store={configureStore()}>
+    <Helmet>
+      <link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
+    </Helmet>
+    {getConfig().ZENDESK_KEY && <Zendesk />}
+    <Routes>
+      <Route path="/" element={<Navigate replace to={updatePathWithQueryParams(REGISTER_PAGE)} />} />
+      <Route
+        path={REGISTER_EMBEDDED_PAGE}
+        element={<EmbeddedRegistrationRoute><RegistrationPage /></EmbeddedRegistrationRoute>}
+      />
+      <Route
+        path={LOGIN_PAGE}
+        element={
+          <UnAuthOnlyRoute><Logistration selectedPage={LOGIN_PAGE} /></UnAuthOnlyRoute>
+        }
+      />
+      <Route path={REGISTER_PAGE} element={<UnAuthOnlyRoute><Logistration /></UnAuthOnlyRoute>} />
+      <Route path={RESET_PAGE} element={<UnAuthOnlyRoute><ForgotPasswordPage /></UnAuthOnlyRoute>} />
+      <Route path={PASSWORD_RESET_CONFIRM} element={<ResetPasswordPage />} />
+      <Route path={AUTHN_PROGRESSIVE_PROFILING} element={<ProgressiveProfiling />} />
+      <Route path={RECOMMENDATIONS} element={<RecommendationsPage />} />
+      <Route path={PAGE_NOT_FOUND} element={<NotFoundPage />} />
+      <Route path="*" element={<Navigate replace to={PAGE_NOT_FOUND} />} />
+    </Routes>
+  </AppProvider>
+);

 export default MainApp;
--- a/src/cohesion/constants.js
+++ b/src/cohesion/constants.js
@@ -1,22 +0,0 @@
-export const PAGE_TYPES = {
-  ACCOUNT_CREATION: 'account-creation',
-  SIGN_IN: 'sign-in',
-};
-
-export const ELEMENT_TYPES = {
-  BUTTON: 'BUTTON',
-};
-
-export const EVENT_TYPES = { ElementClicked: 'redventures.usertracking.v3.ElementClicked' };
-
-export const ELEMENT_TEXT = {
-  CREATE_ACCOUNT: 'create-account',
-  OPT_IN_TEXT: 'I agree that edx may send me marketing messages',
-  SIGN_IN: 'Sign In',
-};
-
-export const ELEMENT_NAME = {
-  SIGN_IN: PAGE_TYPES.SIGN_IN,
-  OPT_OUT: 'opt-out',
-  CREATE_ACCOUNT: 'Create an account for free',
-};
--- a/src/cohesion/data/actions.js
+++ b/src/cohesion/data/actions.js
@@ -1,6 +0,0 @@
-export const SET_COHESION_EVENT_ELEMENT_STATES = 'SET_COHESION_EVENT_ELEMENT_STATES';
-
-export const setCohesionEventStates = (eventData) => ({
-  type: SET_COHESION_EVENT_ELEMENT_STATES,
-  payload: eventData,
-});
--- a/src/cohesion/data/reducers.js
+++ b/src/cohesion/data/reducers.js
@@ -1,17 +0,0 @@
-import { SET_COHESION_EVENT_ELEMENT_STATES } from './actions';
-
-export const storeName = 'cohesion';
-
-export const defaultState = {
-  eventData: {},
-};
-
-export const reducer = (state = defaultState, action = {}) => {
-  if (action.type === SET_COHESION_EVENT_ELEMENT_STATES) {
-    return {
-      ...state,
-      eventData: action.payload,
-    };
-  }
-  return state;
-};
--- a/src/cohesion/trackers.js
+++ b/src/cohesion/trackers.js
@@ -1,24 +0,0 @@
-import { EVENT_TYPES } from './constants';
-
-/**
- * Tracks cohesion events by setting the page type and tracking a click event.
- *
- * @param {string} pageType - The type of page where the event occurred.
- * @param {string} elementType - The type of the web element (e.g., 'BUTTON', 'LINK').
- * @param {string} webElementText - The text content of the web element.
- * @param {string} webElementName - The name of the web element.
- */
-const trackCohesionEvent = (eventData) => {
-  window.chsn_pageType = eventData.pageType;
-  const webElement = {
-    elementType: eventData.elementType,
-    text: eventData.webElementText,
-    name: eventData.webElementName,
-  };
-  window.tagular?.('beam', {
-    '@type': EVENT_TYPES.ElementClicked,
-    webElement,
-  });
-};
-
-export default trackCohesionEvent;
--- a/src/cohesion/utils.js
+++ b/src/cohesion/utils.js
@@ -1,6 +0,0 @@
-const mockTagular = () => {
-  const getTagular = jest.fn();
-  window.tagular = getTagular;
-};
-
-export default mockTagular;
--- a/src/common-components/InstitutionLogistration.jsx
+++ b/src/common-components/InstitutionLogistration.jsx
@@ -60,7 +60,7 @@ const InstitutionLogistration = props => {
                    className="btn nav-item p-0 mb-1 institutions--provider-link"
                    destination={lmsBaseUrl + provider.loginUrl}
                  >
-                    {provider?.name}
+                    {provider.name}
                  </Hyperlink>
                </td>
              </tr>
--- a/src/common-components/RedirectLogistration.jsx
+++ b/src/common-components/RedirectLogistration.jsx
@@ -1,15 +1,11 @@
-import { useSelector } from 'react-redux';
-
 import { getConfig } from '@edx/frontend-platform';
 import PropTypes from 'prop-types';
 import { Navigate } from 'react-router-dom';

-import trackCohesionEvent from '../cohesion/trackers';
 import {
  AUTHN_PROGRESSIVE_PROFILING, RECOMMENDATIONS, REDIRECT,
 } from '../data/constants';
-import setCookie from '../data/utils/cookies';
-import { redirectWithDelay } from '../data/utils/dataUtils';
+import { setCookie } from '../data/utils';

 const RedirectLogistration = (props) => {
  const {
@@ -24,16 +20,10 @@ const RedirectLogistration = (props) => {
    userId,
    registrationEmbedded,
    host,
-    currectProvider,
  } = props;
-  const cohesionEventData = useSelector(state => state.cohesion.eventData);
  let finalRedirectUrl = '';

  if (success) {
-    // This event is used by cohesion upon successful login and registration
-    if (!currectProvider) {
-      trackCohesionEvent(cohesionEventData);
-    }
    // If we're in a third party auth pipeline, we must complete the pipeline
    // once user has successfully logged in. Otherwise, redirect to the specified redirect url.
    // Note: For multiple enterprise use case, we need to make sure that user first visits the
@@ -85,7 +75,8 @@ const RedirectLogistration = (props) => {
        />
      );
    }
-    redirectWithDelay(finalRedirectUrl);
+
+    window.location.href = finalRedirectUrl;
  }

  return null;
@@ -103,7 +94,6 @@ RedirectLogistration.defaultProps = {
  userId: null,
  registrationEmbedded: false,
  host: '',
-  currectProvider: '',
 };

 RedirectLogistration.propTypes = {
@@ -118,7 +108,6 @@ RedirectLogistration.propTypes = {
  userId: PropTypes.number,
  registrationEmbedded: PropTypes.bool,
  host: PropTypes.string,
-  currectProvider: PropTypes.string,
 };

 export default RedirectLogistration;
--- a/src/common-components/RouteTracker.jsx
+++ b/src/common-components/RouteTracker.jsx
@@ -1,15 +0,0 @@
-import { useEffect } from 'react';
-
-import { useLocation } from 'react-router-dom';
-
-const RouteTracker = () => {
-  const location = useLocation();
-
-  useEffect(() => {
-    window.tagular?.('pageView');
-  }, [location]);
-
-  return null;
-};
-
-export default RouteTracker;
--- a/src/common-components/SocialAuthProviders.jsx
+++ b/src/common-components/SocialAuthProviders.jsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import { useSelector } from 'react-redux';

 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
@@ -9,35 +8,17 @@ import { Login } from '@openedx/paragon/icons';
 import PropTypes from 'prop-types';

 import messages from './messages';
-import { ELEMENT_TYPES, PAGE_TYPES } from '../cohesion/constants';
-import trackCohesionEvent from '../cohesion/trackers';
-import {
-  LOGIN_PAGE, REGISTER_PAGE, SUPPORTED_ICON_CLASSES,
-} from '../data/constants';
-import { setCookie } from '../data/utils';
-import { redirectWithDelay } from '../data/utils/dataUtils';
+import { LOGIN_PAGE, SUPPORTED_ICON_CLASSES } from '../data/constants';

 const SocialAuthProviders = (props) => {
  const { formatMessage } = useIntl();
  const { referrer, socialAuthProviders } = props;
-  const registrationFields = useSelector(state => state.register.registrationFormData);

-  function handleSubmit(e, providerName) {
+  function handleSubmit(e) {
    e.preventDefault();
-    const eventData = {
-      pageType: referrer === LOGIN_PAGE ? PAGE_TYPES.SIGN_IN : PAGE_TYPES.ACCOUNT_CREATION,
-      elementType: ELEMENT_TYPES.BUTTON,
-      webElementText: providerName,
-      webElementName: providerName.toLowerCase(),
-    };
-    // This event is used by cohesion upon successful login
-    trackCohesionEvent(eventData);

-    if (referrer === REGISTER_PAGE) {
-      setCookie('marketingEmailsOptIn', registrationFields?.configurableFormFields?.marketingEmailsOptIn);
-    }
    const url = e.currentTarget.dataset.providerUrl;
-    redirectWithDelay(getConfig().LMS_BASE_URL + url);
+    window.location.href = getConfig().LMS_BASE_URL + url;
  }

  const socialAuth = socialAuthProviders.map((provider, index) => (
@@ -47,7 +28,7 @@ const SocialAuthProviders = (props) => {
      type="button"
      className={`btn-social btn-${provider.id} ${index % 2 === 0 ? 'mr-3' : ''}`}
      data-provider-url={referrer === LOGIN_PAGE ? provider.loginUrl : provider.registerUrl}
-      onClick={(event) => handleSubmit(event, provider?.name)}
+      onClick={handleSubmit}
    >
      {provider.iconImage ? (
        <div aria-hidden="true">
--- a/src/common-components/ThirdPartyAuthAlert.jsx
+++ b/src/common-components/ThirdPartyAuthAlert.jsx
@@ -7,7 +7,6 @@ import PropTypes from 'prop-types';

 import messages from './messages';
 import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
-import setCookie from '../data/utils/cookies';

 const ThirdPartyAuthAlert = (props) => {
  const { formatMessage } = useIntl();
@@ -21,10 +20,7 @@ const ThirdPartyAuthAlert = (props) => {
    message = formatMessage(messages['register.third.party.auth.account.not.linked'], { currentProvider, platformName });
  }

-  if (currentProvider) {
-    // Setting this cookie to capture marketingEmailsOptIn for SSO flow on the onboarding component
-    setCookie('ssoPipelineRedirectionDone', true);
-  } else {
+  if (!currentProvider) {
    return null;
  }

--- a/src/common-components/UnAuthOnlyRoute.jsx
+++ b/src/common-components/UnAuthOnlyRoute.jsx
@@ -4,8 +4,9 @@ import { getConfig } from '@edx/frontend-platform';
 import { fetchAuthenticatedUser, getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import PropTypes from 'prop-types';

-import { RESET_PAGE } from '../data/constants';
-import { updatePathWithQueryParams } from '../data/utils';
+import {
+  DEFAULT_REDIRECT_URL,
+} from '../data/constants';

 /**
 * This wrapper redirects the requester to our default redirect url if they are
@@ -24,12 +25,7 @@ const UnAuthOnlyRoute = ({ children }) => {

  if (isReady) {
    if (authUser && authUser.username) {
-      const updatedPath = updatePathWithQueryParams(window.location.pathname);
-      if (updatedPath.startsWith(RESET_PAGE)) {
-        global.location.href = getConfig().LMS_BASE_URL;
-        return null;
-      }
-      global.location.href = getConfig().LMS_BASE_URL.concat(updatedPath);
+      global.location.href = getConfig().LMS_BASE_URL.concat(DEFAULT_REDIRECT_URL);
      return null;
    }

--- a/src/common-components/data/actions.js
+++ b/src/common-components/data/actions.js
@@ -13,15 +13,9 @@ export const getThirdPartyAuthContextBegin = () => ({
  type: THIRD_PARTY_AUTH_CONTEXT.BEGIN,
 });

-export const getThirdPartyAuthContextSuccess = (
-  fieldDescriptions,
-  optionalFields,
-  thirdPartyAuthContext,
-  countriesCodesList) => ({
+export const getThirdPartyAuthContextSuccess = (fieldDescriptions, optionalFields, thirdPartyAuthContext) => ({
  type: THIRD_PARTY_AUTH_CONTEXT.SUCCESS,
-  payload: {
-    fieldDescriptions, optionalFields, thirdPartyAuthContext, countriesCodesList,
-  },
+  payload: { fieldDescriptions, optionalFields, thirdPartyAuthContext },
 });

 export const getThirdPartyAuthContextFailure = () => ({
--- a/src/common-components/data/constants.js
+++ b/src/common-components/data/constants.js
@@ -1,83 +0,0 @@
-export const registerFields = {
-  fields: {
-    country: {
-      name: 'country',
-      error_message: 'Select your country or region of residence',
-    },
-    honor_code: {
-      name: 'honor_code',
-      type: 'tos_and_honor_code',
-      error_message: '',
-    },
-  },
-};
-
-export const progressiveProfilingFields = {
-  extended_profile: [],
-  fields: {
-    level_of_education: {
-      name: 'level_of_education',
-      type: 'select',
-      label: 'Highest level of education completed',
-      error_message: '',
-      options: [
-        [
-          'p',
-          'Doctorate',
-        ],
-        [
-          'm',
-          "Master's or professional degree",
-        ],
-        [
-          'b',
-          "Bachelor's degree",
-        ],
-        [
-          'a',
-          'Associate degree',
-        ],
-        [
-          'hs',
-          'Secondary/high school',
-        ],
-        [
-          'jhs',
-          'Junior secondary/junior high/middle school',
-        ],
-        [
-          'none',
-          'No formal education',
-        ],
-        [
-          'other',
-          'Other education',
-        ],
-      ],
-    },
-    gender: {
-      name: 'gender',
-      type: 'select',
-      label: 'Gender',
-      error_message: '',
-      options: [
-        [
-          'm',
-          'Male',
-        ],
-        [
-          'f',
-          'Female',
-        ],
-        [
-          'o',
-          'Other/Prefer Not to Say',
-        ],
-      ],
-    },
-  },
-};
-
-export const FIELD_LABELS = {
-  COUNTRY: 'country',
-};
--- a/src/common-components/data/reducers.js
+++ b/src/common-components/data/reducers.js
@@ -35,7 +35,6 @@ const reducer = (state = defaultState, action = {}) => {
        optionalFields: action.payload.optionalFields,
        thirdPartyAuthContext: action.payload.thirdPartyAuthContext,
        thirdPartyAuthApiStatus: COMPLETE_STATE,
-        countriesCodesList: action.payload.countriesCodesList,
      };
    }
    case THIRD_PARTY_AUTH_CONTEXT.FAILURE:
--- a/src/common-components/data/sagas.js
+++ b/src/common-components/data/sagas.js
@@ -1,4 +1,3 @@
-import { getConfig } from '@edx/frontend-platform';
 import { logError } from '@edx/frontend-platform/logging';
 import { call, put, takeEvery } from 'redux-saga/effects';

@@ -8,9 +7,7 @@ import {
  getThirdPartyAuthContextSuccess,
  THIRD_PARTY_AUTH_CONTEXT,
 } from './actions';
-import { progressiveProfilingFields, registerFields } from './constants';
 import {
-  getCountryList,
  getThirdPartyAuthContext,
 } from './service';
 import { setCountryFromThirdPartyAuthContext } from '../../register/data/actions';
@@ -21,25 +18,9 @@ export function* fetchThirdPartyAuthContext(action) {
    const {
      fieldDescriptions, optionalFields, thirdPartyAuthContext,
    } = yield call(getThirdPartyAuthContext, action.payload.urlParams);
-    const countriesCodesList = (yield call(getCountryList)) || [];

    yield put(setCountryFromThirdPartyAuthContext(thirdPartyAuthContext.countryCode));
-    // hard code country field, level of education and gender fields
-    if (getConfig().ENABLE_HARD_CODE_OPTIONAL_FIELDS) {
-      yield put(getThirdPartyAuthContextSuccess(
-        registerFields,
-        progressiveProfilingFields,
-        thirdPartyAuthContext,
-        countriesCodesList,
-      ));
-    } else {
-      yield put(getThirdPartyAuthContextSuccess(
-        fieldDescriptions,
-        optionalFields,
-        thirdPartyAuthContext,
-        countriesCodesList,
-      ));
-    }
+    yield put(getThirdPartyAuthContextSuccess(fieldDescriptions, optionalFields, thirdPartyAuthContext));
  } catch (e) {
    yield put(getThirdPartyAuthContextFailure());
    logError(e);
--- a/src/common-components/data/service.js
+++ b/src/common-components/data/service.js
@@ -1,8 +1,5 @@
 import { getConfig } from '@edx/frontend-platform';
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
-import { logError } from '@edx/frontend-platform/logging';
-
-import { FIELD_LABELS } from './constants';

 // eslint-disable-next-line import/prefer-default-export
 export async function getThirdPartyAuthContext(urlParams) {
@@ -26,28 +23,3 @@ export async function getThirdPartyAuthContext(urlParams) {
    thirdPartyAuthContext: data.contextData || {},
  };
 }
-
-function extractCountryList(data) {
-  return data?.fields
-    .find(({ name }) => name === FIELD_LABELS.COUNTRY)
-    ?.options?.map(({ value }) => (value)) || [];
-}
-
-export async function getCountryList() {
-  try {
-    const requestConfig = {
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      isPublic: true,
-    };
-
-    const { data } = await getAuthenticatedHttpClient()
-      .get(
-      `${getConfig().LMS_BASE_URL}/user_api/v1/account/registration/`,
-      requestConfig,
-      );
-    return extractCountryList(data);
-  } catch (e) {
-    logError(e);
-    return [];
-  }
-}
--- a/src/common-components/data/tests/sagas.test.js
+++ b/src/common-components/data/tests/sagas.test.js
@@ -8,11 +8,6 @@ import * as api from '../service';

 const { loggingService } = initializeMockLogging();

-jest.mock('../service', () => ({
-  getCountryList: jest.fn(),
-  getThirdPartyAuthContext: jest.fn(),
-}));
-
 describe('fetchThirdPartyAuthContext', () => {
  const params = {
    payload: { urlParams: {} },
@@ -36,7 +31,6 @@ describe('fetchThirdPartyAuthContext', () => {
        thirdPartyAuthContext: data,
        fieldDescriptions: {},
        optionalFields: {},
-        countriesCodesList: [],
      }));

    const dispatched = [];
@@ -50,7 +44,7 @@ describe('fetchThirdPartyAuthContext', () => {
    expect(dispatched).toEqual([
      actions.getThirdPartyAuthContextBegin(),
      setCountryFromThirdPartyAuthContext(),
-      actions.getThirdPartyAuthContextSuccess({}, {}, data, []),
+      actions.getThirdPartyAuthContextSuccess({}, {}, data),
    ]);
    getThirdPartyAuthContext.mockClear();
  });
--- a/src/common-components/index.jsx
+++ b/src/common-components/index.jsx
@@ -2,7 +2,6 @@ export { default as RedirectLogistration } from './RedirectLogistration';
 export { default as registerIcons } from './RegisterFaIcons';
 export { default as EmbeddedRegistrationRoute } from './EmbeddedRegistrationRoute';
 export { default as UnAuthOnlyRoute } from './UnAuthOnlyRoute';
-export { default as RouteTracker } from './RouteTracker';
 export { default as NotFoundPage } from './NotFoundPage';
 export { default as SocialAuthProviders } from './SocialAuthProviders';
 export { default as ThirdPartyAuthAlert } from './ThirdPartyAuthAlert';
--- a/src/common-components/tests/EmbeddedRegistrationRoute.test.jsx
+++ b/src/common-components/tests/EmbeddedRegistrationRoute.test.jsx
@@ -5,13 +5,14 @@ import React from 'react';
 import { getConfig } from '@edx/frontend-platform';
 import { render } from '@testing-library/react';
 import { act } from 'react-dom/test-utils';
-import {
-  MemoryRouter, Route, BrowserRouter as Router, Routes,
-} from 'react-router-dom';

 import { PAGE_NOT_FOUND, REGISTER_EMBEDDED_PAGE } from '../../data/constants';
 import EmbeddedRegistrationRoute from '../EmbeddedRegistrationRoute';

+import {
+  MemoryRouter, Route, BrowserRouter as Router, Routes,
+} from 'react-router-dom';
+
 const RRD = require('react-router-dom');
 // Just render plain div with its children
 // eslint-disable-next-line react/prop-types
--- a/src/common-components/tests/FormField.test.jsx
+++ b/src/common-components/tests/FormField.test.jsx
@@ -1,6 +1,7 @@
+import React from 'react';
 import { Provider } from 'react-redux';

-import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import { fireEvent, render } from '@testing-library/react';
 import { act } from 'react-dom/test-utils';
 import { MemoryRouter } from 'react-router-dom';
@@ -36,6 +37,7 @@ describe('FormGroup', () => {

 describe('PasswordField', () => {
  const mockStore = configureStore();
+  const IntlPasswordField = injectIntl(PasswordField);
  let props = {};
  let store = {};

@@ -64,7 +66,7 @@ describe('PasswordField', () => {
  });

  it('should show/hide password on icon click', () => {
-    const { getByLabelText } = render(reduxWrapper(<PasswordField {...props} />));
+    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
    const passwordInput = getByLabelText('Password');

    const showPasswordButton = getByLabelText('Show password');
@@ -77,7 +79,7 @@ describe('PasswordField', () => {
  });

  it('should show password requirement tooltip on focus', async () => {
-    const { getByLabelText } = render(reduxWrapper(<PasswordField {...props} />));
+    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
    const passwordInput = getByLabelText('Password');
    jest.useFakeTimers();
    await act(async () => {
@@ -94,7 +96,7 @@ describe('PasswordField', () => {
      ...props,
      value: '',
    };
-    const { getByLabelText } = render(reduxWrapper(<PasswordField {...props} />));
+    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
    const passwordInput = getByLabelText('Password');
    jest.useFakeTimers();
    await act(async () => {
@@ -117,7 +119,7 @@ describe('PasswordField', () => {
  });

  it('should update password requirement checks', async () => {
-    const { getByLabelText } = render(reduxWrapper(<PasswordField {...props} />));
+    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
    const passwordInput = getByLabelText('Password');
    jest.useFakeTimers();
    await act(async () => {
@@ -140,7 +142,7 @@ describe('PasswordField', () => {
  });

  it('should not run validations when blur is fired on password icon click', () => {
-    const { container, getByLabelText } = render(reduxWrapper(<PasswordField {...props} />));
+    const { container, getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
    const passwordInput = container.querySelector('input[name="password"]');

    const passwordIcon = getByLabelText('Show password');
@@ -161,7 +163,7 @@ describe('PasswordField', () => {
      ...props,
      handleBlur: jest.fn(),
    };
-    const { container } = render(reduxWrapper(<PasswordField {...props} />));
+    const { container } = render(reduxWrapper(<IntlPasswordField {...props} />));
    const passwordInput = container.querySelector('input[name="password"]');

    fireEvent.blur(passwordInput, {
@@ -179,7 +181,7 @@ describe('PasswordField', () => {
      ...props,
      handleErrorChange: jest.fn(),
    };
-    const { container } = render(reduxWrapper(<PasswordField {...props} />));
+    const { container } = render(reduxWrapper(<IntlPasswordField {...props} />));
    const passwordInput = container.querySelector('input[name="password"]');

    fireEvent.blur(passwordInput, {
@@ -202,7 +204,7 @@ describe('PasswordField', () => {
      handleErrorChange: jest.fn(),
    };

-    const { getByLabelText } = render(reduxWrapper(<PasswordField {...props} />));
+    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));

    const passwordIcon = getByLabelText('Show password');

@@ -222,7 +224,7 @@ describe('PasswordField', () => {
      handleErrorChange: jest.fn(),
    };

-    const { getByLabelText } = render(reduxWrapper(<PasswordField {...props} />));
+    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));

    const passwordIcon = getByLabelText('Show password');

@@ -246,7 +248,7 @@ describe('PasswordField', () => {
      ...props,
      handleErrorChange: jest.fn(),
    };
-    const { getByLabelText } = render(reduxWrapper(<PasswordField {...props} />));
+    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));
    const passwordField = getByLabelText('Password');
    fireEvent.blur(passwordField, {
      target: {
@@ -266,7 +268,7 @@ describe('PasswordField', () => {
      handleErrorChange: jest.fn(),
      handleBlur: jest.fn(),
    };
-    const { getByLabelText } = render(reduxWrapper(<PasswordField {...props} />));
+    const { getByLabelText } = render(reduxWrapper(<IntlPasswordField {...props} />));

    const passwordIcon = getByLabelText('Show password');

--- a/src/common-components/tests/SocialAuthProviders.test.jsx
+++ b/src/common-components/tests/SocialAuthProviders.test.jsx
@@ -1,35 +1,16 @@
 import React from 'react';
-import { Provider } from 'react-redux';

 import { IntlProvider } from '@edx/frontend-platform/i18n';
 import renderer from 'react-test-renderer';
-import configureStore from 'redux-mock-store';

 import registerIcons from '../RegisterFaIcons';
 import SocialAuthProviders from '../SocialAuthProviders';

 registerIcons();
-const mockStore = configureStore();

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

-  const initialState = {
-    register: {
-      registrationFormData: {
-        configurableFormFields: {
-          marketingEmailsOptIn: true,
-        },
-      },
-    },
-  };
-  const store = mockStore(initialState);
-  const reduxWrapper = children => (
-    <IntlProvider locale="en">
-      <Provider store={store}>{children}</Provider>
-    </IntlProvider>
-  );
-
  const appleProvider = {
    id: 'oa2-apple-id',
    name: 'Apple',
@@ -49,11 +30,11 @@ describe('SocialAuthProviders', () => {
  it('should match social auth provider with iconImage snapshot', () => {
    props = { socialAuthProviders: [appleProvider, facebookProvider] };

-    const tree = renderer.create(reduxWrapper(
+    const tree = renderer.create(
      <IntlProvider locale="en">
        <SocialAuthProviders {...props} />
      </IntlProvider>,
-    )).toJSON();
+    ).toJSON();

    expect(tree).toMatchSnapshot();
  });
@@ -67,11 +48,11 @@ describe('SocialAuthProviders', () => {
      }],
    };

-    const tree = renderer.create(reduxWrapper(
+    const tree = renderer.create(
      <IntlProvider locale="en">
        <SocialAuthProviders {...props} />
      </IntlProvider>,
-    )).toJSON();
+    ).toJSON();

    expect(tree).toMatchSnapshot();
  });
@@ -85,11 +66,11 @@ describe('SocialAuthProviders', () => {
      }],
    };

-    const tree = renderer.create(reduxWrapper(
+    const tree = renderer.create(
      <IntlProvider locale="en">
        <SocialAuthProviders {...props} />
      </IntlProvider>,
-    )).toJSON();
+    ).toJSON();

    expect(tree).toMatchSnapshot();
  });
--- a/src/common-components/tests/UnAuthOnlyRoute.test.jsx
+++ b/src/common-components/tests/UnAuthOnlyRoute.test.jsx
@@ -5,13 +5,14 @@ import React from 'react';
 import { fetchAuthenticatedUser, getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import { render } from '@testing-library/react';
 import { act } from 'react-dom/test-utils';
-import {
-  MemoryRouter, Route, BrowserRouter as Router, Routes,
-} from 'react-router-dom';

 import { UnAuthOnlyRoute } from '..';
 import { REGISTER_PAGE } from '../../data/constants';

+import {
+  MemoryRouter, Route, BrowserRouter as Router, Routes,
+} from 'react-router-dom';
+
 jest.mock('@edx/frontend-platform/auth', () => ({
  getAuthenticatedUser: jest.fn(),
  fetchAuthenticatedUser: jest.fn(),
--- a/src/common-components/tests/snapshots/SocialAuthProviders.test.jsx.snap
+++ b/src/common-components/tests/snapshots/SocialAuthProviders.test.jsx.snap
@@ -66,14 +66,14 @@ exports[`SocialAuthProviders should match social auth provider with iconClass sn
      data-prefix="fab"
      focusable="false"
      role="img"
-      style={{}}
+      style={Object {}}
      viewBox="0 0 488 512"
      xmlns="http://www.w3.org/2000/svg"
    >
      <path
        d="M488 261.8C488 403.3 391.1 504 248 504 110.8 504 0 393.2 0 256S110.8 8 248 8c66.8 0 123 24.5 166.3 64.9l-67.5 64.9C258.5 52.6 94.3 116.6 94.3 256c0 86.5 69.1 156.6 153.7 156.6 98.2 0 135-70.4 140.8-106.9H248v-85.3h236.1c2.3 12.7 3.9 24.9 3.9 41.4z"
        fill="currentColor"
-        style={{}}
+        style={Object {}}
      />
    </svg>
  </div>
@@ -93,7 +93,7 @@ exports[`SocialAuthProviders should match social auth provider with iconClass sn
 `;

 exports[`SocialAuthProviders should match social auth provider with iconImage snapshot 1`] = `
-[
+Array [
  <button
    className="btn-social btn-oa2-apple-id mr-3"
    data-provider-url="/auth/login/apple-id/?auth_entry=login&next=/dashboard"
--- a/src/common-components/tests/snapshots/ThirdPartyAuthAlert.test.jsx.snap
+++ b/src/common-components/tests/snapshots/ThirdPartyAuthAlert.test.jsx.snap
@@ -21,7 +21,7 @@ exports[`ThirdPartyAuthAlert should match login page third party auth alert mess
 `;

 exports[`ThirdPartyAuthAlert should match register page third party auth alert message snapshot 1`] = `
-[
+Array [
  <div
    className="fade alert-content alert-success mt-n2 mb-5 alert show"
    id="tpa-alert"
--- a/src/common-components/tests/snapshots/Zendesk.test.jsx.snap
+++ b/src/common-components/tests/snapshots/Zendesk.test.jsx.snap
@@ -5,23 +5,23 @@ exports[`Zendesk Help should match login page third party auth alert message sna
  cookies={true}
  defer={true}
  webWidget={
-    {
-      "answerBot": {
-        "avatar": {
-          "name": {
+    Object {
+      "answerBot": Object {
+        "avatar": Object {
+          "name": Object {
            "*": "edX Support",
          },
          "url": undefined,
        },
        "contactOnlyAfterQuery": true,
        "suppress": false,
-        "title": {
+        "title": Object {
          "*": "edX Support",
        },
      },
-      "chat": {
-        "departments": {
-          "enabled": [
+      "chat": Object {
+        "departments": Object {
+          "enabled": Array [
            "account settings",
            "billing and payments",
            "certificates",
@@ -33,17 +33,17 @@ exports[`Zendesk Help should match login page third party auth alert message sna
        },
        "suppress": false,
      },
-      "contactForm": {
+      "contactForm": Object {
        "attachments": true,
-        "selectTicketForm": {
+        "selectTicketForm": Object {
          "*": "Please choose your request type:",
        },
-        "ticketForms": [
-          {
-            "fields": [
-              {
+        "ticketForms": Array [
+          Object {
+            "fields": Array [
+              Object {
                "id": "description",
-                "prefill": {
+                "prefill": Object {
                  "*": "",
                },
              },
@@ -53,10 +53,10 @@ exports[`Zendesk Help should match login page third party auth alert message sna
          },
        ],
      },
-      "contactOptions": {
+      "contactOptions": Object {
        "enabled": false,
      },
-      "helpCenter": {
+      "helpCenter": Object {
        "originalArticleButton": true,
      },
    }
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -11,7 +11,6 @@ const configuration = {
  MARKETING_EMAILS_OPT_IN: process.env.MARKETING_EMAILS_OPT_IN || '',
  SHOW_CONFIGURABLE_EDX_FIELDS: process.env.SHOW_CONFIGURABLE_EDX_FIELDS || false,
  SHOW_REGISTRATION_LINKS: process.env.SHOW_REGISTRATION_LINKS !== 'false',
-  ENABLE_HARD_CODE_OPTIONAL_FIELDS: process.env.ENABLE_HARD_CODE_OPTIONAL_FIELDS || false,
  ENABLE_IMAGE_LAYOUT: process.env.ENABLE_IMAGE_LAYOUT || false,
  // Links
  ACTIVATION_EMAIL_SUPPORT_LINK: process.env.ACTIVATION_EMAIL_SUPPORT_LINK || null,
@@ -36,8 +35,6 @@ const configuration = {
  ZENDESK_LOGO_URL: process.env.ZENDESK_LOGO_URL,
  ALGOLIA_APP_ID: process.env.ALGOLIA_APP_ID || '',
  ALGOLIA_SEARCH_API_KEY: process.env.ALGOLIA_SEARCH_API_KEY || '',
-  AUTO_GENERATED_USERNAME_EXPERIMENT_ID: process.env.AUTO_GENERATED_USERNAME_EXPERIMENT_ID || '',
-  RECAPTCHA_SITE_KEY_WEB: process.env.RECAPTCHA_SITE_KEY_WEB || '',
 };

 export default configuration;
--- a/src/data/constants.js
+++ b/src/data/constants.js
@@ -37,4 +37,3 @@ export const VALID_EMAIL_REGEX = '(^[-!#$%&\'*+/=?^_`{}|~0-9A-Z]+(\\.[-!#$%&\'*+
 // things like auto-enrollment upon login and registration.
 export const AUTH_PARAMS = ['course_id', 'enrollment_action', 'course_mode', 'email_opt_in', 'purchase_workflow', 'next', 'register_for_free', 'track', 'is_account_recovery', 'variant', 'host', 'cta'];
 export const REDIRECT = 'redirect';
-export const APP_NAME = 'authn_mfe';
--- a/src/data/reducers.js
+++ b/src/data/reducers.js
@@ -1,6 +1,5 @@
 import { combineReducers } from 'redux';

-import { reducer as cohesionReducer, storeName as cohesionStoreName } from '../cohesion/data/reducers';
 import {
  reducer as commonComponentsReducer,
  storeName as commonComponentsStoreName,
@@ -32,7 +31,6 @@ const createRootReducer = () => combineReducers({
  [commonComponentsStoreName]: commonComponentsReducer,
  [forgotPasswordStoreName]: forgotPasswordReducer,
  [resetPasswordStoreName]: resetPasswordReducer,
-  [cohesionStoreName]: cohesionReducer,
  [authnProgressiveProfilingStoreName]: authnProgressiveProfilingReducers,
 });
 export default createRootReducer;
--- a/src/data/segment/utils.js
+++ b/src/data/segment/utils.js
@@ -1,37 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
-
-import { APP_NAME } from '../constants';
-
-export const LINK_TIMEOUT = 300;
-
-/**
- * Creates an event tracker function that sends a tracking event with the given name and options.
- *
- * @param {string} name - The name of the event to be tracked.
- * @param {object} [options={}] - Additional options to be included with the event.
- * @returns {function} - A function that, when called, sends the tracking event.
- */
-export const createEventTracker = (name, options = {}) => () => sendTrackEvent(
-  name,
-  { ...options, app_name: APP_NAME },
-);
-
-/**
- * Creates an event tracker function that sends a tracking event with the given name and options.
- *
- * @param {string} name - The name of the event to be tracked.
- * @param {object} [options={}] - Additional options to be included with the event.
- * @returns {function} - A function that, when called, sends the tracking event.
- */
-export const createPageEventTracker = (name, options = null) => () => sendPageEvent(
-  name,
-  options,
-  { app_name: APP_NAME },
-);
-
-export const createLinkTracker = (tracker, href) => (e) => {
-  e.preventDefault();
-  tracker();
-  return setTimeout(() => { window.location.href = href; }, LINK_TIMEOUT);
-};
--- a/src/data/utils/cookies.js
+++ b/src/data/utils/cookies.js
@@ -11,11 +11,3 @@ export default function setCookie(cookieName, cookieValue, cookieExpiry) {
    cookies.set(cookieName, cookieValue, options);
  }
 }
-
-export function removeCookie(cookieName) {
-  if (cookieName) {
-    const cookies = new Cookies();
-    const options = { domain: getConfig().SESSION_COOKIE_DOMAIN, path: '/' };
-    cookies.remove(cookieName, options);
-  }
-}
--- a/src/data/utils/dataUtils.js
+++ b/src/data/utils/dataUtils.js
@@ -81,9 +81,3 @@ export const isHostAvailableInQueryParams = () => {
  const queryParams = getAllPossibleQueryParams();
  return 'host' in queryParams;
 };
-
-export const redirectWithDelay = (redirectUrl) => {
-  setTimeout(() => {
-    window.location.href = redirectUrl;
-  }, 1000);
-};
--- a/src/data/utils/index.js
+++ b/src/data/utils/index.js
@@ -8,4 +8,4 @@ export {
  windowScrollTo,
 } from './dataUtils';
 export { default as AsyncActionType } from './reduxUtils';
-export { default as setCookie, removeCookie } from './cookies';
+export { default as setCookie } from './cookies';
--- a/src/forgot-password/ForgotPasswordPage.jsx
+++ b/src/forgot-password/ForgotPasswordPage.jsx
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';

 import { getConfig } from '@edx/frontend-platform';
+import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { useIntl } from '@edx/frontend-platform/i18n';
 import {
  Form,
@@ -24,10 +25,6 @@ import BaseContainer from '../base-container';
 import { FormGroup } from '../common-components';
 import { DEFAULT_STATE, LOGIN_PAGE, VALID_EMAIL_REGEX } from '../data/constants';
 import { updatePathWithQueryParams, windowScrollTo } from '../data/utils';
-import {
-  trackForgotPasswordPageEvent,
-  trackForgotPasswordPageViewed,
-} from '../tracking/trackers/forgotpassword';

 const ForgotPasswordPage = (props) => {
  const platformName = getConfig().SITE_NAME;
@@ -44,8 +41,8 @@ const ForgotPasswordPage = (props) => {
  const navigate = useNavigate();

  useEffect(() => {
-    trackForgotPasswordPageEvent();
-    trackForgotPasswordPageViewed();
+    sendPageEvent('login_and_registration', 'reset');
+    sendTrackEvent('edx.bi.password_reset_form.viewed', { category: 'user-engagement' });
  }, []);

  useEffect(() => {
--- a/src/forgot-password/tests/ForgotPasswordPage.test.jsx
+++ b/src/forgot-password/tests/ForgotPasswordPage.test.jsx
@@ -1,7 +1,8 @@
+import React from 'react';
 import { Provider } from 'react-redux';

 import { mergeConfig } from '@edx/frontend-platform';
-import { configure, IntlProvider } from '@edx/frontend-platform/i18n';
+import { configure, injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import {
  fireEvent, render, screen,
 } from '@testing-library/react';
@@ -25,6 +26,7 @@ jest.mock('react-router-dom', () => ({
  useNavigate: () => mockedNavigator,
 }));

+const IntlForgotPasswordPage = injectIntl(ForgotPasswordPage);
 const mockStore = configureStore();

 const initialState = {
@@ -76,7 +78,7 @@ describe('ForgotPasswordPage', () => {
  );

  it('not should display need other help signing in button', () => {
-    const { queryByTestId } = render(reduxWrapper(<ForgotPasswordPage {...props} />));
+    const { queryByTestId } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
    const forgotPasswordButton = queryByTestId('forgot-password');
    expect(forgotPasswordButton).toBeNull();
  });
@@ -85,14 +87,14 @@ describe('ForgotPasswordPage', () => {
    mergeConfig({
      LOGIN_ISSUE_SUPPORT_LINK: '/support',
    });
-    render(reduxWrapper(<ForgotPasswordPage {...props} />));
+    render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
    const forgotPasswordButton = screen.findByText('Need help signing in?');
    expect(forgotPasswordButton).toBeDefined();
  });

  it('should display email validation error message', async () => {
    const validationMessage = 'We were unable to contact you.Enter a valid email address below.';
-    const { container } = render(reduxWrapper(<ForgotPasswordPage {...props} />));
+    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));

    const emailInput = screen.getByLabelText('Email');

@@ -113,7 +115,7 @@ describe('ForgotPasswordPage', () => {
    const expectedMessage = 'We were unable to contact you.'
                            + 'An error has occurred. Try refreshing the page, or check your internet connection.';

-    const { container } = render(reduxWrapper(<ForgotPasswordPage {...props} />));
+    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));

    const alertElements = container.querySelectorAll('.alert-danger');
    const validationErrors = alertElements[0].textContent;
@@ -122,7 +124,7 @@ describe('ForgotPasswordPage', () => {

  it('should display empty email validation message', async () => {
    const validationMessage = 'We were unable to contact you.Enter your email below.';
-    const { container } = render(reduxWrapper(<ForgotPasswordPage {...props} />));
+    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));

    const submitButton = screen.getByText('Submit');
    fireEvent.click(submitButton);
@@ -139,7 +141,7 @@ describe('ForgotPasswordPage', () => {
      forgotPassword: { status: 'forbidden' },
    });

-    const { container } = render(reduxWrapper(<ForgotPasswordPage {...props} />));
+    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));

    const alertElements = container.querySelectorAll('.alert-danger');
    const validationErrors = alertElements[0].textContent;
@@ -147,7 +149,7 @@ describe('ForgotPasswordPage', () => {
  });

  it('should not display any error message on change event', () => {
-    render(reduxWrapper(<ForgotPasswordPage {...props} />));
+    render(reduxWrapper(<IntlForgotPasswordPage {...props} />));

    const emailInput = screen.getByLabelText('Email');

@@ -170,7 +172,7 @@ describe('ForgotPasswordPage', () => {
    };

    store.dispatch = jest.fn(store.dispatch);
-    render(reduxWrapper(<ForgotPasswordPage {...props} />));
+    render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
    const emailInput = screen.getByLabelText('Email');

    fireEvent.blur(emailInput);
@@ -185,7 +187,7 @@ describe('ForgotPasswordPage', () => {
      emailValidationError: validationMessage,
      email: '',
    };
-    const { container } = render(reduxWrapper(<ForgotPasswordPage {...props} />));
+    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
    const validationElement = container.querySelector('.pgn__form-text-invalid');
    expect(validationElement.textContent).toEqual(validationMessage);
  });
@@ -203,7 +205,7 @@ describe('ForgotPasswordPage', () => {

    store.dispatch = jest.fn(store.dispatch);

-    render(reduxWrapper(<ForgotPasswordPage {...props} />));
+    render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
    const emailInput = screen.getByLabelText('Email');

    fireEvent.focus(emailInput);
@@ -217,7 +219,7 @@ describe('ForgotPasswordPage', () => {
      emailValidationError: '',
      email: '',
    };
-    render(reduxWrapper(<ForgotPasswordPage {...props} />));
+    render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
    const errorElement = screen.queryByTestId('email-invalid-feedback');
    expect(errorElement).toBeNull();
  });
@@ -234,7 +236,7 @@ describe('ForgotPasswordPage', () => {
                           + 'receive a password reset message after 1 minute, verify that you entered the correct email address,'
                           + ' or check your spam folder. If you need further assistance, contact technical support.';

-    const { container } = render(reduxWrapper(<ForgotPasswordPage {...props} />));
+    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
    const successElement = findByTextContent(container, successMessage);

    expect(successElement).toBeDefined();
@@ -252,7 +254,7 @@ describe('ForgotPasswordPage', () => {
                            + 'This password reset link is invalid. It may have been used already. '
                            + 'Enter your email below to receive a new link.';

-    const { container } = render(reduxWrapper(<ForgotPasswordPage {...props} />));
+    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));
    const successElement = findByTextContent(container, successMessage);

    expect(successElement).toBeDefined();
@@ -260,7 +262,7 @@ describe('ForgotPasswordPage', () => {
  });

  it('should redirect onto login page', async () => {
-    const { container } = render(reduxWrapper(<ForgotPasswordPage {...props} />));
+    const { container } = render(reduxWrapper(<IntlForgotPasswordPage {...props} />));

    const navElement = container.querySelector('nav');
    const anchorElement = navElement.querySelector('a');
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -1,36 +1,27 @@
 import 'core-js/stable';
 import 'regenerator-runtime/runtime';

-import React, { StrictMode } from 'react';
+import React from 'react';
+import ReactDOM from 'react-dom';

 import {
  APP_INIT_ERROR, APP_READY, initialize, mergeConfig, subscribe,
 } from '@edx/frontend-platform';
 import { ErrorPage } from '@edx/frontend-platform/react';
-import { createRoot } from 'react-dom/client';

 import configuration from './config';
 import messages from './i18n';
 import MainApp from './MainApp';

 subscribe(APP_READY, () => {
-  const root = createRoot(document.getElementById('root'));
-
-  root.render(
-    <StrictMode>
-      <MainApp />
-    </StrictMode>,
+  ReactDOM.render(
+    <MainApp />,
+    document.getElementById('root'),
  );
 });

 subscribe(APP_INIT_ERROR, (error) => {
-  const root = createRoot(document.getElementById('root'));
-
-  root.render(
-    <StrictMode>
-      <ErrorPage message={error.message} />
-    </StrictMode>,
-  );
+  ReactDOM.render(<ErrorPage message={error.message} />, document.getElementById('root'));
 });

 initialize({
--- a/src/index.scss
+++ b/src/index.scss
@@ -1,2 +1,6 @@
-@use "@openedx/paragon/styles/css/core/custom-media-breakpoints" as paragonCustomMediaBreakpoints;
+@import "~@edx/brand/paragon/fonts";
+@import "~@edx/brand/paragon/variables";
+@import "~@openedx/paragon/scss/core/core";
+@import "~@edx/brand/paragon/overrides";
+
@import "sass/style";
--- a/src/login/AccountActivationMessage.jsx
+++ b/src/login/AccountActivationMessage.jsx
@@ -2,7 +2,7 @@ import React from 'react';

 import { getConfig } from '@edx/frontend-platform';
 import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n';
-import { Alert, Hyperlink } from '@openedx/paragon';
+import { Alert } from '@openedx/paragon';
 import { CheckCircle, Error } from '@openedx/paragon/icons';
 import PropTypes from 'prop-types';

@@ -36,17 +36,19 @@ const AccountActivationMessage = ({ messageType }) => {
      break;
    }
    case ACCOUNT_ACTIVATION_MESSAGE.ERROR: {
-      const supportEmail = (
-        <Hyperlink isInline destination={`mailto:${getConfig().INFO_EMAIL}`}>{getConfig().INFO_EMAIL}</Hyperlink>
+      const supportLink = (
+        <Alert.Link href={getConfig().ACTIVATION_EMAIL_SUPPORT_LINK}>
+          {formatMessage(messages['account.activation.support.link'])}
+        </Alert.Link>
      );

      heading = formatMessage(messages[`account.${activationOrConfirmation}.error.message.title`]);
      activationMessage = (
        <FormattedMessage
          id="account.activation.error.message"
-          defaultMessage="Something went wrong, please contact {supportEmail} to resolve this issue."
+          defaultMessage="Something went wrong, please {supportLink} to resolve this issue."
          description="Account activation error message"
-          values={{ supportEmail }}
+          values={{ supportLink }}
        />
      );
      break;
--- a/src/login/ChangePasswordPrompt.jsx
+++ b/src/login/ChangePasswordPrompt.jsx
@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';

 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
@@ -11,23 +10,19 @@ import PropTypes from 'prop-types';
 import { Link, useNavigate } from 'react-router-dom';

 import messages from './messages';
-import trackCohesionEvent from '../cohesion/trackers';
 import { DEFAULT_REDIRECT_URL, RESET_PAGE } from '../data/constants';
 import { updatePathWithQueryParams } from '../data/utils';
-import { redirectWithDelay } from '../data/utils/dataUtils';
 import useMobileResponsive from '../data/utils/useMobileResponsive';

 const ChangePasswordPrompt = ({ variant, redirectUrl }) => {
  const isMobileView = useMobileResponsive();
  const [redirectToResetPasswordPage, setRedirectToResetPasswordPage] = useState(false);
-  const cohesionEventData = useSelector(state => state.cohesion.eventData);
  const handlers = {
    handleToggleOff: () => {
      if (variant === 'block') {
        setRedirectToResetPasswordPage(true);
      } else {
-        trackCohesionEvent(cohesionEventData);
-        redirectWithDelay(redirectUrl || getConfig().LMS_BASE_URL.concat(DEFAULT_REDIRECT_URL));
+        window.location.href = redirectUrl || getConfig().LMS_BASE_URL.concat(DEFAULT_REDIRECT_URL);
      }
    },
  };
--- a/src/login/LoginPage.jsx
+++ b/src/login/LoginPage.jsx
@@ -1,8 +1,9 @@
-import { useEffect, useMemo, useState } from 'react';
-import { connect, useDispatch } from 'react-redux';
+import React, { useEffect, useMemo, useState } from 'react';
+import { connect } from 'react-redux';

 import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
+import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
+import { injectIntl, useIntl } from '@edx/frontend-platform/i18n';
 import {
  Form, StatefulButton,
 } from '@openedx/paragon';
@@ -20,10 +21,6 @@ import {
 import { INVALID_FORM, TPA_AUTHENTICATION_FAILURE } from './data/constants';
 import LoginFailureMessage from './LoginFailure';
 import messages from './messages';
-import {
-  ELEMENT_NAME, ELEMENT_TEXT, ELEMENT_TYPES, PAGE_TYPES,
-} from '../cohesion/constants';
-import { setCohesionEventStates } from '../cohesion/data/actions';
 import {
  FormGroup,
  InstitutionLogistration,
@@ -35,7 +32,9 @@ import { getThirdPartyAuthContext } from '../common-components/data/actions';
 import { thirdPartyAuthContextSelector } from '../common-components/data/selectors';
 import EnterpriseSSO from '../common-components/EnterpriseSSO';
 import ThirdPartyAuth from '../common-components/ThirdPartyAuth';
-import { DEFAULT_STATE, PENDING_STATE, RESET_PAGE } from '../data/constants';
+import {
+  DEFAULT_STATE, PENDING_STATE, RESET_PAGE,
+} from '../data/constants';
 import {
  getActivationStatus,
  getAllPossibleQueryParams,
@@ -43,11 +42,7 @@ import {
  getTpaProvider,
  updatePathWithQueryParams,
 } from '../data/utils';
-import { removeCookie } from '../data/utils/cookies';
 import ResetPasswordSuccess from '../reset-password/ResetPasswordSuccess';
-import {
-  trackForgotPasswordLinkClick, trackLoginPageViewed, trackLoginSuccess,
-} from '../tracking/trackers/login';

 const LoginPage = (props) => {
  const {
@@ -74,7 +69,6 @@ const LoginPage = (props) => {
    getTPADataFromBackend,
  } = props;
  const { formatMessage } = useIntl();
-  const dispatch = useDispatch();
  const activationMsgType = getActivationStatus();
  const queryParams = useMemo(() => getAllPossibleQueryParams(), []);

@@ -84,17 +78,9 @@ const LoginPage = (props) => {
  const tpaHint = getTpaHint();

  useEffect(() => {
-    trackLoginPageViewed();
+    sendPageEvent('login_and_registration', 'login');
  }, []);

-  useEffect(() => {
-    if (loginResult.success) {
-      trackLoginSuccess();
-      // Remove this cookie that was set to capture marketingEmailsOptIn for the onboarding component
-      removeCookie('ssoPipelineRedirectionDone');
-    }
-  }, [loginResult]);
-
  useEffect(() => {
    const payload = { ...queryParams };
    if (tpaHint) {
@@ -154,15 +140,6 @@ const LoginPage = (props) => {

  const handleSubmit = (event) => {
    event.preventDefault();
-    const eventData = {
-      pageType: PAGE_TYPES.SIGN_IN,
-      elementType: ELEMENT_TYPES.BUTTON,
-      webElementText: ELEMENT_TEXT.SIGN_IN,
-      webElementName: ELEMENT_NAME.SIGN_IN,
-    };
-
-    dispatch(setCohesionEventStates(eventData));
-
    if (showResetPasswordSuccessBanner) {
      props.dismissPasswordResetBanner();
    }
@@ -193,6 +170,9 @@ const LoginPage = (props) => {
    const { name } = event.target;
    setErrors(prevErrors => ({ ...prevErrors, [name]: '' }));
  };
+  const trackForgotPasswordLinkClick = () => {
+    sendTrackEvent('edx.bi.password-reset_form.toggled', { category: 'user-engagement' });
+  };

  const { provider, skipHintedLogin } = getTpaProvider(tpaHint, providers, secondaryProviders);

@@ -228,7 +208,6 @@ const LoginPage = (props) => {
        success={loginResult.success}
        redirectUrl={loginResult.redirectUrl}
        finishAuthUrl={finishAuthUrl}
-        currentProvider={currentProvider}
      />
      <div className="mw-xs mt-3 mb-2">
        <LoginFailureMessage
@@ -386,4 +365,4 @@ export default connect(
    loginRequest,
    getTPADataFromBackend: getThirdPartyAuthContext,
  },
-)(LoginPage);
+)(injectIntl(LoginPage));
--- a/src/login/messages.jsx
+++ b/src/login/messages.jsx
@@ -95,6 +95,11 @@ const messages = defineMessages({
    defaultMessage: 'Your account could not be activated',
    description: 'Account Activation error message title',
  },
+  'account.activation.support.link': {
+    id: 'account.activation.support.link',
+    defaultMessage: 'contact support',
+    description: 'Link text used in account activation error message to go to learner help center',
+  },
  // Email Confirmation Strings
  'account.confirmation.success.message.title': {
    id: 'account.confirmation.success.message.title',
--- a/src/login/tests/AccountActivationMessage.test.jsx
+++ b/src/login/tests/AccountActivationMessage.test.jsx
@@ -1,5 +1,7 @@
+import React from 'react';
+
 import { mergeConfig } from '@edx/frontend-platform';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import {
  render, screen,
 } from '@testing-library/react';
@@ -7,6 +9,8 @@ import {
 import AccountActivationMessage from '../AccountActivationMessage';
 import { ACCOUNT_ACTIVATION_MESSAGE } from '../data/constants';

+const IntlAccountActivationMessage = injectIntl(AccountActivationMessage);
+
 describe('AccountActivationMessage', () => {
  beforeEach(() => {
    mergeConfig({
@@ -17,7 +21,7 @@ describe('AccountActivationMessage', () => {
  it('should match account already activated message', () => {
    render(
      <IntlProvider locale="en">
-        <AccountActivationMessage messageType={ACCOUNT_ACTIVATION_MESSAGE.INFO} />
+        <IntlAccountActivationMessage messageType={ACCOUNT_ACTIVATION_MESSAGE.INFO} />
      </IntlProvider>,
    );

@@ -32,7 +36,7 @@ describe('AccountActivationMessage', () => {
  it('should match account activated success message', () => {
    render(
      <IntlProvider locale="en">
-        <AccountActivationMessage messageType={ACCOUNT_ACTIVATION_MESSAGE.SUCCESS} />
+        <IntlAccountActivationMessage messageType={ACCOUNT_ACTIVATION_MESSAGE.SUCCESS} />
      </IntlProvider>,
    );

@@ -49,12 +53,12 @@ describe('AccountActivationMessage', () => {
  it('should match account activation error message', () => {
    render(
      <IntlProvider locale="en">
-        <AccountActivationMessage messageType={ACCOUNT_ACTIVATION_MESSAGE.ERROR} />
+        <IntlAccountActivationMessage messageType={ACCOUNT_ACTIVATION_MESSAGE.ERROR} />
      </IntlProvider>,
    );

    const expectedMessage = 'Your account could not be activated'
-                            + 'Something went wrong, please contact  to resolve this issue.';
+                            + 'Something went wrong, please contact support to resolve this issue.';

    expect(screen.getByText(
      '',
@@ -65,7 +69,7 @@ describe('AccountActivationMessage', () => {
  it('should not display anything for invalid message type', () => {
    const { container } = render(
      <IntlProvider locale="en">
-        <AccountActivationMessage messageType="invalid-message" />
+        <IntlAccountActivationMessage messageType="invalid-message" />
      </IntlProvider>,
    );

@@ -84,7 +88,7 @@ describe('EmailConfirmationMessage', () => {
  it('should match email already confirmed message', () => {
    render(
      <IntlProvider locale="en">
-        <AccountActivationMessage messageType={ACCOUNT_ACTIVATION_MESSAGE.INFO} />
+        <IntlAccountActivationMessage messageType={ACCOUNT_ACTIVATION_MESSAGE.INFO} />
      </IntlProvider>,
    );

@@ -99,7 +103,7 @@ describe('EmailConfirmationMessage', () => {
  it('should match email confirmation success message', () => {
    render(
      <IntlProvider locale="en">
-        <AccountActivationMessage messageType={ACCOUNT_ACTIVATION_MESSAGE.SUCCESS} />
+        <IntlAccountActivationMessage messageType={ACCOUNT_ACTIVATION_MESSAGE.SUCCESS} />
      </IntlProvider>,
    );
    const expectedMessage = 'Success! You have confirmed your email.Sign in to continue.';
@@ -113,11 +117,11 @@ describe('EmailConfirmationMessage', () => {
  it('should match email confirmation error message', () => {
    render(
      <IntlProvider locale="en">
-        <AccountActivationMessage messageType={ACCOUNT_ACTIVATION_MESSAGE.ERROR} />
+        <IntlAccountActivationMessage messageType={ACCOUNT_ACTIVATION_MESSAGE.ERROR} />
      </IntlProvider>,
    );
    const expectedMessage = 'Your email could not be confirmed'
-                            + 'Something went wrong, please contact  to resolve this issue.';
+                            + 'Something went wrong, please contact support to resolve this issue.';
    expect(screen.getByText(
      '',
      { selector: '#account-activation-message' },
--- a/src/login/tests/ChangePasswordPrompt.test.jsx
+++ b/src/login/tests/ChangePasswordPrompt.test.jsx
@@ -1,29 +1,18 @@
 import React from 'react';
-import { Provider } from 'react-redux';

 import { getConfig } from '@edx/frontend-platform';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import {
-  fireEvent, render, screen, waitFor,
+  fireEvent, render, screen,
 } from '@testing-library/react';
 import { act } from 'react-dom/test-utils';
 import { MemoryRouter } from 'react-router-dom';
-import configureStore from 'redux-mock-store';

-import mockTagular from '../../cohesion/utils';
 import { RESET_PAGE } from '../../data/constants';
 import ChangePasswordPrompt from '../ChangePasswordPrompt';

+const IntlChangePasswordPrompt = injectIntl(ChangePasswordPrompt);
 const mockedNavigator = jest.fn();
-const mockStore = configureStore();
-mockTagular();
-
-const eventData = {
-  pageType: 'test-page',
-  elementType: 'test-element-type',
-  webElementText: 'test-element-text',
-  webElementName: 'test-element-name',
-};

 jest.mock('react-router-dom', () => ({
  ...(jest.requireActual('react-router-dom')),
@@ -32,14 +21,8 @@ jest.mock('react-router-dom', () => ({

 describe('ChangePasswordPromptTests', () => {
  let props = {};
-  let store = {};
-
-  const initialState = {
-    cohesion: { eventData: {} },
-  };

  beforeAll(() => {
-    store = mockStore(initialState);
    Object.defineProperty(window, 'matchMedia', {
      writable: true,
      value: jest.fn().mockImplementation(query => ({
@@ -48,56 +31,38 @@ describe('ChangePasswordPromptTests', () => {
    });
  });

-  it('[nudge modal] should redirect to next url when user clicks close button', async () => {
+  it('[nudge modal] should redirect to next url when user clicks close button', () => {
    const dashboardUrl = getConfig().BASE_URL.concat('/dashboard');
    props = {
      variant: 'nudge',
      redirectUrl: dashboardUrl,
    };

-    store = mockStore({
-      ...initialState,
-      cohesion: {
-        eventData,
-      },
-    });
-
    delete window.location;
    window.location = { href: getConfig().BASE_URL };

    render(
      <IntlProvider locale="en">
-        <Provider store={store}>
-          <MemoryRouter>
-            <ChangePasswordPrompt {...props} />
-          </MemoryRouter>
-        </Provider>
+        <MemoryRouter>
+          <IntlChangePasswordPrompt {...props} />
+        </MemoryRouter>
      </IntlProvider>,
    );

    fireEvent.click(screen.getByText('Close'));
-    await waitFor(() => {
-      expect(window.location.href).toBe(dashboardUrl);
-    }, { timeout: 1100 });
+    expect(window.location.href).toBe(dashboardUrl);
  });

  it('[block modal] should redirect to reset password page when user clicks outside modal', async () => {
    props = {
      variant: 'block',
    };
-    store = mockStore({
-      ...initialState,
-      cohesion: {
-        eventData,
-      },
-    });
+
    render(
      <IntlProvider locale="en">
-        <Provider store={store}>
-          <MemoryRouter>
-            <ChangePasswordPrompt {...props} />
-          </MemoryRouter>
-        </Provider>
+        <MemoryRouter>
+          <IntlChangePasswordPrompt {...props} />
+        </MemoryRouter>
      </IntlProvider>,
    );

--- a/src/login/tests/LoginFailure.test.jsx
+++ b/src/login/tests/LoginFailure.test.jsx
@@ -1,12 +1,10 @@
 import React from 'react';
-import { Provider } from 'react-redux';

 import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import {
  render, screen,
 } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
-import configureStore from 'redux-mock-store';

 import {
  ACCOUNT_LOCKED_OUT,
@@ -27,27 +25,13 @@ import LoginFailureMessage from '../LoginFailure';
 jest.mock('@edx/frontend-platform/auth', () => ({
  getAuthService: jest.fn(),
 }));
-const mockStore = configureStore();

 const IntlLoginFailureMessage = injectIntl(LoginFailureMessage);

-const eventData = {
-  pageType: 'test-page',
-  elementType: 'test-element-type',
-  webElementText: 'test-element-text',
-  webElementName: 'test-element-name',
-};
-
 describe('LoginFailureMessage', () => {
  let props = {};
-  let store = {};
-
-  const initialState = {
-    cohesion: { eventData: {} },
-  };

  beforeAll(() => {
-    store = mockStore(initialState);
    Object.defineProperty(window, 'matchMedia', {
      writable: true,
      value: jest.fn().mockImplementation(query => ({
@@ -64,7 +48,7 @@ describe('LoginFailureMessage', () => {

    render(
      <IntlProvider locale="en">
-        <LoginFailureMessage {...props} />
+        <IntlLoginFailureMessage {...props} />
      </IntlProvider>,
    );

@@ -92,7 +76,7 @@ describe('LoginFailureMessage', () => {

    render(
      <IntlProvider locale="en">
-        <LoginFailureMessage {...props} />
+        <IntlLoginFailureMessage {...props} />
      </IntlProvider>,
    );

@@ -122,7 +106,7 @@ describe('LoginFailureMessage', () => {

    render(
      <IntlProvider locale="en">
-        <LoginFailureMessage {...props} />
+        <IntlLoginFailureMessage {...props} />
      </IntlProvider>,
    );

@@ -148,7 +132,7 @@ describe('LoginFailureMessage', () => {

    render(
      <IntlProvider locale="en">
-        <LoginFailureMessage {...props} />
+        <IntlLoginFailureMessage {...props} />
      </IntlProvider>,
    );

@@ -168,7 +152,7 @@ describe('LoginFailureMessage', () => {

    render(
      <IntlProvider locale="en">
-        <LoginFailureMessage {...props} />
+        <IntlLoginFailureMessage {...props} />
      </IntlProvider>,
    );

@@ -192,7 +176,7 @@ describe('LoginFailureMessage', () => {

    render(
      <IntlProvider locale="en">
-        <LoginFailureMessage {...props} />
+        <IntlLoginFailureMessage {...props} />
      </IntlProvider>,
    );

@@ -212,7 +196,7 @@ describe('LoginFailureMessage', () => {

    render(
      <IntlProvider locale="en">
-        <LoginFailureMessage {...props} />
+        <IntlLoginFailureMessage {...props} />
      </IntlProvider>,
    );

@@ -232,7 +216,7 @@ describe('LoginFailureMessage', () => {

    render(
      <IntlProvider locale="en">
-        <LoginFailureMessage {...props} />
+        <IntlLoginFailureMessage {...props} />
      </IntlProvider>,
    );

@@ -252,7 +236,7 @@ describe('LoginFailureMessage', () => {

    render(
      <IntlProvider locale="en">
-        <LoginFailureMessage {...props} />
+        <IntlLoginFailureMessage {...props} />
      </IntlProvider>,
    );

@@ -271,7 +255,7 @@ describe('LoginFailureMessage', () => {

    render(
      <IntlProvider locale="en">
-        <LoginFailureMessage {...props} />
+        <IntlLoginFailureMessage {...props} />
      </IntlProvider>,
    );

@@ -291,7 +275,7 @@ describe('LoginFailureMessage', () => {

    render(
      <IntlProvider locale="en">
-        <LoginFailureMessage {...props} />
+        <IntlLoginFailureMessage {...props} />
      </IntlProvider>,
    );

@@ -314,19 +298,11 @@ describe('LoginFailureMessage', () => {
      errorCount: 0,
    };

-    store = mockStore({
-      ...initialState,
-      cohesion: {
-        eventData,
-      },
-    });
    render(
      <IntlProvider locale="en">
-        <Provider store={store}>
-          <MemoryRouter>
-            <IntlLoginFailureMessage {...props} />
-          </MemoryRouter>
-        </Provider>
+        <MemoryRouter>
+          <IntlLoginFailureMessage {...props} />
+        </MemoryRouter>
      </IntlProvider>,
    );

@@ -347,20 +323,12 @@ describe('LoginFailureMessage', () => {
      errorCode: REQUIRE_PASSWORD_CHANGE,
      errorCount: 0,
    };
-    store = mockStore({
-      ...initialState,
-      cohesion: {
-        eventData,
-      },
-    });

    render(
      <IntlProvider locale="en">
-        <Provider store={store}>
-          <MemoryRouter>
-            <IntlLoginFailureMessage {...props} />
-          </MemoryRouter>
-        </Provider>
+        <MemoryRouter>
+          <IntlLoginFailureMessage {...props} />
+        </MemoryRouter>
      </IntlProvider>,
    );

@@ -391,7 +359,7 @@ describe('LoginFailureMessage', () => {

    render(
      <IntlProvider locale="en">
-        <LoginFailureMessage {...props} />
+        <IntlLoginFailureMessage {...props} />
      </IntlProvider>,
    );

--- a/src/login/tests/LoginPage.test.jsx
+++ b/src/login/tests/LoginPage.test.jsx
@@ -1,8 +1,9 @@
+import React from 'react';
 import { Provider } from 'react-redux';

 import { getConfig, mergeConfig } from '@edx/frontend-platform';
 import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import {
  fireEvent, render, screen, waitFor,
 } from '@testing-library/react';
@@ -10,10 +11,7 @@ import { act } from 'react-dom/test-utils';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';

-import mockTagular from '../../cohesion/utils';
-import {
-  APP_NAME, COMPLETE_STATE, LOGIN_PAGE, PENDING_STATE,
-} from '../../data/constants';
+import { COMPLETE_STATE, LOGIN_PAGE, PENDING_STATE } from '../../data/constants';
 import { backupLoginFormBegin, dismissPasswordResetBanner, loginRequest } from '../data/actions';
 import { INTERNAL_SERVER_ERROR } from '../data/constants';
 import LoginPage from '../LoginPage';
@@ -25,8 +23,8 @@ jest.mock('@edx/frontend-platform/analytics', () => ({
 jest.mock('@edx/frontend-platform/auth', () => ({
  getAuthService: jest.fn(),
 }));
-mockTagular();

+const IntlLoginPage = injectIntl(LoginPage);
 const mockStore = configureStore();

 describe('LoginPage', () => {
@@ -58,7 +56,6 @@ describe('LoginPage', () => {
    register: {
      validationApiRateLimited: false,
    },
-    cohesion: { eventData: {} },
  };

  const secondaryProviders = {
@@ -91,7 +88,7 @@ describe('LoginPage', () => {
  it('should submit form for valid input', () => {
    store.dispatch = jest.fn(store.dispatch);

-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));

    fireEvent.change(screen.getByText(
      '',
@@ -112,7 +109,7 @@ describe('LoginPage', () => {

  it('should not dispatch loginRequest on empty form submission', () => {
    store.dispatch = jest.fn(store.dispatch);
-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));

    fireEvent.click(screen.getByText(
      '',
@@ -131,7 +128,7 @@ describe('LoginPage', () => {
    });

    store.dispatch = jest.fn(store.dispatch);
-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));
    fireEvent.click(screen.getByText(
      '',
      { selector: '.btn-brand' },
@@ -145,7 +142,7 @@ describe('LoginPage', () => {
  it('should match state for invalid email (less than 2 characters), on form submission', () => {
    store.dispatch = jest.fn(store.dispatch);

-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));

    fireEvent.change(screen.getByText(
      '',
@@ -165,7 +162,7 @@ describe('LoginPage', () => {
  });

  it('should show error messages for required fields on empty form submission', () => {
-    const { container } = render(reduxWrapper(<LoginPage {...props} />));
+    const { container } = render(reduxWrapper(<IntlLoginPage {...props} />));
    fireEvent.click(screen.getByText(
      '',
      { selector: '.btn-brand' },
@@ -179,7 +176,7 @@ describe('LoginPage', () => {
  });

  it('should run frontend validations for emailOrUsername field on form submission', () => {
-    const { container } = render(reduxWrapper(<LoginPage {...props} />));
+    const { container } = render(reduxWrapper(<IntlLoginPage {...props} />));

    fireEvent.change(screen.getByText(
      '',
@@ -198,7 +195,7 @@ describe('LoginPage', () => {
  it('should reset field related error messages on onFocus event', async () => {
    store.dispatch = jest.fn(store.dispatch);

-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));

    await act(async () => {
      // clicking submit button with empty fields to make the errors appear
@@ -227,7 +224,7 @@ describe('LoginPage', () => {
  // ******** test form buttons and links ********

  it('should match default button state', () => {
-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(screen.getByText('Sign in')).toBeDefined();
  });

@@ -240,7 +237,7 @@ describe('LoginPage', () => {
      },
    });

-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));

    expect(screen.getByText(
      'pending',
@@ -248,7 +245,7 @@ describe('LoginPage', () => {
  });

  it('should show forgot password link', () => {
-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));

    expect(screen.getByText(
      'Forgot password',
@@ -268,7 +265,7 @@ describe('LoginPage', () => {
      },
    });

-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(screen.getByText(
      '',
      { selector: `#${ssoProvider.id}` },
@@ -290,7 +287,7 @@ describe('LoginPage', () => {
      },
    });

-    const { queryByText } = render(reduxWrapper(<LoginPage {...props} />));
+    const { queryByText } = render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(queryByText('Company or school credentials')).toBeNull();
    expect(queryByText('Or sign in with:')).toBeNull();
    expect(queryByText('Institution/campus credentials')).toBeNull();
@@ -310,7 +307,7 @@ describe('LoginPage', () => {
      },
    });

-    const { queryByText } = render(reduxWrapper(<LoginPage {...props} />));
+    const { queryByText } = render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(queryByText('Company or school credentials')).toBeNull();
    expect(queryByText('Or sign in with:')).toBeNull();
  });
@@ -330,7 +327,7 @@ describe('LoginPage', () => {
      },
    });

-    const { queryByText } = render(reduxWrapper(<LoginPage {...props} />));
+    const { queryByText } = render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(queryByText('Or sign in with:')).toBeDefined();
    expect(queryByText('Company or school credentials')).toBeDefined();
    expect(queryByText('Institution/campus credentials')).toBeDefined();
@@ -355,7 +352,7 @@ describe('LoginPage', () => {
      },
    });

-    const { queryByText } = render(reduxWrapper(<LoginPage {...props} />));
+    const { queryByText } = render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(queryByText('Or sign in with:')).toBeDefined();
    expect(queryByText('Company or school credentials')).toBeNull();
    expect(queryByText('Institution/campus credentials')).toBeDefined();
@@ -383,7 +380,7 @@ describe('LoginPage', () => {
      },
    });

-    const { queryByText } = render(reduxWrapper(<LoginPage {...props} />));
+    const { queryByText } = render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(queryByText('Or sign in with:')).toBeDefined();
    expect(queryByText('Institution/campus credentials')).toBeDefined();

@@ -403,7 +400,7 @@ describe('LoginPage', () => {
      },
    });

-    const { queryByText } = render(reduxWrapper(<LoginPage {...props} />));
+    const { queryByText } = render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(queryByText('Or sign in with:')).toBeNull();
    expect(queryByText('Institution/campus credentials')).toBeNull();
    expect(queryByText('Company or school credentials')).toBeNull();
@@ -421,7 +418,7 @@ describe('LoginPage', () => {
      },
    });

-    const { queryByText } = render(reduxWrapper(<LoginPage {...props} />));
+    const { queryByText } = render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(queryByText('Or sign in with:')).toBeDefined();
    expect(queryByText('Company or school credentials')).toBeNull();
    expect(queryByText('Institution/campus credentials')).toBeDefined();
@@ -444,7 +441,7 @@ describe('LoginPage', () => {
      },
    });

-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(screen.getByText(
      '',
      { selector: '#login-failure-alert' },
@@ -468,7 +465,7 @@ describe('LoginPage', () => {
                            + 'linked '}${ getConfig().SITE_NAME } account. To link your accounts, sign in now using your ${
                             getConfig().SITE_NAME } password.`;

-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(screen.getByText(
      '',
      { selector: '#tpa-alert' },
@@ -487,7 +484,7 @@ describe('LoginPage', () => {
        },
      },
    });
-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(screen.getByText(
      '',
      { selector: '#login-failure-alert' },
@@ -504,7 +501,7 @@ describe('LoginPage', () => {
      },
    });

-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(screen.getByText(
      '',
      { selector: '#login-failure-alert' },
@@ -513,7 +510,7 @@ describe('LoginPage', () => {

  // ******** test redirection ********

-  it('should redirect to url returned by login endpoint after successful authentication', async () => {
+  it('should redirect to url returned by login endpoint after successful authentication', () => {
    const dashboardURL = 'https://test.com/testing-dashboard/';
    store = mockStore({
      ...initialState,
@@ -528,13 +525,11 @@ describe('LoginPage', () => {

    delete window.location;
    window.location = { href: getConfig().BASE_URL };
-    render(reduxWrapper(<LoginPage {...props} />));
-    await waitFor(() => {
-      expect(window.location.href).toBe(dashboardURL);
-    }, { timeout: 1100 });
+    render(reduxWrapper(<IntlLoginPage {...props} />));
+    expect(window.location.href).toBe(dashboardURL);
  });

-  it('should redirect to finishAuthUrl upon successful login via SSO', async () => {
+  it('should redirect to finishAuthUrl upon successful login via SSO', () => {
    const authCompleteUrl = '/auth/complete/google-oauth2/';
    store = mockStore({
      ...initialState,
@@ -557,13 +552,11 @@ describe('LoginPage', () => {
    delete window.location;
    window.location = { href: getConfig().BASE_URL };

-    render(reduxWrapper(<LoginPage {...props} />));
-    await waitFor(() => {
-      expect(window.location.href).toBe(getConfig().LMS_BASE_URL + authCompleteUrl);
-    }, { timeout: 1100 });
+    render(reduxWrapper(<IntlLoginPage {...props} />));
+    expect(window.location.href).toBe(getConfig().LMS_BASE_URL + authCompleteUrl);
  });

-  it('should redirect to social auth provider url on SSO button click', async () => {
+  it('should redirect to social auth provider url on SSO button click', () => {
    store = mockStore({
      ...initialState,
      commonComponents: {
@@ -578,18 +571,16 @@ describe('LoginPage', () => {
    delete window.location;
    window.location = { href: getConfig().BASE_URL };

-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));

    fireEvent.click(screen.getByText(
      '',
      { selector: '#oa2-apple-id' },
    ));
-    await waitFor(() => {
-      expect(window.location.href).toBe(getConfig().LMS_BASE_URL + ssoProvider.loginUrl);
-    }, { timeout: 1100 });
+    expect(window.location.href).toBe(getConfig().LMS_BASE_URL + ssoProvider.loginUrl);
  });

-  it('should redirect to finishAuthUrl upon successful authentication via SSO', async () => {
+  it('should redirect to finishAuthUrl upon successful authentication via SSO', () => {
    const finishAuthUrl = '/auth/complete/google-oauth2/';
    store = mockStore({
      ...initialState,
@@ -609,10 +600,8 @@ describe('LoginPage', () => {
    delete window.location;
    window.location = { href: getConfig().BASE_URL };

-    render(reduxWrapper(<LoginPage {...props} />));
-    await waitFor(() => {
-      expect(window.location.href).toBe(getConfig().LMS_BASE_URL + finishAuthUrl);
-    }, { timeout: 1100 });
+    render(reduxWrapper(<IntlLoginPage {...props} />));
+    expect(window.location.href).toBe(getConfig().LMS_BASE_URL + finishAuthUrl);
  });

  // ******** test hinted third party auth ********
@@ -633,7 +622,7 @@ describe('LoginPage', () => {
    delete window.location;
    window.location = { href: getConfig().BASE_URL.concat(LOGIN_PAGE), search: `?next=/dashboard&tpa_hint=${ssoProvider.id}` };

-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(screen.getByText(
      '',
      { selector: `#${ssoProvider.id}` },
@@ -660,7 +649,7 @@ describe('LoginPage', () => {
    delete window.location;
    window.location = { href: getConfig().BASE_URL.concat(LOGIN_PAGE), search: `?next=/dashboard&tpa_hint=${ssoProvider.id}` };

-    const { container } = render(reduxWrapper(<LoginPage {...props} />));
+    const { container } = render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(container.querySelector('.react-loading-skeleton')).toBeTruthy();
  });

@@ -682,7 +671,7 @@ describe('LoginPage', () => {
    window.location = { href: getConfig().BASE_URL.concat(LOGIN_PAGE), search: `?next=/dashboard&tpa_hint=${secondaryProviders.id}` };
    secondaryProviders.iconImage = null;

-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(window.location.href).toEqual(getConfig().LMS_BASE_URL + secondaryProviders.loginUrl);
  });

@@ -702,7 +691,7 @@ describe('LoginPage', () => {
    delete window.location;
    window.location = { href: getConfig().BASE_URL.concat(LOGIN_PAGE), search: '?next=/dashboard&tpa_hint=invalid' };

-    const { container } = render(reduxWrapper(<LoginPage {...props} />));
+    const { container } = render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(container.querySelector(`#${ssoProvider.id}`).querySelector('#provider-name').textContent).toEqual(`${ssoProvider.name}`);

    mergeConfig({
@@ -726,7 +715,7 @@ describe('LoginPage', () => {
    delete window.location;
    window.location = { href: getConfig().BASE_URL.concat(LOGIN_PAGE), search: `?tpa_hint=${ssoProvider.id}` };

-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(screen.getByText(
      'Show me other ways to sign in or register',
    ).textContent).toBeDefined();
@@ -752,7 +741,7 @@ describe('LoginPage', () => {
    delete window.location;
    window.location = { href: getConfig().BASE_URL.concat(LOGIN_PAGE), search: `?tpa_hint=${ssoProvider.id}` };

-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(screen.getByText(
      'Show me other ways to sign in',
    ).textContent).toBeDefined();
@@ -761,8 +750,8 @@ describe('LoginPage', () => {
  // ******** miscellaneous tests ********

  it('should send page event when login page is rendered', () => {
-    render(reduxWrapper(<LoginPage {...props} />));
-    expect(sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'login', { app_name: APP_NAME });
+    render(reduxWrapper(<IntlLoginPage {...props} />));
+    expect(sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'login');
  });

  it('tests that form is in invalid state when it is submitted', () => {
@@ -775,7 +764,7 @@ describe('LoginPage', () => {
    });

    store.dispatch = jest.fn(store.dispatch);
-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(store.dispatch).toHaveBeenCalledWith(backupLoginFormBegin(
      {
        formFields: {
@@ -789,13 +778,13 @@ describe('LoginPage', () => {
  });

  it('should send track event when forgot password link is clicked', () => {
-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));
    fireEvent.click(screen.getByText(
      'Forgot password',
      { selector: '#forgot-password' },
    ));

-    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.password-reset_form.toggled', { category: 'user-engagement', app_name: APP_NAME });
+    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.password-reset_form.toggled', { category: 'user-engagement' });
  });

  it('should backup the login form state when shouldBackupState is true', () => {
@@ -808,7 +797,7 @@ describe('LoginPage', () => {
    });

    store.dispatch = jest.fn(store.dispatch);
-    render(reduxWrapper(<LoginPage {...props} />));
+    render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(store.dispatch).toHaveBeenCalledWith(backupLoginFormBegin(
      {
        formFields: {
@@ -837,7 +826,7 @@ describe('LoginPage', () => {
      },
    });

-    const { container } = render(reduxWrapper(<LoginPage {...props} />));
+    const { container } = render(reduxWrapper(<IntlLoginPage {...props} />));
    expect(container.querySelector('input#emailOrUsername').value).toEqual('john_doe');
    expect(container.querySelector('input#password').value).toEqual('test-password');
  });
--- a/src/logistration/Logistration.jsx
+++ b/src/logistration/Logistration.jsx
@@ -20,7 +20,7 @@ import {
  tpaProvidersSelector,
 } from '../common-components/data/selectors';
 import messages from '../common-components/messages';
-import { APP_NAME, LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
+import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
 import {
  getTpaHint, getTpaProvider, updatePathWithQueryParams,
 } from '../data/utils';
@@ -56,11 +56,11 @@ const Logistration = (props) => {
  }, [navigate, disablePublicAccountCreation]);

  const handleInstitutionLogin = (e) => {
-    sendTrackEvent('edx.bi.institution_login_form.toggled', { category: 'user-engagement', app_name: APP_NAME });
+    sendTrackEvent('edx.bi.institution_login_form.toggled', { category: 'user-engagement' });
    if (typeof e === 'string') {
-      sendPageEvent('login_and_registration', e === '/login' ? 'login' : 'register', { app_name: APP_NAME });
+      sendPageEvent('login_and_registration', e === '/login' ? 'login' : 'register');
    } else {
-      sendPageEvent('login_and_registration', e.target.dataset.eventName, { app_name: APP_NAME });
+      sendPageEvent('login_and_registration', e.target.dataset.eventName);
    }

    setInstitutionLogin(!institutionLogin);
@@ -70,8 +70,7 @@ const Logistration = (props) => {
    if (tabKey === currentTab) {
      return;
    }
-
-    sendTrackEvent(`edx.bi.${tabKey.replace('/', '')}_form.toggled`, { category: 'user-engagement', app_name: APP_NAME });
+    sendTrackEvent(`edx.bi.${tabKey.replace('/', '')}_form.toggled`, { category: 'user-engagement' });
    props.clearThirdPartyAuthContextErrorMessage();
    if (tabKey === LOGIN_PAGE) {
      props.backupRegistrationForm();
--- a/src/logistration/Logistration.test.jsx
+++ b/src/logistration/Logistration.test.jsx
@@ -1,8 +1,9 @@
+import React from 'react';
 import { Provider } from 'react-redux';

 import { getConfig, mergeConfig } from '@edx/frontend-platform';
 import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
-import { configure, IntlProvider } from '@edx/frontend-platform/i18n';
+import { configure, injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import { fireEvent, render, screen } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
@@ -10,23 +11,19 @@ import configureStore from 'redux-mock-store';
 import Logistration from './Logistration';
 import { clearThirdPartyAuthContextErrorMessage } from '../common-components/data/actions';
 import {
-  APP_NAME,
  COMPLETE_STATE, LOGIN_PAGE, REGISTER_PAGE,
 } from '../data/constants';
 import { backupLoginForm } from '../login/data/actions';
 import { backupRegistrationForm } from '../register/data/actions';
-import { NOT_INITIALIZED } from '../register/data/optimizelyExperiment/helper';
-import useAutoGeneratedUsernameExperimentVariation
-  from '../register/data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation';

 jest.mock('@edx/frontend-platform/analytics', () => ({
  sendPageEvent: jest.fn(),
  sendTrackEvent: jest.fn(),
 }));
 jest.mock('@edx/frontend-platform/auth');
-jest.mock('../register/data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation', () => jest.fn());

 const mockStore = configureStore();
+const IntlLogistration = injectIntl(Logistration);

 describe('Logistration', () => {
  let store = {};
@@ -67,7 +64,6 @@ describe('Logistration', () => {
      usernameSuggestions: [],
      validationApiRateLimited: false,
    },
-    cohesion: { eventData: {} },
    commonComponents: {
      thirdPartyAuthContext: {
        providers: [],
@@ -88,7 +84,6 @@ describe('Logistration', () => {
      })),
    }));

-    useAutoGeneratedUsernameExperimentVariation.mockReturnValue(NOT_INITIALIZED);
    configure({
      loggingService: { logError: jest.fn() },
      config: {
@@ -100,7 +95,7 @@ describe('Logistration', () => {
  });

  it('should do nothing when user clicks on the same tab (login/register) again', () => {
-    const { container } = render(reduxWrapper(<Logistration />));
+    const { container } = render(reduxWrapper(<IntlLogistration />));
    // While staying on the registration form, clicking the register tab again
    fireEvent.click(container.querySelector('a[data-rb-event-key="/register"]'));

@@ -112,14 +107,14 @@ describe('Logistration', () => {
      ALLOW_PUBLIC_ACCOUNT_CREATION: true,
    });

-    const { container } = render(reduxWrapper(<Logistration />));
+    const { container } = render(reduxWrapper(<IntlLogistration />));

    expect(container.querySelector('RegistrationPage')).toBeDefined();
  });

  it('should render login page', () => {
    const props = { selectedPage: LOGIN_PAGE };
-    const { container } = render(reduxWrapper(<Logistration {...props} />));
+    const { container } = render(reduxWrapper(<IntlLogistration {...props} />));

    expect(container.querySelector('LoginPage')).toBeDefined();
  });
@@ -130,7 +125,7 @@ describe('Logistration', () => {
    });

    let props = { selectedPage: LOGIN_PAGE };
-    const { rerender } = render(reduxWrapper(<Logistration {...props} />));
+    const { rerender } = render(reduxWrapper(<IntlLogistration {...props} />));

    // verifying sign in heading
    expect(screen.getByRole('heading', { level: 3 }).textContent).toEqual('Sign in');
@@ -138,7 +133,7 @@ describe('Logistration', () => {
    // register page is still accessible when SHOW_REGISTRATION_LINKS is false
    // but it needs to be accessed directly
    props = { selectedPage: REGISTER_PAGE };
-    rerender(reduxWrapper(<Logistration {...props} />));
+    rerender(reduxWrapper(<IntlLogistration {...props} />));

    // verifying register heading
    expect(screen.getByRole('heading', { level: 3 }).textContent).toEqual('Register');
@@ -165,7 +160,7 @@ describe('Logistration', () => {
    });

    const props = { selectedPage: LOGIN_PAGE };
-    const { container } = render(reduxWrapper(<Logistration {...props} />));
+    const { container } = render(reduxWrapper(<IntlLogistration {...props} />));

    // verifying sign in heading for institution login false
    expect(screen.getByRole('heading', { level: 3 }).textContent).toEqual('Sign in');
@@ -195,7 +190,7 @@ describe('Logistration', () => {
    });

    const props = { selectedPage: LOGIN_PAGE };
-    render(reduxWrapper(<Logistration {...props} />));
+    render(reduxWrapper(<IntlLogistration {...props} />));
    expect(screen.getByText('Institution/campus credentials')).toBeDefined();

    // on clicking "Institution/campus credentials" button, it should display institution login page
@@ -226,11 +221,11 @@ describe('Logistration', () => {
    });

    const props = { selectedPage: LOGIN_PAGE };
-    render(reduxWrapper(<Logistration {...props} />));
+    render(reduxWrapper(<IntlLogistration {...props} />));
    fireEvent.click(screen.getByText('Institution/campus credentials'));

-    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.institution_login_form.toggled', { category: 'user-engagement', app_name: APP_NAME });
-    expect(sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'institution_login', { app_name: APP_NAME });
+    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.institution_login_form.toggled', { category: 'user-engagement' });
+    expect(sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'institution_login');

    mergeConfig({
      DISABLE_ENTERPRISE_LOGIN: '',
@@ -258,7 +253,7 @@ describe('Logistration', () => {
    delete window.location;
    window.location = { hostname: getConfig().SITE_NAME, href: getConfig().BASE_URL };

-    render(reduxWrapper(<Logistration />));
+    render(reduxWrapper(<IntlLogistration />));
    fireEvent.click(screen.getByText('Institution/campus credentials'));
    expect(screen.getByText('Test University')).toBeDefined();

@@ -269,7 +264,7 @@ describe('Logistration', () => {

  it('should fire action to backup registration form on tab click', () => {
    store.dispatch = jest.fn(store.dispatch);
-    const { container } = render(reduxWrapper(<Logistration />));
+    const { container } = render(reduxWrapper(<IntlLogistration />));
    fireEvent.click(container.querySelector('a[data-rb-event-key="/login"]'));
    expect(store.dispatch).toHaveBeenCalledWith(backupRegistrationForm());
  });
@@ -277,14 +272,14 @@ describe('Logistration', () => {
  it('should fire action to backup login form on tab click', () => {
    store.dispatch = jest.fn(store.dispatch);
    const props = { selectedPage: LOGIN_PAGE };
-    const { container } = render(reduxWrapper(<Logistration {...props} />));
+    const { container } = render(reduxWrapper(<IntlLogistration {...props} />));
    fireEvent.click(container.querySelector('a[data-rb-event-key="/register"]'));
    expect(store.dispatch).toHaveBeenCalledWith(backupLoginForm());
  });

  it('should clear tpa context errorMessage tab click', () => {
    store.dispatch = jest.fn(store.dispatch);
-    const { container } = render(reduxWrapper(<Logistration />));
+    const { container } = render(reduxWrapper(<IntlLogistration />));
    fireEvent.click(container.querySelector('a[data-rb-event-key="/login"]'));
    expect(store.dispatch).toHaveBeenCalledWith(clearThirdPartyAuthContextErrorMessage());
  });
--- a/src/plugin-slots/MainAppSlot/MainAppSlot.test.jsx
+++ b/src/plugin-slots/MainAppSlot/MainAppSlot.test.jsx
@@ -1,29 +0,0 @@
-import { PluginSlot } from '@openedx/frontend-plugin-framework';
-import { render } from '@testing-library/react';
-
-import MainAppSlot from './index';
-
-jest.mock('@openedx/frontend-plugin-framework', () => ({
-  PluginSlot: jest.fn(() => null),
-}));
-
-describe('MainAppSlot', () => {
-  it('renders without crashing', () => {
-    render(<MainAppSlot />);
-  });
-
-  it('renders a PluginSlot component', () => {
-    render(<MainAppSlot />);
-    expect(PluginSlot).toHaveBeenCalled();
-  });
-
-  it('passes the correct id prop to PluginSlot', () => {
-    render(<MainAppSlot />);
-    expect(PluginSlot).toHaveBeenCalledWith({ id: 'main_app_slot' }, {});
-  });
-
-  it('does not render any children', () => {
-    const { container } = render(<MainAppSlot />);
-    expect(container.firstChild).toBeNull();
-  });
-});
--- a/src/plugin-slots/MainAppSlot/README.md
+++ b/src/plugin-slots/MainAppSlot/README.md
@@ -1,41 +0,0 @@
-# Main App Slot
-
-### Slot ID: `main_app_slot`
-
-## Description
-
-This slot is used for adding content at the root level.
-
-## Example
-
-The following `env.config.jsx` will render a component at the MFE root level.
-
-![Screenshot of Content added after the Main App Slot](./images/main_app_slot.png)
-
-```js
-import {
-  DIRECT_PLUGIN,
-  PLUGIN_OPERATIONS,
-} from "@openedx/frontend-plugin-framework";
-import { ExampleComponent } from "@openedx/frontend-plugin-example";
-
-const config = {
-  pluginSlots: {
-    main_app_slot: {
-      plugins: [
-        {
-          op: PLUGIN_OPERATIONS.Insert,
-          widget: {
-            id: "example-component",
-            type: DIRECT_PLUGIN,
-            priority: 60,
-            RenderWidget: ExampleComponent,
-          },
-        },
-      ],
-    },
-  },
-};
-
-export default config;
-```
--- a/src/plugin-slots/MainAppSlot/images/main_app_slot.png
+++ b/src/plugin-slots/MainAppSlot/images/main_app_slot.png
--- a/src/plugin-slots/MainAppSlot/index.jsx
+++ b/src/plugin-slots/MainAppSlot/index.jsx
@@ -1,7 +0,0 @@
-import { PluginSlot } from '@openedx/frontend-plugin-framework';
-
-const MainAppSlot = () => (
-  <PluginSlot id="main_app_slot" />
-);
-
-export default MainAppSlot;
--- a/src/plugin-slots/README.md
+++ b/src/plugin-slots/README.md
@@ -1,3 +0,0 @@
-# `frontend-app-authn` Plugin Slots
-
- [`main_app_slot`](./MainAppSlot/)
--- a/src/progressive-profiling/ProgressiveProfiling.jsx
+++ b/src/progressive-profiling/ProgressiveProfiling.jsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { connect } from 'react-redux';

 import { getConfig, snakeCaseObject } from '@edx/frontend-platform';
-import { identifyAuthenticatedUser } from '@edx/frontend-platform/analytics';
+import { identifyAuthenticatedUser, sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
 import {
  AxiosJwtAuthService,
  configure as configureAuth,
@@ -39,13 +39,6 @@ import {
 import isOneTrustFunctionalCookieEnabled from '../data/oneTrust';
 import { getAllPossibleQueryParams, isHostAvailableInQueryParams } from '../data/utils';
 import { FormFieldRenderer } from '../field-renderer';
-import {
-  trackDisablePostRegistrationRecommendations,
-  trackProgressiveProfilingPageViewed,
-  trackProgressiveProfilingSkipLinkClick,
-  trackProgressiveProfilingSubmitClick,
-  trackProgressiveProfilingSupportLinkCLick,
-} from '../tracking/trackers/progressive-profiling';

 const ProgressiveProfiling = (props) => {
  const { formatMessage } = useIntl();
@@ -105,13 +98,14 @@ const ProgressiveProfiling = (props) => {
  useEffect(() => {
    if (authenticatedUser?.userId) {
      identifyAuthenticatedUser(authenticatedUser.userId);
-      trackProgressiveProfilingPageViewed();
+      sendPageEvent('login_and_registration', 'welcome');
    }
  }, [authenticatedUser]);

  useEffect(() => {
    if (!enablePostRegistrationRecommendations) {
-      trackDisablePostRegistrationRecommendations(
+      sendTrackEvent(
+        'edx.bi.user.recommendations.not.enabled',
        { functionalCookiesConsent, page: 'authn_recommendations' },
      );
      return;
@@ -155,23 +149,29 @@ const ProgressiveProfiling = (props) => {
      });
    }
    props.saveUserProfile(authenticatedUser.username, snakeCaseObject(payload));
-    const eventProperties = {
-      isGenderSelected: !!values.gender,
-      isYearOfBirthSelected: !!values.year_of_birth,
-      isLevelOfEducationSelected: !!values.level_of_education,
-      isWorkExperienceSelected: !!values.work_experience,
-      host: queryParams?.host || '',
-    };
-    trackProgressiveProfilingSubmitClick(eventProperties);
+
+    sendTrackEvent(
+      'edx.bi.welcome.page.submit.clicked',
+      {
+        isGenderSelected: !!values.gender,
+        isYearOfBirthSelected: !!values.year_of_birth,
+        isLevelOfEducationSelected: !!values.level_of_education,
+        isWorkExperienceSelected: !!values.work_experience,
+        host: queryParams?.host || '',
+      },
+    );
  };

  const handleSkip = (e) => {
    e.preventDefault();
    window.history.replaceState(location.state, null, '');
    setShowModal(true);
-    trackProgressiveProfilingSkipLinkClick({
-      host: queryParams?.host || '',
-    });
+    sendTrackEvent(
+      'edx.bi.welcome.page.skip.link.clicked',
+      {
+        host: queryParams?.host || '',
+      },
+    );
  };

  const onChangeHandler = (e) => {
@@ -242,7 +242,7 @@ const ProgressiveProfiling = (props) => {
                    destination={getConfig().AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK}
                    target="_blank"
                    showLaunchIcon={false}
-                    onClick={() => (trackProgressiveProfilingSupportLinkCLick())}
+                    onClick={() => (sendTrackEvent('edx.bi.welcome.page.support.link.clicked'))}
                  >
                    {formatMessage(messages['optional.fields.information.link'])}
                  </Hyperlink>
--- a/src/progressive-profiling/tests/ProgressiveProfiling.test.jsx
+++ b/src/progressive-profiling/tests/ProgressiveProfiling.test.jsx
@@ -1,18 +1,17 @@
+import React from 'react';
 import { Provider } from 'react-redux';

 import { getConfig, mergeConfig } from '@edx/frontend-platform';
 import { identifyAuthenticatedUser, sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { configure, IntlProvider } from '@edx/frontend-platform/i18n';
+import { configure, injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import {
-  fireEvent, render, screen, waitFor,
+  fireEvent, render, screen,
 } from '@testing-library/react';
 import { MemoryRouter, mockNavigate, useLocation } from 'react-router-dom';
 import configureStore from 'redux-mock-store';

-import mockTagular from '../../cohesion/utils';
 import {
-  APP_NAME,
  AUTHN_PROGRESSIVE_PROFILING,
  COMPLETE_STATE, DEFAULT_REDIRECT_URL,
  EMBEDDED,
@@ -23,8 +22,8 @@ import {
 import { saveUserProfile } from '../data/actions';
 import ProgressiveProfiling from '../ProgressiveProfiling';

+const IntlProgressiveProfilingPage = injectIntl(ProgressiveProfiling);
 const mockStore = configureStore();
-mockTagular();

 jest.mock('@edx/frontend-platform/analytics', () => ({
  sendPageEvent: jest.fn(),
@@ -55,13 +54,6 @@ jest.mock('react-router-dom', () => {
  };
 });

-const eventData = {
-  pageType: 'test-page',
-  elementType: 'test-element-type',
-  webElementText: 'test-element-text',
-  webElementName: 'test-element-name',
-};
-
 describe('ProgressiveProfilingTests', () => {
  let store = {};

@@ -122,7 +114,7 @@ describe('ProgressiveProfilingTests', () => {
    mergeConfig({
      AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK: '',
    });
-    const { queryByRole } = render(reduxWrapper(<ProgressiveProfiling />));
+    const { queryByRole } = render(reduxWrapper(<IntlProgressiveProfilingPage />));
    const button = queryByRole('button', { name: /learn more about how we use this information/i });

    expect(button).toBeNull();
@@ -133,7 +125,7 @@ describe('ProgressiveProfilingTests', () => {
      AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK: 'http://localhost:1999/support',
    });

-    const { getByText } = render(reduxWrapper(<ProgressiveProfiling />));
+    const { getByText } = render(reduxWrapper(<IntlProgressiveProfilingPage />));

    const learnMoreButton = getByText('Learn more about how we use this information.');

@@ -143,7 +135,7 @@ describe('ProgressiveProfilingTests', () => {
  it('should open modal on pressing skip for now button', () => {
    delete window.location;
    window.location = { href: getConfig().BASE_URL.concat(AUTHN_PROGRESSIVE_PROFILING) };
-    const { getByRole } = render(reduxWrapper(<ProgressiveProfiling />));
+    const { getByRole } = render(reduxWrapper(<IntlProgressiveProfilingPage />));

    const skipButton = getByRole('button', { name: /skip for now/i });
    fireEvent.click(skipButton);
@@ -151,15 +143,14 @@ describe('ProgressiveProfilingTests', () => {
    const modalContentContainer = document.getElementsByClassName('.pgn__modal-content-container');

    expect(modalContentContainer).toBeTruthy();
-    const payload = { host: '', app_name: APP_NAME };

-    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.welcome.page.skip.link.clicked', payload);
+    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.welcome.page.skip.link.clicked', { host: '' });
  });

  // ******** test event functionality ********

  it('should make identify call to segment on progressive profiling page', () => {
-    render(reduxWrapper(<ProgressiveProfiling />));
+    render(reduxWrapper(<IntlProgressiveProfilingPage />));

    expect(identifyAuthenticatedUser).toHaveBeenCalledWith(3);
    expect(identifyAuthenticatedUser).toHaveBeenCalled();
@@ -169,12 +160,12 @@ describe('ProgressiveProfilingTests', () => {
    mergeConfig({
      AUTHN_PROGRESSIVE_PROFILING_SUPPORT_LINK: 'http://localhost:1999/support',
    });
-    render(reduxWrapper(<ProgressiveProfiling />));
+    render(reduxWrapper(<IntlProgressiveProfilingPage />));

    const supportLink = screen.getByRole('link', { name: /learn more about how we use this information/i });
    fireEvent.click(supportLink);

-    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.welcome.page.support.link.clicked', { app_name: APP_NAME });
+    expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.welcome.page.support.link.clicked');
  });

  it('should set empty host property value for non-embedded experience', () => {
@@ -184,11 +175,10 @@ describe('ProgressiveProfilingTests', () => {
      isLevelOfEducationSelected: false,
      isWorkExperienceSelected: false,
      host: '',
-      app_name: APP_NAME,
    };
    delete window.location;
    window.location = { href: getConfig().BASE_URL.concat(AUTHN_PROGRESSIVE_PROFILING) };
-    render(reduxWrapper(<ProgressiveProfiling />));
+    render(reduxWrapper(<IntlProgressiveProfilingPage />));

    const nextButton = screen.getByText('Next');
    fireEvent.click(nextButton);
@@ -204,7 +194,7 @@ describe('ProgressiveProfilingTests', () => {
      extended_profile: [{ field_name: 'company', field_value: 'test company' }],
    };
    store.dispatch = jest.fn(store.dispatch);
-    const { getByLabelText, getByText } = render(reduxWrapper(<ProgressiveProfiling />));
+    const { getByLabelText, getByText } = render(reduxWrapper(<IntlProgressiveProfilingPage />));

    const genderSelect = getByLabelText('Gender');
    const companyInput = getByLabelText('Company');
@@ -226,7 +216,7 @@ describe('ProgressiveProfilingTests', () => {
      },
    });

-    const { container } = render(reduxWrapper(<ProgressiveProfiling />));
+    const { container } = render(reduxWrapper(<IntlProgressiveProfilingPage />));
    const errorElement = container.querySelector('#pp-page-errors');

    expect(errorElement).toBeTruthy();
@@ -242,7 +232,7 @@ describe('ProgressiveProfilingTests', () => {
      href: getConfig().BASE_URL,
    };

-    render(reduxWrapper(<ProgressiveProfiling />));
+    render(reduxWrapper(<IntlProgressiveProfilingPage />));
    expect(window.location.href).toEqual(DASHBOARD_URL);
  });

@@ -259,11 +249,8 @@ describe('ProgressiveProfilingTests', () => {
          ...initialState.welcomePage,
          success: true,
        },
-        cohesion: {
-          eventData,
-        },
      });
-      const { container } = render(reduxWrapper(<ProgressiveProfiling />));
+      const { container } = render(reduxWrapper(<IntlProgressiveProfilingPage />));
      const nextButton = container.querySelector('button.btn-brand');
      expect(nextButton.textContent).toEqual('Next');

@@ -288,18 +275,13 @@ describe('ProgressiveProfilingTests', () => {
          ...initialState.welcomePage,
          success: true,
        },
-        cohesion: {
-          eventData,
-        },
      });

-      const { container } = render(reduxWrapper(<ProgressiveProfiling />));
+      const { container } = render(reduxWrapper(<IntlProgressiveProfilingPage />));
      const nextButton = container.querySelector('button.btn-brand');
      expect(nextButton.textContent).toEqual('Submit');

-      await waitFor(() => {
-        expect(window.location.href).toEqual(redirectUrl);
-      }, { timeout: 1100 });
+      expect(window.location.href).toEqual(redirectUrl);
    });
  });

@@ -329,12 +311,12 @@ describe('ProgressiveProfilingTests', () => {
        href: getConfig().BASE_URL.concat(AUTHN_PROGRESSIVE_PROFILING),
        search: `?host=${host}&variant=${EMBEDDED}`,
      };
-      render(reduxWrapper(<ProgressiveProfiling />));
+      render(reduxWrapper(<IntlProgressiveProfilingPage />));

      const skipLinkButton = screen.getByText('Skip for now');
      fireEvent.click(skipLinkButton);

-      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.welcome.page.skip.link.clicked', { host, app_name: APP_NAME });
+      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.welcome.page.skip.link.clicked', { host });
    });

    it('should show spinner while fetching the optional fields', () => {
@@ -354,7 +336,7 @@ describe('ProgressiveProfilingTests', () => {
        },
      });

-      const { container } = render(reduxWrapper(<ProgressiveProfiling />));
+      const { container } = render(reduxWrapper(<IntlProgressiveProfilingPage />));

      const tpaSpinnerElement = container.querySelector('#tpa-spinner');
      expect(tpaSpinnerElement).toBeTruthy();
@@ -367,14 +349,13 @@ describe('ProgressiveProfilingTests', () => {
        isLevelOfEducationSelected: false,
        isWorkExperienceSelected: false,
        host: 'http://example.com',
-        app_name: APP_NAME,
      };
      delete window.location;
      window.location = {
        href: getConfig().BASE_URL.concat(AUTHN_PROGRESSIVE_PROFILING),
        search: `?host=${host}`,
      };
-      render(reduxWrapper(<ProgressiveProfiling />));
+      render(reduxWrapper(<IntlProgressiveProfilingPage />));
      const submitButton = screen.getByText('Next');
      fireEvent.click(submitButton);

@@ -389,7 +370,7 @@ describe('ProgressiveProfilingTests', () => {
        search: `?variant=${EMBEDDED}&host=${host}`,
      };

-      const { container } = render(reduxWrapper(<ProgressiveProfiling />));
+      const { container } = render(reduxWrapper(<IntlProgressiveProfilingPage />));

      const genderField = container.querySelector('#gender');
      expect(genderField).toBeTruthy();
@@ -410,11 +391,11 @@ describe('ProgressiveProfilingTests', () => {
        },
      });

-      render(reduxWrapper(<ProgressiveProfiling />));
+      render(reduxWrapper(<IntlProgressiveProfilingPage />));
      expect(window.location.href).toBe(DASHBOARD_URL);
    });

-    it('should redirect to provided redirect url', async () => {
+    it('should redirect to provided redirect url', () => {
      const redirectUrl = 'https://redirect-test.com';
      delete window.location;
      window.location = {
@@ -436,17 +417,12 @@ describe('ProgressiveProfilingTests', () => {
          ...initialState.welcomePage,
          success: true,
        },
-        cohesion: {
-          eventData,
-        },
      });

-      render(reduxWrapper(<ProgressiveProfiling />));
+      render(reduxWrapper(<IntlProgressiveProfilingPage />));
      const submitButton = screen.getByText('Submit');
      fireEvent.click(submitButton);
-      await waitFor(() => {
-        expect(window.location.href).toBe(redirectUrl);
-      }, { timeout: 1100 });
+      expect(window.location.href).toBe(redirectUrl);
    });
  });
 });
--- a/src/recommendations/RecommendationsPageLayouts/SmallLayout.test.jsx
+++ b/src/recommendations/RecommendationsPageLayouts/SmallLayout.test.jsx
@@ -1,9 +1,13 @@
-import { IntlProvider } from '@edx/frontend-platform/i18n';
+import React from 'react';
+
+import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import { render } from '@testing-library/react';

 import SmallLayout from './SmallLayout';
 import mockedRecommendedProducts from '../data/tests/mockedData';

+const IntlRecommendationsSmallLayoutPage = injectIntl(SmallLayout);
+
 jest.mock('react-router-dom', () => ({
  ...jest.requireActual('react-router-dom'),
  useLocation: jest.fn(),
@@ -32,7 +36,7 @@ describe('RecommendationsPageTests', () => {
  });

  it('should render recommendations when recommendations are not loading', () => {
-    const { container } = render(reduxWrapper(<SmallLayout {...props} />));
+    const { container } = render(reduxWrapper(<IntlRecommendationsSmallLayoutPage {...props} />));

    const reactLoadingSkeleton = container.querySelector('.react-loading-skeleton');

@@ -44,7 +48,7 @@ describe('RecommendationsPageTests', () => {
      ...props,
      isLoading: true,
    };
-    const { container } = render(reduxWrapper(<SmallLayout {...props} />));
+    const { container } = render(reduxWrapper(<IntlRecommendationsSmallLayoutPage {...props} />));

    const reactLoadingSkeleton = container.querySelector('.react-loading-skeleton');

--- a/src/recommendations/data/tests/hooks.test.jsx
+++ b/src/recommendations/data/tests/hooks.test.jsx
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react';
+import { renderHook } from '@testing-library/react-hooks';
 import algoliasearchHelper from 'algoliasearch-helper';

 import mockedRecommendedProducts from './mockedData';
--- a/src/recommendations/tests/RecommendationsList.test.jsx
+++ b/src/recommendations/tests/RecommendationsList.test.jsx
@@ -1,12 +1,14 @@
+import React from 'react';
 import { Provider } from 'react-redux';

-import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import { render } from '@testing-library/react';
 import configureStore from 'redux-mock-store';

 import mockedProductData from './mockedData';
 import RecommendationList from '../RecommendationsList';

+const IntlRecommendationList = injectIntl(RecommendationList);
 const mockStore = configureStore();

 describe('RecommendationsListTests', () => {
@@ -23,7 +25,7 @@ describe('RecommendationsListTests', () => {
      userId: 1234567,
    };

-    const { container } = render(reduxWrapper(<RecommendationList {...props} />));
+    const { container } = render(reduxWrapper(<IntlRecommendationList {...props} />));

    const recommendationCards = container.querySelectorAll('.recommendation-card');
    expect(recommendationCards.length).toEqual(mockedProductData.length);
@@ -35,7 +37,7 @@ describe('RecommendationsListTests', () => {
      userId: 1234567,
    };

-    const { getByText } = render(reduxWrapper(<RecommendationList {...props} />));
+    const { getByText } = render(reduxWrapper(<IntlRecommendationList {...props} />));

    const firstFooterContent = getByText('1 Course');
    const secondFooterContent = getByText('2 Courses');
--- a/src/recommendations/tests/RecommendationsPage.test.jsx
+++ b/src/recommendations/tests/RecommendationsPage.test.jsx
@@ -1,8 +1,9 @@
+import React from 'react';
 import { Provider } from 'react-redux';

 import { getConfig } from '@edx/frontend-platform';
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import { useMediaQuery } from '@openedx/paragon';
 import { fireEvent, render } from '@testing-library/react';
 import { useLocation } from 'react-router-dom';
@@ -15,6 +16,7 @@ import mockedRecommendedProducts from '../data/tests/mockedData';
 import RecommendationsPage from '../RecommendationsPage';
 import { eventNames, getProductMapping } from '../track';

+const IntlRecommendationsPage = injectIntl(RecommendationsPage);
 const mockStore = configureStore();

 jest.mock('@edx/frontend-platform/analytics', () => ({
@@ -75,7 +77,7 @@ describe('RecommendationsPageTests', () => {
  });

  it('should redirect to dashboard if user is not coming from registration workflow', () => {
-    render(reduxWrapper(<RecommendationsPage />));
+    render(reduxWrapper(<IntlRecommendationsPage />));
    expect(window.location.href).toEqual(dashboardUrl);
  });

@@ -84,14 +86,14 @@ describe('RecommendationsPageTests', () => {
      recommendations: [],
      isLoading: false,
    });
-    render(reduxWrapper(<RecommendationsPage />));
+    render(reduxWrapper(<IntlRecommendationsPage />));
    expect(window.location.href).toEqual(dashboardUrl);
  });

  it('should redirect user if they click "Skip for now" button', () => {
    mockUseLocation();
    jest.useFakeTimers();
-    const { container } = render(reduxWrapper(<RecommendationsPage />));
+    const { container } = render(reduxWrapper(<IntlRecommendationsPage />));
    const skipButton = container.querySelector('.pgn__stateful-btn-state-default');
    fireEvent.click(skipButton);
    jest.advanceTimersByTime(300);
@@ -101,7 +103,7 @@ describe('RecommendationsPageTests', () => {
  it('should display recommendations small layout for small screen', () => {
    mockUseLocation();
    useMediaQuery.mockReturnValue(true);
-    const { container } = render(reduxWrapper(<RecommendationsPage />));
+    const { container } = render(reduxWrapper(<IntlRecommendationsPage />));

    const recommendationsSmallLayout = container.querySelector('#recommendations-small-layout');
    const reactLoadingSkeleton = container.querySelector('.react-loading-skeleton');
@@ -113,7 +115,7 @@ describe('RecommendationsPageTests', () => {
  it('should display recommendations large layout for large screen', () => {
    mockUseLocation();
    useMediaQuery.mockReturnValue(false);
-    const { container } = render(reduxWrapper(<RecommendationsPage />));
+    const { container } = render(reduxWrapper(<IntlRecommendationsPage />));

    const pgnCollapsible = container.querySelector('.pgn_collapsible');
    const reactLoadingSkeleton = container.querySelector('.react-loading-skeleton');
@@ -129,7 +131,7 @@ describe('RecommendationsPageTests', () => {
      recommendations: [],
      isLoading: true,
    });
-    const { container } = render(reduxWrapper(<RecommendationsPage />));
+    const { container } = render(reduxWrapper(<IntlRecommendationsPage />));

    const reactLoadingSkeleton = container.querySelector('.react-loading-skeleton');

@@ -143,7 +145,7 @@ describe('RecommendationsPageTests', () => {
      recommendations: [],
      isLoading: true,
    });
-    const { container } = render(reduxWrapper(<RecommendationsPage />));
+    const { container } = render(reduxWrapper(<IntlRecommendationsPage />));

    const reactLoadingSkeleton = container.querySelector('.react-loading-skeleton');

@@ -158,7 +160,7 @@ describe('RecommendationsPageTests', () => {
    });

    useMediaQuery.mockReturnValue(false);
-    render(reduxWrapper(<RecommendationsPage />));
+    render(reduxWrapper(<IntlRecommendationsPage />));

    expect(sendTrackEvent).toBeCalled();
    expect(sendTrackEvent).toHaveBeenCalledWith(
--- a/src/recommendations/track.js
+++ b/src/recommendations/track.js
@@ -15,7 +15,7 @@ const generateProductKey = (product) => (
 export const getProductMapping = (recommendedProducts) => recommendedProducts.map((product) => ({
  product_key: generateProductKey(product),
  product_line: product.cardType,
-  product_source: product?.productSource?.name,
+  product_source: product.productSource.name,
 }));

 export const trackRecommendationClick = (product, position, userId) => {
@@ -25,7 +25,7 @@ export const trackRecommendationClick = (product, position, userId) => {
    recommendation_type: product.recommendationType,
    product_key: generateProductKey(product),
    product_line: product.cardType,
-    product_source: product?.productSource?.name,
+    product_source: product.productSource.name,
    user_id: userId,
  });

--- a/src/register/RegistrationFields/CountryField/CountryField.test.jsx
+++ b/src/register/RegistrationFields/CountryField/CountryField.test.jsx
@@ -1,7 +1,8 @@
+import React from 'react';
 import { Provider } from 'react-redux';

 import { mergeConfig } from '@edx/frontend-platform';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import { fireEvent, render } from '@testing-library/react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
@@ -9,6 +10,7 @@ import configureStore from 'redux-mock-store';
 import { COUNTRY_CODE_KEY, COUNTRY_DISPLAY_KEY } from './validator';
 import { CountryField } from '../index';

+const IntlCountryField = injectIntl(CountryField);
 const mockStore = configureStore();

 jest.mock('react-router-dom', () => {
@@ -80,7 +82,7 @@ describe('CountryField', () => {
    };

    it('should run country field validation when onBlur is fired', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<CountryField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlCountryField {...props} />)));
      const countryInput = container.querySelector('input[name="country"]');

      fireEvent.blur(countryInput, {
@@ -95,7 +97,7 @@ describe('CountryField', () => {
    });

    it('should run country field validation when country name is invalid', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<CountryField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlCountryField {...props} />)));
      const countryInput = container.querySelector('input[name="country"]');

      fireEvent.blur(countryInput, {
@@ -110,7 +112,7 @@ describe('CountryField', () => {
    });

    it('should not run country field validation when onBlur is fired by drop-down arrow icon click', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<CountryField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlCountryField {...props} />)));
      const countryInput = container.querySelector('input[name="country"]');
      const dropdownArrowIcon = container.querySelector('.btn-icon.pgn__form-autosuggest__icon-button');

@@ -123,7 +125,7 @@ describe('CountryField', () => {
    });

    it('should update errors for frontend validations', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<CountryField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlCountryField {...props} />)));
      const countryInput = container.querySelector('input[name="country"]');

      fireEvent.blur(countryInput, { target: { value: '', name: 'country' } });
@@ -133,7 +135,7 @@ describe('CountryField', () => {
    });

    it('should clear error on focus', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<CountryField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlCountryField {...props} />)));
      const countryInput = container.querySelector('input[name="country"]');

      fireEvent.focus(countryInput);
@@ -151,7 +153,7 @@ describe('CountryField', () => {
        },
      });

-      const { container } = render(routerWrapper(reduxWrapper(<CountryField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlCountryField {...props} />)));

      container.querySelector('input[name="country"]');
      expect(props.onChangeHandler).toHaveBeenCalledTimes(1);
@@ -162,7 +164,7 @@ describe('CountryField', () => {
    });

    it('should set option on dropdown menu item click', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<CountryField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlCountryField {...props} />)));

      const dropdownButton = container.querySelector('.pgn__form-autosuggest__icon-button');
      fireEvent.click(dropdownButton);
@@ -179,7 +181,7 @@ describe('CountryField', () => {

    it('should set value on change', () => {
      const { container } = render(
-        routerWrapper(reduxWrapper(<CountryField {...props} />)),
+        routerWrapper(reduxWrapper(<IntlCountryField {...props} />)),
      );

      const countryInput = container.querySelector('input[name="country"]');
@@ -198,7 +200,7 @@ describe('CountryField', () => {
        errorMessage: 'country error message',
      };

-      const { container } = render(routerWrapper(reduxWrapper(<CountryField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlCountryField {...props} />)));

      const feedbackElement = container.querySelector('div[feedback-for="country"]');
      expect(feedbackElement).toBeTruthy();
--- a/src/register/RegistrationFields/EmailField/EmailField.test.jsx
+++ b/src/register/RegistrationFields/EmailField/EmailField.test.jsx
@@ -1,7 +1,8 @@
+import React from 'react';
 import { Provider } from 'react-redux';

 import { getConfig } from '@edx/frontend-platform';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import { fireEvent, render } from '@testing-library/react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
@@ -9,6 +10,7 @@ import configureStore from 'redux-mock-store';
 import { clearRegistrationBackendError, fetchRealtimeValidations } from '../../data/actions';
 import { EmailField } from '../index';

+const IntlEmailField = injectIntl(EmailField);
 const mockStore = configureStore();

 jest.mock('react-router-dom', () => {
@@ -78,7 +80,7 @@ describe('EmailField', () => {
    };

    it('should run email field validation when onBlur is fired', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<EmailField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlEmailField {...props} />)));

      const emailInput = container.querySelector('input#email');
      fireEvent.blur(emailInput, { target: { value: '', name: 'email' } });
@@ -90,7 +92,7 @@ describe('EmailField', () => {
    });

    it('should update errors for frontend validations', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<EmailField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlEmailField {...props} />)));

      const emailInput = container.querySelector('input#email');
      fireEvent.blur(emailInput, { target: { value: 'ab', name: 'email' } });
@@ -103,7 +105,7 @@ describe('EmailField', () => {
    });

    it('should clear error on focus', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<EmailField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlEmailField {...props} />)));

      const emailInput = container.querySelector('input#email');
      fireEvent.focus(emailInput, { target: { value: '', name: 'email' } });
@@ -117,7 +119,7 @@ describe('EmailField', () => {

    it('should call backend validation api on blur event, if frontend validations have passed', () => {
      store.dispatch = jest.fn(store.dispatch);
-      const { container } = render(routerWrapper(reduxWrapper(<EmailField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlEmailField {...props} />)));

      // Enter a valid email so that frontend validations are passed
      const emailInput = container.querySelector('input#email');
@@ -127,7 +129,7 @@ describe('EmailField', () => {
    });

    it('should give email suggestions for common service provider domain typos', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<EmailField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlEmailField {...props} />)));

      const emailInput = container.querySelector('input#email');
      fireEvent.blur(emailInput, { target: { value: 'john@yopmail.com', name: 'email' } });
@@ -137,7 +139,7 @@ describe('EmailField', () => {
    });

    it('should be able to click on email suggestions and set it as value', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<EmailField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlEmailField {...props} />)));

      const emailInput = container.querySelector('input#email');
      fireEvent.blur(emailInput, { target: { value: 'john@yopmail.com', name: 'email' } });
@@ -152,7 +154,7 @@ describe('EmailField', () => {
    });

    it('should give error for common top level domain mistakes', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<EmailField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlEmailField {...props} />)));

      const emailInput = container.querySelector('input#email');
      fireEvent.blur(emailInput, { target: { value: 'john@gmail.mistake', name: 'email' } });
@@ -162,7 +164,7 @@ describe('EmailField', () => {
    });

    it('should give error and suggestion for invalid email', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<EmailField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlEmailField {...props} />)));

      const emailInput = container.querySelector('input#email');
      fireEvent.blur(emailInput, { target: { value: 'john@gmail', name: 'email' } });
@@ -192,7 +194,7 @@ describe('EmailField', () => {

      store.dispatch = jest.fn(store.dispatch);

-      const { container } = render(routerWrapper(reduxWrapper(<EmailField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlEmailField {...props} />)));

      const emailInput = container.querySelector('input#email');
      fireEvent.focus(emailInput, { target: { value: 'a@gmail.com', name: 'email' } });
@@ -201,7 +203,7 @@ describe('EmailField', () => {
    });

    it('should clear email suggestions when close icon is clicked', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<EmailField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlEmailField {...props} />)));

      const emailInput = container.querySelector('input#email');
      fireEvent.blur(emailInput, { target: { value: 'john@gmail.mistake', name: 'email' } });
@@ -222,7 +224,7 @@ describe('EmailField', () => {
        confirmEmailValue: 'confirmEmail@yopmail.com',
      };

-      const { container } = render(routerWrapper(reduxWrapper(<EmailField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlEmailField {...props} />)));
      const emailInput = container.querySelector('input#email');
      fireEvent.blur(emailInput, { target: { value: 'differentEmail@yopmail.com', name: 'email' } });

--- a/src/register/RegistrationFields/HonorCodeField/HonorCode.test.jsx
+++ b/src/register/RegistrationFields/HonorCodeField/HonorCode.test.jsx
@@ -1,9 +1,13 @@
+import React from 'react';
+
 import { getConfig, mergeConfig } from '@edx/frontend-platform';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import { render } from '@testing-library/react';

 import { HonorCode } from '../index';

+const IntlHonorCode = injectIntl(HonorCode);
+
 describe('HonorCodeTest', () => {
  mergeConfig({
    PRIVACY_POLICY: 'http://privacy-policy.com',
@@ -24,7 +28,7 @@ describe('HonorCodeTest', () => {
    const errorMessage = `You must agree to the ${getConfig().SITE_NAME} Honor Code`;
    const { container } = render(
      <IntlProvider locale="en">
-        <HonorCode
+        <IntlHonorCode
          errorMessage={errorMessage}
          onChangeHandler={changeHandler}
        />
@@ -39,7 +43,7 @@ describe('HonorCodeTest', () => {
    const expectedMsg = 'I agree to the Your Platform Name Here\u00a0Honor Codein a new tab';
    const { container } = render(
      <IntlProvider locale="en">
-        <HonorCode onChangeHandler={changeHandler} />
+        <IntlHonorCode onChangeHandler={changeHandler} />
      </IntlProvider>,
    );

@@ -52,7 +56,7 @@ describe('HonorCodeTest', () => {
  it('should render Terms of Service and Honor code field', () => {
    const { container } = render(
      <IntlProvider locale="en">
-        <HonorCode fieldType="tos_and_honor_code" onChangeHandler={changeHandler} />
+        <IntlHonorCode fieldType="tos_and_honor_code" onChangeHandler={changeHandler} />
      </IntlProvider>,
    );
    const expectedMsg = 'By creating an account, you agree to the Terms of Service and Honor Code and you '
--- a/src/register/RegistrationFields/NameField/NameField.test.jsx
+++ b/src/register/RegistrationFields/NameField/NameField.test.jsx
@@ -1,6 +1,7 @@
+import React from 'react';
 import { Provider } from 'react-redux';

-import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import { fireEvent, render } from '@testing-library/react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
@@ -8,6 +9,7 @@ import configureStore from 'redux-mock-store';
 import { clearRegistrationBackendError, fetchRealtimeValidations } from '../../data/actions';
 import { NameField } from '../index';

+const IntlNameField = injectIntl(NameField);
 const mockStore = configureStore();

 jest.mock('react-router-dom', () => {
@@ -67,7 +69,7 @@ describe('NameField', () => {
    const fieldValidation = { name: 'Enter your full name' };

    it('should run name field validation when onBlur is fired', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<NameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlNameField {...props} />)));

      const nameInput = container.querySelector('input#name');
      fireEvent.blur(nameInput, { target: { value: '', name: 'name' } });
@@ -80,7 +82,7 @@ describe('NameField', () => {
    });

    it('should update errors for frontend validations', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<NameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlNameField {...props} />)));

      const nameInput = container.querySelector('input#name');
      fireEvent.blur(nameInput, { target: { value: 'https://invalid-name.com', name: 'name' } });
@@ -93,7 +95,7 @@ describe('NameField', () => {
    });

    it('should clear error on focus', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<NameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlNameField {...props} />)));

      const nameInput = container.querySelector('input#name');
      fireEvent.focus(nameInput, { target: { value: '', name: 'name' } });
@@ -111,7 +113,7 @@ describe('NameField', () => {
        ...props,
        shouldFetchUsernameSuggestions: true,
      };
-      const { container } = render(routerWrapper(reduxWrapper(<NameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlNameField {...props} />)));

      const nameInput = container.querySelector('input#name');
      // Enter a valid name so that frontend validations are passed
@@ -133,7 +135,7 @@ describe('NameField', () => {
      });

      store.dispatch = jest.fn(store.dispatch);
-      const { container } = render(routerWrapper(reduxWrapper(<NameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlNameField {...props} />)));

      const nameInput = container.querySelector('input#name');

--- a/src/register/RegistrationFields/NameField/validator.js
+++ b/src/register/RegistrationFields/NameField/validator.js
@@ -11,7 +11,7 @@ export const INVALID_NAME_REGEX = /https?:\/\/(?:[-\w.]|(?:%[\da-fA-F]{2}))*/g;

 const validateName = (value, formatMessage) => {
  let fieldError = '';
-  if (!value || (value && !value.trim())) {
+  if (!value.trim()) {
    fieldError = formatMessage(messages['empty.name.field.error']);
  } else if (URL_REGEX.test(value) || HTML_REGEX.test(value) || INVALID_NAME_REGEX.test(value)) {
    fieldError = formatMessage(messages['name.validation.message']);
--- a/src/register/RegistrationFields/TermsOfServiceField/TermsOfService.test.jsx
+++ b/src/register/RegistrationFields/TermsOfServiceField/TermsOfService.test.jsx
@@ -1,9 +1,13 @@
+import React from 'react';
+
 import { getConfig } from '@edx/frontend-platform';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import { fireEvent, render } from '@testing-library/react';

 import { TermsOfService } from '../index';

+const IntlTermsOfService = injectIntl(TermsOfService);
+
 describe('TermsOfServiceTest', () => {
  let value = false;

@@ -19,7 +23,7 @@ describe('TermsOfServiceTest', () => {
    const errorMessage = `You must agree to the ${getConfig().SITE_NAME} Terms of Service`;
    const { container } = render(
      <IntlProvider locale="en">
-        <TermsOfService errorMessage={errorMessage} onChangeHandler={changeHandler} />
+        <IntlTermsOfService errorMessage={errorMessage} onChangeHandler={changeHandler} />
      </IntlProvider>,
    );
    const errorElement = container.querySelector('.form-text-size');
@@ -29,7 +33,7 @@ describe('TermsOfServiceTest', () => {
  it('should render Terms of Service field', () => {
    const { container } = render(
      <IntlProvider locale="en">
-        <TermsOfService onChangeHandler={changeHandler} />
+        <IntlTermsOfService onChangeHandler={changeHandler} />
      </IntlProvider>,
    );

@@ -44,7 +48,7 @@ describe('TermsOfServiceTest', () => {
  it('should change value when Terms of Service field is checked', () => {
    const { container } = render(
      <IntlProvider locale="en">
-        <TermsOfService onChangeHandler={changeHandler} />
+        <IntlTermsOfService onChangeHandler={changeHandler} />
      </IntlProvider>,
    );
    const field = container.querySelector('input#tos');
--- a/src/register/RegistrationFields/UsernameField/UsernameField.jsx
+++ b/src/register/RegistrationFields/UsernameField/UsernameField.jsx
@@ -101,7 +101,7 @@ const UsernameField = (props) => {
  };

  const suggestedUsernames = () => (
-    <div className={className}>
+    <div className={className} role="listbox">
      <span className="text-gray username-suggestion--label">{formatMessage(messages['registration.username.suggestion.label'])}</span>
      <div className="username-scroll-suggested--form-field">
        {usernameSuggestions.map((username, index) => (
@@ -112,7 +112,9 @@ const UsernameField = (props) => {
            className="username-suggestions--chip data-hj-suppress"
            autoComplete={props.autoComplete}
            key={`suggestion-${index.toString()}`}
+            tabIndex={0}
            onClick={(e) => handleSuggestionClick(e, username)}
+            role="option"
          >
            {username}
          </Button>
@@ -123,7 +125,7 @@ const UsernameField = (props) => {
  );

  if (usernameSuggestions.length > 0 && errorMessage && value === ' ') {
-    className = 'username-suggestions__error';
+    className = 'username-suggestions';
    iconButton = <IconButton src={Close} iconAs={Icon} alt="Close" onClick={() => handleUsernameSuggestionClose()} variant="black" size="sm" className="username-suggestions__close__button" />;
    suggestedUsernameDiv = suggestedUsernames();
  } else if (usernameSuggestions.length > 0 && value === ' ') {
@@ -134,14 +136,15 @@ const UsernameField = (props) => {
    suggestedUsernameDiv = suggestedUsernames();
  }
  return (
-    <FormGroup
-      {...props}
-      handleChange={handleOnChange}
-      handleFocus={handleOnFocus}
-      handleBlur={handleOnBlur}
-    >
+    <div className="username__form-group-wrapper">
      {suggestedUsernameDiv}
-    </FormGroup>
+      <FormGroup
+        {...props}
+        handleChange={handleOnChange}
+        handleFocus={handleOnFocus}
+        handleBlur={handleOnBlur}
+      />
+    </div>
  );
 };

--- a/src/register/RegistrationFields/UsernameField/UsernameField.test.jsx
+++ b/src/register/RegistrationFields/UsernameField/UsernameField.test.jsx
@@ -1,6 +1,7 @@
+import React from 'react';
 import { Provider } from 'react-redux';

-import { IntlProvider } from '@edx/frontend-platform/i18n';
+import { injectIntl, IntlProvider } from '@edx/frontend-platform/i18n';
 import { fireEvent, render } from '@testing-library/react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
@@ -8,6 +9,7 @@ import configureStore from 'redux-mock-store';
 import { clearRegistrationBackendError, clearUsernameSuggestions, fetchRealtimeValidations } from '../../data/actions';
 import { UsernameField } from '../index';

+const IntlUsernameField = injectIntl(UsernameField);
 const mockStore = configureStore();

 jest.mock('react-router-dom', () => {
@@ -71,7 +73,7 @@ describe('UsernameField', () => {
    };

    it('should run username field validation when onBlur is fired', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));

      const usernameField = container.querySelector('input#username');
      fireEvent.blur(usernameField, { target: { value: '', name: 'username' } });
@@ -84,7 +86,7 @@ describe('UsernameField', () => {
    });

    it('should update errors for frontend validations', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));

      const usernameField = container.querySelector('input#username');
      fireEvent.blur(usernameField, { target: { value: 'user#', name: 'username' } });
@@ -97,7 +99,7 @@ describe('UsernameField', () => {
    });

    it('should clear error on focus', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));

      const usernameField = container.querySelector('input#username');
      fireEvent.focus(usernameField, { target: { value: '', name: 'username' } });
@@ -110,7 +112,7 @@ describe('UsernameField', () => {
    });

    it('should remove space from field on focus if space exists', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));

      const usernameField = container.querySelector('input#username');
      fireEvent.focus(usernameField, { target: { value: ' ', name: 'username' } });
@@ -123,7 +125,7 @@ describe('UsernameField', () => {

    it('should call backend validation api on blur event, if frontend validations have passed', () => {
      store.dispatch = jest.fn(store.dispatch);
-      const { container } = render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));

      const usernameField = container.querySelector('input#username');
      // Enter a valid username so that frontend validations are passed
@@ -133,7 +135,7 @@ describe('UsernameField', () => {
    });

    it('should remove space from the start of username on change', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));
      const usernameField = container.querySelector('input#username');
      fireEvent.change(usernameField, { target: { value: ' test-user', name: 'username' } });

@@ -144,7 +146,7 @@ describe('UsernameField', () => {
    });

    it('should not set username if it is more than 30 character long', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));

      const usernameField = container.querySelector('input#username');
      fireEvent.change(usernameField, { target: { value: 'why_this_is_not_valid_username_', name: 'username' } });
@@ -155,7 +157,7 @@ describe('UsernameField', () => {
    it('should clear username suggestions when username field is focused in', () => {
      store.dispatch = jest.fn(store.dispatch);

-      const { container } = render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));

      const usernameField = container.querySelector('input#username');
      fireEvent.focus(usernameField);
@@ -177,7 +179,7 @@ describe('UsernameField', () => {
        errorMessage: 'It looks like this username is already taken',
      };

-      const { container } = render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));
      const usernameSuggestions = container.querySelectorAll('button.username-suggestions--chip');
      expect(usernameSuggestions.length).toEqual(3);
    });
@@ -196,7 +198,7 @@ describe('UsernameField', () => {
        value: ' ',
      };

-      const { container } = render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));
      const usernameSuggestions = container.querySelectorAll('button.username-suggestions--chip');
      expect(usernameSuggestions.length).toEqual(3);
    });
@@ -216,7 +218,7 @@ describe('UsernameField', () => {
        errorMessage: 'username error',
      };

-      const { container } = render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));
      const usernameSuggestions = container.querySelectorAll('button.username-suggestions--chip');
      expect(usernameSuggestions.length).toEqual(3);
    });
@@ -230,7 +232,7 @@ describe('UsernameField', () => {
        },
      });

-      render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));
      expect(props.handleChange).toHaveBeenCalledTimes(1);
      expect(props.handleChange).toHaveBeenCalledWith(
        { target: { name: 'username', value: ' ' } },
@@ -251,7 +253,7 @@ describe('UsernameField', () => {
        value: ' ',
      };

-      const { container } = render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));
      const usernameSuggestion = container.querySelector('.username-suggestions--chip');
      fireEvent.click(usernameSuggestion);
      expect(props.handleChange).toHaveBeenCalledTimes(1);
@@ -275,7 +277,7 @@ describe('UsernameField', () => {
        value: ' ',
      };

-      const { container } = render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));
      let closeButton = container.querySelector('button.username-suggestions__close__button');
      fireEvent.click(closeButton);
      expect(store.dispatch).toHaveBeenCalledWith(clearUsernameSuggestions());
@@ -285,7 +287,7 @@ describe('UsernameField', () => {
        errorMessage: 'username error',
      };

-      render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));
      closeButton = container.querySelector('button.username-suggestions__close__button');
      fireEvent.click(closeButton);
      expect(store.dispatch).toHaveBeenCalledWith(clearUsernameSuggestions());
@@ -307,7 +309,7 @@ describe('UsernameField', () => {

      store.dispatch = jest.fn(store.dispatch);

-      const { container } = render(routerWrapper(reduxWrapper(<UsernameField {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlUsernameField {...props} />)));

      const usernameField = container.querySelector('input#username');
      fireEvent.focus(usernameField, { target: { value: 'test', name: 'username' } });
--- a/src/register/RegistrationPage.jsx
+++ b/src/register/RegistrationPage.jsx
@@ -4,6 +4,7 @@ import React, {
 import { useDispatch, useSelector } from 'react-redux';

 import { getConfig } from '@edx/frontend-platform';
+import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { useIntl } from '@edx/frontend-platform/i18n';
 import { Form, Spinner, StatefulButton } from '@openedx/paragon';
 import classNames from 'classnames';
@@ -11,19 +12,12 @@ import PropTypes from 'prop-types';
 import { Helmet } from 'react-helmet';
 import Skeleton from 'react-loading-skeleton';

-import {
-  InstitutionLogistration,
-  PasswordField,
-  RedirectLogistration,
-  ThirdPartyAuthAlert,
-} from '../common-components';
 import ConfigurableRegistrationForm from './components/ConfigurableRegistrationForm';
 import RegistrationFailure from './components/RegistrationFailure';
 import {
  backupRegistrationFormBegin,
  clearRegistrationBackendError,
  registerNewUser,
-  setAutoGeneratedUsernameExperimentData,
  setEmailSuggestionInStore,
  setUserPipelineDataLoaded,
 } from './data/actions';
@@ -31,9 +25,6 @@ import {
  FORM_SUBMISSION_ERROR,
  TPA_AUTHENTICATION_FAILURE,
 } from './data/constants';
-import useRecaptchaSubmission from './data/hooks';
-import { AUTO_GENERATED_USERNAME_REGISTRATION_EXP_VARIATION, NOT_INITIALIZED } from './data/optimizelyExperiment/helper';
-import useAutoGeneratedUsernameExperimentVariation from './data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation';
 import getBackendValidations from './data/selectors';
 import {
  isFormValid, prepareRegistrationPayload,
@@ -41,20 +32,21 @@ import {
 import messages from './messages';
 import { EmailField, NameField, UsernameField } from './RegistrationFields';
 import {
-  ELEMENT_NAME, ELEMENT_TEXT, ELEMENT_TYPES, PAGE_TYPES,
-} from '../cohesion/constants';
-import { setCohesionEventStates } from '../cohesion/data/actions';
+  InstitutionLogistration,
+  PasswordField,
+  RedirectLogistration,
+  ThirdPartyAuthAlert,
+} from '../common-components';
 import { getThirdPartyAuthContext as getRegistrationDataFromBackend } from '../common-components/data/actions';
 import EnterpriseSSO from '../common-components/EnterpriseSSO';
 import ThirdPartyAuth from '../common-components/ThirdPartyAuth';
 import {
-  APP_NAME, COMPLETE_STATE, PENDING_STATE,
-  REGISTER_PAGE,
+  COMPLETE_STATE, PENDING_STATE, REGISTER_PAGE,
 } from '../data/constants';
 import {
-  getAllPossibleQueryParams, getTpaHint, getTpaProvider, isHostAvailableInQueryParams, removeCookie, setCookie,
+  getAllPossibleQueryParams, getTpaHint, getTpaProvider, isHostAvailableInQueryParams, setCookie,
 } from '../data/utils';
-import { trackRegistrationPageViewed, trackRegistrationSuccess } from '../tracking/trackers/register';
+
 /**
 * Main Registration Page component
 */
@@ -62,7 +54,6 @@ const RegistrationPage = (props) => {
  const { formatMessage } = useIntl();
  const dispatch = useDispatch();

-  const { executeWithFallback } = useRecaptchaSubmission('submit_registration_form');
  const registrationEmbedded = isHostAvailableInQueryParams();
  const platformName = getConfig().SITE_NAME;
  const flags = {
@@ -77,7 +68,6 @@ const RegistrationPage = (props) => {
  } = props;

  const backedUpFormData = useSelector(state => state.register.registrationFormData);
-  const initExpVariation = useSelector(state => state.register.autoGeneratedUsernameExperimentVariation);
  const registrationError = useSelector(state => state.register.registrationError);
  const registrationErrorCode = registrationError?.errorCode;
  const registrationResult = useSelector(state => state.register.registrationResult);
@@ -95,7 +85,6 @@ const RegistrationPage = (props) => {
  const providers = useSelector(state => state.commonComponents.thirdPartyAuthContext.providers);
  const secondaryProviders = useSelector(state => state.commonComponents.thirdPartyAuthContext.secondaryProviders);
  const pipelineUserDetails = useSelector(state => state.commonComponents.thirdPartyAuthContext.pipelineUserDetails);
-  const countriesCodesList = useSelector(state => state.commonComponents.countriesCodesList);

  const backendValidations = useSelector(getBackendValidations);
  const queryParams = useMemo(() => getAllPossibleQueryParams(), []);
@@ -114,12 +103,6 @@ const RegistrationPage = (props) => {
    ? formatMessage(messages['create.account.cta.button'], { label: cta })
    : formatMessage(messages['create.account.for.free.button']);

-  const autoGeneratedUsernameExpVariation = useAutoGeneratedUsernameExperimentVariation(
-    initExpVariation, registrationEmbedded, tpaHint, currentProvider, thirdPartyAuthApiStatus,
-  );
-
-  const hideUsernameField = flags.autoGeneratedUsernameEnabled
-      || autoGeneratedUsernameExpVariation === AUTO_GENERATED_USERNAME_REGISTRATION_EXP_VARIATION;
  /**
   * Set the userPipelineDetails data in formFields for only first time
   */
@@ -145,7 +128,7 @@ const RegistrationPage = (props) => {

  useEffect(() => {
    if (!formStartTime) {
-      trackRegistrationPageViewed();
+      sendPageEvent('login_and_registration', 'register');
      const payload = { ...queryParams, is_register_page: true };
      if (tpaHint) {
        payload.tpa_hint = tpaHint;
@@ -166,10 +149,8 @@ const RegistrationPage = (props) => {
        formFields: { ...formFields },
        errors: { ...errors },
      }));
-      dispatch(setAutoGeneratedUsernameExperimentData(autoGeneratedUsernameExpVariation));
    }
-  }, [shouldBackupState, configurableFormFields, // eslint-disable-line react-hooks/exhaustive-deps
-    formFields, errors, dispatch, backedUpFormData]);
+  }, [shouldBackupState, configurableFormFields, formFields, errors, dispatch, backedUpFormData]);

  useEffect(() => {
    if (backendValidations) {
@@ -190,15 +171,10 @@ const RegistrationPage = (props) => {
  useEffect(() => {
    if (registrationResult.success) {
      // This event is used by GTM
-      trackRegistrationSuccess();
+      sendTrackEvent('edx.bi.user.account.registered.client', {});

      // This is used by the "User Retention Rate Event" on GTM
      setCookie(getConfig().USER_RETENTION_COOKIE_NAME, true);
-
-      // Remove marketingEmailsOptIn cookie that was set on SSO registration flow
-      removeCookie('marketingEmailsOptIn');
-      // Remove this cookie that was set to capture marketingEmailsOptIn for the onboarding component
-      removeCookie('ssoPipelineRedirectionDone');
    }
  }, [registrationResult]);

@@ -232,15 +208,15 @@ const RegistrationPage = (props) => {
    }
  };

-  const registerUser = async () => {
+  const registerUser = () => {
    const totalRegistrationTime = (Date.now() - formStartTime) / 1000;
-    let payload = { ...formFields, app_name: APP_NAME };
+    let payload = { ...formFields };

    if (currentProvider) {
      delete payload.password;
      payload.social_auth_provider = currentProvider;
    }
-    if (hideUsernameField) {
+    if (flags.autoGeneratedUsernameEnabled) {
      delete payload.username;
    }

@@ -252,7 +228,7 @@ const RegistrationPage = (props) => {
      fieldDescriptions,
      formatMessage,
    );
-    setErrors({ ...fieldErrors, captchaError: '' });
+    setErrors({ ...fieldErrors });
    dispatch(setEmailSuggestionInStore(emailSuggestion));

    // returning if not valid
@@ -261,41 +237,20 @@ const RegistrationPage = (props) => {
      return;
    }

-    let recaptchaToken = null;
-    try {
-      recaptchaToken = await executeWithFallback();
-    } catch (err) {
-      setErrors(prev => ({
-        ...prev,
-        captchaError: err.message,
-      }));
-      return;
-    }
-
+    // Preparing payload for submission
    payload = prepareRegistrationPayload(
      payload,
      configurableFormFields,
      flags.showMarketingEmailOptInCheckbox,
      totalRegistrationTime,
-      queryParams,
-    );
-    if (recaptchaToken) {
-      payload = { ...payload, captcha_token: recaptchaToken };
-    }
+      queryParams);

+    // making register call
    dispatch(registerNewUser(payload));
  };

  const handleSubmit = (e) => {
    e.preventDefault();
-    const eventData = {
-      pageType: PAGE_TYPES.ACCOUNT_CREATION,
-      elementType: ELEMENT_TYPES.BUTTON,
-      webElementText: ELEMENT_TEXT.CREATE_ACCOUNT,
-      webElementName: ELEMENT_NAME.CREATE_ACCOUNT,
-    };
-
-    dispatch(setCohesionEventStates(eventData));
    registerUser();
  };

@@ -330,117 +285,107 @@ const RegistrationPage = (props) => {
          redirectToProgressiveProfilingPage={
            getConfig().ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN && !!Object.keys(optionalFields.fields).length
          }
-          currentProvider={currentProvider}
        />
-        {(autoSubmitRegForm && !errorCode.type)
-        || (!autoGeneratedUsernameExpVariation && !(
-          autoGeneratedUsernameExpVariation === NOT_INITIALIZED
-          || registrationEmbedded || !!tpaHint || !!currentProvider))
-          ? (
-            <div className="mw-xs mt-5 text-center">
-              <Spinner animation="border" variant="primary" id="tpa-spinner" />
-            </div>
-          ) : (
-            <div
-              className={classNames(
-                'mw-xs mt-3',
-                { 'w-100 m-auto pt-4 main-content': registrationEmbedded },
+        {autoSubmitRegForm && !errorCode.type ? (
+          <div className="mw-xs mt-5 text-center">
+            <Spinner animation="border" variant="primary" id="tpa-spinner" />
+          </div>
+        ) : (
+          <div
+            className={classNames(
+              'mw-xs mt-3',
+              { 'w-100 m-auto pt-4 main-content': registrationEmbedded },
+            )}
+          >
+            <ThirdPartyAuthAlert
+              currentProvider={currentProvider}
+              platformName={platformName}
+              referrer={REGISTER_PAGE}
+            />
+            <RegistrationFailure
+              errorCode={errorCode.type}
+              failureCount={errorCode.count}
+              context={{ provider: currentProvider, errorMessage: thirdPartyAuthErrorMessage }}
+            />
+            <Form id="registration-form" name="registration-form">
+              <NameField
+                name="name"
+                value={formFields.name}
+                shouldFetchUsernameSuggestions={!formFields.username.trim()}
+                handleChange={handleOnChange}
+                handleErrorChange={handleErrorChange}
+                errorMessage={errors.name}
+                helpText={[formatMessage(messages['help.text.name'])]}
+                floatingLabel={formatMessage(messages['registration.fullname.label'])}
+              />
+              <EmailField
+                name="email"
+                value={formFields.email}
+                confirmEmailValue={configurableFormFields?.confirm_email}
+                handleErrorChange={handleErrorChange}
+                handleChange={handleOnChange}
+                errorMessage={errors.email}
+                helpText={[formatMessage(messages['help.text.email'])]}
+                floatingLabel={formatMessage(messages['registration.email.label'])}
+              />
+              {!flags.autoGeneratedUsernameEnabled && (
+                <UsernameField
+                  name="username"
+                  spellCheck="false"
+                  value={formFields.username}
+                  handleChange={handleOnChange}
+                  handleErrorChange={handleErrorChange}
+                  errorMessage={errors.username}
+                  helpText={[formatMessage(messages['help.text.username.1']), formatMessage(messages['help.text.username.2'])]}
+                  floatingLabel={formatMessage(messages['registration.username.label'])}
+                />
              )}
-            >
-              <ThirdPartyAuthAlert
-                currentProvider={currentProvider}
-                platformName={platformName}
-                referrer={REGISTER_PAGE}
-              />
-              <RegistrationFailure
-                errorCode={errorCode.type}
-                failureCount={errorCode.count}
-                context={{ provider: currentProvider, errorMessage: thirdPartyAuthErrorMessage }}
-              />
-              <Form id="registration-form" name="registration-form">
-                <NameField
-                  name="name"
-                  value={formFields.name}
-                  shouldFetchUsernameSuggestions={!formFields.username.trim()}
+              {!currentProvider && (
+                <PasswordField
+                  name="password"
+                  value={formFields.password}
                  handleChange={handleOnChange}
                  handleErrorChange={handleErrorChange}
-                  errorMessage={errors.name}
-                  helpText={[formatMessage(messages['help.text.name'])]}
-                  floatingLabel={formatMessage(messages['registration.fullname.label'])}
+                  errorMessage={errors.password}
+                  floatingLabel={formatMessage(messages['registration.password.label'])}
                />
-                <EmailField
-                  name="email"
-                  value={formFields.email}
-                  confirmEmailValue={configurableFormFields?.confirm_email}
-                  handleErrorChange={handleErrorChange}
-                  handleChange={handleOnChange}
-                  errorMessage={errors.email}
-                  helpText={[formatMessage(messages['help.text.email'])]}
-                  floatingLabel={formatMessage(messages['registration.email.label'])}
+              )}
+              <ConfigurableRegistrationForm
+                email={formFields.email}
+                fieldErrors={errors}
+                formFields={configurableFormFields}
+                setFieldErrors={registrationEmbedded ? setTemporaryErrors : setErrors}
+                setFormFields={setConfigurableFormFields}
+                autoSubmitRegisterForm={autoSubmitRegForm}
+                fieldDescriptions={fieldDescriptions}
+              />
+              <StatefulButton
+                id="register-user"
+                name="register-user"
+                type="submit"
+                variant="brand"
+                className="register-button mt-4 mb-4"
+                state={submitState}
+                labels={{
+                  default: buttonLabel,
+                  pending: '',
+                }}
+                onClick={handleSubmit}
+                onMouseDown={(e) => e.preventDefault()}
+              />
+              {!registrationEmbedded && (
+                <ThirdPartyAuth
+                  currentProvider={currentProvider}
+                  providers={providers}
+                  secondaryProviders={secondaryProviders}
+                  handleInstitutionLogin={handleInstitutionLogin}
+                  thirdPartyAuthApiStatus={thirdPartyAuthApiStatus}
                />
-                {!hideUsernameField && (
-                  <UsernameField
-                    name="username"
-                    spellCheck="false"
-                    value={formFields.username}
-                    handleChange={handleOnChange}
-                    handleErrorChange={handleErrorChange}
-                    errorMessage={errors.username}
-                    helpText={[formatMessage(messages['help.text.username.1']), formatMessage(messages['help.text.username.2'])]}
-                    floatingLabel={formatMessage(messages['registration.username.label'])}
-                  />
-                )}
-                {!currentProvider && (
-                  <PasswordField
-                    name="password"
-                    value={formFields.password}
-                    handleChange={handleOnChange}
-                    handleErrorChange={handleErrorChange}
-                    errorMessage={errors.password}
-                    floatingLabel={formatMessage(messages['registration.password.label'])}
-                  />
-                )}
-                <ConfigurableRegistrationForm
-                  email={formFields.email}
-                  fieldErrors={errors}
-                  formFields={configurableFormFields}
-                  setFieldErrors={registrationEmbedded ? setTemporaryErrors : setErrors}
-                  setFormFields={setConfigurableFormFields}
-                  autoSubmitRegisterForm={autoSubmitRegForm}
-                  fieldDescriptions={fieldDescriptions}
-                  countriesCodesList={countriesCodesList}
-                />
-                {errors?.captchaError && (
-                  <div className="mt-3 pgn__form-text-invalid pgn__form-text">
-                    {errors.captchaError}
-                  </div>
-                )}
-                <StatefulButton
-                  id="register-user"
-                  name="register-user"
-                  type="submit"
-                  variant="brand"
-                  className="register-button mt-4 mb-4"
-                  state={submitState}
-                  labels={{
-                    default: buttonLabel,
-                    pending: '',
-                  }}
-                  onClick={handleSubmit}
-                  onMouseDown={(e) => e.preventDefault()}
-                />
-                {!registrationEmbedded && (
-                  <ThirdPartyAuth
-                    currentProvider={currentProvider}
-                    providers={providers}
-                    secondaryProviders={secondaryProviders}
-                    handleInstitutionLogin={handleInstitutionLogin}
-                    thirdPartyAuthApiStatus={thirdPartyAuthApiStatus}
-                  />
-                )}
-              </Form>
-            </div>
-          )}
+              )}
+            </Form>
+          </div>
+        )}
+
      </>
    );
  };
--- a/src/register/RegistrationPage.test.jsx
+++ b/src/register/RegistrationPage.test.jsx
@@ -1,11 +1,12 @@
+import React from 'react';
 import { Provider } from 'react-redux';

 import { getConfig, mergeConfig } from '@edx/frontend-platform';
 import { sendPageEvent, sendTrackEvent } from '@edx/frontend-platform/analytics';
 import {
-  configure, getLocale, IntlProvider,
+  configure, getLocale, injectIntl, IntlProvider,
 } from '@edx/frontend-platform/i18n';
-import { fireEvent, render, waitFor } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import { mockNavigate, BrowserRouter as Router } from 'react-router-dom';
 import configureStore from 'redux-mock-store';

@@ -16,14 +17,9 @@ import {
  setUserPipelineDataLoaded,
 } from './data/actions';
 import { INTERNAL_SERVER_ERROR } from './data/constants';
-import mockTagular from '../cohesion/utils';
-import useRecaptchaSubmission from './data/hooks';
-import { NOT_INITIALIZED } from './data/optimizelyExperiment/helper';
-import useAutoGeneratedUsernameExperimentVariation
-  from './data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation';
 import RegistrationPage from './RegistrationPage';
 import {
-  APP_NAME, AUTHN_PROGRESSIVE_PROFILING, COMPLETE_STATE, PENDING_STATE, REGISTER_PAGE,
+  AUTHN_PROGRESSIVE_PROFILING, COMPLETE_STATE, PENDING_STATE, REGISTER_PAGE,
 } from '../data/constants';

 jest.mock('@edx/frontend-platform/analytics', () => ({
@@ -34,16 +30,9 @@ jest.mock('@edx/frontend-platform/i18n', () => ({
  ...jest.requireActual('@edx/frontend-platform/i18n'),
  getLocale: jest.fn(),
 }));
-jest.mock('./data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation', () => jest.fn());
-jest.mock('./data/hooks', () => ({
-  __esModule: true,
-  default: jest.fn(() => ({
-    executeWithFallback: jest.fn(),
-  })),
-}));

+const IntlRegistrationPage = injectIntl(RegistrationPage);
 const mockStore = configureStore();
-mockTagular();

 jest.mock('react-router-dom', () => {
  const mockNavigation = jest.fn();
@@ -113,7 +102,6 @@ describe('RegistrationPage', () => {
      usernameSuggestions: [],

    },
-    cohesion: { eventData: {} },
    commonComponents: {
      thirdPartyAuthApiStatus: null,
      thirdPartyAuthContext,
@@ -140,12 +128,6 @@ describe('RegistrationPage', () => {
      institutionLogin: false,
    };
    window.location = { search: '' };
-    useAutoGeneratedUsernameExperimentVariation.mockReturnValue(NOT_INITIALIZED);
-    useRecaptchaSubmission.mockReturnValue({
-      executeWithFallback: jest.fn().mockResolvedValue(null),
-      isReady: true,
-      isLoading: false,
-    });
  });

  afterEach(() => {
@@ -187,7 +169,7 @@ describe('RegistrationPage', () => {

    // ******** test registration form submission ********

-    it('should submit form for valid input', async () => {
+    it('should submit form for valid input', () => {
      getLocale.mockImplementation(() => ('en-us'));
      jest.spyOn(global.Date, 'now').mockImplementation(() => 0);

@@ -201,23 +183,20 @@ describe('RegistrationPage', () => {
        password: 'password1',
        country: 'Pakistan',
        honor_code: true,
-        total_registration_time: 0,
+        totalRegistrationTime: 0,
        next: '/course/demo-course-url',
-        app_name: APP_NAME,
      };

      store.dispatch = jest.fn(store.dispatch);
-      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      populateRequiredFields(getByLabelText, payload);
      const button = container.querySelector('button.btn-brand');
      fireEvent.click(button);

-      await waitFor(() => {
-        expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...payload, country: 'PK' }));
-      });
+      expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...payload, country: 'PK' }));
    });

-    it('should submit form without password field when current provider is present', async () => {
+    it('should submit form without password field when current provider is present', () => {
      jest.spyOn(global.Date, 'now').mockImplementation(() => 0);

      const formPayload = {
@@ -227,8 +206,7 @@ describe('RegistrationPage', () => {
        country: 'Pakistan',
        honor_code: true,
        social_auth_provider: 'Apple',
-        total_registration_time: 0,
-        app_name: APP_NAME,
+        totalRegistrationTime: 0,
      };

      store = mockStore({
@@ -242,14 +220,12 @@ describe('RegistrationPage', () => {
        },
      });
      store.dispatch = jest.fn(store.dispatch);
-      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));

      populateRequiredFields(getByLabelText, formPayload, true);
      const button = container.querySelector('button.btn-brand');
      fireEvent.click(button);
-      await waitFor(() => {
-        expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...formPayload, country: 'PK' }));
-      });
+      expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...formPayload, country: 'PK' }));
    });

    it('should display an error when form is submitted with an invalid email', () => {
@@ -263,11 +239,11 @@ describe('RegistrationPage', () => {
        password: 'password1',
        country: 'Ukraine',
        honor_code: true,
-        total_registration_time: 0,
+        totalRegistrationTime: 0,
      };

      store.dispatch = jest.fn(store.dispatch);
-      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      populateRequiredFields(getByLabelText, formPayload, true);

      const button = container.querySelector('button.btn-brand');
@@ -288,11 +264,11 @@ describe('RegistrationPage', () => {
        password: 'password1',
        country: 'Ukraine',
        honor_code: true,
-        total_registration_time: 0,
+        totalRegistrationTime: 0,
      };

      store.dispatch = jest.fn(store.dispatch);
-      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      populateRequiredFields(getByLabelText, formPayload, true);
      const button = container.querySelector('button.btn-brand');
      fireEvent.click(button);
@@ -300,7 +276,7 @@ describe('RegistrationPage', () => {
      expect(validationErrors.textContent).toContain(usernameError);
    });

-    it('should submit form with marketing email opt in value', async () => {
+    it('should submit form with marketing email opt in value', () => {
      mergeConfig({
        MARKETING_EMAILS_OPT_IN: 'true',
      });
@@ -314,26 +290,23 @@ describe('RegistrationPage', () => {
        password: 'password1',
        country: 'Pakistan',
        honor_code: true,
-        total_registration_time: 0,
+        totalRegistrationTime: 0,
        marketing_emails_opt_in: true,
-        app_name: APP_NAME,
      };

      store.dispatch = jest.fn(store.dispatch);
-      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      populateRequiredFields(getByLabelText, payload);
      const button = container.querySelector('button.btn-brand');
      fireEvent.click(button);
-      await waitFor(() => {
-        expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...payload, country: 'PK' }));
-      });
+      expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...payload, country: 'PK' }));

      mergeConfig({
        MARKETING_EMAILS_OPT_IN: '',
      });
    });

-    it('should submit form without UsernameField when autoGeneratedUsernameEnabled is true', async () => {
+    it('should submit form without UsernameField when autoGeneratedUsernameEnabled is true', () => {
      mergeConfig({
        ENABLE_AUTO_GENERATED_USERNAME: true,
      });
@@ -344,18 +317,15 @@ describe('RegistrationPage', () => {
        password: 'password1',
        country: 'Pakistan',
        honor_code: true,
-        total_registration_time: 0,
-        app_name: APP_NAME,
+        totalRegistrationTime: 0,
      };

      store.dispatch = jest.fn(store.dispatch);
-      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      populateRequiredFields(getByLabelText, payload, false, true);
      const button = container.querySelector('button.btn-brand');
      fireEvent.click(button);
-      await waitFor(() => {
-        expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...payload, country: 'PK' }));
-      });
+      expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...payload, country: 'PK' }));
      mergeConfig({
        ENABLE_AUTO_GENERATED_USERNAME: false,
      });
@@ -366,7 +336,7 @@ describe('RegistrationPage', () => {
        ENABLE_AUTO_GENERATED_USERNAME: true,
      });

-      const { queryByLabelText } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { queryByLabelText } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      expect(queryByLabelText('Username')).toBeNull();

      mergeConfig({
@@ -377,7 +347,7 @@ describe('RegistrationPage', () => {
    it('should not dispatch registerNewUser on empty form Submission', () => {
      store.dispatch = jest.fn(store.dispatch);

-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));

      const button = container.querySelector('button.btn-brand');
      fireEvent.click(button);
@@ -387,126 +357,8 @@ describe('RegistrationPage', () => {

    // ******** test registration form validations ********

-    it('should submit form with valid reCAPTCHA token', async () => {
-      getLocale.mockImplementation(() => ('en-us'));
-      jest.spyOn(global.Date, 'now').mockImplementation(() => 0);
-
-      useRecaptchaSubmission.mockReturnValue({
-        executeWithFallback: jest.fn().mockResolvedValue('mock-recaptcha-token'),
-        isReady: true,
-        isLoading: false,
-      });
-
-      const payload = {
-        name: 'John Doe',
-        username: 'john_doe',
-        email: 'john.doe@gmail.com',
-        password: 'password1',
-        country: 'Pakistan',
-        honor_code: true,
-        total_registration_time: 0,
-        app_name: APP_NAME,
-      };
-
-      store.dispatch = jest.fn(store.dispatch);
-      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
-      populateRequiredFields(getByLabelText, payload);
-
-      const button = container.querySelector('button.btn-brand');
-      fireEvent.click(button);
-
-      await waitFor(() => {
-        const actions = store.dispatch.mock.calls.map(call => call[0]);
-        const registerAction = actions.find(a => a.type === registerNewUser().type);
-
-        expect(registerAction).toBeTruthy();
-        expect(registerAction.payload).toMatchObject({
-          registrationInfo: {
-            ...payload,
-            country: 'PK',
-            captcha_token: 'mock-recaptcha-token',
-          },
-        });
-      });
-    });
-
-    it('should display error when reCAPTCHA verification fails', async () => {
-      getLocale.mockImplementation(() => ('en-us'));
-      jest.spyOn(global.Date, 'now').mockImplementation(() => 0);
-
-      useRecaptchaSubmission.mockReturnValue({
-        executeWithFallback: jest.fn().mockRejectedValue(new Error('CAPTCHA verification failed.')),
-        isReady: true,
-        isLoading: false,
-      });
-
-      const payload = {
-        name: 'John Doe',
-        username: 'john_doe',
-        email: 'john.doe@gmail.com',
-        password: 'password1',
-        country: 'Pakistan',
-        honor_code: true,
-        total_registration_time: 0,
-      };
-
-      store.dispatch = jest.fn(store.dispatch);
-      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
-      populateRequiredFields(getByLabelText, payload);
-
-      const button = container.querySelector('button.btn-brand');
-      fireEvent.click(button);
-
-      await waitFor(() => {
-        const captchaError = container.querySelector('.pgn__form-text-invalid');
-        expect(captchaError.textContent).toContain('CAPTCHA verification failed.');
-      });
-
-      expect(store.dispatch).not.toHaveBeenCalledWith(expect.objectContaining({
-        type: registerNewUser().type,
-      }));
-    });
-
-    it('should submit without reCAPTCHA token if reCAPTCHA is disabled', async () => {
-      getLocale.mockImplementation(() => ('en-us'));
-      jest.spyOn(global.Date, 'now').mockImplementation(() => 0);
-
-      useRecaptchaSubmission.mockReturnValue({
-        executeWithFallback: jest.fn().mockResolvedValue(null),
-        isReady: true,
-        isLoading: false,
-      });
-
-      const payload = {
-        name: 'John Doe',
-        username: 'john_doe',
-        email: 'john.doe@gmail.com',
-        password: 'password1',
-        country: 'Pakistan',
-        honor_code: true,
-        total_registration_time: 0,
-        app_name: APP_NAME,
-      };
-
-      store.dispatch = jest.fn(store.dispatch);
-      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
-      populateRequiredFields(getByLabelText, payload);
-
-      const button = container.querySelector('button.btn-brand');
-      fireEvent.click(button);
-
-      await waitFor(() => {
-        expect(store.dispatch).toHaveBeenCalledWith(
-          registerNewUser({
-            ...payload,
-            country: 'PK',
-          }),
-        );
-      });
-    });
-
    it('should show error messages for required fields on empty form submission', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));

      const button = container.querySelector('button.btn-brand');
      fireEvent.click(button);
@@ -534,7 +386,7 @@ describe('RegistrationPage', () => {
          },
        },
      });
-      const { container } = render(routerWrapper(reduxWrapper(<IntlProvider locale="en"><RegistrationPage {...props} /></IntlProvider>)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlProvider locale="en"><IntlRegistrationPage {...props} /></IntlProvider>)));
      const usernameFeedback = container.querySelector('div[feedback-for="username"]');
      const emailFeedback = container.querySelector('div[feedback-for="email"]');

@@ -543,7 +395,7 @@ describe('RegistrationPage', () => {
    });

    it('should clear error on focus', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));

      const submitButton = container.querySelector('button.btn-brand');
      fireEvent.click(submitButton);
@@ -572,7 +424,7 @@ describe('RegistrationPage', () => {
      store.dispatch = jest.fn(store.dispatch);

      const { container } = render(routerWrapper(reduxWrapper(
-        <RegistrationPage {...props} />,
+        <IntlRegistrationPage {...props} />,
      )));

      const emailInput = container.querySelector('input#email');
@@ -583,7 +435,7 @@ describe('RegistrationPage', () => {
    // ******** test form buttons and fields ********

    it('should match default button state', () => {
-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      const button = container.querySelector('button[type="submit"] span');
      expect(button.textContent).toEqual('Create an account for free');
    });
@@ -597,7 +449,7 @@ describe('RegistrationPage', () => {
        },
      });

-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));

      const button = container.querySelector('button[type="submit"] span.sr-only');
      expect(button.textContent).toEqual('pending');
@@ -608,7 +460,7 @@ describe('RegistrationPage', () => {
        MARKETING_EMAILS_OPT_IN: 'true',
      });

-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      const checkboxDivs = container.querySelectorAll('div.form-field--checkbox');
      expect(checkboxDivs.length).toEqual(1);

@@ -621,7 +473,7 @@ describe('RegistrationPage', () => {
      const buttonLabel = 'Register';
      delete window.location;
      window.location = { href: getConfig().BASE_URL, search: `?cta=${buttonLabel}` };
-      const { container } = render(reduxWrapper(<RegistrationPage {...props} />));
+      const { container } = render(reduxWrapper(<IntlRegistrationPage {...props} />));
      const button = container.querySelector('button[type="submit"] span');

      const buttonText = button.textContent;
@@ -640,11 +492,11 @@ describe('RegistrationPage', () => {
        },
      });

-      render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      expect(document.cookie).toMatch(`${getConfig().USER_RETENTION_COOKIE_NAME}=true`);
    });

-    it('should redirect to url returned in registration result after successful account creation', async () => {
+    it('should redirect to url returned in registration result after successful account creation', () => {
      const dashboardURL = 'https://test.com/testing-dashboard/';
      store = mockStore({
        ...initialState,
@@ -658,13 +510,11 @@ describe('RegistrationPage', () => {
      });
      delete window.location;
      window.location = { href: getConfig().BASE_URL };
-      render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
-      await waitFor(() => {
-        expect(window.location.href).toBe(dashboardURL);
-      }, { timeout: 1100 });
+      render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
+      expect(window.location.href).toBe(dashboardURL);
    });

-    it('should redirect to dashboard if features flags are configured but no optional fields are configured', async () => {
+    it('should redirect to dashboard if features flags are configured but no optional fields are configured', () => {
      mergeConfig({
        ENABLE_PROGRESSIVE_PROFILING_ON_AUTHN: true,
      });
@@ -687,10 +537,8 @@ describe('RegistrationPage', () => {
      });
      delete window.location;
      window.location = { href: getConfig().BASE_URL };
-      render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
-      await waitFor(() => {
-        expect(window.location.href).toBe(dashboardUrl);
-      }, { timeout: 1100 });
+      render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
+      expect(window.location.href).toBe(dashboardUrl);
    });

    it('should redirect to progressive profiling page if optional fields are configured', () => {
@@ -720,7 +568,7 @@ describe('RegistrationPage', () => {

      render(reduxWrapper(
        <Router>
-          <RegistrationPage {...props} />
+          <IntlRegistrationPage {...props} />
        </Router>,
      ));
      expect(mockNavigate).toHaveBeenCalledWith(AUTHN_PROGRESSIVE_PROFILING);
@@ -738,13 +586,13 @@ describe('RegistrationPage', () => {
      });

      store.dispatch = jest.fn(store.dispatch);
-      render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      expect(store.dispatch).toHaveBeenCalledWith(backupRegistrationFormBegin({ ...registrationFormData }));
    });

    it('should send page event when register page is rendered', () => {
-      render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
-      expect(sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'register', { app_name: APP_NAME });
+      render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
+      expect(sendPageEvent).toHaveBeenCalledWith('login_and_registration', 'register');
    });

    it('should send track event when user has successfully registered', () => {
@@ -761,8 +609,8 @@ describe('RegistrationPage', () => {

      delete window.location;
      window.location = { href: getConfig().BASE_URL };
-      render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
-      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.user.account.registered.client', { app_name: APP_NAME });
+      render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
+      expect(sendTrackEvent).toHaveBeenCalledWith('edx.bi.user.account.registered.client', {});
    });

    it('should populate form with pipeline user details', () => {
@@ -787,7 +635,7 @@ describe('RegistrationPage', () => {
      store.dispatch = jest.fn(store.dispatch);
      const { container } = render(reduxWrapper(
        <Router>
-          <RegistrationPage {...props} />
+          <IntlRegistrationPage {...props} />
        </Router>,
      ));

@@ -810,7 +658,7 @@ describe('RegistrationPage', () => {
        },
      });

-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      const validationErrors = container.querySelector('div#validation-errors');
      expect(validationErrors.textContent).toContain(
        'An error has occurred. Try refreshing the page, or check your internet connection.',
@@ -837,7 +685,7 @@ describe('RegistrationPage', () => {
        },
      });

-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));

      const fullNameInput = container.querySelector('input#name');
      const usernameInput = container.querySelector('input#username');
@@ -883,14 +731,14 @@ describe('RegistrationPage', () => {
          },
        },
      });
-      render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      expect(window.parent.postMessage).toHaveBeenCalledTimes(2);
    });

    it('should not display validations error on blur event when embedded variant is rendered', () => {
      delete window.location;
      window.location = { href: getConfig().BASE_URL.concat(REGISTER_PAGE), search: '?host=http://localhost/host-website' };
-      const { container } = render(reduxWrapper(<RegistrationPage {...props} />));
+      const { container } = render(reduxWrapper(<IntlRegistrationPage {...props} />));

      const usernameInput = container.querySelector('input#username');
      fireEvent.blur(usernameInput, { target: { value: '', name: 'username' } });
@@ -918,7 +766,7 @@ describe('RegistrationPage', () => {
        },
      });
      const { container } = render(routerWrapper(reduxWrapper(
-        <RegistrationPage {...props} />),
+        <IntlRegistrationPage {...props} />),
      ));

      const usernameFeedback = container.querySelector('div[feedback-for="username"]');
@@ -935,7 +783,7 @@ describe('RegistrationPage', () => {
        search: '?host=http://localhost/host-website',
      };

-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      const submitButton = container.querySelector('button.btn-brand');
      fireEvent.click(submitButton);

@@ -976,7 +824,7 @@ describe('RegistrationPage', () => {
      });
      store.dispatch = jest.fn(store.dispatch);

-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      const spinnerElement = container.querySelector('#tpa-spinner');
      const registrationFormElement = container.querySelector('#registration-form');

@@ -984,7 +832,7 @@ describe('RegistrationPage', () => {
      expect(registrationFormElement).toBeFalsy();
    });

-    it('should auto register if autoSubmitRegForm is true and pipeline details are loaded', async () => {
+    it('should auto register if autoSubmitRegForm is true and pipeline details are loaded', () => {
      jest.spyOn(global.Date, 'now').mockImplementation(() => 0);
      getLocale.mockImplementation(() => ('en-us'));

@@ -1027,18 +875,15 @@ describe('RegistrationPage', () => {
      });
      store.dispatch = jest.fn(store.dispatch);

-      render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
-      await waitFor(() => {
-        expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({
-          name: 'John Doe',
-          username: 'john_doe',
-          email: 'john.doe@example.com',
-          country: 'PK',
-          social_auth_provider: 'Apple',
-          total_registration_time: 0,
-          app_name: APP_NAME,
-        }));
-      });
+      render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
+      expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({
+        name: 'John Doe',
+        username: 'john_doe',
+        email: 'john.doe@example.com',
+        country: 'PK',
+        social_auth_provider: 'Apple',
+        totalRegistrationTime: 0,
+      }));
    });
  });
 });
--- a/src/register/components/ConfigurableRegistrationForm.jsx
+++ b/src/register/components/ConfigurableRegistrationForm.jsx
@@ -1,16 +1,10 @@
-import React, { useCallback, useEffect, useMemo } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import React, { useEffect, useMemo } from 'react';

 import { getConfig } from '@edx/frontend-platform';
 import { getCountryList, getLocale, useIntl } from '@edx/frontend-platform/i18n';
 import PropTypes from 'prop-types';

-import {
-  ELEMENT_NAME, ELEMENT_TEXT, ELEMENT_TYPES, PAGE_TYPES,
-} from '../../cohesion/constants';
-import trackCohesionEvent from '../../cohesion/trackers';
 import { FormFieldRenderer } from '../../field-renderer';
-import { backupRegistrationFormBegin } from '../data/actions';
 import { FIELDS } from '../data/constants';
 import messages from '../messages';
 import { CountryField, HonorCode, TermsOfService } from '../RegistrationFields';
@@ -37,14 +31,13 @@ const ConfigurableRegistrationForm = (props) => {
    setFieldErrors,
    setFormFields,
    autoSubmitRegistrationForm,
-    countriesCodesList,
  } = props;
-  const dispatch = useDispatch();

  /** The reason for adding the entry 'United States' is that Chrome browser aut-fill the form with the 'Unites
  States' instead of 'United States of America' which does not exist in country dropdown list and gets the user
  confused and unable to create an account. So we added the United States entry in the dropdown list.
 */
+  const countryList = useMemo(() => getCountryList(getLocale()).concat([{ code: 'US', name: 'United States' }]), []);

  let showTermsOfServiceAndHonorCode = false;
  let showCountryField = false;
@@ -57,8 +50,6 @@ const ConfigurableRegistrationForm = (props) => {
    showMarketingEmailOptInCheckbox: getConfig().MARKETING_EMAILS_OPT_IN,
  };

-  const backedUpFormData = useSelector(state => state.register.registrationFormData);
-
  /**
   * If auto submitting register form, we will check tos and honor code fields if they exist for feature parity.
   */
@@ -79,16 +70,6 @@ const ConfigurableRegistrationForm = (props) => {
    }
  }, [autoSubmitRegistrationForm]); // eslint-disable-line react-hooks/exhaustive-deps

-  const removeDisabledCountries = useCallback((countryList) => {
-    if (!countriesCodesList.length) {
-      return countryList;
-    }
-    return countryList.filter(({ code }) => countriesCodesList.find(x => x === code));
-  }, [countriesCodesList]);
-
-  const countryList = useMemo(() => removeDisabledCountries(
-    getCountryList(getLocale()).concat([{ code: 'US', name: 'United States' }])), [removeDisabledCountries]);
-
  const handleErrorChange = (fieldName, error) => {
    if (fieldName) {
      setFieldErrors(prevErrors => ({
@@ -109,25 +90,6 @@ const ConfigurableRegistrationForm = (props) => {
        setFieldErrors(prevErrors => ({ ...prevErrors, [name]: '' }));
      }
    }
-    // setting marketingEmailsOptIn state for SSO authentication flow for register API call
-    if (name === 'marketingEmailsOptIn') {
-      if (!value) {
-        const cohesionEventData = {
-          pageType: PAGE_TYPES.ACCOUNT_CREATION,
-          elementType: ELEMENT_TYPES.BUTTON,
-          webElementText: ELEMENT_TEXT.OPT_IN_TEXT,
-          webElementName: ELEMENT_NAME.OPT_OUT,
-        };
-        trackCohesionEvent(cohesionEventData);
-      }
-      dispatch(backupRegistrationFormBegin({
-        ...backedUpFormData,
-        configurableFormFields: {
-          ...backedUpFormData.configurableFormFields,
-          [name]: value,
-        },
-      }));
-    }
    setFormFields(prevState => ({ ...prevState, [name]: value }));
  };

@@ -269,16 +231,11 @@ ConfigurableRegistrationForm.propTypes = {
  setFieldErrors: PropTypes.func.isRequired,
  setFormFields: PropTypes.func.isRequired,
  autoSubmitRegistrationForm: PropTypes.bool,
-  countriesCodesList: PropTypes.arrayOf(PropTypes.shape({
-    code: PropTypes.string.isRequired,
-    name: PropTypes.string.isRequired,
-  })),
 };

 ConfigurableRegistrationForm.defaultProps = {
  fieldDescriptions: {},
  autoSubmitRegistrationForm: false,
-  countriesCodesList: [],
 };

 export default ConfigurableRegistrationForm;
--- a/src/register/components/RegistrationFailure.jsx
+++ b/src/register/components/RegistrationFailure.jsx
@@ -9,7 +9,6 @@ import PropTypes from 'prop-types';
 import { windowScrollTo } from '../../data/utils';
 import {
  FORBIDDEN_REQUEST,
-  FORBIDDEN_USERNAME,
  INTERNAL_SERVER_ERROR,
  TPA_AUTHENTICATION_FAILURE,
  TPA_SESSION_EXPIRED,
@@ -49,9 +48,6 @@ const RegistrationFailureMessage = (props) => {
    case TPA_SESSION_EXPIRED:
      errorMessage = formatMessage(messages['registration.tpa.session.expired'], { provider: context.provider });
      break;
-    case FORBIDDEN_USERNAME:
-      errorMessage = formatMessage(messages['registration.forbidden.username']);
-      break;
    default:
      errorMessage = formatMessage(messages['registration.empty.form.submission.error']);
      break;
--- a/src/register/components/tests/ConfigurableRegistrationForm.test.jsx
+++ b/src/register/components/tests/ConfigurableRegistrationForm.test.jsx
@@ -1,19 +1,16 @@
+import React from 'react';
 import { Provider } from 'react-redux';

 import { mergeConfig } from '@edx/frontend-platform';
 import {
-  getLocale, IntlProvider,
+  getLocale, injectIntl, IntlProvider,
 } from '@edx/frontend-platform/i18n';
-import { fireEvent, render, waitFor } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import configureStore from 'redux-mock-store';

-import { APP_NAME } from '../../../data/constants';
 import { registerNewUser } from '../../data/actions';
 import { FIELDS } from '../../data/constants';
-import { NOT_INITIALIZED } from '../../data/optimizelyExperiment/helper';
-import useAutoGeneratedUsernameExperimentVariation
-  from '../../data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation';
 import RegistrationPage from '../../RegistrationPage';
 import ConfigurableRegistrationForm from '../ConfigurableRegistrationForm';

@@ -25,8 +22,9 @@ jest.mock('@edx/frontend-platform/i18n', () => ({
  ...jest.requireActual('@edx/frontend-platform/i18n'),
  getLocale: jest.fn(),
 }));
-jest.mock('../../data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation', () => jest.fn());

+const IntlConfigurableRegistrationForm = injectIntl(ConfigurableRegistrationForm);
+const IntlRegistrationPage = injectIntl(RegistrationPage);
 const mockStore = configureStore();

 jest.mock('react-router-dom', () => {
@@ -96,7 +94,6 @@ describe('ConfigurableRegistrationForm', () => {
      registrationFormData,
      usernameSuggestions: [],
    },
-    cohesion: { eventData: {} },
    commonComponents: {
      thirdPartyAuthApiStatus: null,
      thirdPartyAuthContext,
@@ -124,7 +121,6 @@ describe('ConfigurableRegistrationForm', () => {
    };
    window.location = { search: '' };
    getLocale.mockImplementationOnce(() => ('en-us'));
-    useAutoGeneratedUsernameExperimentVariation.mockReturnValue(NOT_INITIALIZED);
  });

  afterEach(() => {
@@ -162,7 +158,7 @@ describe('ConfigurableRegistrationForm', () => {
      };

      render(routerWrapper(reduxWrapper(
-        <ConfigurableRegistrationForm {...props} />,
+        <IntlConfigurableRegistrationForm {...props} />,
      )));

      expect(document.querySelector('#profession')).toBeTruthy();
@@ -189,11 +185,10 @@ describe('ConfigurableRegistrationForm', () => {
          },
        },
        autoSubmitRegistrationForm: true,
-        countriesCodesList: [{ code: 'AX', name: 'Åland Islands' }, { code: 'AL', name: 'Albania' }],
      };

      render(routerWrapper(reduxWrapper(
-        <ConfigurableRegistrationForm {...props} />,
+        <IntlConfigurableRegistrationForm {...props} />,
      )));

      expect(props.setFormFields).toHaveBeenCalledTimes(2);
@@ -220,12 +215,12 @@ describe('ConfigurableRegistrationForm', () => {
          },
        },
      });
-      render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      expect(document.querySelector('#profession')).toBeTruthy();
      expect(document.querySelector('#tos')).toBeTruthy();
    });

-    it('should submit form with fields returned by backend in payload', async () => {
+    it('should submit form with fields returned by backend in payload', () => {
      mergeConfig({
        SHOW_CONFIGURABLE_EDX_FIELDS: true,
      });
@@ -250,11 +245,11 @@ describe('ConfigurableRegistrationForm', () => {
        country: 'Pakistan',
        honor_code: true,
        profession: 'Engineer',
-        total_registration_time: 0,
+        totalRegistrationTime: 0,
      };

      store.dispatch = jest.fn(store.dispatch);
-      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));

      populateRequiredFields(getByLabelText, payload);

@@ -265,9 +260,7 @@ describe('ConfigurableRegistrationForm', () => {

      fireEvent.click(submitButton);

-      await waitFor(() => {
-        expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...payload, country: 'PK', app_name: APP_NAME }));
-      });
+      expect(store.dispatch).toHaveBeenCalledWith(registerNewUser({ ...payload, country: 'PK' }));
    });

    it('should show error messages for required fields on empty form submission', () => {
@@ -291,7 +284,7 @@ describe('ConfigurableRegistrationForm', () => {
        },
      });

-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      const submitButton = container.querySelector('button.btn-brand');

      fireEvent.click(submitButton);
@@ -317,7 +310,7 @@ describe('ConfigurableRegistrationForm', () => {
          },
        },
      });
-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      const countryInput = container.querySelector('input[name="country"]');
      fireEvent.change(countryInput, { target: { value: 'Pak', name: 'country' } });
      fireEvent.blur(countryInput, { target: { value: 'Pak', name: 'country' } });
@@ -342,7 +335,7 @@ describe('ConfigurableRegistrationForm', () => {
          },
        },
      });
-      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));

      const emailInput = getByLabelText('Email');
      const confirmEmailInput = getByLabelText('Confirm Email');
@@ -363,7 +356,7 @@ describe('ConfigurableRegistrationForm', () => {
        password: 'password1',
        country: 'Ukraine',
        honor_code: true,
-        total_registration_time: 0,
+        totalRegistrationTime: 0,
      };

      store = mockStore({
@@ -378,7 +371,7 @@ describe('ConfigurableRegistrationForm', () => {
          },
        },
      });
-      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { getByLabelText, container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));

      populateRequiredFields(getByLabelText, formPayload, true);
      fireEvent.change(
@@ -413,7 +406,7 @@ describe('ConfigurableRegistrationForm', () => {
      });

      const { getByLabelText, container } = render(
-        routerWrapper(reduxWrapper(<RegistrationPage {...props} />)),
+        routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)),
      );

      const professionInput = getByLabelText('Profession');
--- a/src/register/components/tests/RegistrationFailure.test.jsx
+++ b/src/register/components/tests/RegistrationFailure.test.jsx
@@ -1,8 +1,9 @@
+import React from 'react';
 import { Provider } from 'react-redux';

 import { mergeConfig } from '@edx/frontend-platform';
 import {
-  configure, getLocale, IntlProvider,
+  configure, getLocale, injectIntl, IntlProvider,
 } from '@edx/frontend-platform/i18n';
 import { render, screen } from '@testing-library/react';
 import { BrowserRouter as Router } from 'react-router-dom';
@@ -11,9 +12,6 @@ import configureStore from 'redux-mock-store';
 import {
  FORBIDDEN_REQUEST, INTERNAL_SERVER_ERROR, TPA_AUTHENTICATION_FAILURE, TPA_SESSION_EXPIRED,
 } from '../../data/constants';
-import { NOT_INITIALIZED } from '../../data/optimizelyExperiment/helper';
-import useAutoGeneratedUsernameExperimentVariation
-  from '../../data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation';
 import RegistrationPage from '../../RegistrationPage';
 import RegistrationFailureMessage from '../RegistrationFailure';

@@ -25,8 +23,9 @@ jest.mock('@edx/frontend-platform/i18n', () => ({
  ...jest.requireActual('@edx/frontend-platform/i18n'),
  getLocale: jest.fn(),
 }));
-jest.mock('../../data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation', () => jest.fn());

+const IntlRegistrationPage = injectIntl(RegistrationPage);
+const IntlRegistrationFailure = injectIntl(RegistrationFailureMessage);
 const mockStore = configureStore();

 jest.mock('react-router-dom', () => {
@@ -96,7 +95,6 @@ describe('RegistrationFailure', () => {
      registrationFormData,
      usernameSuggestions: [],
    },
-    cohesion: { eventData: {} },
    commonComponents: {
      thirdPartyAuthApiStatus: null,
      thirdPartyAuthContext,
@@ -123,7 +121,6 @@ describe('RegistrationFailure', () => {
      institutionLogin: false,
    };
    window.location = { search: '' };
-    useAutoGeneratedUsernameExperimentVariation.mockReturnValue(NOT_INITIALIZED);
  });

  afterEach(() => {
@@ -140,7 +137,7 @@ describe('RegistrationFailure', () => {
        failureCount: 0,
      };

-      const { container } = render(reduxWrapper(<RegistrationFailureMessage {...props} />));
+      const { container } = render(reduxWrapper(<IntlRegistrationFailure {...props} />));

      const alertHeading = container.querySelectorAll('div.alert-heading');
      expect(alertHeading.length).toEqual(1);
@@ -156,7 +153,7 @@ describe('RegistrationFailure', () => {
        failureCount: 0,
      };

-      const { container } = render(reduxWrapper(<RegistrationFailureMessage {...props} />));
+      const { container } = render(reduxWrapper(<IntlRegistrationFailure {...props} />));

      const alertHeading = container.querySelectorAll('div.alert-heading');
      expect(alertHeading.length).toEqual(1);
@@ -175,7 +172,7 @@ describe('RegistrationFailure', () => {
        failureCount: 0,
      };

-      const { container } = render(reduxWrapper(<RegistrationFailureMessage {...props} />));
+      const { container } = render(reduxWrapper(<IntlRegistrationFailure {...props} />));

      const alertHeading = container.querySelectorAll('div.alert-heading');
      expect(alertHeading.length).toEqual(1);
@@ -194,7 +191,7 @@ describe('RegistrationFailure', () => {
        failureCount: 0,
      };

-      const { container } = render(reduxWrapper(<RegistrationFailureMessage {...props} />));
+      const { container } = render(reduxWrapper(<IntlRegistrationFailure {...props} />));

      const alertHeading = container.querySelectorAll('div.alert-heading');
      expect(alertHeading.length).toEqual(1);
@@ -214,7 +211,7 @@ describe('RegistrationFailure', () => {
        },
      });

-      render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      const validationError = screen.queryByText('An error has occurred. Try refreshing the page, or check your internet connection.');

      expect(validationError).not.toBeNull();
--- a/src/register/components/tests/ThirdPartyAuth.test.jsx
+++ b/src/register/components/tests/ThirdPartyAuth.test.jsx
@@ -1,20 +1,17 @@
+import React from 'react';
 import { Provider } from 'react-redux';

 import { getConfig, mergeConfig } from '@edx/frontend-platform';
 import {
-  configure, getLocale, IntlProvider,
+  configure, getLocale, injectIntl, IntlProvider,
 } from '@edx/frontend-platform/i18n';
-import { fireEvent, render, waitFor } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import configureStore from 'redux-mock-store';

-import mockTagular from '../../../cohesion/utils';
 import {
  COMPLETE_STATE, LOGIN_PAGE, PENDING_STATE, REGISTER_PAGE,
 } from '../../../data/constants';
-import { NOT_INITIALIZED } from '../../data/optimizelyExperiment/helper';
-import useAutoGeneratedUsernameExperimentVariation
-  from '../../data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation';
 import RegistrationPage from '../../RegistrationPage';

 jest.mock('@edx/frontend-platform/analytics', () => ({
@@ -25,9 +22,8 @@ jest.mock('@edx/frontend-platform/i18n', () => ({
  ...jest.requireActual('@edx/frontend-platform/i18n'),
  getLocale: jest.fn(),
 }));
-jest.mock('../../data/optimizelyExperiment/useAutoGeneratedUsernameExperimentVariation', () => jest.fn());
-mockTagular();

+const IntlRegistrationPage = injectIntl(RegistrationPage);
 const mockStore = configureStore();

 jest.mock('react-router-dom', () => {
@@ -98,7 +94,6 @@ describe('ThirdPartyAuth', () => {
      registrationFormData,
      usernameSuggestions: [],
    },
-    cohesion: { eventData: {} },
    commonComponents: {
      thirdPartyAuthApiStatus: null,
      thirdPartyAuthContext,
@@ -125,7 +120,6 @@ describe('ThirdPartyAuth', () => {
      institutionLogin: false,
    };
    window.location = { search: '' };
-    useAutoGeneratedUsernameExperimentVariation.mockReturnValue(NOT_INITIALIZED);
  });

  afterEach(() => {
@@ -163,7 +157,7 @@ describe('ThirdPartyAuth', () => {
      });

      const { queryByLabelText } = render(
-        routerWrapper(reduxWrapper(<RegistrationPage {...props} />, { store })),
+        routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />, { store })),
      );

      const passwordField = queryByLabelText('Password');
@@ -188,7 +182,7 @@ describe('ThirdPartyAuth', () => {
      window.location = { href: getConfig().BASE_URL.concat(LOGIN_PAGE), search: `?next=/dashboard&tpa_hint=${ssoProvider.id}` };

      const { container } = render(
-        routerWrapper(reduxWrapper(<RegistrationPage {...props} />)),
+        routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)),
      );
      const tpaButton = container.querySelector(`button#${ssoProvider.id}`);

@@ -213,7 +207,7 @@ describe('ThirdPartyAuth', () => {
        search: `?next=/dashboard&tpa_hint=${ssoProvider.id}`,
      };

-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      const skeletonElement = container.querySelector('.react-loading-skeleton');

      expect(skeletonElement).toBeTruthy();
@@ -237,7 +231,7 @@ describe('ThirdPartyAuth', () => {
      window.location = { href: getConfig().BASE_URL.concat(REGISTER_PAGE), search: `?next=/dashboard&tpa_hint=${ssoProvider.id}` };
      ssoProvider.iconImage = null;

-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      const iconElement = container.querySelector(`button#${ssoProvider.id} div span.pgn__icon`);

      expect(iconElement).toBeTruthy();
@@ -260,7 +254,7 @@ describe('ThirdPartyAuth', () => {
      delete window.location;
      window.location = { href: getConfig().BASE_URL.concat(REGISTER_PAGE), search: `?next=/dashboard&tpa_hint=${secondaryProviders.id}` };

-      render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      expect(window.location.href).toEqual(getConfig().LMS_BASE_URL + secondaryProviders.registerUrl);
    });

@@ -281,7 +275,7 @@ describe('ThirdPartyAuth', () => {
      delete window.location;
      window.location = { href: getConfig().BASE_URL.concat(LOGIN_PAGE), search: '?next=/dashboard&tpa_hint=invalid' };

-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      const providerButton = container.querySelector(`button#${ssoProvider.id} span#provider-name`);

      expect(providerButton.textContent).toEqual(expectedMessage);
@@ -300,7 +294,7 @@ describe('ThirdPartyAuth', () => {
      });

      const { container } = render(
-        routerWrapper(reduxWrapper(<RegistrationPage {...props} />, { store })),
+        routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />, { store })),
      );

      const buttonsWithId = container.querySelectorAll(`button#${ssoProvider.id}`);
@@ -321,7 +315,7 @@ describe('ThirdPartyAuth', () => {
      });

      const { container } = render(
-        routerWrapper(reduxWrapper(<RegistrationPage {...props} />)),
+        routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)),
      );

      const buttonsWithId = container.querySelectorAll(`button#${ssoProvider.id}`);
@@ -335,12 +329,12 @@ describe('ThirdPartyAuth', () => {
        institutionLogin: true,
      };

-      const { getByText } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { getByText } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      const headingElement = getByText('Register with institution/campus credentials');
      expect(headingElement).toBeTruthy();
    });

-    it('should redirect to social auth provider url on SSO button click', async () => {
+    it('should redirect to social auth provider url on SSO button click', () => {
      const registerUrl = '/auth/login/apple-id/?auth_entry=register&next=/dashboard';
      store = mockStore({
        ...initialState,
@@ -360,18 +354,16 @@ describe('ThirdPartyAuth', () => {
      window.location = { href: getConfig().BASE_URL };

      const { container } = render(
-        routerWrapper(reduxWrapper(<RegistrationPage {...props} />)),
+        routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)),
      );

      const ssoButton = container.querySelector('button#oa2-apple-id');
      fireEvent.click(ssoButton);

-      await waitFor(() => {
-        expect(window.location.href).toBe(getConfig().LMS_BASE_URL + registerUrl);
-      }, { timeout: 1100 });
+      expect(window.location.href).toBe(getConfig().LMS_BASE_URL + registerUrl);
    });

-    it('should redirect to finishAuthUrl upon successful registration via SSO', async () => {
+    it('should redirect to finishAuthUrl upon successful registration via SSO', () => {
      const authCompleteUrl = '/auth/complete/google-oauth2/';
      store = mockStore({
        ...initialState,
@@ -393,10 +385,8 @@ describe('ThirdPartyAuth', () => {
      delete window.location;
      window.location = { href: getConfig().BASE_URL };

-      render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
-      await waitFor(() => {
-        expect(window.location.href).toBe(getConfig().LMS_BASE_URL + authCompleteUrl);
-      }, { timeout: 1100 });
+      render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
+      expect(window.location.href).toBe(getConfig().LMS_BASE_URL + authCompleteUrl);
    });

    // ******** test alert messages ********
@@ -416,7 +406,7 @@ describe('ThirdPartyAuth', () => {
      const expectedMessage = `${'You\'ve successfully signed into Apple! We just need a little more information before '
                              + 'you start learning with '}${ getConfig().SITE_NAME }.`;

-      const { container } = render(routerWrapper(reduxWrapper(<RegistrationPage {...props} />)));
+      const { container } = render(routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)));
      const tpaAlert = container.querySelector('#tpa-alert p');
      expect(tpaAlert.textContent).toEqual(expectedMessage);
    });
@@ -447,7 +437,7 @@ describe('ThirdPartyAuth', () => {
      store.dispatch = jest.fn(store.dispatch);

      const { container } = render(
-        routerWrapper(reduxWrapper(<RegistrationPage {...props} />)),
+        routerWrapper(reduxWrapper(<IntlRegistrationPage {...props} />)),
      );

      const alertHeading = container.querySelector('div.alert-heading');
--- a/src/register/data/actions.js
+++ b/src/register/data/actions.js
@@ -8,7 +8,7 @@ export const REGISTRATION_CLEAR_BACKEND_ERROR = 'REGISTRATION_CLEAR_BACKEND_ERRO
 export const REGISTER_SET_COUNTRY_CODE = 'REGISTER_SET_COUNTRY_CODE';
 export const REGISTER_SET_USER_PIPELINE_DATA_LOADED = 'REGISTER_SET_USER_PIPELINE_DATA_LOADED';
 export const REGISTER_SET_EMAIL_SUGGESTIONS = 'REGISTER_SET_EMAIL_SUGGESTIONS';
-export const REGISTER_SET_AUTO_GENERATED_USERNAME_REGISTRATION_EXP_DATA = 'REGISTER_SET_AUTO_GENERATED_USERNAME_REGISTRATION_EXP_DATA';
+
 // Backup registration form
 export const backupRegistrationForm = () => ({
  type: BACKUP_REGISTRATION_DATA.BASE,
@@ -83,9 +83,3 @@ export const setUserPipelineDataLoaded = (value) => ({
  type: REGISTER_SET_USER_PIPELINE_DATA_LOADED,
  payload: { value },
 });
-
-// Auto Generated Username Registration Experiment Actions
-export const setAutoGeneratedUsernameExperimentData = (autoGeneratedRegExpVariation) => ({
-  type: REGISTER_SET_AUTO_GENERATED_USERNAME_REGISTRATION_EXP_DATA,
-  payload: { autoGeneratedRegExpVariation },
-});
--- a/src/register/data/constants.js
+++ b/src/register/data/constants.js
@@ -11,4 +11,3 @@ export const FORM_SUBMISSION_ERROR = 'form-submission-error';
 export const INTERNAL_SERVER_ERROR = 'internal-server-error';
 export const TPA_AUTHENTICATION_FAILURE = 'tpa-authentication-failure';
 export const TPA_SESSION_EXPIRED = 'tpa-session-expired';
-export const FORBIDDEN_USERNAME = 'forbidden-username';
--- a/src/register/data/hooks.js
+++ b/src/register/data/hooks.js
@@ -1,40 +0,0 @@
-import { useCallback } from 'react';
-
-import { getConfig } from '@edx/frontend-platform';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { useGoogleReCaptcha } from 'react-google-recaptcha-v3';
-
-import messages from '../messages';
-
-const useRecaptchaSubmission = (actionName = 'submit') => {
-  const { formatMessage } = useIntl();
-  const { executeRecaptcha } = useGoogleReCaptcha();
-  const recaptchaKey = getConfig().RECAPTCHA_SITE_KEY_WEB;
-
-  const isReady = !!executeRecaptcha || !recaptchaKey;
-
-  const executeWithFallback = useCallback(async () => {
-    if (executeRecaptcha && recaptchaKey) {
-      const token = await executeRecaptcha(actionName);
-      if (!token) {
-        throw new Error(formatMessage(messages['registration.captcha.verification.label']));
-      }
-      return token;
-    }
-
-    // Fallback: no reCAPTCHA or not ready
-    if (recaptchaKey) {
-      // eslint-disable-next-line no-console
-      console.warn(`reCAPTCHA not ready for action: ${actionName}. Proceeding without token.`);
-    }
-    return null;
-  }, [executeRecaptcha, recaptchaKey, actionName, formatMessage]);
-
-  return {
-    executeWithFallback,
-    isReady,
-    isLoading: recaptchaKey && !executeRecaptcha,
-  };
-};
-
-export default useRecaptchaSubmission;
--- a/src/register/data/hooks.test.jsx
+++ b/src/register/data/hooks.test.jsx
@@ -1,90 +0,0 @@
-import { getConfig } from '@edx/frontend-platform';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
-import { renderHook } from '@testing-library/react';
-import { useGoogleReCaptcha } from 'react-google-recaptcha-v3';
-
-import useRecaptchaSubmission from './hooks';
-
-jest.mock('@edx/frontend-platform', () => ({
-  getConfig: jest.fn(),
-}));
-
-jest.mock('react-google-recaptcha-v3', () => ({
-  useGoogleReCaptcha: jest.fn(),
-}));
-
-jest.mock('@edx/frontend-platform/i18n', () => ({
-  ...jest.requireActual('@edx/frontend-platform/i18n'),
-  useIntl: () => ({ formatMessage: (msg) => msg.defaultMessage || msg }),
-}));
-
-describe('useRecaptchaSubmission', () => {
-  beforeEach(() => {
-    getConfig.mockReturnValue({ RECAPTCHA_SITE_KEY_WEB: 'test-key' });
-    useGoogleReCaptcha.mockReturnValue({ executeRecaptcha: jest.fn() });
-  });
-
-  it('should throw error if reCAPTCHA returns empty token', async () => {
-    useGoogleReCaptcha.mockReturnValue({
-      executeRecaptcha: jest.fn().mockResolvedValue(null),
-    });
-
-    const { result } = renderHook(() => useRecaptchaSubmission('test_action'), {
-      wrapper: ({ children }) => <IntlProvider locale="en">{children}</IntlProvider>,
-    });
-
-    await expect(result.current.executeWithFallback()).rejects.toThrow(
-      'CAPTCHA verification failed.',
-    );
-  });
-
-  it('should warn and return null if reCAPTCHA key exists but executeRecaptcha is not ready', async () => {
-    const warnSpy = jest.spyOn(console, 'warn').mockImplementation();
-
-    useGoogleReCaptcha.mockReturnValue({
-      executeRecaptcha: undefined,
-    });
-
-    const { result } = renderHook(() => useRecaptchaSubmission('test_action'), {
-      wrapper: ({ children }) => <IntlProvider locale="en">{children}</IntlProvider>,
-    });
-
-    const token = await result.current.executeWithFallback();
-
-    expect(token).toBeNull();
-    expect(warnSpy).toHaveBeenCalledWith(
-      'reCAPTCHA not ready for action: test_action. Proceeding without token.',
-    );
-
-    warnSpy.mockRestore();
-  });
-
-  it('should handle undefined RECAPTCHA_SITE_KEY_WEB gracefully', async () => {
-    const warnSpy = jest.spyOn(console, 'warn').mockImplementation();
-
-    getConfig.mockReturnValue({ RECAPTCHA_SITE_KEY_WEB: undefined });
-
-    const { result } = renderHook(() => useRecaptchaSubmission('test_action'), {
-      wrapper: ({ children }) => <IntlProvider locale="en">{children}</IntlProvider>,
-    });
-
-    const token = await result.current.executeWithFallback();
-
-    expect(token).toBeNull();
-    expect(warnSpy).not.toHaveBeenCalled();
-    warnSpy.mockRestore();
-  });
-
-  it('should return token if reCAPTCHA succeeds', async () => {
-    useGoogleReCaptcha.mockReturnValue({
-      executeRecaptcha: jest.fn().mockResolvedValue('valid-token'),
-    });
-
-    const { result } = renderHook(() => useRecaptchaSubmission('test_action'), {
-      wrapper: ({ children }) => <IntlProvider locale="en">{children}</IntlProvider>,
-    });
-
-    const token = await result.current.executeWithFallback();
-    expect(token).toBe('valid-token');
-  });
-});
--- a/src/register/data/optimizelyExperiment/helper.js
+++ b/src/register/data/optimizelyExperiment/helper.js
@@ -1,30 +0,0 @@
-/**
- * This file contains data for auto generated username Optimizely experiment
- */
-import { getConfig } from '@edx/frontend-platform';
-
-export const NOT_INITIALIZED = 'experiment-not-initialized';
-export const CONTROL = 'control-registration-page';
-export const AUTO_GENERATED_USERNAME_REGISTRATION_EXP_VARIATION = 'auto-generated-username-register-page';
-const AUTO_GENERATED_USERNAME_EXP_PAGE = 'targeting_for_auto_generated_username_page';
-
-export function getAutoGeneratedUsernameExperimentVariation() {
-  try {
-    if (window.optimizely
-        && window.optimizely.get('data').experiments[getConfig().AUTO_GENERATED_USERNAME_EXPERIMENT_ID]) {
-      const selectedVariant = window.optimizely.get('state').getVariationMap()[
-        getConfig().AUTO_GENERATED_USERNAME_EXPERIMENT_ID
-      ];
-      return selectedVariant?.name;
-    }
-  } catch (e) { /* empty */ }
-  return '';
-}
-
-export function activateAutoGeneratedUsernameExperiment() {
-  window.optimizely = window.optimizely || [];
-  window.optimizely.push({
-    type: 'page',
-    pageName: AUTO_GENERATED_USERNAME_EXP_PAGE,
-  });
-}
--- a/Show More
+++ b/Show More