Using hooks in DeleteAccount - goodnight, redux!

2019-07-09 17:10:13 -04:00
126 changed files with 12851 additions and 10231 deletions
--- a/.babelrc
+++ b/.babelrc
@@ -0,0 +1,41 @@
+{
+  "presets": [
+    [
+      "env",
+      {
+        "targets": {
+          "browsers": ["last 2 versions", "ie 11"]
+        }
+      }
+    ],
+    "babel-preset-react"
+  ],
+  "plugins": [
+    "transform-object-rest-spread",
+    "transform-class-properties",
+    ["transform-imports", {
+      "@fortawesome/free-brands-svg-icons": {
+        "transform": "@fortawesome/free-brands-svg-icons/${member}",
+        "skipDefaultConversion": true
+      },
+      "@fortawesome/free-regular-svg-icons": {
+        "transform": "@fortawesome/free-regular-svg-icons/${member}",
+        "skipDefaultConversion": true
+      },
+      "@fortawesome/free-solid-svg-icons": {
+        "transform": "@fortawesome/free-solid-svg-icons/${member}",
+        "skipDefaultConversion": true
+      }
+    }]
+  ],
+  "env": {
+    "i18n": {
+      "plugins": [
+        ["react-intl", {
+          "messagesDir": "./temp/babel-plugin-react-intl",
+          "moduleSourceName": "@edx/frontend-i18n"
+        }]
+      ]
+    }
+  }
+}
--- a/.env
+++ b/.env
@@ -1,18 +0,0 @@
-ACCESS_TOKEN_COOKIE_NAME=null
-BASE_URL=null
-CREDENTIALS_BASE_URL=null
-CSRF_TOKEN_API_PATH=null
-ECOMMERCE_BASE_URL=null
-LANGUAGE_PREFERENCE_COOKIE_NAME=null
-LMS_BASE_URL=null
-LOGIN_URL=null
-LOGOUT_URL=null
-MARKETING_SITE_BASE_URL=null
-NODE_ENV=null
-ORDER_HISTORY_URL=null
-REFRESH_ACCESS_TOKEN_ENDPOINT=null
-SEGMENT_KEY=null
-SITE_NAME=null
-SUPPORT_URL=null
-USER_INFO_COOKIE_NAME=null
-ENABLE_LOGIN_AND_REGISTRATION=false
--- a/.env.development
+++ b/.env.development
@@ -1,19 +0,0 @@
-ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
-BASE_URL='localhost:1997'
-CREDENTIALS_BASE_URL='http://localhost:18150'
-CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
-ECOMMERCE_BASE_URL='http://localhost:18130'
-LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
-LMS_BASE_URL='http://localhost:18000'
-LOGIN_URL='http://localhost:1997/login'
-LOGOUT_URL='http://localhost:18000/login'
-MARKETING_SITE_BASE_URL='http://localhost:18000'
-NODE_ENV='development'
-ORDER_HISTORY_URL='localhost:1996/orders'
-PORT=1997
-REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
-SEGMENT_KEY=null
-SITE_NAME='edX'
-SUPPORT_URL='http://localhost:18000/support'
-USER_INFO_COOKIE_NAME='edx-user-info'
-ENABLE_LOGIN_AND_REGISTRATION=true
--- a/.env.test
+++ b/.env.test
@@ -1,18 +0,0 @@
-ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
-BASE_URL='localhost:1997'
-CREDENTIALS_BASE_URL='http://localhost:18150'
-CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
-ECOMMERCE_BASE_URL='http://localhost:18130'
-LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
-LMS_BASE_URL='http://localhost:18000'
-LOGIN_URL='http://localhost:18000/login'
-LOGOUT_URL='http://localhost:18000/login'
-MARKETING_SITE_BASE_URL='http://localhost:18000'
-NODE_ENV=null
-ORDER_HISTORY_URL='localhost:1996/orders'
-REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
-SEGMENT_KEY=null
-SITE_NAME='edX'
-SUPPORT_URL='http://localhost:18000/support'
-USER_INFO_COOKIE_NAME='edx-user-info'
-ENABLE_LOGIN_AND_REGISTRATION=false #hackathon 23 todo
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,4 +2,3 @@ coverage/*
 dist/
 node_modules/
 __mocks__/
-__snapshots__/
--- a/.eslintrc
+++ b/.eslintrc
@@ -0,0 +1,34 @@
+{
+  "extends": "eslint-config-edx",
+  "parser": "babel-eslint",
+  "rules": {
+    "import/no-extraneous-dependencies": [
+      "error",
+      {
+        "devDependencies": [
+          "webpack/*.js",
+          "**/*.test.jsx",
+          "**/*.test.js"
+        ]
+      }
+    ],
+    // https://github.com/evcohen/eslint-plugin-jsx-a11y/issues/340#issuecomment-338424908
+    "jsx-a11y/anchor-is-valid": [ "error", {
+      "components": [ "Link" ],
+      "specialLink": [ "to" ]
+    }],
+    "jsx-a11y/label-has-for": [ 2, {
+      "components": [ "label" ],
+      "required": {
+        "some": [ "nesting", "id" ]
+      },
+      "allowChildren": false
+    }]
+  },
+  "env": {
+    "jest": true
+  },
+  "globals": {
+    "newrelic": false
+  }
+}
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,3 +0,0 @@
-const { createConfig } = require('@edx/frontend-build');
-
-module.exports = createConfig('eslint');
--- a/.npmignore
+++ b/.npmignore
@@ -1,15 +1,13 @@
-.tx
+.eslintignore
+.eslintrc.json
+.gitignore
+.travis.yml
+docker-compose.yml
+Dockerfile
+Makefile
+npm-debug.log
+
+webpack
 coverage
-dist
 node_modules
 public
-src
-.dockerignore
-.eslintignore
-.eslintrc
-.gitignore
-.releaserc
-.travis.yml
-babel.config.js
-Makefile
-renovate.json
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,23 @@
 language: node_js
-node_js: 12
+node_js:
+  - lts/*
+cache:
+  directories:
+    - "~/.npm"
 before_install:
- npm install -g npm@6
+  - npm install -g npm@latest
+  - npm install -g greenkeeper-lockfile@1.14.0
 install:
- npm ci
+  - npm ci
+before_script: greenkeeper-lockfile-update
+after_script: greenkeeper-lockfile-upload
 script:
- make validate-no-uncommitted-package-lock-changes
- npm run i18n_extract
- npm run lint
- npm run test
- npm run build
- npm run is-es5
+  - make validate-no-uncommitted-package-lock-changes
+  - npm run i18n_extract
+  - npm run lint
+  - npm run test
+  - npm run build
+  - npm run is-es5
 after_success:
- codecov
+  - npm run coveralls
+  - codecov
--- a/149
+++ b/149
@@ -1,21 +1,23 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007

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

                            Preamble

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

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

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

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

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

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

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

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

  0. Definitions.

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

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

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

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

  14. Revised Versions of this License.

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

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

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

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

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

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

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

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

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

  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/README.rst
+++ b/README.rst
@@ -1,60 +1,42 @@
-|Build Status| |Codecov| |npm_version| |npm_downloads| |license| |semantic-release|
+|Build Status| |Coveralls| |npm_version| |npm_downloads| |license|

 frontend-app-account
-====================
+=========================

-This is a micro-frontend application responsible for the display and updating of a user's account information.  Please tag **@edx/arch-team** on any PRs or issues.
+Please tag **@edx/arch-team** on any PRs or issues.

-Development
+Introduction
+------------
+
+React app for account settings.
+
+Get Started
 -----------

-Start Devstack
-^^^^^^^^^^^^^^
+1. Start up your local devstack
+2. If you don't have node installed. Install Node
+3. In the project directory: npm install
+4. Then run npm start
+5. Open your browser to http://localhost:1997/account-settings

-To use this application `devstack <https://github.com/edx/devstack>`__ must be running and you must be logged into it.
+Important Note
+--------------

-  Start devstack
-  Log in (http://localhost:18000/login)
+The production Webpack configuration for this repo uses `Purgecss <https://www.purgecss.com/>`_ 
+to remove unused CSS from the production css file. In webpack/webpack.prod.config.js the Purgecss
+plugin is configured to scan directories to determine what css selectors should remain. Currently
+the src/ directory is scanned along with all @edx/frontend-component* node modules and paragon.
+If you add and use a component in this repo that relies on HTML classes or ids for styling you
+must add it to the Purgecss configuration or it will be unstyled in the production build. 

-Start the development server
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In this project, install requirements and start the development server by running:
-
-.. code:: bash
-
-   npm install
-   npm start # The server will run on port 1997
-
-Once the dev server is up visit http://localhost:1997.
-
-Configuration and Deployment
----------------------------
-
-This MFE is configured via node environment variables supplied at build time. See the .env file for the list of required environment variables. Example build syntax with a single environment variable:
-
-.. code:: bash
-
-   NODE_ENV=development ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload' npm run build
-
-
-For more information see the document: `Micro-frontend applications in Open
-edX <https://github.com/edx/edx-developer-docs/blob/5191e800bf16cf42f25c58c58f983bdaf7f9305d/docs/micro-frontends-in-open-edx.rst>`__.
-
-Notes
-----
-
-The production Webpack configuration for this repo uses `Purgecss <https://www.purgecss.com/>`__ to remove unused CSS from the production css file. In ``webpack.prod.config.js`` the Purgecss plugin is configured to scan directories to determine what css selectors should remain. Currently the src/ directory is scanned along with all ``@edx/frontend-component*`` node modules and ``@edx/paragon``. **If you add and use a component in this repo that relies on HTML classes or ids for styling you must add it to the Purgecss configuration or it will be unstyled in the production build.**

 .. |Build Status| image:: https://api.travis-ci.org/edx/frontend-app-account.svg?branch=master
   :target: https://travis-ci.org/edx/frontend-app-account
-.. |Codecov| image:: https://img.shields.io/codecov/c/github/edx/frontend-app-account
-   :target: https://codecov.io/gh/edx/frontend-app-account
+.. |Coveralls| image:: https://img.shields.io/coveralls/edx/frontend-app-account.svg?branch=master
+   :target: https://coveralls.io/github/edx/frontend-app-account
 .. |npm_version| image:: https://img.shields.io/npm/v/@edx/frontend-app-account.svg
   :target: @edx/frontend-app-account
 .. |npm_downloads| image:: https://img.shields.io/npm/dt/@edx/frontend-app-account.svg
   :target: @edx/frontend-app-account
 .. |license| image:: https://img.shields.io/npm/l/@edx/frontend-app-account.svg
   :target: @edx/frontend-app-account
-.. |semantic-release| image:: https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg
-   :target: https://github.com/semantic-release/semantic-release
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,7 +0,0 @@
-const { createConfig } = require('@edx/frontend-build');
-
-module.exports = createConfig('jest', {
-  setupFiles: [
-    '<rootDir>/src/setupTest.js',
-  ],
-});
--- a/openedx.yaml
+++ b/openedx.yaml
@@ -4,4 +4,3 @@
 nick: acct
 oeps: {}
 owner: edx/arch-team
-openedx-release: {ref: master}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,88 +1,154 @@
 {
  "name": "@edx/frontend-app-account",
-  "version": "1.0.0-semantically-released",
-  "description": "User account micro-frontend for Open edX",
-  "author": "edX",
-  "license": "AGPL-3.0",
+  "version": "0.1.0",
+  "description": "User account React app",
  "repository": {
    "type": "git",
    "url": "git+https://github.com/edx/frontend-app-account.git"
  },
  "scripts": {
-    "build": "fedx-scripts webpack",
-    "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
+    "build": "NODE_ENV=production BABEL_ENV=production webpack --config=webpack/webpack.prod.config.js",
+    "coveralls": "cat ./coverage/lcov.info | coveralls",
+    "i18n_extract": "BABEL_ENV=i18n babel src --quiet > /dev/null",
    "is-es5": "es-check es5 ./dist/*.js",
-    "lint": "fedx-scripts eslint",
-    "snapshot": "fedx-scripts jest --updateSnapshot",
-    "start": "fedx-scripts webpack-dev-server --progress",
-    "test": "fedx-scripts jest --coverage --passWithNoTests"
-  },
-  "bugs": {
-    "url": "https://github.com/edx/frontend-app-account/issues"
+    "lint": "eslint --ext .js --ext .jsx .",
+    "precommit": "npm run lint",
+    "start": "NODE_ENV=development BABEL_ENV=development webpack-dev-server --config=webpack/webpack.dev.config.js --progress",
+    "test": "jest --coverage --passWithNoTests",
+    "travis-deploy-once": "travis-deploy-once"
  },
+  "author": "edX",
+  "license": "AGPL-3.0",
  "homepage": "https://github.com/edx/frontend-app-account#readme",
  "publishConfig": {
    "access": "public"
  },
-  "browserslist": [
-    "last 2 versions",
-    "ie 11"
-  ],
  "dependencies": {
-    "@edx/frontend-component-footer": "10.0.7",
-    "@edx/frontend-component-header": "2.0.5",
-    "@edx/frontend-platform": "1.2.0",
-    "@edx/paragon": "7.1.5",
-    "@fortawesome/fontawesome-svg-core": "1.2.27",
-    "@fortawesome/free-brands-svg-icons": "5.8.2",
-    "@fortawesome/free-regular-svg-icons": "5.7.2",
-    "@fortawesome/free-solid-svg-icons": "5.8.2",
-    "@fortawesome/react-fontawesome": "0.1.8",
-    "babel-polyfill": "6.26.0",
-    "classnames": "2.2.6",
-    "font-awesome": "4.7.0",
-    "form-urlencoded": "4.0.1",
-    "formdata-polyfill": "3.0.19",
-    "history": "4.10.1",
-    "lodash.camelcase": "4.3.0",
-    "lodash.findindex": "4.6.0",
-    "lodash.get": "4.4.2",
-    "lodash.isempty": "4.4.0",
-    "lodash.merge": "4.6.2",
-    "lodash.omit": "4.5.0",
-    "lodash.pick": "4.4.0",
-    "lodash.snakecase": "4.1.1",
-    "memoize-one": "5.1.1",
-    "newrelic": "5.13.1",
-    "prop-types": "15.7.2",
-    "querystring": "0.2.0",
-    "react": "16.10.2",
-    "react-dom": "16.10.2",
-    "react-redux": "7.1.3",
-    "react-router": "5.1.2",
-    "react-router-dom": "5.1.2",
-    "react-router-hash-link": "1.2.2",
-    "react-scrollspy": "3.4.2",
-    "react-transition-group": "4.3.0",
-    "redux": "4.0.5",
-    "redux-devtools-extension": "2.13.8",
-    "redux-logger": "3.0.6",
-    "redux-saga": "1.1.3",
-    "redux-thunk": "2.3.0",
-    "reselect": "4.0.0",
-    "universal-cookie": "4.0.3"
+    "@cospired/i18n-iso-languages": "^2.0.2",
+    "@edx/edx-bootstrap": "^2.2.1",
+    "@edx/frontend-analytics": "^2.0.0",
+    "@edx/frontend-auth": "^5.3.4",
+    "@edx/frontend-component-footer": "^6.0.2",
+    "@edx/frontend-component-site-header": "^2.4.0",
+    "@edx/frontend-i18n": "^2.1.0",
+    "@edx/frontend-logging": "^2.0.2",
+    "@edx/paragon": "^4.2.6",
+    "@fortawesome/fontawesome-svg-core": "^1.2.18",
+    "@fortawesome/free-brands-svg-icons": "^5.8.2",
+    "@fortawesome/free-regular-svg-icons": "^5.7.1",
+    "@fortawesome/free-solid-svg-icons": "^5.8.1",
+    "@fortawesome/react-fontawesome": "^0.1.4",
+    "babel-polyfill": "^6.26.0",
+    "classnames": "^2.2.6",
+    "connected-react-router": "^5.0.1",
+    "email-prop-type": "^1.1.5",
+    "font-awesome": "^4.7.0",
+    "form-urlencoded": "^3.0.0",
+    "formdata-polyfill": "^3.0.18",
+    "glob": "^7.1.3",
+    "history": "^4.7.2",
+    "i18n-iso-countries": "^3.7.8",
+    "iso-countries-languages": "^0.2.1",
+    "lodash.camelcase": "^4.3.0",
+    "lodash.findindex": "^4.6.0",
+    "lodash.get": "^4.4.2",
+    "lodash.isempty": "^4.4.0",
+    "lodash.omit": "^4.5.0",
+    "lodash.pick": "^4.4.0",
+    "lodash.snakecase": "^4.1.1",
+    "memoize-one": "^5.0.4",
+    "newrelic": "^5.5.0",
+    "prop-types": "^15.5.10",
+    "react": "^16.8.3",
+    "react-dom": "^16.8.3",
+    "react-redux": "^5.1.1",
+    "react-router": "^4.2.0",
+    "react-router-dom": "^4.2.2",
+    "react-router-hash-link": "^1.2.1",
+    "react-scrollspy": "^3.4.0",
+    "react-transition-group": "^2.5.3",
+    "redux": "^4.0.1",
+    "redux-devtools-extension": "^2.13.2",
+    "redux-logger": "^3.0.6",
+    "redux-saga": "^1.0.1",
+    "redux-thunk": "^2.2.0",
+    "reselect": "^4.0.0",
+    "universal-cookie": "^3.1.0",
+    "url-polyfill": "^1.1.5"
  },
  "devDependencies": {
-    "@edx/frontend-build": "2.0.6",
-    "codecov": "3.6.5",
-    "enzyme": "3.10.0",
-    "enzyme-adapter-react-16": "1.15.2",
-    "es-check": "5.0.0",
-    "glob": "7.1.6",
-    "husky": "3.0.9",
-    "purgecss-webpack-plugin": "1.6.0",
-    "react-test-renderer": "16.8.6",
+    "@svgr/webpack": "^4.2.0",
+    "autoprefixer": "^9.4.2",
+    "axios-mock-adapter": "^1.15.0",
+    "babel-cli": "^6.26.0",
+    "babel-eslint": "^8.2.2",
+    "babel-jest": "^22.4.0",
+    "babel-loader": "^7.1.2",
+    "babel-plugin-react-intl": "^3.0.1",
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-plugin-transform-imports": "^1.5.1",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
+    "babel-preset-react": "^6.24.1",
+    "clean-webpack-plugin": "^0.1.19",
+    "codecov": "^3.0.0",
+    "copy-webpack-plugin": "^4.6.0",
+    "css-loader": "^0.28.9",
+    "enzyme": "^3.3.0",
+    "enzyme-adapter-react-16": "^1.1.1",
+    "es-check": "^5.0.0",
+    "eslint-config-edx": "^4.0.3",
+    "fetch-mock": "^6.3.0",
+    "file-loader": "^1.1.9",
+    "html-webpack-harddisk-plugin": "^0.2.0",
+    "html-webpack-new-relic-plugin": "^1.1.0",
+    "html-webpack-plugin": "^3.0.3",
+    "husky": "^0.14.3",
+    "identity-obj-proxy": "^3.0.0",
+    "image-webpack-loader": "^4.2.0",
+    "jest": "^22.4.0",
+    "mini-css-extract-plugin": "^0.4.0",
+    "new-relic-source-map-webpack-plugin": "1.1.0",
+    "node-sass": "^4.7.2",
+    "postcss-loader": "^3.0.0",
+    "postcss-rtl": "^1.3.3",
+    "purgecss-webpack-plugin": "^1.5.0",
+    "react-dev-utils": "^5.0.0",
+    "react-test-renderer": "^16.8.6",
    "reactifex": "1.1.1",
-    "redux-mock-store": "1.5.4"
+    "redux-mock-store": "^1.5.3",
+    "sass-loader": "^6.0.6",
+    "source-map-loader": "^0.2.4",
+    "style-loader": "^0.20.2",
+    "travis-deploy-once": "^5.0.9",
+    "url-loader": "^1.1.2",
+    "webpack": "^4.25.1",
+    "webpack-bundle-analyzer": "^3.3.2",
+    "webpack-cli": "^3.1.2",
+    "webpack-dev-server": "^3.1.0",
+    "webpack-merge": "^4.1.1"
+  },
+  "jest": {
+    "testURL": "http://localhost/",
+    "setupFiles": [
+      "./src/setupTest.js"
+    ],
+    "moduleNameMapper": {
+      "\\.svg": "<rootDir>/__mocks__/svgrMock.js",
+      "\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
+      "\\.(css|scss)$": "identity-obj-proxy"
+    },
+    "collectCoverageFrom": [
+      "src/**/*.{js,jsx}"
+    ],
+    "coveragePathIgnorePatterns": [
+      "/node_modules/",
+      "src/setupTest.js",
+      "src/index.js",
+      "/tests/"
+    ],
+    "transformIgnorePatterns": [
+      "/node_modules/(?!(@edx/paragon)/).*/"
+    ]
  }
 }
--- a/public/index.html
+++ b/public/index.html
@@ -4,7 +4,6 @@
      <title>Account | edX</title>
      <meta charset="utf-8">
      <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
  </head>
  <body>
    <div id="root"></div>
--- a/renovate.json
+++ b/renovate.json
@@ -1,9 +0,0 @@
-{
-  "extends": [
-    "config:base"
-  ],
-  "patch": {
-    "automerge": true
-  },
-  "rebaseStalePrs": true
-}
--- a/src/account-settings/AccountSettingsPage.jsx
+++ b/src/account-settings/AccountSettingsPage.jsx
@@ -1,25 +1,21 @@
-import { AppContext } from '@edx/frontend-platform/react';
-import { getConfig, history, getQueryParameters } from '@edx/frontend-platform';
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import memoize from 'memoize-one';
 import findIndex from 'lodash.findindex';
-import { sendTrackingLogEvent } from '@edx/frontend-platform/analytics';
 import {
  injectIntl,
  intlShape,
  FormattedMessage,
-  getCountryList,
-  getLanguageList,
-} from '@edx/frontend-platform/i18n';
+} from '@edx/frontend-i18n';
 import { Hyperlink } from '@edx/paragon';

 import messages from './AccountSettingsPage.messages';
-import { fetchSettings, saveSettings, updateDraft } from './data/actions';
-import { accountSettingsPageSelector } from './data/selectors';
-import PageLoading from './PageLoading';
-import Alert from './Alert';
+
+import { fetchSettings, saveSettings, updateDraft } from './actions';
+import { accountSettingsPageSelector } from './selectors';
+
+import { Alert, PageLoading } from '../common';
 import JumpNav from './JumpNav';
 import DeleteAccount from './delete-account';
 import EditableField from './EditableField';
@@ -31,39 +27,40 @@ import {
  YEAR_OF_BIRTH_OPTIONS,
  EDUCATION_LEVELS,
  GENDER_OPTIONS,
-} from './data/constants';
+} from './constants';
 import { fetchSiteLanguages } from './site-language';

 class AccountSettingsPage extends React.Component {
-  constructor(props, context) {
-    super(props, context);
-
-    // If there is a "duplicate_provider" query parameter, that's the backend's
-    // way of telling us that the provider account the user tried to link is already linked
-    // to another Open edX account. We use this to display a message to that effect, and remove the
-    // parameter from the URL.
-    const duplicateTpaProvider = getQueryParameters().duplicate_provider;
-    if (duplicateTpaProvider !== undefined) {
-      history.replace(history.location.pathname);
-    }
-    this.state = {
-      duplicateTpaProvider,
-    };
+  constructor(props) {
+    super(props);
+    this.educationLevels = EDUCATION_LEVELS.map(key => ({
+      value: key,
+      label: props.intl.formatMessage(messages[`account.settings.field.education.levels.${key || 'empty'}`]),
+    }));
+    this.genderOptions = GENDER_OPTIONS.map(key => ({
+      value: key,
+      label: props.intl.formatMessage(messages[`account.settings.field.gender.options.${key || 'empty'}`]),
+    }));
+    this.languageProficiencyOptions = [{
+      value: '',
+      label: props.intl.formatMessage(messages['account.settings.field.language_proficiencies.options.empty']),
+    }].concat(props.languageProficiencyOptions);
+    this.yearOfBirthOptions = [{
+      value: '',
+      label: props.intl.formatMessage(messages['account.settings.field.year_of_birth.options.empty']),
+    }].concat(YEAR_OF_BIRTH_OPTIONS);
+    this.countryOptions = [{
+      value: '',
+      label: props.intl.formatMessage(messages['account.settings.field.country.options.empty']),
+    }].concat(props.countryOptions);
  }

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

-  // NOTE: We need 'locale' for the memoization in getLocalizedTimeZoneOptions.  Don't remove it!
-  // eslint-disable-next-line no-unused-vars
-  getLocalizedTimeZoneOptions = memoize((timeZoneOptions, countryTimeZoneOptions, locale) => {
+  getTimeZoneOptions = memoize((timeZoneOptions, countryTimeZoneOptions) => {
    const concatTimeZoneOptions = [{
      label: this.props.intl.formatMessage(messages['account.settings.field.time.zone.default']),
      value: '',
@@ -81,29 +78,6 @@ class AccountSettingsPage extends React.Component {
    return concatTimeZoneOptions;
  });

-  getLocalizedOptions = memoize(locale => ({
-    countryOptions: [{
-      value: '',
-      label: this.props.intl.formatMessage(messages['account.settings.field.country.options.empty']),
-    }].concat(getCountryList(locale).map(({ code, name }) => ({ value: code, label: name }))),
-    languageProficiencyOptions: [{
-      value: '',
-      label: this.props.intl.formatMessage(messages['account.settings.field.language_proficiencies.options.empty']),
-    }].concat(getLanguageList(locale).map(({ code, name }) => ({ value: code, label: name }))),
-    yearOfBirthOptions: [{
-      value: '',
-      label: this.props.intl.formatMessage(messages['account.settings.field.year_of_birth.options.empty']),
-    }].concat(YEAR_OF_BIRTH_OPTIONS),
-    educationLevelOptions: EDUCATION_LEVELS.map(key => ({
-      value: key,
-      label: this.props.intl.formatMessage(messages[`account.settings.field.education.levels.${key || 'empty'}`]),
-    })),
-    genderOptions: GENDER_OPTIONS.map(key => ({
-      value: key,
-      label: this.props.intl.formatMessage(messages[`account.settings.field.gender.options.${key || 'empty'}`]),
-    })),
-  }));
-
  isEditable(fieldName) {
    return !this.props.staticFields.includes(fieldName);
  }
@@ -123,7 +97,7 @@ class AccountSettingsPage extends React.Component {
  };

  renderDuplicateTpaProviderMessage() {
-    if (!this.state.duplicateTpaProvider) {
+    if (!this.props.duplicateTpaProvider) {
      return null;
    }

@@ -135,7 +109,7 @@ class AccountSettingsPage extends React.Component {
            defaultMessage="The {provider} account you selected is already linked to another edX account."
            description="alert message informing the user that the third-party account they attempted to link is already linked to another edX account"
            values={{
-              provider: <b>{this.state.duplicateTpaProvider}</b>,
+              provider: <b>{this.props.duplicateTpaProvider}</b>,
            }}
          />
        </Alert>
@@ -158,7 +132,7 @@ class AccountSettingsPage extends React.Component {
            values={{
              managerTitle: <b>{this.props.profileDataManager}</b>,
              support: (
-                <Hyperlink destination={getConfig().SUPPORT_URL} target="_blank">
+                <Hyperlink destination={this.props.supportUrl} target="_blank">
                  <FormattedMessage
                    id="account.settings.message.managed.settings.support"
                    defaultMessage="support"
@@ -205,19 +179,9 @@ class AccountSettingsPage extends React.Component {
      onSubmit: this.handleSubmit,
    };

-    // Memoized options lists
-    const {
-      countryOptions,
-      languageProficiencyOptions,
-      yearOfBirthOptions,
-      educationLevelOptions,
-      genderOptions,
-    } = this.getLocalizedOptions(this.context.locale);
-
-    const timeZoneOptions = this.getLocalizedTimeZoneOptions(
+    const timeZoneOptions = this.getTimeZoneOptions(
      this.props.timeZoneOptions,
      this.props.countryTimeZoneOptions,
-      this.context.locale,
    );

    const hasLinkedTPA = findIndex(this.props.tpaProviders, provider => provider.connected) >= 0;
@@ -276,14 +240,14 @@ class AccountSettingsPage extends React.Component {
            label={this.props.intl.formatMessage(messages['account.settings.field.dob'])}
            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.dob.empty'])}
            value={this.props.formValues.year_of_birth}
-            options={yearOfBirthOptions}
+            options={this.yearOfBirthOptions}
            {...editableFieldProps}
          />
          <EditableField
            name="country"
            type="select"
            value={this.props.formValues.country}
-            options={countryOptions}
+            options={this.countryOptions}
            label={this.props.intl.formatMessage(messages['account.settings.field.country'])}
            emptyLabel={
              this.isEditable('country') ?
@@ -304,7 +268,7 @@ class AccountSettingsPage extends React.Component {
            name="level_of_education"
            type="select"
            value={this.props.formValues.level_of_education}
-            options={educationLevelOptions}
+            options={this.educationLevels}
            label={this.props.intl.formatMessage(messages['account.settings.field.education'])}
            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.education.empty'])}
            {...editableFieldProps}
@@ -313,7 +277,7 @@ class AccountSettingsPage extends React.Component {
            name="gender"
            type="select"
            value={this.props.formValues.gender}
-            options={genderOptions}
+            options={this.genderOptions}
            label={this.props.intl.formatMessage(messages['account.settings.field.gender'])}
            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.gender.empty'])}
            {...editableFieldProps}
@@ -322,7 +286,7 @@ class AccountSettingsPage extends React.Component {
            name="language_proficiencies"
            type="select"
            value={this.props.formValues.language_proficiencies}
-            options={languageProficiencyOptions}
+            options={this.languageProficiencyOptions}
            label={this.props.intl.formatMessage(messages['account.settings.field.language.proficiencies'])}
            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.language.proficiencies.empty'])}
            {...editableFieldProps}
@@ -371,7 +335,7 @@ class AccountSettingsPage extends React.Component {
            name="siteLanguage"
            type="select"
            options={this.props.siteLanguageOptions}
-            value={this.props.siteLanguage.draft !== undefined ? this.props.siteLanguage.draft : this.context.locale}
+            value={this.props.siteLanguage.draftOrSavedValue}
            label={this.props.intl.formatMessage(messages['account.settings.field.site.language'])}
            helpText={this.props.intl.formatMessage(messages['account.settings.field.site.language.help.text'])}
            {...editableFieldProps}
@@ -402,6 +366,7 @@ class AccountSettingsPage extends React.Component {
          <DeleteAccount
            isVerifiedAccount={this.props.isActive}
            hasLinkedTPA={hasLinkedTPA}
+            logoutUrl={this.props.logoutUrl}
          />
        </div>

@@ -455,8 +420,6 @@ class AccountSettingsPage extends React.Component {
  }
 }

-AccountSettingsPage.contextType = AppContext;
-
 AccountSettingsPage.propTypes = {
  intl: intlShape.isRequired,
  loading: PropTypes.bool,
@@ -481,12 +444,21 @@ AccountSettingsPage.propTypes = {
  }).isRequired,
  siteLanguage: PropTypes.shape({
    previousValue: PropTypes.string,
-    draft: PropTypes.string,
+    draftOrSavedValue: PropTypes.string,
+    savedValue: PropTypes.string,
  }),
  siteLanguageOptions: PropTypes.arrayOf(PropTypes.shape({
    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
  })),
+  countryOptions: PropTypes.arrayOf(PropTypes.shape({
+    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  })),
+  languageProficiencyOptions: PropTypes.arrayOf(PropTypes.shape({
+    label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  })),
  profileDataManager: PropTypes.string,
  staticFields: PropTypes.arrayOf(PropTypes.string),
  hiddenFields: PropTypes.arrayOf(PropTypes.string),
@@ -504,7 +476,10 @@ AccountSettingsPage.propTypes = {
  updateDraft: PropTypes.func.isRequired,
  saveSettings: PropTypes.func.isRequired,
  fetchSettings: PropTypes.func.isRequired,
+  duplicateTpaProvider: PropTypes.string,
  tpaProviders: PropTypes.arrayOf(PropTypes.object),
+  supportUrl: PropTypes.string.isRequired,
+  logoutUrl: PropTypes.string.isRequired,
 };

 AccountSettingsPage.defaultProps = {
@@ -513,11 +488,14 @@ AccountSettingsPage.defaultProps = {
  loadingError: null,
  siteLanguage: null,
  siteLanguageOptions: [],
+  countryOptions: [],
  timeZoneOptions: [],
  countryTimeZoneOptions: [],
+  languageProficiencyOptions: [],
  profileDataManager: null,
  staticFields: [],
  hiddenFields: ['secondary_email'],
+  duplicateTpaProvider: null,
  tpaProviders: [],
  isActive: true,
 };
--- a/src/account-settings/AccountSettingsPage.messages.jsx
+++ b/src/account-settings/AccountSettingsPage.messages.jsx
@@ -1,4 +1,4 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
+import { defineMessages } from '@edx/frontend-i18n';

 const messages = defineMessages({
  'account.settings.page.heading': {
--- a/src/account-settings/BetaLanguageBanner.jsx
+++ b/src/account-settings/BetaLanguageBanner.jsx
@@ -1,15 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { AppContext } from '@edx/frontend-platform/react';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-i18n';
 import { connect } from 'react-redux';
 import { Button, Hyperlink } from '@edx/paragon';

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

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

  render() {
-    const savedLanguage = this.getSiteLanguageEntry(this.context.locale);
+    const savedLanguage = this.getSiteLanguageEntry(this.props.siteLanguage.savedValue);
    const isSavedLanguageReleased = savedLanguage.released === true;
    const noPreviousLanguageSet = this.props.siteLanguage.previousValue === null;
    if (isSavedLanguageReleased || noPreviousLanguageSet) {
@@ -88,13 +87,12 @@ class BetaLanguageBanner extends React.Component {
  }
 }

-BetaLanguageBanner.contextType = AppContext;
-
 BetaLanguageBanner.propTypes = {
  intl: intlShape.isRequired,
  siteLanguage: PropTypes.shape({
    previousValue: PropTypes.string,
-    draft: PropTypes.string,
+    draftOrSavedValue: PropTypes.string,
+    savedValue: PropTypes.string,
  }),
  siteLanguageList: PropTypes.arrayOf(PropTypes.shape({
    name: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
--- a/src/account-settings/EditableField.jsx
+++ b/src/account-settings/EditableField.jsx
@@ -1,19 +1,19 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-i18n';
 import { Button, Input, StatefulButton, ValidationFormGroup } from '@edx/paragon';
 import { faPencilAlt } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

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

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


 function EditableField(props) {
--- a/src/account-settings/EmailField.jsx
+++ b/src/account-settings/EmailField.jsx
@@ -1,20 +1,19 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-i18n';
 import { Button, StatefulButton, Input, ValidationFormGroup } from '@edx/paragon';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faExclamationTriangle, faPencilAlt } from '@fortawesome/free-solid-svg-icons';

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

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


 function EmailField(props) {
--- a/src/account-settings/JumpNav.jsx
+++ b/src/account-settings/JumpNav.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-i18n'; // eslint-disable-line
 import { NavHashLink } from 'react-router-hash-link';
 import Scrollspy from 'react-scrollspy';

--- a/src/account-settings/_style.scss
+++ b/src/account-settings/_style.scss
@@ -20,9 +20,6 @@
    }
    li {
      margin-bottom: .5rem;
-      a {
-        text-decoration: underline;
-      }
    }
  }

@@ -32,7 +29,7 @@
  }
  .account-section {
    // These properties together will shift the hashlink position
-    margin-bottom: map-get($spacers, 5);
+    margin-bottom: map-get($spacers, 5); 
    padding-top: 1rem;
  }
 }
--- a/src/account-settings/data/actions.js
+++ b/src/account-settings/data/actions.js
@@ -1,4 +1,6 @@
-import { AsyncActionType } from './utils';
+import { utils } from '../common';
+
+const { AsyncActionType } = utils;

 export const FETCH_SETTINGS = new AsyncActionType('ACCOUNT_SETTINGS', 'FETCH_SETTINGS');
 export const SAVE_SETTINGS = new AsyncActionType('ACCOUNT_SETTINGS', 'SAVE_SETTINGS');
--- a/src/account-settings/data/constants.js
+++ b/src/account-settings/data/constants.js
--- a/src/account-settings/data/utils/snapshots/reduxUtils.test.js.snap
+++ b/src/account-settings/data/utils/snapshots/reduxUtils.test.js.snap
@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`getModuleState should throw an exception on a bad path 1`] = `"Unexpected state key uhoh given to getModuleState. Is your state path set up correctly?"`;
--- a/src/account-settings/data/utils/dataUtils.js
+++ b/src/account-settings/data/utils/dataUtils.js
@@ -1,38 +0,0 @@
-import camelCase from 'lodash.camelcase';
-import snakeCase from 'lodash.snakecase';
-
-export function modifyObjectKeys(object, modify) {
-  // If the passed in object is not an object, return it.
-  if (
-    object === undefined ||
-    object === null ||
-    (typeof object !== 'object' && !Array.isArray(object))
-  ) {
-    return object;
-  }
-
-  if (Array.isArray(object)) {
-    return object.map(value => modifyObjectKeys(value, modify));
-  }
-
-  // Otherwise, process all its keys.
-  const result = {};
-  Object.entries(object).forEach(([key, value]) => {
-    result[modify(key)] = modifyObjectKeys(value, modify);
-  });
-  return result;
-}
-
-export function camelCaseObject(object) {
-  return modifyObjectKeys(object, camelCase);
-}
-
-export function snakeCaseObject(object) {
-  return modifyObjectKeys(object, snakeCase);
-}
-
-export function convertKeyNames(object, nameMap) {
-  const transformer = key => (nameMap[key] === undefined ? key : nameMap[key]);
-
-  return modifyObjectKeys(object, transformer);
-}
--- a/src/account-settings/data/utils/dataUtils.test.js
+++ b/src/account-settings/data/utils/dataUtils.test.js
@@ -1,90 +0,0 @@
-import {
-  modifyObjectKeys,
-  camelCaseObject,
-  snakeCaseObject,
-  convertKeyNames,
-} from './dataUtils';
-
-describe('modifyObjectKeys', () => {
-  it('should use the provided modify function to change all keys in and object and its children', () => {
-    function meowKeys(key) {
-      return `${key}Meow`;
-    }
-
-    const result = modifyObjectKeys(
-      {
-        one: undefined,
-        two: null,
-        three: '',
-        four: 0,
-        five: NaN,
-        six: [1, 2, { seven: 'woof' }],
-        eight: { nine: { ten: 'bark' }, eleven: true },
-      },
-      meowKeys,
-    );
-
-    expect(result).toEqual({
-      oneMeow: undefined,
-      twoMeow: null,
-      threeMeow: '',
-      fourMeow: 0,
-      fiveMeow: NaN,
-      sixMeow: [1, 2, { sevenMeow: 'woof' }],
-      eightMeow: { nineMeow: { tenMeow: 'bark' }, elevenMeow: true },
-    });
-  });
-});
-
-describe('camelCaseObject', () => {
-  it('should make everything camelCase', () => {
-    const result = camelCaseObject({
-      what_now: 'brown cow',
-      but_who: { says_you_people: 'okay then', but_how: { will_we_even_know: 'the song is over' } },
-      'dot.dot.dot': 123,
-    });
-
-    expect(result).toEqual({
-      whatNow: 'brown cow',
-      butWho: { saysYouPeople: 'okay then', butHow: { willWeEvenKnow: 'the song is over' } },
-      dotDotDot: 123,
-    });
-  });
-});
-
-describe('snakeCaseObject', () => {
-  it('should make everything snake_case', () => {
-    const result = snakeCaseObject({
-      whatNow: 'brown cow',
-      butWho: { saysYouPeople: 'okay then', butHow: { willWeEvenKnow: 'the song is over' } },
-      'dot.dot.dot': 123,
-    });
-
-    expect(result).toEqual({
-      what_now: 'brown cow',
-      but_who: { says_you_people: 'okay then', but_how: { will_we_even_know: 'the song is over' } },
-      dot_dot_dot: 123,
-    });
-  });
-});
-
-describe('convertKeyNames', () => {
-  it('should replace the specified keynames', () => {
-    const result = convertKeyNames(
-      {
-        one: { two: { three: 'four' } },
-        five: 'six',
-      },
-      {
-        two: 'blue',
-        five: 'alive',
-        seven: 'heaven',
-      },
-    );
-
-    expect(result).toEqual({
-      one: { blue: { three: 'four' } },
-      alive: 'six',
-    });
-  });
-});
--- a/src/account-settings/data/utils/index.js
+++ b/src/account-settings/data/utils/index.js
@@ -1,12 +0,0 @@
-export {
-  camelCaseObject,
-  convertKeyNames,
-  modifyObjectKeys,
-  snakeCaseObject,
-} from './dataUtils';
-export {
-  AsyncActionType,
-  getModuleState,
-} from './reduxUtils';
-export { default as handleFailure } from './sagaUtils';
-export { unpackFieldErrors, handleRequestError } from './serviceUtils';
--- a/src/account-settings/data/utils/reduxUtils.js
+++ b/src/account-settings/data/utils/reduxUtils.js
@@ -1,62 +0,0 @@
-/**
- * Helper class to save time when writing out action types for asynchronous methods.  Also helps
- * ensure that actions are namespaced.
- */
-export class AsyncActionType {
-  constructor(topic, name) {
-    this.topic = topic;
-    this.name = name;
-  }
-
-  get BASE() {
-    return `${this.topic}__${this.name}`;
-  }
-
-  get BEGIN() {
-    return `${this.topic}__${this.name}__BEGIN`;
-  }
-
-  get SUCCESS() {
-    return `${this.topic}__${this.name}__SUCCESS`;
-  }
-
-  get FAILURE() {
-    return `${this.topic}__${this.name}__FAILURE`;
-  }
-
-  get RESET() {
-    return `${this.topic}__${this.name}__RESET`;
-  }
-}
-
-/**
- * Given a state tree and an array representing a set of keys to traverse in that tree, returns
- * the portion of the tree at that key path.
- *
- * Example:
- *
- * const result = getModuleState(
- *   {
- *     first: { red: { awesome: 'sauce' }, blue: { weak: 'sauce' } },
- *     second: { other: 'data', }
- *   },
- *   ['first', 'red']
- * );
- *
- * result will be:
- *
- * {
- *   awesome: 'sauce'
- * }
- */
-export function getModuleState(state, originalPath) {
-  const path = [...originalPath]; // don't modify your argument
-  if (path.length < 1) {
-    return state;
-  }
-  const key = path.shift();
-  if (state[key] === undefined) {
-    throw new Error(`Unexpected state key ${key} given to getModuleState. Is your state path set up correctly?`);
-  }
-  return getModuleState(state[key], path);
-}
--- a/src/account-settings/data/utils/reduxUtils.test.js
+++ b/src/account-settings/data/utils/reduxUtils.test.js
@@ -1,51 +0,0 @@
-import {
-  AsyncActionType,
-  getModuleState,
-} from './reduxUtils';
-
-describe('AsyncActionType', () => {
-  it('should return well formatted action strings', () => {
-    const actionType = new AsyncActionType('HOUSE_CATS', 'START_THE_RACE');
-
-    expect(actionType.BASE).toBe('HOUSE_CATS__START_THE_RACE');
-    expect(actionType.BEGIN).toBe('HOUSE_CATS__START_THE_RACE__BEGIN');
-    expect(actionType.SUCCESS).toBe('HOUSE_CATS__START_THE_RACE__SUCCESS');
-    expect(actionType.FAILURE).toBe('HOUSE_CATS__START_THE_RACE__FAILURE');
-    expect(actionType.RESET).toBe('HOUSE_CATS__START_THE_RACE__RESET');
-  });
-});
-
-describe('getModuleState', () => {
-  const state = {
-    first: { red: { awesome: 'sauce' }, blue: { weak: 'sauce' } },
-    second: { other: 'data' },
-  };
-
-  it('should return everything if given an empty path', () => {
-    expect(getModuleState(state, [])).toEqual(state);
-  });
-
-  it('should resolve paths correctly', () => {
-    expect(getModuleState(
-      state,
-      ['first'],
-    )).toEqual({ red: { awesome: 'sauce' }, blue: { weak: 'sauce' } });
-
-    expect(getModuleState(
-      state,
-      ['first', 'red'],
-    )).toEqual({ awesome: 'sauce' });
-
-    expect(getModuleState(state, ['second'])).toEqual({ other: 'data' });
-  });
-
-  it('should throw an exception on a bad path', () => {
-    expect(() => {
-      getModuleState(state, ['uhoh']);
-    }).toThrowErrorMatchingSnapshot();
-  });
-
-  it('should return non-objects correctly', () => {
-    expect(getModuleState(state, ['first', 'red', 'awesome'])).toEqual('sauce');
-  });
-});
--- a/src/account-settings/delete-account/BeforeProceedingBanner.jsx
+++ b/src/account-settings/delete-account/BeforeProceedingBanner.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-i18n';
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Hyperlink } from '@edx/paragon';
@@ -9,10 +9,10 @@ import { Hyperlink } from '@edx/paragon';
 import messages from './messages';

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

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

  return (
    <Alert
@@ -25,7 +25,7 @@ const BeforeProceedingBanner = (props) => {
        description="Error that appears if you are trying to delete your edX account, but something about your account needs attention first.  The actionLink will be instructions, such as 'unlink your Facebook account'."
        values={{
          actionLink: (
-            <Hyperlink destination={supportArticleUrl}>
+            <Hyperlink destination={supportUrl}>
              {intl.formatMessage(messages[instructionMessageId])}
            </Hyperlink>
          ),
@@ -38,7 +38,7 @@ const BeforeProceedingBanner = (props) => {
 BeforeProceedingBanner.propTypes = {
  instructionMessageId: PropTypes.string.isRequired,
  intl: intlShape.isRequired,
-  supportArticleUrl: PropTypes.string.isRequired,
+  supportUrl: PropTypes.string.isRequired,
 };

 export default injectIntl(BeforeProceedingBanner);
--- a/src/account-settings/delete-account/ConfirmationModal.jsx
+++ b/src/account-settings/delete-account/ConfirmationModal.jsx
@@ -2,12 +2,12 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';

 import { Button, Input, Modal, ValidationFormGroup } from '@edx/paragon';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-i18n';
 import { faExclamationCircle, faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

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

 export class ConfirmationModal extends Component {
@@ -51,7 +51,7 @@ export class ConfirmationModal extends Component {

  render() {
    const {
-      status,
+      open,
      errorType,
      intl,
      onCancel,
@@ -59,7 +59,6 @@ export class ConfirmationModal extends Component {
      onSubmit,
      password,
    } = this.props;
-    const open = ['confirming', 'pending', 'failed'].includes(status);
    const passwordFieldId = 'passwordFieldId';
    const invalidMessage = messages[this.getShortErrorMessageId(errorType)];
    return (
@@ -113,7 +112,7 @@ export class ConfirmationModal extends Component {
 }

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

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

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

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

@@ -43,7 +44,8 @@ describe('ConfirmationModal', () => {
        <IntlProvider locale="en">
          <IntlConfirmationModal
            {...props}
-            status="pending" // This will cause 'modal-backdrop' and 'show' to appear on the modal as CSS classes.
+            // This will cause 'modal-backdrop' and 'show' to appear on the modal as CSS classes.
+            open
          />
        </IntlProvider>
      ))
@@ -58,7 +60,8 @@ describe('ConfirmationModal', () => {
          <IntlConfirmationModal
            {...props}
            errorType="empty-password"
-            status="pending" // This will cause 'modal-backdrop' and 'show' to appear on the modal as CSS classes.
+            // This will cause 'modal-backdrop' and 'show' to appear on the modal as CSS classes.
+            open
          />
        </IntlProvider>
      ))
--- a/src/account-settings/delete-account/DeleteAccount.jsx
+++ b/src/account-settings/delete-account/DeleteAccount.jsx
@@ -1,19 +1,8 @@
-import React from 'react';
+import React, { useState, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { getConfig } from '@edx/frontend-platform';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-i18n';
 import { Button, Hyperlink } from '@edx/paragon';

-// Actions
-import {
-  deleteAccount,
-  deleteAccountConfirmation,
-  deleteAccountFailure,
-  deleteAccountReset,
-  deleteAccountCancel,
-} from './data/actions';
-
 // Messages
 import messages from './messages';

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

-export class DeleteAccount extends React.Component {
-  state = {
-    password: '',
-  };
+function DeleteAccount(props) {
+  const {
+    logoutUrl, hasLinkedTPA, isVerifiedAccount, intl,
+  } = props;

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

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

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

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

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

-    return (
-      <div>
-        <h2 className="section-heading">
-          {intl.formatMessage(messages['account.settings.delete.account.header'])}
-        </h2>
-        <p>{intl.formatMessage(messages['account.settings.delete.account.subheader'])}</p>
-        <p>{intl.formatMessage(messages['account.settings.delete.account.text.1'])}</p>
-        <p>{intl.formatMessage(messages['account.settings.delete.account.text.2'])}</p>
-        <p>
-          <PrintingInstructions />
-        </p>
-        <p className="text-danger h6">
-          {intl.formatMessage(messages['account.settings.delete.account.text.warning'])}
-        </p>
-        <p>
-          <Hyperlink destination="https://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings">
-            {intl.formatMessage(messages['account.settings.delete.account.text.change.instead'])}
-          </Hyperlink>
-        </p>
-        <p>
-          <Button
-            className="btn-outline-danger"
-            onClick={canDelete ? this.props.deleteAccountConfirmation : null}
-            disabled={!canDelete}
-          >
-            {intl.formatMessage(messages['account.settings.delete.account.button'])}
-          </Button>
-        </p>
+  return (
+    <div>
+      <h2 className="section-heading">
+        {intl.formatMessage(messages['account.settings.delete.account.header'])}
+      </h2>
+      <p>{intl.formatMessage(messages['account.settings.delete.account.subheader'])}</p>
+      <p>{intl.formatMessage(messages['account.settings.delete.account.text.1'])}</p>
+      <p>{intl.formatMessage(messages['account.settings.delete.account.text.2'])}</p>
+      <p>
+        <PrintingInstructions />
+      </p>
+      <p className="text-danger h6">
+        {intl.formatMessage(messages['account.settings.delete.account.text.warning'])}
+      </p>
+      <p>
+        <Hyperlink destination="https://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings">
+          {intl.formatMessage(messages['account.settings.delete.account.text.change.instead'])}
+        </Hyperlink>
+      </p>
+      <p>
+        <Button
+          className="btn-outline-danger"
+          onClick={handleDeleteAccountClick}
+          disabled={!canDelete}
+        >
+          {intl.formatMessage(messages['account.settings.delete.account.button'])}
+        </Button>
+      </p>

-        {isVerifiedAccount ? null : (
-          <BeforeProceedingBanner
-            instructionMessageId="account.settings.delete.account.please.activate"
-            supportArticleUrl="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-activate-my-account-"
-          />
-        )}
-
-        {hasLinkedTPA ? (
-          <BeforeProceedingBanner
-            instructionMessageId="account.settings.delete.account.please.unlink"
-            supportArticleUrl="https://support.edx.org/hc/en-us/articles/207206067"
-          />
-        ) : null}
-
-        <ConnectedConfirmationModal
-          status={status}
-          errorType={errorType}
-          onSubmit={this.handleSubmit}
-          onCancel={this.handleCancel}
-          onChange={this.handlePasswordChange}
-          password={this.state.password}
+      {isVerifiedAccount ? null : (
+        <BeforeProceedingBanner
+          instructionMessageId="account.settings.delete.account.please.activate"
+          supportUrl="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-activate-my-account-"
        />
+      )}

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

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

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

-// Assume we're part of the accountSettings state.
-const mapStateToProps = state => state.accountSettings.deleteAccount;
-
-export default connect(
-  mapStateToProps,
-  {
-    deleteAccount,
-    deleteAccountConfirmation,
-    deleteAccountFailure,
-    deleteAccountReset,
-    deleteAccountCancel,
-  },
-)(injectIntl(DeleteAccount));
+export default injectIntl(DeleteAccount);
--- a/src/account-settings/delete-account/DeleteAccount.test.jsx
+++ b/src/account-settings/delete-account/DeleteAccount.test.jsx
@@ -1,29 +1,21 @@
 import React from 'react';
 import renderer from 'react-test-renderer';
-import { IntlProvider, injectIntl } from '@edx/frontend-platform/i18n';
+import { IntlProvider } from '@edx/frontend-i18n';

 // Testing the modals separately, they just clutter up the snapshots if included here.
 jest.mock('./ConfirmationModal');
 jest.mock('./SuccessModal');

-import { DeleteAccount } from './DeleteAccount'; // eslint-disable-line import/first
-
-const IntlDeleteAccount = injectIntl(DeleteAccount);
+import DeleteAccount from './DeleteAccount'; // eslint-disable-line import/first

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

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

@@ -31,7 +23,7 @@ describe('DeleteAccount', () => {
    const tree = renderer
      .create((
        <IntlProvider locale="en">
-          <IntlDeleteAccount
+          <DeleteAccount
            {...props}
          />
        </IntlProvider>
@@ -44,7 +36,7 @@ describe('DeleteAccount', () => {
    const tree = renderer
      .create((
        <IntlProvider locale="en">
-          <IntlDeleteAccount
+          <DeleteAccount
            {...props}
            isVerifiedAccount={false}
          />
@@ -58,7 +50,7 @@ describe('DeleteAccount', () => {
    const tree = renderer
      .create((
        <IntlProvider locale="en">
-          <IntlDeleteAccount
+          <DeleteAccount
            {...props}
            hasLinkedTPA
          />
--- a/src/account-settings/delete-account/PrintingInstructions.jsx
+++ b/src/account-settings/delete-account/PrintingInstructions.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-i18n';
 import { Hyperlink } from '@edx/paragon';

 import messages from './messages';
--- a/src/account-settings/delete-account/SuccessModal.jsx
+++ b/src/account-settings/delete-account/SuccessModal.jsx
@@ -1,15 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape } from '@edx/frontend-i18n';
 import { Modal } from '@edx/paragon';

 import messages from './messages';

 export const SuccessModal = (props) => {
-  const { status, intl, onClose } = props;
+  const { open, intl, onClose } = props;
  return (
    <Modal
-      open={status === 'deleted'}
+      open={open}
      title={intl.formatMessage(messages['account.settings.delete.account.modal.after.header'])}
      body={
        <div>
@@ -26,13 +26,13 @@ export const SuccessModal = (props) => {
 };

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

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

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

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

  it('should match default closed success modal snapshot', () => {
-    let tree = renderer.create((
+    const tree = renderer.create((
      <IntlProvider locale="en"><IntlSuccessModal {...props} /></IntlProvider>))
      .toJSON();
    expect(tree).toMatchSnapshot();
-
-    tree = renderer.create((
-      <IntlProvider locale="en"><IntlSuccessModal {...props} status="confirming" /></IntlProvider>))
-      .toJSON();
-    expect(tree).toMatchSnapshot();
-
-    tree = renderer.create((
-      <IntlProvider locale="en"><IntlSuccessModal {...props} status="pending" /></IntlProvider>))
-      .toJSON();
-    expect(tree).toMatchSnapshot();
-
-    tree = renderer.create((
-      <IntlProvider locale="en"><IntlSuccessModal {...props} status="failed" /></IntlProvider>))
-      .toJSON();
-    expect(tree).toMatchSnapshot();
  });

  it('should match open success modal snapshot', () => {
@@ -48,7 +33,8 @@ describe('SuccessModal', () => {
        <IntlProvider locale="en">
          <IntlSuccessModal
            {...props}
-            status="deleted" // This will cause 'modal-backdrop' and 'show' to appear on the modal as CSS classes.
+            // This will cause 'modal-backdrop' and 'show' to appear on the modal as CSS classes.
+            open
          />
        </IntlProvider>
      ))
--- a/src/account-settings/delete-account/snapshots/ConfirmationModal.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/ConfirmationModal.test.jsx.snap
@@ -8,11 +8,11 @@ exports[`ConfirmationModal should match default closed confirmation modal snapsh
  />
  <div
    className="modal js-close-modal-on-click fade"
-    onMouseDown={[Function]}
+    onClick={[Function]}
    role="presentation"
  >
    <div
-      aria-labelledby="id2"
+      aria-labelledby="id3"
      aria-modal={true}
      className=""
      role="dialog"
@@ -26,7 +26,7 @@ exports[`ConfirmationModal should match default closed confirmation modal snapsh
        >
          <h2
            className="modal-title"
-            id="id2"
+            id="id3"
          >
            Are you sure?
          </h2>
@@ -120,7 +120,6 @@ exports[`ConfirmationModal should match default closed confirmation modal snapsh
          </button>
          <button
            className="btn js-close-modal-on-click btn-secondary"
-            id="paragonCloseModalButton1"
            onBlur={[Function]}
            onClick={[Function]}
            onKeyDown={[Function]}
@@ -143,11 +142,11 @@ exports[`ConfirmationModal should match empty password confirmation modal snapsh
  />
  <div
    className="modal js-close-modal-on-click show d-block"
-    onMouseDown={[Function]}
+    onClick={[Function]}
    role="presentation"
  >
    <div
-      aria-labelledby="id6"
+      aria-labelledby="id5"
      aria-modal={true}
      className="modal-dialog"
      role="dialog"
@@ -161,7 +160,7 @@ exports[`ConfirmationModal should match empty password confirmation modal snapsh
        >
          <h2
            className="modal-title"
-            id="id6"
+            id="id5"
          >
            Are you sure?
          </h2>
@@ -288,7 +287,6 @@ exports[`ConfirmationModal should match empty password confirmation modal snapsh
          </button>
          <button
            className="btn js-close-modal-on-click btn-secondary"
-            id="paragonCloseModalButton5"
            onBlur={[Function]}
            onClick={[Function]}
            onKeyDown={[Function]}
@@ -311,7 +309,7 @@ exports[`ConfirmationModal should match open confirmation modal snapshot 1`] = `
  />
  <div
    className="modal js-close-modal-on-click show d-block"
-    onMouseDown={[Function]}
+    onClick={[Function]}
    role="presentation"
  >
    <div
@@ -423,7 +421,6 @@ exports[`ConfirmationModal should match open confirmation modal snapshot 1`] = `
          </button>
          <button
            className="btn js-close-modal-on-click btn-secondary"
-            id="paragonCloseModalButton3"
            onBlur={[Function]}
            onClick={[Function]}
            onKeyDown={[Function]}
--- a/src/account-settings/delete-account/snapshots/SuccessModal.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/SuccessModal.test.jsx.snap
@@ -8,11 +8,11 @@ exports[`SuccessModal should match default closed success modal snapshot 1`] = `
  />
  <div
    className="modal js-close-modal-on-click fade"
-    onMouseDown={[Function]}
+    onClick={[Function]}
    role="presentation"
  >
    <div
-      aria-labelledby="id2"
+      aria-labelledby="id3"
      aria-modal={true}
      className=""
      role="dialog"
@@ -26,7 +26,7 @@ exports[`SuccessModal should match default closed success modal snapshot 1`] = `
        >
          <h2
            className="modal-title"
-            id="id2"
+            id="id3"
          >
            We're sorry to see you go!  Your account will be deleted shortly.
          </h2>
@@ -47,7 +47,6 @@ exports[`SuccessModal should match default closed success modal snapshot 1`] = `
        >
          <button
            className="btn js-close-modal-on-click btn-secondary"
-            id="paragonCloseModalButton1"
            onBlur={[Function]}
            onClick={[Function]}
            onKeyDown={[Function]}
@@ -62,21 +61,21 @@ exports[`SuccessModal should match default closed success modal snapshot 1`] = `
 </div>
 `;

-exports[`SuccessModal should match default closed success modal snapshot 2`] = `
+exports[`SuccessModal should match open success modal snapshot 1`] = `
 <div>
  <div
-    className="fade"
+    className="modal-backdrop show"
    role="presentation"
  />
  <div
-    className="modal js-close-modal-on-click fade"
-    onMouseDown={[Function]}
+    className="modal js-close-modal-on-click show d-block"
+    onClick={[Function]}
    role="presentation"
  >
    <div
      aria-labelledby="id4"
      aria-modal={true}
-      className=""
+      className="modal-dialog"
      role="dialog"
      tabIndex="-1"
    >
@@ -109,193 +108,6 @@ exports[`SuccessModal should match default closed success modal snapshot 2`] = `
        >
          <button
            className="btn js-close-modal-on-click btn-secondary"
-            id="paragonCloseModalButton3"
-            onBlur={[Function]}
-            onClick={[Function]}
-            onKeyDown={[Function]}
-            type="button"
-          >
-            Close
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`SuccessModal should match default closed success modal snapshot 3`] = `
-<div>
-  <div
-    className="fade"
-    role="presentation"
-  />
-  <div
-    className="modal js-close-modal-on-click fade"
-    onMouseDown={[Function]}
-    role="presentation"
-  >
-    <div
-      aria-labelledby="id6"
-      aria-modal={true}
-      className=""
-      role="dialog"
-      tabIndex="-1"
-    >
-      <div
-        className="modal-content"
-      >
-        <div
-          className="modal-header"
-        >
-          <h2
-            className="modal-title"
-            id="id6"
-          >
-            We're sorry to see you go!  Your account will be deleted shortly.
-          </h2>
-        </div>
-        <div
-          className="modal-body"
-        >
-          <div>
-            <p
-              className="h6"
-            >
-              Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
-            </p>
-          </div>
-        </div>
-        <div
-          className="modal-footer"
-        >
-          <button
-            className="btn js-close-modal-on-click btn-secondary"
-            id="paragonCloseModalButton5"
-            onBlur={[Function]}
-            onClick={[Function]}
-            onKeyDown={[Function]}
-            type="button"
-          >
-            Close
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`SuccessModal should match default closed success modal snapshot 4`] = `
-<div>
-  <div
-    className="fade"
-    role="presentation"
-  />
-  <div
-    className="modal js-close-modal-on-click fade"
-    onMouseDown={[Function]}
-    role="presentation"
-  >
-    <div
-      aria-labelledby="id8"
-      aria-modal={true}
-      className=""
-      role="dialog"
-      tabIndex="-1"
-    >
-      <div
-        className="modal-content"
-      >
-        <div
-          className="modal-header"
-        >
-          <h2
-            className="modal-title"
-            id="id8"
-          >
-            We're sorry to see you go!  Your account will be deleted shortly.
-          </h2>
-        </div>
-        <div
-          className="modal-body"
-        >
-          <div>
-            <p
-              className="h6"
-            >
-              Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
-            </p>
-          </div>
-        </div>
-        <div
-          className="modal-footer"
-        >
-          <button
-            className="btn js-close-modal-on-click btn-secondary"
-            id="paragonCloseModalButton7"
-            onBlur={[Function]}
-            onClick={[Function]}
-            onKeyDown={[Function]}
-            type="button"
-          >
-            Close
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`SuccessModal should match open success modal snapshot 1`] = `
-<div>
-  <div
-    className="modal-backdrop show"
-    role="presentation"
-  />
-  <div
-    className="modal js-close-modal-on-click show d-block"
-    onMouseDown={[Function]}
-    role="presentation"
-  >
-    <div
-      aria-labelledby="id10"
-      aria-modal={true}
-      className="modal-dialog"
-      role="dialog"
-      tabIndex="-1"
-    >
-      <div
-        className="modal-content"
-      >
-        <div
-          className="modal-header"
-        >
-          <h2
-            className="modal-title"
-            id="id10"
-          >
-            We're sorry to see you go!  Your account will be deleted shortly.
-          </h2>
-        </div>
-        <div
-          className="modal-body"
-        >
-          <div>
-            <p
-              className="h6"
-            >
-              Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.
-            </p>
-          </div>
-        </div>
-        <div
-          className="modal-footer"
-        >
-          <button
-            className="btn js-close-modal-on-click btn-secondary"
-            id="paragonCloseModalButton9"
            onBlur={[Function]}
            onClick={[Function]}
            onKeyDown={[Function]}
--- a/src/account-settings/delete-account/data/actions.js
+++ b/src/account-settings/delete-account/data/actions.js
@@ -1,37 +0,0 @@
-import { AsyncActionType } from '../../data/utils';
-
-export const DELETE_ACCOUNT = new AsyncActionType('ACCOUNT_SETTINGS', 'DELETE_ACCOUNT');
-DELETE_ACCOUNT.CONFIRMATION = 'ACCOUNT_SETTINGS__DELETE_ACCOUNT__CONFIRMATION';
-DELETE_ACCOUNT.CANCEL = 'ACCOUNT_SETTINGS__DELETE_ACCOUNT__CANCEL';
-
-export const deleteAccount = password => ({
-  type: DELETE_ACCOUNT.BASE,
-  payload: { password },
-});
-
-export const deleteAccountConfirmation = () => ({
-  type: DELETE_ACCOUNT.CONFIRMATION,
-});
-
-export const deleteAccountBegin = () => ({
-  type: DELETE_ACCOUNT.BEGIN,
-});
-
-export const deleteAccountSuccess = () => ({
-  type: DELETE_ACCOUNT.SUCCESS,
-});
-
-export const deleteAccountFailure = reason => ({
-  type: DELETE_ACCOUNT.FAILURE,
-  payload: { reason },
-});
-
-// to clear errors from the confirmation modal
-export const deleteAccountReset = () => ({
-  type: DELETE_ACCOUNT.RESET,
-});
-
-// to close the modal
-export const deleteAccountCancel = () => ({
-  type: DELETE_ACCOUNT.CANCEL,
-});
--- a/src/account-settings/delete-account/data/reducers.js
+++ b/src/account-settings/delete-account/data/reducers.js
@@ -1,60 +0,0 @@
-import { DELETE_ACCOUNT } from './actions';
-
-export const defaultState = {
-  status: null,
-  errorType: null,
-};
-
-const reducer = (state = defaultState, action = null) => {
-  if (action !== null) {
-    switch (action.type) {
-      case DELETE_ACCOUNT.CONFIRMATION:
-        return {
-          ...state,
-          status: 'confirming',
-        };
-
-      case DELETE_ACCOUNT.BEGIN:
-        return {
-          ...state,
-          status: 'pending',
-        };
-
-      case DELETE_ACCOUNT.SUCCESS:
-        return {
-          ...state,
-          status: 'deleted',
-        };
-
-      case DELETE_ACCOUNT.FAILURE:
-        return {
-          ...state,
-          status: 'failed',
-          errorType: action.payload.reason || 'server',
-        };
-
-      case DELETE_ACCOUNT.RESET: {
-        const oldStatus = state.status;
-
-        return {
-          ...state,
-          // clear the error state if applicable, otherwise don't change state
-          status: oldStatus === 'failed' ? 'confirming' : oldStatus,
-          errorType: null,
-        };
-      }
-
-      case DELETE_ACCOUNT.CANCEL:
-        return {
-          ...state,
-          status: null,
-          errorType: null,
-        };
-
-      default:
-    }
-  }
-  return state;
-};
-
-export default reducer;
--- a/src/account-settings/delete-account/data/reducers.test.js
+++ b/src/account-settings/delete-account/data/reducers.test.js
@@ -1,107 +0,0 @@
-import reducer from './reducers';
-import {
-  deleteAccountConfirmation,
-  deleteAccountBegin,
-  deleteAccountSuccess,
-  deleteAccountFailure,
-  deleteAccountReset,
-  deleteAccountCancel,
-} from './actions';
-
-describe('delete-account reducer', () => {
-  let state = null;
-
-  beforeEach(() => {
-    state = reducer();
-  });
-
-  it('should process DELETE_ACCOUNT.CONFIRMATION', () => {
-    const result = reducer(state, deleteAccountConfirmation());
-    expect(result).toEqual({
-      errorType: null,
-      status: 'confirming',
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.BEGIN', () => {
-    const result = reducer(state, deleteAccountBegin());
-    expect(result).toEqual({
-      errorType: null,
-      status: 'pending',
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.SUCCESS', () => {
-    const result = reducer(state, deleteAccountSuccess());
-    expect(result).toEqual({
-      errorType: null,
-      status: 'deleted',
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.FAILURE no reason', () => {
-    const result = reducer(state, deleteAccountFailure());
-    expect(result).toEqual({
-      errorType: 'server',
-      status: 'failed',
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.FAILURE with reason', () => {
-    const result = reducer(state, deleteAccountFailure('carnivorous buns'));
-    expect(result).toEqual({
-      errorType: 'carnivorous buns',
-      status: 'failed',
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.RESET no status', () => {
-    const result = reducer(state, deleteAccountReset());
-    expect(result).toEqual({
-      errorType: null,
-      status: null,
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.RESET with failed old status', () => {
-    const result = reducer(
-      {
-        errorType: 'carnivorous buns',
-        status: 'failed',
-      },
-      deleteAccountReset(),
-    );
-    expect(result).toEqual({
-      errorType: null,
-      status: 'confirming',
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.RESET with pending old status', () => {
-    const result = reducer(
-      {
-        errorType: 'carnivorous buns',
-        status: 'pending',
-      },
-      deleteAccountReset(),
-    );
-    expect(result).toEqual({
-      errorType: null,
-      status: 'pending',
-    });
-  });
-
-  it('should process DELETE_ACCOUNT.CANCEL', () => {
-    const result = reducer(
-      {
-        errorType: 'carnivorous buns',
-        status: 'failed',
-      },
-      deleteAccountCancel(),
-    );
-    expect(result).toEqual({
-      errorType: null,
-      status: null,
-    });
-  });
-});
--- a/src/account-settings/delete-account/data/sagas.js
+++ b/src/account-settings/delete-account/data/sagas.js
@@ -1,28 +0,0 @@
-import { put, call, takeEvery } from 'redux-saga/effects';
-
-import {
-  DELETE_ACCOUNT,
-  deleteAccountBegin,
-  deleteAccountSuccess,
-  deleteAccountFailure,
-} from './actions';
-
-import { postDeleteAccount } from './service';
-
-export function* handleDeleteAccount(action) {
-  try {
-    yield put(deleteAccountBegin());
-    const response = yield call(postDeleteAccount, action.payload.password);
-    yield put(deleteAccountSuccess(response));
-  } catch (e) {
-    if (typeof e.response.data === 'string') {
-      yield put(deleteAccountFailure());
-    } else {
-      throw e;
-    }
-  }
-}
-
-export default function* saga() {
-  yield takeEvery(DELETE_ACCOUNT.BASE, handleDeleteAccount);
-}
--- a/src/account-settings/delete-account/data/service.js
+++ b/src/account-settings/delete-account/data/service.js
@@ -1,16 +1,24 @@
-import { getConfig } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import formurlencoded from 'form-urlencoded';
-import { handleRequestError } from '../../data/utils';
+import { applyConfiguration, handleRequestError } from '../../../common/serviceUtils';
+
+let config = {
+  DELETE_ACCOUNT_URL: null,
+};
+
+let apiClient = null;
+
+export function configureService(newConfig, newApiClient) {
+  config = applyConfiguration(config, newConfig);
+  apiClient = newApiClient;
+}

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

 const messages = defineMessages({
  'account.settings.delete.account.header': {
--- a/src/account-settings/index.js
+++ b/src/account-settings/index.js
@@ -1,5 +1,13 @@
-export { default } from './AccountSettingsPage';
-export { default as reducer } from './data/reducers';
-export { default as saga } from './data/sagas';
-export { storeName } from './data/selectors';
-export { default as NotFoundPage } from './NotFoundPage';
+import ConnectedAccountSettingsPage from './AccountSettingsPage';
+import reducer from './reducers';
+import saga from './sagas';
+import { configureService } from './service';
+import { storeName } from './selectors';
+
+export {
+  configureService,
+  ConnectedAccountSettingsPage,
+  reducer,
+  saga,
+  storeName,
+};
--- a/src/account-settings/data/reducers.js
+++ b/src/account-settings/data/reducers.js
@@ -9,10 +9,9 @@ import {
  RESET_DRAFTS,
 } from './actions';

-import { reducer as deleteAccountReducer, DELETE_ACCOUNT } from '../delete-account';
-import { reducer as siteLanguageReducer, FETCH_SITE_LANGUAGES } from '../site-language';
-import { reducer as resetPasswordReducer, RESET_PASSWORD } from '../reset-password';
-import { reducer as thirdPartyAuthReducer, DISCONNECT_AUTH } from '../third-party-auth';
+import { reducer as siteLanguageReducer, FETCH_SITE_LANGUAGES } from './site-language';
+import { reducer as resetPasswordReducer, RESET_PASSWORD } from './reset-password';
+import { reducer as thirdPartyAuthReducer, DISCONNECT_AUTH } from './third-party-auth';

 export const defaultState = {
  loading: false,
@@ -27,7 +26,6 @@ export const defaultState = {
  timeZones: [],
  countryTimeZones: [],
  previousSiteLanguage: null,
-  deleteAccount: deleteAccountReducer(),
  siteLanguage: siteLanguageReducer(),
  resetPassword: resetPasswordReducer(),
  thirdPartyAuth: thirdPartyAuthReducer(),
@@ -151,20 +149,8 @@ const reducer = (state = defaultState, action) => {
        countryTimeZones: action.payload.timeZones,
      };

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

    case FETCH_SITE_LANGUAGES.BEGIN:
    case FETCH_SITE_LANGUAGES.SUCCESS:
--- a/src/account-settings/reset-password/ConfirmationAlert.jsx
+++ b/src/account-settings/reset-password/ConfirmationAlert.jsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage } from '@edx/frontend-platform/i18n';
+import { FormattedMessage } from '@edx/frontend-i18n';
 import { Hyperlink } from '@edx/paragon';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';

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

 const ConfirmationAlert = (props) => {
  const { email } = props;
--- a/src/account-settings/reset-password/ResetPassword.jsx
+++ b/src/account-settings/reset-password/ResetPassword.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
+import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-i18n';
 import { StatefulButton } from '@edx/paragon';

 import { resetPassword } from './data/actions';
--- a/src/account-settings/reset-password/data/actions.js
+++ b/src/account-settings/reset-password/data/actions.js
@@ -1,4 +1,6 @@
-import { AsyncActionType } from '../../data/utils';
+import { utils } from '../../../common';
+
+const { AsyncActionType } = utils;

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

--- a/src/account-settings/reset-password/data/service.js
+++ b/src/account-settings/reset-password/data/service.js
@@ -1,13 +1,21 @@
-import { getConfig } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import formurlencoded from 'form-urlencoded';
-import { handleRequestError } from '../../data/utils';
+import { applyConfiguration, handleRequestError } from '../../../common/serviceUtils';
+
+let config = {
+  PASSWORD_RESET_URL: null,
+};
+
+let apiClient = null;
+
+export function configureService(newConfig, newApiClient) {
+  config = applyConfiguration(config, newConfig);
+  apiClient = newApiClient;
+}

-// eslint-disable-next-line import/prefer-default-export
 export async function postResetPassword(email) {
-  const { data } = await getAuthenticatedHttpClient()
+  const { data } = await apiClient
    .post(
-      `${getConfig().LMS_BASE_URL}/password_reset/`,
+      config.PASSWORD_RESET_URL,
      formurlencoded({ email }),
      {
        headers: {
--- a/src/account-settings/reset-password/index.js
+++ b/src/account-settings/reset-password/index.js
@@ -2,3 +2,4 @@ export { default } from './ResetPassword';
 export { default as reducer } from './data/reducers';
 export { RESET_PASSWORD } from './data/actions';
 export { default as saga } from './data/sagas';
+export { configureService } from './data/service';
--- a/src/account-settings/reset-password/messages.js
+++ b/src/account-settings/reset-password/messages.js
@@ -1,4 +1,4 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
+import { defineMessages } from '@edx/frontend-i18n';

 const messages = defineMessages({
  'account.settings.editable.field.password.reset.button': {
--- a/src/account-settings/data/sagas.js
+++ b/src/account-settings/data/sagas.js
@@ -1,8 +1,4 @@
-import { call, put, delay, takeEvery, all } from 'redux-saga/effects';
-
-import { publish } from '@edx/frontend-platform';
-import { getLocale, handleRtl, LOCALE_CHANGED } from '@edx/frontend-platform/i18n';
-import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
+import { call, put, delay, takeEvery, select, all } from 'redux-saga/effects';

 // Actions
 import {
@@ -20,29 +16,28 @@ import {
  fetchTimeZones,
  fetchTimeZonesSuccess,
 } from './actions';
+import { usernameSelector, userRolesSelector, siteLanguageSelector } from './selectors';

 // Sub-modules
-import { saga as deleteAccountSaga } from '../delete-account';
-import { saga as resetPasswordSaga } from '../reset-password';
-import {
-  saga as siteLanguageSaga,
-  patchPreferences,
-  postSetLang,
-} from '../site-language';
-import { saga as thirdPartyAuthSaga } from '../third-party-auth';
+import { saga as resetPasswordSaga } from './reset-password';
+import { saga as siteLanguageSaga, ApiService as SiteLanguageApiService } from './site-language';
+import { saga as thirdPartyAuthSaga } from './third-party-auth';

 // Services
-import { getSettings, patchSettings, getTimeZones } from './service';
+import * as ApiService from './service';
+
+import { setLocale, handleRtl } from '@edx/frontend-i18n'; // eslint-disable-line

 export function* handleFetchSettings() {
  try {
    yield put(fetchSettingsBegin());
-    const { username, roles: userRoles } = getAuthenticatedUser();
+    const username = yield select(usernameSelector);
+    const userRoles = yield select(userRolesSelector);

    const {
      thirdPartyAuthProviders, profileDataManager, timeZones, ...values
    } = yield call(
-      getSettings,
+      ApiService.getSettings,
      username,
      userRoles,
    );
@@ -65,25 +60,22 @@ export function* handleSaveSettings(action) {
  try {
    yield put(saveSettingsBegin());

-    const { username } = getAuthenticatedUser();
+    const username = yield select(usernameSelector);
    const { commitValues, formId } = action.payload;
    const commitData = { [formId]: commitValues };
    let savedValues = null;
    if (formId === 'siteLanguage') {
-      const previousSiteLanguage = getLocale();
-      // The following two requests need to be done sequentially, with patching preferences before
-      // the post to setlang.  They used to be done in parallel, but this might create ambiguous
-      // behavior.
-      yield call(patchPreferences, username, { prefLang: commitValues });
-      yield call(postSetLang, commitValues);
-
-      yield put(savePreviousSiteLanguage(previousSiteLanguage));
-
-      publish(LOCALE_CHANGED, getLocale());
+      const previousSiteLanguage = yield select(siteLanguageSelector);
+      yield all([
+        call(SiteLanguageApiService.patchPreferences, username, { prefLang: commitValues }),
+        call(SiteLanguageApiService.postSetLang, commitValues),
+      ]);
+      yield put(setLocale(commitValues));
+      yield put(savePreviousSiteLanguage(previousSiteLanguage.savedValue));
      handleRtl();
      savedValues = commitData;
    } else {
-      savedValues = yield call(patchSettings, username, commitData);
+      savedValues = yield call(ApiService.patchSettings, username, commitData);
    }
    yield put(saveSettingsSuccess(savedValues, commitData));
    if (savedValues.country) yield put(fetchTimeZones(savedValues.country));
@@ -100,7 +92,7 @@ export function* handleSaveSettings(action) {
 }

 export function* handleFetchTimeZones(action) {
-  const response = yield call(getTimeZones, action.payload.country);
+  const response = yield call(ApiService.getTimeZones, action.payload.country);
  yield put(fetchTimeZonesSuccess(response, action.payload.country));
 }

@@ -110,7 +102,6 @@ export default function* saga() {
  yield takeEvery(SAVE_SETTINGS.BASE, handleSaveSettings);
  yield takeEvery(FETCH_TIME_ZONES.BASE, handleFetchTimeZones);
  yield all([
-    deleteAccountSaga(),
    siteLanguageSaga(),
    resetPasswordSaga(),
    thirdPartyAuthSaga(),
--- a/src/account-settings/data/selectors.js
+++ b/src/account-settings/data/selectors.js
@@ -1,11 +1,24 @@
 import { createSelector, createStructuredSelector } from 'reselect';
+import {
+  localeSelector,
+  getCountryList,
+  getLanguageList,
+} from '@edx/frontend-i18n'; // eslint-disable-line

-import { siteLanguageOptionsSelector, siteLanguageListSelector } from '../site-language';
+import { siteLanguageOptionsSelector, siteLanguageListSelector } from './site-language';

 export const storeName = 'accountSettings';

+export const usernameSelector = state => state.authentication.username;
+
+export const userRolesSelector = state => state.authentication.roles || [];
+
 export const accountSettingsSelector = state => ({ ...state[storeName] });

+const duplicateTpaProviderSelector = state => state.errors.duplicateTpaProvider;
+
+const configurationSelector = state => state.configuration;
+
 const editableFieldNameSelector = (state, props) => props.name;

 const valuesSelector = createSelector(
@@ -87,6 +100,17 @@ const formValuesSelector = createSelector(
  },
 );

+const countryOptionsSelector = createSelector(
+  localeSelector,
+  locale => getCountryList(locale).map(({ code, name }) => ({ value: code, label: name })),
+);
+
+const languageProficiencyOptionsSelector = createSelector(
+  localeSelector,
+  locale => getLanguageList(locale).map(({ code, name }) => ({ value: code, label: name })),
+);
+
+
 const transformTimeZonesToOptions = timeZoneArr => timeZoneArr
  .map(({ time_zone, description }) => ({ // eslint-disable-line camelcase
    value: time_zone, label: description,
@@ -107,24 +131,40 @@ const activeAccountSelector = createSelector(
  accountSettings => accountSettings.values.is_active,
 );

+/**
+ * This selector converts the site language code back to the server version so that it can match up
+ * with one of the options in the site language dropdown.  The drafts version will already be the
+ * server version, but if it's from localeSelector, it will be our client (two character) version.
+ */
 export const siteLanguageSelector = createSelector(
  previousSiteLanguageSelector,
  draftsSelector,
-  (previousValue, drafts) => ({
+  localeSelector,
+  (previousValue, drafts, locale) => ({
    previousValue,
-    draft: drafts.siteLanguage,
+    draftOrSavedValue: (drafts.siteLanguage !== undefined ? drafts.siteLanguage : locale),
+    savedValue: locale,
  }),
 );

-export const betaLanguageBannerSelector = createStructuredSelector({
-  siteLanguageList: siteLanguageListSelector,
-  siteLanguage: siteLanguageSelector,
-});
+export const betaLanguageBannerSelector = createSelector(
+  siteLanguageListSelector,
+  siteLanguageSelector,
+  (
+    siteLanguageList,
+    siteLanguage,
+  ) => ({
+    siteLanguageList,
+    siteLanguage,
+  }),
+);

 export const accountSettingsPageSelector = createSelector(
  accountSettingsSelector,
  siteLanguageOptionsSelector,
  siteLanguageSelector,
+  countryOptionsSelector,
+  languageProficiencyOptionsSelector,
  formValuesSelector,
  profileDataManagerSelector,
  staticFieldsSelector,
@@ -132,10 +172,14 @@ export const accountSettingsPageSelector = createSelector(
  timeZonesSelector,
  countryTimeZonesSelector,
  activeAccountSelector,
+  duplicateTpaProviderSelector,
+  configurationSelector,
  (
    accountSettings,
    siteLanguageOptions,
    siteLanguage,
+    countryOptions,
+    languageProficiencyOptions,
    formValues,
    profileDataManager,
    staticFields,
@@ -143,9 +187,13 @@ export const accountSettingsPageSelector = createSelector(
    timeZoneOptions,
    countryTimeZoneOptions,
    activeAccount,
+    duplicateTpaProvider,
+    configuration,
  ) => ({
    siteLanguageOptions,
    siteLanguage,
+    countryOptions,
+    languageProficiencyOptions,
    loading: accountSettings.loading,
    loaded: accountSettings.loaded,
    loadingError: accountSettings.loadingError,
@@ -156,6 +204,9 @@ export const accountSettingsPageSelector = createSelector(
    profileDataManager,
    staticFields,
    hiddenFields,
+    duplicateTpaProvider,
    tpaProviders: accountSettings.thirdPartyAuth.providers,
+    supportUrl: configuration.SUPPORT_URL,
+    logoutUrl: configuration.LOGOUT_URL,
  }),
 );
--- a/src/account-settings/data/service.js
+++ b/src/account-settings/data/service.js
@@ -1,11 +1,22 @@
-import { getConfig } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import pick from 'lodash.pick';
 import omit from 'lodash.omit';
 import isEmpty from 'lodash.isempty';

-import { handleRequestError, unpackFieldErrors } from './utils';
-import { getThirdPartyAuthProviders } from '../third-party-auth';
+import { applyConfiguration, handleRequestError, unpackFieldErrors } from '../common/serviceUtils';
+import { configureService as configureDeleteAccountApiService } from './delete-account';
+import { configureService as configureResetPasswordApiService } from './reset-password';
+import { configureService as configureSiteLanguageApiService } from './site-language';
+import { configureService as configureThirdPartyAuthApiService, getThirdPartyAuthProviders } from './third-party-auth';
+
+let config = {
+  BASE_URL: null,
+  ACCOUNTS_API_BASE_URL: null,
+  PREFERENCES_API_BASE_URL: null,
+  ECOMMERCE_API_BASE_URL: null,
+  LMS_BASE_URL: null,
+  DELETE_ACCOUNT_URL: null,
+  PASSWORD_RESET_URL: null,
+};

 const SOCIAL_PLATFORMS = [
  { id: 'twitter', key: 'social_link_twitter' },
@@ -13,6 +24,18 @@ const SOCIAL_PLATFORMS = [
  { id: 'linkedin', key: 'social_link_linkedin' },
 ];

+let apiClient = null;
+
+export function configureService(newConfig, newApiClient) {
+  config = applyConfiguration(config, newConfig);
+  apiClient = newApiClient;
+
+  configureDeleteAccountApiService(config, apiClient);
+  configureResetPasswordApiService(config, apiClient);
+  configureSiteLanguageApiService(config, apiClient);
+  configureThirdPartyAuthApiService(config, apiClient);
+}
+
 function unpackAccountResponseData(data) {
  const unpackedData = data;

@@ -67,8 +90,7 @@ function packAccountCommitData(commitData) {
 }

 export async function getAccount(username) {
-  const { data } = await getAuthenticatedHttpClient()
-    .get(`${getConfig().LMS_BASE_URL}/api/user/v1/accounts/${username}`);
+  const { data } = await apiClient.get(`${config.ACCOUNTS_API_BASE_URL}/${username}`);
  return unpackAccountResponseData(data);
 }

@@ -77,9 +99,9 @@ export async function patchAccount(username, commitValues) {
    headers: { 'Content-Type': 'application/merge-patch+json' },
  };

-  const { data } = await getAuthenticatedHttpClient()
+  const { data } = await apiClient
    .patch(
-      `${getConfig().LMS_BASE_URL}/api/user/v1/accounts/${username}`,
+      `${config.ACCOUNTS_API_BASE_URL}/${username}`,
      packAccountCommitData(commitValues),
      requestConfig,
    )
@@ -100,25 +122,23 @@ export async function patchAccount(username, commitValues) {
 }

 export async function getPreferences(username) {
-  const { data } = await getAuthenticatedHttpClient()
-    .get(`${getConfig().LMS_BASE_URL}/api/user/v1/preferences/${username}`);
+  const { data } = await apiClient.get(`${config.PREFERENCES_API_BASE_URL}/${username}`);
  return data;
 }

 export async function patchPreferences(username, commitValues) {
  const requestConfig = { headers: { 'Content-Type': 'application/merge-patch+json' } };
-  const requestUrl = `${getConfig().LMS_BASE_URL}/api/user/v1/preferences/${username}`;
+  const requestUrl = `${config.PREFERENCES_API_BASE_URL}/${username}`;

  // Ignore the success response, the API does not currently return any data.
-  await getAuthenticatedHttpClient()
-    .patch(requestUrl, commitValues, requestConfig).catch(handleRequestError);
+  await apiClient.patch(requestUrl, commitValues, requestConfig).catch(handleRequestError);

  return commitValues;
 }

 export async function getTimeZones(forCountry) {
-  const { data } = await getAuthenticatedHttpClient()
-    .get(`${getConfig().LMS_BASE_URL}/user_api/v1/preferences/time_zones/`, {
+  const { data } = await apiClient
+    .get(`${config.LMS_BASE_URL}/user_api/v1/preferences/time_zones/`, {
      params: { country_code: forCountry },
    })
    .catch(handleRequestError);
@@ -133,8 +153,8 @@ export async function getProfileDataManager(username, userRoles) {
  const userRoleNames = userRoles.map(role => role.split(':')[0]);

  if (userRoleNames.includes('enterprise_learner')) {
-    const url = `${getConfig().LMS_BASE_URL}/enterprise/api/v1/enterprise-learner/?username=${username}`;
-    const { data } = await getAuthenticatedHttpClient().get(url).catch(handleRequestError);
+    const url = `${config.LMS_BASE_URL}/enterprise/api/v1/enterprise-learner/?username=${username}`;
+    const { data } = await apiClient.get(url).catch(handleRequestError);

    if ('results' in data) {
      for (let i = 0; i < data.results.length; i += 1) {
@@ -197,3 +217,4 @@ export async function patchSettings(username, commitValues) {
  const combinedResults = Object.assign({}, ...results);
  return combinedResults;
 }
+
--- a/src/account-settings/site-language/actions.js
+++ b/src/account-settings/site-language/actions.js
@@ -1,4 +1,4 @@
-import { AsyncActionType } from '../data/utils';
+import { AsyncActionType } from '../../common/utils';

 export const FETCH_SITE_LANGUAGES = new AsyncActionType('SITE_LANGUAGE', 'FETCH_SITE_LANGUAGES');

--- a/src/account-settings/site-language/index.js
+++ b/src/account-settings/site-language/index.js
@@ -1,9 +1,16 @@
-export { default as reducer } from './reducers';
-export { default as saga } from './sagas';
+import reducer from './reducers';
+import saga from './sagas';
+import { configureService, ApiService } from './service';
+import { siteLanguageOptionsSelector, siteLanguageListSelector } from './selectors';
+import { fetchSiteLanguages, FETCH_SITE_LANGUAGES } from './actions';
+
 export {
-  getSiteLanguageList,
-  patchPreferences,
-  postSetLang,
-} from './service';
-export { siteLanguageOptionsSelector, siteLanguageListSelector } from './selectors';
-export { fetchSiteLanguages, FETCH_SITE_LANGUAGES } from './actions';
+  ApiService,
+  configureService,
+  fetchSiteLanguages,
+  FETCH_SITE_LANGUAGES,
+  reducer,
+  saga,
+  siteLanguageListSelector,
+  siteLanguageOptionsSelector,
+};
--- a/src/account-settings/site-language/sagas.js
+++ b/src/account-settings/site-language/sagas.js
@@ -7,13 +7,13 @@ import {
  FETCH_SITE_LANGUAGES,
 } from './actions';

-import { getSiteLanguageList } from './service';
-import { handleFailure } from '../data/utils';
+import { ApiService } from './service';
+import handleFailure from '../../common/sagaUtils';

 function* handleFetchSiteLanguages() {
  try {
    yield put(fetchSiteLanguagesBegin());
-    const siteLanguageList = yield call(getSiteLanguageList);
+    const siteLanguageList = yield call(ApiService.getSiteLanguageList);
    yield put(fetchSiteLanguagesSuccess(siteLanguageList));
  } catch (e) {
    yield call(handleFailure, e, fetchSiteLanguagesFailure);
--- a/src/account-settings/site-language/selectors.js
+++ b/src/account-settings/site-language/selectors.js
@@ -1,5 +1,5 @@
 import { createSelector } from 'reselect';
-import { getModuleState } from '../data/utils';
+import { getModuleState } from '../../common/utils';

 export const storePath = ['accountSettings', 'siteLanguage'];

--- a/src/account-settings/site-language/service.js
+++ b/src/account-settings/site-language/service.js
@@ -1,32 +1,48 @@
-import { getConfig } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import siteLanguageList from './constants';
-import { snakeCaseObject, convertKeyNames } from '../data/utils';
+import { snakeCaseObject, convertKeyNames } from '../../common/utils';
+import { applyConfiguration } from '../../common/serviceUtils';

-export async function getSiteLanguageList() {
+let config = {
+  BASE_URL: null,
+  PREFERENCES_API_BASE_URL: null,
+  LMS_BASE_URL: null,
+};
+
+let apiClient = null;
+
+export function configureService(newConfig, newApiClient) {
+  config = applyConfiguration(config, newConfig);
+  apiClient = newApiClient;
+}
+
+async function getSiteLanguageList() {
  return siteLanguageList;
 }

-export async function patchPreferences(username, params) {
+async function patchPreferences(username, params) {
  let processedParams = snakeCaseObject(params);
  processedParams = convertKeyNames(processedParams, {
    pref_lang: 'pref-lang',
  });

-  await getAuthenticatedHttpClient()
-    .patch(`${getConfig().LMS_BASE_URL}/api/user/v1/preferences/${username}`, processedParams, {
-      headers: { 'Content-Type': 'application/merge-patch+json' },
-    });
+  await apiClient.patch(`${config.PREFERENCES_API_BASE_URL}/${username}`, processedParams, {
+    headers: { 'Content-Type': 'application/merge-patch+json' },
+  });

  return params; // TODO: Once the server returns the updated preferences object, return that.
 }

-export async function postSetLang(code) {
+async function postSetLang(code) {
  const formData = new FormData();
  formData.append('language', code);

-  await getAuthenticatedHttpClient()
-    .post(`${getConfig().LMS_BASE_URL}/i18n/setlang/`, formData, {
-      headers: { 'X-Requested-With': 'XMLHttpRequest' },
-    });
+  await apiClient.post(`${config.LMS_BASE_URL}/i18n/setlang/`, formData, {
+    headers: { 'X-Requested-With': 'XMLHttpRequest' },
+  });
 }
+
+export const ApiService = {
+  getSiteLanguageList,
+  patchPreferences,
+  postSetLang,
+};
--- a/src/account-settings/third-party-auth/ThirdPartyAuth.jsx
+++ b/src/account-settings/third-party-auth/ThirdPartyAuth.jsx
@@ -1,10 +1,10 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { FormattedMessage } from '@edx/frontend-platform/i18n';
+import { FormattedMessage } from '@edx/frontend-i18n';
 import { Hyperlink, StatefulButton } from '@edx/paragon';

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

 class ThirdPartyAuth extends Component {
--- a/src/account-settings/third-party-auth/data/actions.js
+++ b/src/account-settings/third-party-auth/data/actions.js
@@ -1,4 +1,6 @@
-import { AsyncActionType } from '../../data/utils';
+import { utils } from '../../../common';
+
+const { AsyncActionType } = utils;

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

--- a/src/account-settings/third-party-auth/data/sagas.js
+++ b/src/account-settings/third-party-auth/data/sagas.js
@@ -1,5 +1,5 @@
 import { call, put, takeEvery } from 'redux-saga/effects';
-import { logError } from '@edx/frontend-platform/logging';
+import { logAPIErrorResponse } from '@edx/frontend-logging';

 import {
  disconnectAuthReset,
@@ -23,7 +23,7 @@ function* handleDisconnectAuth(action) {
    const thirdPartyAuthProviders = yield call(getThirdPartyAuthProviders);
    yield put(disconnectAuthSuccess(providerId, thirdPartyAuthProviders));
  } catch (e) {
-    logError(e);
+    logAPIErrorResponse(e);
    yield put(disconnectAuthFailure(providerId));
  }
 }
--- a/src/account-settings/third-party-auth/data/service.js
+++ b/src/account-settings/third-party-auth/data/service.js
@@ -1,23 +1,29 @@
-import { getConfig } from '@edx/frontend-platform';
-import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
+import { applyConfiguration, handleRequestError } from '../../../common/serviceUtils';

-import { handleRequestError } from '../../data/utils';
+let config = {
+  LMS_BASE_URL: null,
+};
+
+let apiClient = null;
+
+export function configureService(newConfig, newApiClient) {
+  config = applyConfiguration(config, newConfig);
+  apiClient = newApiClient;
+}

 export async function getThirdPartyAuthProviders() {
-  const { data } = await getAuthenticatedHttpClient()
-    .get(`${getConfig().LMS_BASE_URL}/api/third_party_auth/v0/providers/user_status`)
+  const { data } = await apiClient
+    .get(`${config.LMS_BASE_URL}/api/third_party_auth/v0/providers/user_status`)
    .catch(handleRequestError);

  return data.map(({ connect_url: connectUrl, disconnect_url: disconnectUrl, ...provider }) => ({
    ...provider,
-    connectUrl: `${getConfig().LMS_BASE_URL}${connectUrl}`,
-    disconnectUrl: `${getConfig().LMS_BASE_URL}${disconnectUrl}`,
+    connectUrl: `${config.LMS_BASE_URL}${connectUrl}`,
+    disconnectUrl: `${config.LMS_BASE_URL}${disconnectUrl}`,
  }));
 }

 export async function postDisconnectAuth(url) {
-  const { data } = await getAuthenticatedHttpClient()
-    .post(url)
-    .catch(handleRequestError);
+  const { data } = await apiClient.post(url).catch(handleRequestError);
  return data;
 }
--- a/src/account-settings/third-party-auth/index.js
+++ b/src/account-settings/third-party-auth/index.js
@@ -1,5 +1,5 @@
 export { default } from './ThirdPartyAuth';
 export { default as reducer } from './data/reducers';
 export { default as saga } from './data/sagas';
-export { getThirdPartyAuthProviders, postDisconnectAuth } from './data/service';
+export { configureService, getThirdPartyAuthProviders } from './data/service';
 export { DISCONNECT_AUTH } from './data/actions';
--- a/src/assets/dot-pattern-light.png
+++ b/src/assets/dot-pattern-light.png
--- a/src/assets/edx-footer.png
+++ b/src/assets/edx-footer.png
--- a/src/assets/edx-sm.png
+++ b/src/assets/edx-sm.png
--- a/src/assets/favicon.ico
+++ b/src/assets/favicon.ico
--- a/src/assets/headerlogo.svg
+++ b/src/assets/headerlogo.svg
@@ -12,4 +12,4 @@
        <path d="M710.619925,85.5 L664.019925,85.5 L664.019925,0.02 L576.019925,0.02 L576.019925,85.5 L632.859925,85.5 L632.859925,159.2 C598.417874,134.487772 557.04992,121.286425 514.659925,121.48 C456.044663,121.405246 400.107354,146.01621 360.559925,189.28 C381.937732,213.470272 397.422343,242.283149 405.799925,273.46 C426.944121,233.500977 468.451514,208.51034 513.659925,208.52 C581.059925,208.52 632.879925,263.16 632.879925,330.52 L632.879925,331.2 C632.539925,398.28 580.879925,452.56 513.659925,452.56 C468.477451,452.593197 426.976426,427.652566 405.799925,387.74 L405.799925,387.74 C401.869213,380.340239 398.718926,372.551658 396.399925,364.5 L308.399925,364.5 C309.686934,372.450225 311.443338,380.317312 313.659925,388.06 C315.970162,396.190434 318.775397,404.171995 322.059925,411.96 L397.659925,411.96 C388.805702,433.929527 376.258024,454.222269 360.559925,471.96 C400.107354,515.22379 456.044663,539.834754 514.659925,539.76 C571.465111,540.091874 625.745998,516.316729 664.019925,474.34 L664.019925,452.04 L705.059925,452.04 L718.899925,434.96 L718.899925,95.74 L710.619925,85.5 Z M632.879925,501.9 L632.879925,539.74 L664.019925,539.74 L664.019925,474.18 C654.623775,484.469293 644.18821,493.758755 632.879925,501.9 L632.879925,501.9 Z M313.599925,273.14 C311.569597,280.231983 309.927163,287.429316 308.679925,294.7 L322.179925,294.7 C320.007771,287.25831 317.134915,280.039338 313.599925,273.14 L313.599925,273.14 Z" id="Shape" fill="#8A8C8F" fill-rule="nonzero"></path>
        <path d="M410.399925,294.7 C409.199925,287.5 407.659925,280.4 405.799925,273.46 C402.19356,280.242036 399.246706,287.354671 396.999925,294.7 C390.06397,317.386469 389.855554,341.597488 396.399925,364.4 L410.719925,364.4 C414.264276,341.293291 414.156293,317.77319 410.399925,294.7 L410.399925,294.7 Z M209.059925,121.48 C107.422724,121.487508 20.5081632,194.571683 3.05992537,294.7 L91.3999254,294.7 C107.135726,243.467257 154.465065,208.503753 208.059925,208.52 C252.638644,208.335148 293.496156,233.351373 313.599925,273.14 C322.501981,241.908137 338.58337,213.190393 360.559925,189.28 C322.206855,145.880863 266.976617,121.163964 209.059925,121.48 L209.059925,121.48 Z M297.479925,411.86 C275.077969,437.877726 242.392659,452.761934 208.059925,452.58 C153.691226,452.598435 105.87164,416.63791 90.7999254,364.4 L308.339925,364.4 C304.575868,341.309464 304.690779,317.752715 308.679925,294.7 L3.05992537,294.7 C-0.902504563,317.755068 -1.01739385,341.307372 2.71992537,364.4 L2.71992537,364.4 C19.3292424,465.441984 106.661918,539.594765 209.059925,539.6 C266.986094,539.900862 322.217868,515.161403 360.559925,471.74 C344.364089,454.096816 331.320914,433.801419 321.999925,411.74 L297.479925,411.86 Z" id="Shape" fill="#B72768" fill-rule="nonzero"></path>
    </g>
-</svg>
+</svg>
--- a/src/common/snapshots/utils.test.js.snap
+++ b/src/common/snapshots/utils.test.js.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`keepKeys getModuleState should throw an exception on a bad path 1`] = `"Unexpected state key uhoh given to getModuleState. Is your state path set up correctly?"`;
--- a/src/common/actions.js
+++ b/src/common/actions.js
@@ -0,0 +1,11 @@
+import { fetchUserAccount as _fetchUserAccount, UserAccountApiService } from '@edx/frontend-auth';
+
+let userAccountApiService = null;
+
+export function configureUserAccountApiService(configuration, apiClient) {
+  userAccountApiService = new UserAccountApiService(apiClient, configuration.LMS_BASE_URL);
+}
+
+export function fetchUserAccount(username) {
+  return _fetchUserAccount(userAccountApiService, username);
+}
--- a/src/common/components/Alert.jsx
+++ b/src/common/components/Alert.jsx
--- a/src/common/components/ErrorBoundary.jsx
+++ b/src/common/components/ErrorBoundary.jsx
@@ -0,0 +1,41 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+
+import { logAPIErrorResponse } from '@edx/frontend-logging';
+
+import ErrorPage from './ErrorPage';
+
+/*
+  Error boundary component used to log caught errors and display the error page.
+*/
+export default class ErrorBoundary extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { hasError: false };
+  }
+
+  static getDerivedStateFromError() {
+    // Update state so the next render will show the fallback UI.
+    return { hasError: true };
+  }
+
+  componentDidCatch(error, info) {
+    logAPIErrorResponse(`${error} ${info}`);
+  }
+
+  render() {
+    if (this.state.hasError) {
+      return <ErrorPage />;
+    }
+
+    return this.props.children;
+  }
+}
+
+ErrorBoundary.propTypes = {
+  children: PropTypes.node,
+};
+
+ErrorBoundary.defaultProps = {
+  children: null,
+};
--- a/src/common/components/ErrorPage.jsx
+++ b/src/common/components/ErrorPage.jsx
@@ -0,0 +1,42 @@
+import React, { Component } from 'react';
+import { FormattedMessage } from '@edx/frontend-i18n';
+import { Button } from '@edx/paragon';
+
+export default class ErrorPage extends Component {
+  reload() {
+    window.location.reload();
+  }
+
+  render() {
+    return (
+      <div className="container-fluid py-5 justify-content-center align-items-start text-center">
+        <div className="row">
+          <div className="col">
+            <p className="my-0 py-5 text-muted">
+              <FormattedMessage
+                id="unexpected.error.message.text"
+                defaultMessage="An unexpected error occurred. Please click the button below to return to refresh the page."
+                description="error message when an unexpected error occurs"
+              />
+            </p>
+          </div>
+        </div>
+        <div className="row">
+          <div className="col">
+            <Button
+              buttonType="primary"
+              onClick={this.reload}
+              label={
+                <FormattedMessage
+                  id="unexpected.error.button.text"
+                  defaultMessage="Try Again"
+                  description="text for button that tries to reload the app by refreshing the page"
+                />
+              }
+            />
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
--- a/src/common/components/PageLoading.jsx
+++ b/src/common/components/PageLoading.jsx
--- a/src/common/components/SwitchContent.jsx
+++ b/src/common/components/SwitchContent.jsx
--- a/src/common/hooks.js
+++ b/src/common/hooks.js
@@ -0,0 +1,42 @@
+import { useState } from 'react';
+
+const useAction = (action) => {
+  const [loaded, setLoaded] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const [data, setData] = useState(null);
+
+  const performAction = async (body = null) => {
+    try {
+      setLoading(true);
+      setLoaded(false);
+      setData(null);
+      setError(null);
+      const result = await action(body);
+      setData(result);
+      setLoaded(true);
+    } catch (e) {
+      if (e.response.data) {
+        setError(e.response.data);
+      } else {
+        throw e;
+      }
+      setLoaded(false);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const resetAction = () => {
+    setLoading(false);
+    setLoaded(false);
+    setData(null);
+    setError(null);
+  };
+
+  return [{
+    loaded, loading, data, error,
+  }, performAction, resetAction];
+};
+
+export default useAction;
--- a/src/common/index.js
+++ b/src/common/index.js
@@ -0,0 +1,16 @@
+import * as utils from './utils';
+import Alert from './components/Alert';
+import PageLoading from './components/PageLoading';
+import ErrorBoundary from './components/ErrorBoundary';
+import SwitchContent from './components/SwitchContent';
+import { configureUserAccountApiService, fetchUserAccount } from './actions';
+
+export {
+  Alert,
+  ErrorBoundary,
+  PageLoading,
+  SwitchContent,
+  utils,
+  configureUserAccountApiService,
+  fetchUserAccount,
+};
--- a/src/account-settings/data/utils/sagaUtils.js
+++ b/src/account-settings/data/utils/sagaUtils.js
@@ -1,16 +1,16 @@
 import { put } from 'redux-saga/effects';
-import { logError } from '@edx/frontend-platform/logging';
-import { history } from '@edx/frontend-platform';
+import { push } from 'connected-react-router';
+import { logAPIErrorResponse } from '@edx/frontend-logging';

 export default function* handleFailure(error, failureAction = null, failureRedirectPath = null) {
  if (error.fieldErrors && failureAction !== null) {
    yield put(failureAction({ fieldErrors: error.fieldErrors }));
  }
-  logError(error);
+  logAPIErrorResponse(error);
  if (failureAction !== null) {
    yield put(failureAction(error.message));
  }
  if (failureRedirectPath !== null) {
-    history.push(failureRedirectPath);
+    yield put(push(failureRedirectPath));
  }
 }
--- a/src/account-settings/data/utils/serviceUtils.js
+++ b/src/account-settings/data/utils/serviceUtils.js
@@ -1,3 +1,14 @@
+import pick from 'lodash.pick';
+
+export function applyConfiguration(expected, actual) {
+  Object.keys(expected).forEach((key) => {
+    if (actual[key] === undefined) {
+      throw new Error(`Service configuration error: ${key} is required.`);
+    }
+  });
+  return pick(actual, Object.keys(expected));
+}
+
 /**
 * Turns field errors of the form:
 *
--- a/src/registration/data/utils/reduxUtils.js
+++ b/src/registration/data/utils/reduxUtils.js
@@ -1,32 +1,50 @@
-/**
- * Helper class to save time when writing out action types for asynchronous methods.  Also helps
- * ensure that actions are namespaced.
- */
-export class AsyncActionType {
-  constructor(topic, name) {
-    this.topic = topic;
-    this.name = name;
+import camelCase from 'lodash.camelcase';
+import snakeCase from 'lodash.snakecase';
+
+export function modifyObjectKeys(object, modify) {
+  // If the passed in object is not an object, return it.
+  if (
+    object === undefined ||
+    object === null ||
+    (typeof object !== 'object' && !Array.isArray(object))
+  ) {
+    return object;
  }

-  get BASE() {
-    return `${this.topic}__${this.name}`;
+  if (Array.isArray(object)) {
+    return object.map(value => modifyObjectKeys(value, modify));
  }

-  get BEGIN() {
-    return `${this.topic}__${this.name}__BEGIN`;
-  }
+  // Otherwise, process all its keys.
+  const result = {};
+  Object.entries(object).forEach(([key, value]) => {
+    result[modify(key)] = modifyObjectKeys(value, modify);
+  });
+  return result;
+}

-  get SUCCESS() {
-    return `${this.topic}__${this.name}__SUCCESS`;
-  }
+export function camelCaseObject(object) {
+  return modifyObjectKeys(object, camelCase);
+}

-  get FAILURE() {
-    return `${this.topic}__${this.name}__FAILURE`;
-  }
+export function snakeCaseObject(object) {
+  return modifyObjectKeys(object, snakeCase);
+}

-  get RESET() {
-    return `${this.topic}__${this.name}__RESET`;
-  }
+export function convertKeyNames(object, nameMap) {
+  const transformer = key => (nameMap[key] === undefined ? key : nameMap[key]);
+
+  return modifyObjectKeys(object, transformer);
+}
+
+export function keepKeys(data, whitelist) {
+  const result = {};
+  Object.keys(data).forEach((key) => {
+    if (whitelist.indexOf(key) > -1) {
+      result[key] = data[key];
+    }
+  });
+  return result;
 }

 /**
@@ -60,3 +78,36 @@ export function getModuleState(state, originalPath) {
  }
  return getModuleState(state[key], path);
 }
+
+/**
+ * Helper class to save time when writing out action types for asynchronous methods.  Also helps
+ * ensure that actions are namespaced.
+ *
+ * TODO: Put somewhere common to it can be used by other MFEs.
+ */
+export class AsyncActionType {
+  constructor(topic, name) {
+    this.topic = topic;
+    this.name = name;
+  }
+
+  get BASE() {
+    return `${this.topic}__${this.name}`;
+  }
+
+  get BEGIN() {
+    return `${this.topic}__${this.name}__BEGIN`;
+  }
+
+  get SUCCESS() {
+    return `${this.topic}__${this.name}__SUCCESS`;
+  }
+
+  get FAILURE() {
+    return `${this.topic}__${this.name}__FAILURE`;
+  }
+
+  get RESET() {
+    return `${this.topic}__${this.name}__RESET`;
+  }
+}
--- a/src/registration/data/utils/dataUtils.test.js
+++ b/src/registration/data/utils/dataUtils.test.js
@@ -1,9 +1,12 @@
 import {
+  AsyncActionType,
  modifyObjectKeys,
  camelCaseObject,
  snakeCaseObject,
  convertKeyNames,
-} from './dataUtils';
+  keepKeys,
+  getModuleState,
+} from './utils';

 describe('modifyObjectKeys', () => {
  it('should use the provided modify function to change all keys in and object and its children', () => {
@@ -88,3 +91,77 @@ describe('convertKeyNames', () => {
    });
  });
 });
+
+describe('keepKeys', () => {
+  it('should keep the specified keys only', () => {
+    const result = keepKeys(
+      {
+        one: 123,
+        two: { three: 'skip me' },
+        four: 'five',
+        six: null,
+        8: 'sneaky',
+      },
+      [
+        'one',
+        'three',
+        'six',
+        'seven',
+        '8', // yup, the 8 integer will be converted to a string.
+      ],
+    );
+
+    expect(result).toEqual({
+      one: 123,
+      six: null,
+      8: 'sneaky',
+    });
+  });
+
+  describe('AsyncActionType', () => {
+    it('should return well formatted action strings', () => {
+      const actionType = new AsyncActionType('HOUSE_CATS', 'START_THE_RACE');
+
+      expect(actionType.BASE).toBe('HOUSE_CATS__START_THE_RACE');
+      expect(actionType.BEGIN).toBe('HOUSE_CATS__START_THE_RACE__BEGIN');
+      expect(actionType.SUCCESS).toBe('HOUSE_CATS__START_THE_RACE__SUCCESS');
+      expect(actionType.FAILURE).toBe('HOUSE_CATS__START_THE_RACE__FAILURE');
+      expect(actionType.RESET).toBe('HOUSE_CATS__START_THE_RACE__RESET');
+    });
+  });
+
+  describe('getModuleState', () => {
+    const state = {
+      first: { red: { awesome: 'sauce' }, blue: { weak: 'sauce' } },
+      second: { other: 'data' },
+    };
+
+    it('should return everything if given an empty path', () => {
+      expect(getModuleState(state, [])).toEqual(state);
+    });
+
+    it('should resolve paths correctly', () => {
+      expect(getModuleState(
+        state,
+        ['first'],
+      )).toEqual({ red: { awesome: 'sauce' }, blue: { weak: 'sauce' } });
+
+      expect(getModuleState(
+        state,
+        ['first', 'red'],
+      )).toEqual({ awesome: 'sauce' });
+
+      expect(getModuleState(state, ['second'])).toEqual({ other: 'data' });
+    });
+
+    it('should throw an exception on a bad path', () => {
+      expect(() => {
+        getModuleState(state, ['uhoh']);
+      }).toThrowErrorMatchingSnapshot();
+    });
+
+    it('should return non-objects correctly', () => {
+      expect(getModuleState(state, ['first', 'red', 'awesome'])).toEqual('sauce');
+    });
+  });
+});
--- a/src/components/App.jsx
+++ b/src/components/App.jsx
@@ -0,0 +1,266 @@
+import React, { Component } from 'react';
+import { connect, Provider } from 'react-redux';
+import PropTypes from 'prop-types';
+import { Route, Switch } from 'react-router-dom';
+import { ConnectedRouter } from 'connected-react-router';
+import { sendTrackEvent } from '@edx/frontend-analytics';
+import { IntlProvider, injectIntl, intlShape, getMessages } from '@edx/frontend-i18n';
+import SiteHeader from '@edx/frontend-component-site-header';
+import SiteFooter from '@edx/frontend-component-footer';
+
+import {
+  faFacebookSquare,
+  faTwitterSquare,
+  faYoutubeSquare,
+  faLinkedin,
+  faRedditSquare,
+} from '@fortawesome/free-brands-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+
+import { ErrorBoundary, fetchUserAccount } from '../common';
+import { ConnectedAccountSettingsPage } from '../account-settings';
+
+import FooterLogo from '../assets/edx-footer.png';
+import HeaderLogo from '../assets/logo.svg';
+import NotFoundPage from './NotFoundPage';
+
+import messages from './App.messages';
+
+function PageContent({
+  configuration,
+  username,
+  avatar,
+  intl,
+}) {
+  const mainMenu = [
+    {
+      type: 'item',
+      href: `${configuration.LMS_BASE_URL}/dashboard`,
+      content: intl.formatMessage(messages['siteheader.links.courses']),
+    },
+    {
+      type: 'item',
+      href: `${configuration.LMS_BASE_URL}/dashboard/programs`,
+      content: intl.formatMessage(messages['siteheader.links.programs']),
+    },
+    {
+      type: 'item',
+      href: `${configuration.MARKETING_SITE_BASE_URL}/course`,
+      content: intl.formatMessage(messages['siteheader.links.content.search']),
+      onClick: () => {
+        sendTrackEvent(
+          'edx.bi.dashboard.find_courses_button.clicked',
+          { category: 'account', label: 'header' },
+        );
+      },
+    },
+  ];
+  const userMenu = [
+    {
+      type: 'item',
+      href: `${configuration.LMS_BASE_URL}`,
+      content: intl.formatMessage(messages['siteheader.user.menu.dashboard']),
+    },
+    {
+      type: 'item',
+      href: `${configuration.LMS_BASE_URL}/u/${username}`,
+      content: intl.formatMessage(messages['siteheader.user.menu.profile']),
+    },
+    {
+      type: 'item',
+      href: `${configuration.LMS_BASE_URL}/account/settings`,
+      content: intl.formatMessage(messages['siteheader.user.menu.account.settings']),
+    },
+    {
+      type: 'item',
+      href: configuration.ORDER_HISTORY_URL,
+      content: intl.formatMessage(messages['siteheader.user.menu.order.history']),
+    },
+    {
+      type: 'item',
+      href: configuration.LOGOUT_URL,
+      content: intl.formatMessage(messages['siteheader.user.menu.logout']),
+    },
+  ];
+  const loggedOutItems = [
+    {
+      type: 'item',
+      href: `${configuration.LMS_BASE_URL}/login`,
+      content: intl.formatMessage(messages['siteheader.user.menu.login']),
+    },
+    {
+      type: 'item',
+      href: `${configuration.LMS_BASE_URL}/register`,
+      content: intl.formatMessage(messages['siteheader.user.menu.register']),
+    },
+  ];
+  const socialLinks = [
+    {
+      title: 'Facebook',
+      url: configuration.FACEBOOK_URL,
+      icon: <FontAwesomeIcon icon={faFacebookSquare} className="social-icon" size="2x" />,
+      screenReaderText: 'Like edX on Facebook',
+    },
+    {
+      title: 'Twitter',
+      url: configuration.TWITTER_URL,
+      icon: <FontAwesomeIcon icon={faTwitterSquare} className="social-icon" size="2x" />,
+      screenReaderText: 'Follow edX on Twitter',
+    },
+    {
+      title: 'Youtube',
+      url: configuration.YOU_TUBE_URL,
+      icon: <FontAwesomeIcon icon={faYoutubeSquare} className="social-icon" size="2x" />,
+      screenReaderText: 'Subscribe to the edX YouTube channel',
+    },
+    {
+      title: 'LinkedIn',
+      url: configuration.LINKED_IN_URL,
+      icon: <FontAwesomeIcon icon={faLinkedin} className="social-icon" size="2x" />,
+      screenReaderText: 'Follow edX on LinkedIn',
+    },
+    {
+      title: 'Reddit',
+      url: configuration.REDDIT_URL,
+      icon: <FontAwesomeIcon icon={faRedditSquare} className="social-icon" size="2x" />,
+      screenReaderText: 'Subscribe to the edX subreddit',
+    },
+  ];
+
+  return (
+    <div id="app">
+      <SiteHeader
+        logo={HeaderLogo}
+        loggedIn
+        username={username}
+        avatar={avatar}
+        logoAltText={configuration.SITE_NAME}
+        logoDestination={`${configuration.LMS_BASE_URL}/dashboard`}
+        mainMenu={mainMenu}
+        userMenu={userMenu}
+        loggedOutItems={loggedOutItems}
+      />
+      <main>
+        <Switch>
+          <Route exact path="/" component={ConnectedAccountSettingsPage} />
+          <Route path="/notfound" component={NotFoundPage} />
+          <Route path="*" component={NotFoundPage} />
+        </Switch>
+      </main>
+      <SiteFooter
+        siteName={configuration.SITE_NAME}
+        siteLogo={FooterLogo}
+        marketingSiteBaseUrl={configuration.MARKETING_SITE_BASE_URL}
+        supportUrl={configuration.SUPPORT_URL}
+        contactUrl={configuration.CONTACT_URL}
+        openSourceUrl={configuration.OPEN_SOURCE_URL}
+        termsOfServiceUrl={configuration.TERMS_OF_SERVICE_URL}
+        privacyPolicyUrl={configuration.PRIVACY_POLICY_URL}
+        appleAppStoreUrl={configuration.APPLE_APP_STORE_URL}
+        googlePlayUrl={configuration.GOOGLE_PLAY_URL}
+        socialLinks={socialLinks}
+        enterpriseMarketingLink={{
+          url: configuration.ENTERPRISE_MARKETING_URL,
+          queryParams: {
+            utm_source: configuration.ENTERPRISE_MARKETING_UTM_SOURCE,
+            utm_campaign: configuration.ENTERPRISE_MARKETING_UTM_CAMPAIGN,
+            utm_medium: configuration.ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM,
+          },
+        }}
+        handleAllTrackEvents={sendTrackEvent}
+      />
+    </div>
+  );
+}
+
+const IntlPageContent = injectIntl(PageContent);
+
+class App extends Component {
+  componentDidMount() {
+    const { username } = this.props;
+    this.props.fetchUserAccount(username);
+  }
+
+  render() {
+    return (
+      <ErrorBoundary>
+        <IntlProvider locale={this.props.locale} messages={getMessages()}>
+          <Provider store={this.props.store}>
+            <ConnectedRouter history={this.props.history}>
+              <IntlPageContent
+                configuration={this.props.configuration}
+                username={this.props.username}
+                avatar={this.props.avatar}
+              />
+            </ConnectedRouter>
+          </Provider>
+        </IntlProvider>
+      </ErrorBoundary>
+    );
+  }
+}
+
+const configurationPropTypes = {
+  SITE_NAME: PropTypes.string.isRequired,
+  LMS_BASE_URL: PropTypes.string.isRequired,
+  LOGOUT_URL: PropTypes.string.isRequired,
+  MARKETING_SITE_BASE_URL: PropTypes.string.isRequired,
+  SUPPORT_URL: PropTypes.string.isRequired,
+  CONTACT_URL: PropTypes.string.isRequired,
+  OPEN_SOURCE_URL: PropTypes.string.isRequired,
+  TERMS_OF_SERVICE_URL: PropTypes.string.isRequired,
+  PRIVACY_POLICY_URL: PropTypes.string.isRequired,
+  FACEBOOK_URL: PropTypes.string.isRequired,
+  TWITTER_URL: PropTypes.string.isRequired,
+  YOU_TUBE_URL: PropTypes.string.isRequired,
+  LINKED_IN_URL: PropTypes.string.isRequired,
+  REDDIT_URL: PropTypes.string.isRequired,
+  APPLE_APP_STORE_URL: PropTypes.string.isRequired,
+  GOOGLE_PLAY_URL: PropTypes.string.isRequired,
+  ORDER_HISTORY_URL: PropTypes.string.isRequired,
+  ENTERPRISE_MARKETING_URL: PropTypes.string.isRequired,
+  ENTERPRISE_MARKETING_UTM_SOURCE: PropTypes.string.isRequired,
+  ENTERPRISE_MARKETING_UTM_CAMPAIGN: PropTypes.string.isRequired,
+  ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM: PropTypes.string.isRequired,
+};
+
+PageContent.propTypes = {
+  username: PropTypes.string.isRequired,
+  avatar: PropTypes.string,
+  configuration: PropTypes.shape(configurationPropTypes).isRequired,
+  intl: intlShape.isRequired,
+};
+
+PageContent.defaultProps = {
+  avatar: null,
+};
+
+App.propTypes = {
+  fetchUserAccount: PropTypes.func.isRequired,
+  username: PropTypes.string.isRequired,
+  avatar: PropTypes.string,
+  store: PropTypes.object.isRequired, // eslint-disable-line
+  history: PropTypes.object.isRequired, // eslint-disable-line
+  locale: PropTypes.string.isRequired,
+  configuration: PropTypes.shape(configurationPropTypes).isRequired,
+};
+
+App.defaultProps = {
+  avatar: null,
+};
+
+const mapStateToProps = state => ({
+  username: state.authentication.username,
+  configuration: state.configuration,
+  locale: state.i18n.locale,
+  avatar: state.userAccount.profileImage.hasImage
+    ? state.userAccount.profileImage.imageUrlMedium
+    : null,
+});
+
+export default connect(
+  mapStateToProps,
+  {
+    fetchUserAccount,
+  },
+)(App);
--- a/src/components/App.messages.jsx
+++ b/src/components/App.messages.jsx
@@ -0,0 +1,61 @@
+import { defineMessages } from '@edx/frontend-i18n';
+
+const messages = defineMessages({
+  'siteheader.links.courses': {
+    id: 'siteheader.links.courses',
+    defaultMessage: 'Courses',
+    description: 'Link to the learner course dashboard',
+  },
+  'siteheader.links.programs': {
+    id: 'siteheader.links.programs',
+    defaultMessage: 'Programs',
+    description: 'Link to the learner program dashboard',
+  },
+  'siteheader.links.content.search': {
+    id: 'siteheader.links.content.search',
+    defaultMessage: 'Discover New',
+    description: 'Link to the content search page',
+  },
+  'siteheader.user.menu.dashboard': {
+    id: 'siteheader.user.menu.dashboard',
+    defaultMessage: 'Dashboard',
+    description: 'Link to the user dashboard',
+  },
+  'siteheader.user.menu.profile': {
+    id: 'siteheader.user.menu.profile',
+    defaultMessage: 'Profile',
+    description: 'Link to the user profile',
+  },
+  'siteheader.user.menu.account.settings': {
+    id: 'siteheader.user.menu.account.settings',
+    defaultMessage: 'Account',
+    description: 'Link to account settings',
+  },
+  'siteheader.user.menu.order.history': {
+    id: 'siteheader.user.menu.order.history',
+    defaultMessage: 'Order History',
+    description: 'Link to order history',
+  },
+  'siteheader.user.menu.logout': {
+    id: 'siteheader.user.menu.logout',
+    defaultMessage: 'Logout',
+    description: 'Logout link',
+  },
+  'siteheader.user.menu.login': {
+    id: 'siteheader.user.menu.login',
+    defaultMessage: 'Login',
+    description: 'Login link',
+  },
+  'siteheader.user.menu.register': {
+    id: 'siteheader.user.menu.register',
+    defaultMessage: 'Sign Up',
+    description: 'Link to registration',
+  },
+  'app.loading.message': {
+    id: 'app.loading.message',
+    defaultMessage: 'Loading...',
+    description: 'Message shown when page content is loading.',
+  },
+});
+
+export default messages;
--- a/src/account-settings/NotFoundPage.jsx
+++ b/src/account-settings/NotFoundPage.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { FormattedMessage } from '@edx/frontend-platform/i18n';
+import { FormattedMessage } from '@edx/frontend-i18n';

 export default function NotFoundPage() {
  return (
--- a/src/data/configureStore.js
+++ b/src/data/configureStore.js
@@ -1,33 +0,0 @@
-import { getConfig } from '@edx/frontend-platform';
-import { applyMiddleware, createStore, compose } from 'redux';
-import thunkMiddleware from 'redux-thunk';
-import { composeWithDevTools } from 'redux-devtools-extension';
-import { createLogger } from 'redux-logger';
-import createSagaMiddleware from 'redux-saga';
-
-import createRootReducer from './reducers';
-import rootSaga from './sagas';
-
-const sagaMiddleware = createSagaMiddleware();
-
-function composeMiddleware() {
-  if (getConfig().ENVIRONMENT === 'development') {
-    const loggerMiddleware = createLogger({
-      collapsed: true,
-    });
-    return composeWithDevTools(applyMiddleware(thunkMiddleware, sagaMiddleware, loggerMiddleware));
-  }
-
-  return compose(applyMiddleware(thunkMiddleware, sagaMiddleware));
-}
-
-export default function configureStore(initialState = {}) {
-  const store = createStore(
-    createRootReducer(),
-    initialState,
-    composeMiddleware(),
-  );
-  sagaMiddleware.run(rootSaga);
-
-  return store;
-}
--- a/src/data/reducers.js
+++ b/src/data/reducers.js
@@ -1,16 +0,0 @@
-import { combineReducers } from 'redux';
-
-import {
-  reducer as accountSettingsReducer,
-  storeName as accountSettingsStoreName,
-} from '../account-settings';
-
-import {
-  reducer as registrationReducer,
-} from '../registration';
-
-const createRootReducer = () => combineReducers({
-  [accountSettingsStoreName]: accountSettingsReducer,
-  registration: registrationReducer,
-});
-export default createRootReducer;
--- a/src/data/sagas.js
+++ b/src/data/sagas.js
@@ -1,10 +0,0 @@
-import { all } from 'redux-saga/effects';
-import { saga as accountSettingsSaga } from '../account-settings';
-import { saga as registrationSaga } from '../registration';
-
-export default function* rootSaga() {
-  yield all([
-    accountSettingsSaga(),
-    registrationSaga(),
-  ]);
-}
--- a/src/environment.js
+++ b/src/environment.js
@@ -0,0 +1,47 @@
+export const configuration = {
+  BASE_URL: process.env.BASE_URL,
+  LMS_BASE_URL: process.env.LMS_BASE_URL,
+  ECOMMERCE_BASE_URL: process.env.ECOMMERCE_BASE_URL,
+  CREDENTIALS_BASE_URL: process.env.CREDENTIALS_BASE_URL,
+  LOGIN_URL: process.env.LOGIN_URL,
+  LOGOUT_URL: process.env.LOGOUT_URL,
+  CSRF_TOKEN_API_PATH: process.env.CSRF_TOKEN_API_PATH,
+  REFRESH_ACCESS_TOKEN_ENDPOINT: process.env.REFRESH_ACCESS_TOKEN_ENDPOINT,
+  SEGMENT_KEY: process.env.SEGMENT_KEY,
+  ACCESS_TOKEN_COOKIE_NAME: process.env.ACCESS_TOKEN_COOKIE_NAME,
+  USER_INFO_COOKIE_NAME: process.env.USER_INFO_COOKIE_NAME,
+  CSRF_COOKIE_NAME: process.env.CSRF_COOKIE_NAME,
+  LANGUAGE_PREFERENCE_COOKIE_NAME: process.env.LANGUAGE_PREFERENCE_COOKIE_NAME,
+  SITE_NAME: process.env.SITE_NAME,
+  MARKETING_SITE_BASE_URL: process.env.MARKETING_SITE_BASE_URL,
+  SUPPORT_URL: process.env.SUPPORT_URL,
+  CONTACT_URL: process.env.CONTACT_URL,
+  OPEN_SOURCE_URL: process.env.OPEN_SOURCE_URL,
+  TERMS_OF_SERVICE_URL: process.env.TERMS_OF_SERVICE_URL,
+  PRIVACY_POLICY_URL: process.env.PRIVACY_POLICY_URL,
+  FACEBOOK_URL: process.env.FACEBOOK_URL,
+  TWITTER_URL: process.env.TWITTER_URL,
+  YOU_TUBE_URL: process.env.YOU_TUBE_URL,
+  LINKED_IN_URL: process.env.LINKED_IN_URL,
+  REDDIT_URL: process.env.REDDIT_URL,
+  APPLE_APP_STORE_URL: process.env.APPLE_APP_STORE_URL,
+  GOOGLE_PLAY_URL: process.env.GOOGLE_PLAY_URL,
+  ACCOUNT_SETTINGS_URL: `${process.env.LMS_BASE_URL}/account/settings`,
+  DATA_API_BASE_URL: process.env.DATA_API_BASE_URL,
+  SECURE_COOKIES: process.env.NODE_ENV !== 'development',
+  ENVIRONMENT: process.env.NODE_ENV,
+  ACCOUNTS_API_BASE_URL: `${process.env.LMS_BASE_URL}/api/user/v1/accounts`,
+  PREFERENCES_API_BASE_URL: `${process.env.LMS_BASE_URL}/api/user/v1/preferences`,
+  CERTIFICATES_API_BASE_URL: `${process.env.LMS_BASE_URL}/api/certificates/v0/certificates`,
+  VIEW_MY_RECORDS_URL: `${process.env.CREDENTIALS_BASE_URL}/records`,
+  ECOMMERCE_API_BASE_URL: `${process.env.ECOMMERCE_BASE_URL}/api/v2`,
+  ORDER_HISTORY_URL: process.env.ORDER_HISTORY_URL,
+  DELETE_ACCOUNT_URL: `${process.env.LMS_BASE_URL}/api/user/v1/accounts/deactivate_logout/`,
+  PASSWORD_RESET_URL: `${process.env.LMS_BASE_URL}/password_reset/`,
+  ENTERPRISE_MARKETING_URL: process.env.ENTERPRISE_MARKETING_URL,
+  ENTERPRISE_MARKETING_UTM_SOURCE: process.env.ENTERPRISE_MARKETING_UTM_SOURCE,
+  ENTERPRISE_MARKETING_UTM_CAMPAIGN: process.env.ENTERPRISE_MARKETING_UTM_CAMPAIGN,
+  ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM: process.env.ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM,
+};
+
+export const features = {};
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -100,7 +100,6 @@
  "account.settings.delete.account.modal.after.text": "Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.",
  "account.settings.delete.account.modal.after.button": "Close",
  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, {actionLink}.",
-  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
  "account.settings.editable.field.password.reset.button": "Reset Password",
@@ -109,5 +108,19 @@
  "account.settings.sso.account.connected": "Linked",
  "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
  "account.settings.sso.unlink.account": "Unlink {name} account",
-  "account.settings.sso.no.providers": "No accounts can be linked at this time."
+  "account.settings.sso.no.providers": "No accounts can be linked at this time.",
+  "unexpected.error.message.text": "An unexpected error occurred. Please click the button below to return to refresh the page.",
+  "unexpected.error.button.text": "Try Again",
+  "siteheader.links.courses": "Courses",
+  "siteheader.links.programs": "Programs",
+  "siteheader.links.content.search": "Discover New",
+  "siteheader.user.menu.dashboard": "Dashboard",
+  "siteheader.user.menu.profile": "Profile",
+  "siteheader.user.menu.account.settings": "Account",
+  "siteheader.user.menu.order.history": "Order History",
+  "siteheader.user.menu.logout": "Logout",
+  "siteheader.user.menu.login": "Login",
+  "siteheader.user.menu.register": "Sign Up",
+  "app.loading.message": "Loading...",
+  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again."
 }
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -1,46 +1,46 @@
 {
  "account.settings.message.duplicate.tpa.provider": "La cuenta de {provider} seleccionada ya está vinculada con otra cuenta de edX. ",
-  "account.settings.message.managed.settings": "Los ajustes en el perfil son administrados por {managerTitle}. Contacte su administrador o {support} para obtener ayuda.",
-  "account.settings.message.managed.settings.support": "soporte",
+  "account.settings.message.managed.settings": "Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help.",
+  "account.settings.message.managed.settings.support": "support",
  "account.settings.page.heading": "Configuración de cuenta",
  "account.settings.loading.message": "Cargando...",
  "account.settings.loading.error": "Error: {error}",
  "account.settings.banner.beta.language": "Ha establecido su idioma en {beta_language}, el cual no está traducido completamente. Puede ayudarnos a traducir este idioma totalmente uniéndose la comunidad Transifex y adicionando traducciones desde el Inglés para los estudiantes que hablan {beta_language}.",
-  "account.settings.banner.beta.language.action.switch.back": "Regresar a {previous_language}",
+  "account.settings.banner.beta.language.action.switch.back": "Switch Back to {previous_language}",
  "account.settings.banner.beta.language.action.help.translate": "Ayude a traducir a {beta_language}",
  "account.settings.section.account.information": "Información de la cuenta",
  "account.settings.section.account.information.description": "Estas configuraciones incluyen información básica sobre tu cuenta.",
-  "account.settings.section.profile.information": "Información del perfil",
-  "account.settings.section.site.preferences": "Preferencias del sitio",
+  "account.settings.section.profile.information": "Profile Information",
+  "account.settings.section.site.preferences": "Site Preferences",
  "account.settings.section.linked.accounts": "Cuentas vinculadas",
-  "account.settings.section.linked.accounts.description": "Puedes vincular tus cuentas de redes sociales para simplificar el proceso de iniciar sesión en edX.",
+  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to edX.",
  "account.settings.field.username": "Nombre de usuario",
-  "account.settings.field.username.help.text": "El nombre que lo identifica en edX. No podrá cambiar el nombre de usuario.",
+  "account.settings.field.username.help.text": "The name that identifies you on edX. You cannot change your username.",
  "account.settings.field.full.name": "Nombre completo",
  "account.settings.field.full.name.empty": "Añade nombre",
  "account.settings.field.full.name.help.text": "El nombre que es usado para la verificación de identidad y aparece en sus certificados.",
-  "account.settings.field.email": "Correo electrónico (Ingresar)",
-  "account.settings.field.email.empty": "Agregar correo electrónico",
-  "account.settings.field.email.confirmation": "Le enviamos un mensaje de confirmación a  {value}. Hacer click en la liga del mensaje para actualizar su correo electrónico.",
-  "account.settings.field.email.help.text": "Recibes mensajes de edX y equipos del curso en esta dirección.",
-  "account.settings.field.secondary.email": "Correo electrónico de recuperación",
-  "account.settings.field.secondary.email.empty": "Agregar un correo electrónico de recuperación",
-  "account.settings.field.secondary.email.confirmation": "Le enviamos un mensaje de confirmación a  {value}. Hacer click en la liga del mensaje para actualizar su correo electrónico.",
-  "account.settings.email.field.confirmation.header": "Confirmación pendiente",
+  "account.settings.field.email": "Email address (Sign in)",
+  "account.settings.field.email.empty": "Add email address",
+  "account.settings.field.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your email address.",
+  "account.settings.field.email.help.text": "You receive messages from edX and course teams at this address.",
+  "account.settings.field.secondary.email": "Recovery email address",
+  "account.settings.field.secondary.email.empty": "Add a recovery email address",
+  "account.settings.field.secondary.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your recovery email address.",
+  "account.settings.email.field.confirmation.header": "Pending confirmation",
  "account.settings.field.dob": "Año de nacimiento",
-  "account.settings.field.dob.empty": "Agregar año de nacimiento",
-  "account.settings.field.year_of_birth.options.empty": "Selecciona año de nacimiento",
+  "account.settings.field.dob.empty": "Add year of birth",
+  "account.settings.field.year_of_birth.options.empty": "Select a year of birth",
  "account.settings.field.country": "País",
-  "account.settings.field.country.empty": "Agregar país",
-  "account.settings.field.country.options.empty": "Seleccionar un país",
-  "account.settings.field.site.language": "Idioma del sitio",
+  "account.settings.field.country.empty": "Add country",
+  "account.settings.field.country.options.empty": "Select a Country",
+  "account.settings.field.site.language": "Site language",
  "account.settings.field.site.language.help.text": "El idioma que se usará para el sitio. Actualmente solo hay disponibilidad de usar un número limitado de idiomas.",
  "account.settings.field.education": "Educación",
-  "account.settings.field.education.empty": "Agregar un nivel educativo",
-  "account.settings.field.education.levels.empty": "Seleccionar un nivel educativo",
+  "account.settings.field.education.empty": "Add level of education",
+  "account.settings.field.education.levels.empty": "Select a level of education",
  "account.settings.field.education.levels.p": "Doctorado",
  "account.settings.field.education.levels.m": "Master o magíster",
-  "account.settings.field.education.levels.b": "Pregrado o Licenciatura",
+  "account.settings.field.education.levels.b": "Bachelor's Degree",
  "account.settings.field.education.levels.a": "Grado técnico - tecnológico",
  "account.settings.field.education.levels.hs": "Enseñanza secundaria",
  "account.settings.field.education.levels.jhs": "Formación media",
@@ -48,66 +48,79 @@
  "account.settings.field.education.levels.none": "Ninguna educación formal",
  "account.settings.field.education.levels.o": "Otra educación",
  "account.settings.field.gender": "Género",
-  "account.settings.field.gender.empty": "Agregar género",
-  "account.settings.field.gender.options.empty": "Seleccionar el género",
+  "account.settings.field.gender.empty": "Add gender",
+  "account.settings.field.gender.options.empty": "Select a gender",
  "account.settings.field.gender.options.f": "Femenino",
  "account.settings.field.gender.options.m": "Masculino",
  "account.settings.field.gender.options.o": "Otro",
-  "account.settings.field.language.proficiencies": "Idiomas hablados",
-  "account.settings.field.language.proficiencies.empty": "Agregar un idioma hablado",
-  "account.settings.field.language_proficiencies.options.empty": "Selecciona lenguaje",
-  "account.settings.field.time.zone": "Zona horaria",
-  "account.settings.field.time.zone.empty": "Indicar zona horaria",
-  "account.settings.field.time.zone.description": "Selecciona la zona horaria para exponer las fechas del curso. Si no especificas una zona horaria, las fechas del curso, incluidas las fechas límites de tareas, serán expuestas en la zona horaria local de tu navegador.",
+  "account.settings.field.language.proficiencies": "Spoken languages",
+  "account.settings.field.language.proficiencies.empty": "Add a spoken language",
+  "account.settings.field.language_proficiencies.options.empty": "Select a Language",
+  "account.settings.field.time.zone": "Time zone",
+  "account.settings.field.time.zone.empty": "Set time zone",
+  "account.settings.field.time.zone.description": "Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser’s local time zone.",
  "account.settings.field.time.zone.default": "Por defecto (Zona horaria local)",
-  "account.settings.field.time.zone.all": "Todas las zonas horarias",
-  "account.settings.field.time.zone.country": "Zonas horarias",
+  "account.settings.field.time.zone.all": "All time zones",
+  "account.settings.field.time.zone.country": "Country time zones",
  "account.settings.section.social.media": "Enlaces de redes sociales",
  "account.settings.section.social.media.description": "Opcionalmente, conecte sus cuentas personales a los iconos de redes sociales en su perfil de edX.",
  "account.settings.field.social.platform.name.linkedin": "LinkedIn",
-  "account.settings.field.social.platform.name.linkedin.empty": "Agregar perfil de LinkedIn",
+  "account.settings.field.social.platform.name.linkedin.empty": "Add LinkedIn profile",
  "account.settings.jump.nav.delete.account": "Eliminar mi cuenta",
  "account.settings.field.social.platform.name.twitter": "Twitter",
-  "account.settings.field.social.platform.name.twitter.empty": "Agregar perfil de Twitter",
+  "account.settings.field.social.platform.name.twitter.empty": "Add Twitter profile",
  "account.settings.field.social.platform.name.facebook": "Facebook",
-  "account.settings.field.social.platform.name.facebook.empty": "Agregar perfil de Facebook",
+  "account.settings.field.social.platform.name.facebook.empty": "Add Facebook profile",
  "account.settings.editable.field.action.save": "Guardar",
  "account.settings.editable.field.action.cancel": "Cancelar",
  "account.settings.editable.field.action.edit": "Editar",
  "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
  "account.settings.static.field.empty.no.admin": "No value set.",
-  "account.settings.delete.account.before.proceeding": "Antes de continuar, por favor {actionLink}.",
+  "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
  "account.settings.delete.account.header": "Eliminar mi cuenta",
-  "account.settings.delete.account.subheader": "¡Sentimos que te vayas!",
-  "account.settings.delete.account.text.1": "Cuidado: la eliminación de tu cuenta y datos personales es permanente e irreversible. edX no podrá recuperar ni tu cuenta ni los datos eliminados.",
-  "account.settings.delete.account.text.2": "Una vez su cuenta haya sido eliminada, no la podrá usar para tomar cursos en la app de edX, edx.org o en cualquier otro sitio administrado por edX. Esto incluye el acceso a edx.org desde el sistema de su empleador o  universidad y el acceso a páginas privadas ofrecidas por MIT Open Learning, Wharton Executive Education y Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "siga las instrucciones para imprimir o descargar el certificado",
-  "account.settings.delete.account.text.warning": "Warning: La eliminación de la cuenta es permanente. Por favor lee la información de más arriba con atención antes de proceder. Esta es una acción irreversible, y no podrás volver a usar el mismo correo electrónico en edX.",
-  "account.settings.delete.account.text.change.instead": "En lugar de eso, ¿quieres cambiar tu correo electrónico, nombre o contraseña?",
+  "account.settings.delete.account.subheader": "We're sorry to see you go!",
+  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.",
+  "account.settings.delete.account.text.2": "Una vez tu cuenta haya sido eliminada, no la podrás usar para tomar cursos en la app de edX, edx.org o en cualquier otro sitio administrado por edX. Esto incluye el acceso a edx.org desde el sistema de tu empleador o de tu universidad y el acceso a páginas privadas ofrecidas por MIT Open Learning, Wharton Online y Harvard Medical School.",
+  "account.settings.delete.account.text.3.link": "follow the instructions for printing or downloading a certificate",
+  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on edX.",
+  "account.settings.delete.account.text.change.instead": "Want to change your email, name, or password instead?",
  "account.settings.delete.account.button": "Eliminar mi cuenta",
-  "account.settings.delete.account.please.activate": "activar su cuenta",
+  "account.settings.delete.account.please.activate": "activate your account",
  "account.settings.delete.account.please.unlink": "unlink all social media accounts",
  "account.settings.delete.account.modal.header": "¿Está seguro?",
-  "account.settings.delete.account.modal.text.1": "Has seleccionado “Eliminar mi cuenta”. La eliminación de tu cuenta y datos personales es permanente e irreversible. edX no será capaz de recuperar tu cuenta o los datos que se hayan borrado.",
-  "account.settings.delete.account.modal.text.2": "Si procedes, no será posible usar esta cuenta para tomar cursos ni en la aplicación móvil de edX, ni en edx.org, ni en cualquier otro sitio hospedado por edX. Esto incluye el acceso a edx.org desde el sistema de tu empleador o universidad, y el acceso a sitios privados ofrecidos por MIT Open Learning, Wharton Executive Education, y Harvard Medical School.",
+  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.",
+  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
  "account.settings.delete.account.modal.enter.password": "Si deseas continuar y eliminar tu cuenta, por favor introduce la contraseña de tu cuenta:",
  "account.settings.delete.account.modal.confirm.delete": "Si, Eliminar",
  "account.settings.delete.account.modal.confirm.cancel": "Cancelar",
  "account.settings.delete.account.error.unable.to.delete": "No es posible eliminar esta cuenta",
-  "account.settings.delete.account.error.no.password": "Se requiere una contraseña",
+  "account.settings.delete.account.error.no.password": "A password is required",
  "account.settings.delete.account.error.unable.to.delete.details": "Ocurrió un error al procesar tu solicitud. Por favor, intente nuevamente más tarde.",
-  "account.settings.delete.account.modal.after.header": "¡Sentimos que te vayas! Tu cuenta será eliminada en breve.",
+  "account.settings.delete.account.modal.after.header": "We're sorry to see you go!  Your account will be deleted shortly.",
  "account.settings.delete.account.modal.after.text": "La eliminación de cuenta, incluyendo la eliminación de las listas de correo electrónico, puede tardar unas semanas en procesarse totalmente en nuestro sistema. Si quieres renunciar a recibir correos antes de que la eliminación se haya completado, por favor date de baja mediante el enlace que aparece al final de los correos.",
  "account.settings.delete.account.modal.after.button": "Cerrar",
-  "account.settings.delete.account.text.3": "Puede que también pierdas el acceso a los certificados verificados y otros certificados de programas como los de los MicroMasters. Si quieres hacer una copia de dichos certificados para tus archivos antes de proceder a la eliminación, {actionLink}.",
-  "error.notfound.message": "La página que estas buscando no está disponible o hay un error en la URL. Por favor, comprueba la URL y vuelve a intentarlo.",
-  "account.settings.editable.field.password.reset.button.confirmation.support.link": "soporte técnico",
-  "account.settings.editable.field.password.reset.button.confirmation": "Hemos mandado un mensaje a {email}. Haz clic en el enlace en el mensaje para restablecer tu contraseña. ¿No recibiste el mensaje? Contáctate con {technicalSupportLink}.",
+  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, {actionLink}.",
+  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
+  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
  "account.settings.editable.field.password.reset.button": "Restablecer contraseña",
  "account.settings.editable.field.password.reset.label": "Contraseña",
-  "account.settings.sso.link.account": "Iniciar sesión con {name}",
+  "account.settings.sso.link.account": "Sign in with {name}",
  "account.settings.sso.account.connected": "Vinculado",
  "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
-  "account.settings.sso.unlink.account": "Desvincular la cuenta de {accountName} ",
-  "account.settings.sso.no.providers": "No accounts can be linked at this time."
+  "account.settings.sso.unlink.account": "Unlink {name} account",
+  "account.settings.sso.no.providers": "No accounts can be linked at this time.",
+  "unexpected.error.message.text": "An unexpected error occurred. Please click the button below to return to refresh the page.",
+  "unexpected.error.button.text": "Try Again",
+  "siteheader.links.courses": "Cursos",
+  "siteheader.links.programs": "Programs",
+  "siteheader.links.content.search": "Discover New",
+  "siteheader.user.menu.dashboard": "Panel de Control",
+  "siteheader.user.menu.profile": "Perfil",
+  "siteheader.user.menu.account.settings": "Cuenta",
+  "siteheader.user.menu.order.history": "Historial de órdenes",
+  "siteheader.user.menu.logout": "Salir",
+  "siteheader.user.menu.login": "Iniciar Sesión",
+  "siteheader.user.menu.register": "Registrarse",
+  "app.loading.message": "Cargando...",
+  "error.notfound.message": "La página que estas buscando no está disponible o hay un error en la URL. Por favor, comprueba la URL y vuelve a intentarlo."
 }
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -100,7 +100,6 @@
  "account.settings.delete.account.modal.after.text": "Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.",
  "account.settings.delete.account.modal.after.button": "Close",
  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, {actionLink}.",
-  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
  "account.settings.editable.field.password.reset.button": "Reset Password",
@@ -109,5 +108,19 @@
  "account.settings.sso.account.connected": "Linked",
  "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
  "account.settings.sso.unlink.account": "Unlink {name} account",
-  "account.settings.sso.no.providers": "No accounts can be linked at this time."
+  "account.settings.sso.no.providers": "No accounts can be linked at this time.",
+  "unexpected.error.message.text": "An unexpected error occurred. Please click the button below to return to refresh the page.",
+  "unexpected.error.button.text": "Try Again",
+  "siteheader.links.courses": "Courses",
+  "siteheader.links.programs": "Programs",
+  "siteheader.links.content.search": "Discover New",
+  "siteheader.user.menu.dashboard": "Dashboard",
+  "siteheader.user.menu.profile": "Profile",
+  "siteheader.user.menu.account.settings": "Account",
+  "siteheader.user.menu.order.history": "Order History",
+  "siteheader.user.menu.logout": "Logout",
+  "siteheader.user.menu.login": "Login",
+  "siteheader.user.menu.register": "Sign Up",
+  "app.loading.message": "Loading...",
+  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again."
 }
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -100,7 +100,6 @@
  "account.settings.delete.account.modal.after.text": "Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.",
  "account.settings.delete.account.modal.after.button": "Close",
  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, {actionLink}.",
-  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
  "account.settings.editable.field.password.reset.button": "Reset Password",
@@ -109,5 +108,19 @@
  "account.settings.sso.account.connected": "Linked",
  "account.settings.sso.account.disconnect.error": "There was a problem disconnecting this account. Contact support if the problem persists.",
  "account.settings.sso.unlink.account": "Unlink {name} account",
-  "account.settings.sso.no.providers": "No accounts can be linked at this time."
+  "account.settings.sso.no.providers": "No accounts can be linked at this time.",
+  "unexpected.error.message.text": "An unexpected error occurred. Please click the button below to return to refresh the page.",
+  "unexpected.error.button.text": "Try Again",
+  "siteheader.links.courses": "Courses",
+  "siteheader.links.programs": "Programs",
+  "siteheader.links.content.search": "Discover New",
+  "siteheader.user.menu.dashboard": "Dashboard",
+  "siteheader.user.menu.profile": "Profile",
+  "siteheader.user.menu.account.settings": "Account",
+  "siteheader.user.menu.order.history": "Order History",
+  "siteheader.user.menu.logout": "Logout",
+  "siteheader.user.menu.login": "Login",
+  "siteheader.user.menu.register": "Sign Up",
+  "app.loading.message": "Loading...",
+  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again."
 }
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -1,92 +1,99 @@
 import 'babel-polyfill';
+import 'url-polyfill';
 import 'formdata-polyfill';
-import { AppProvider, ErrorPage, AuthenticatedPageRoute } from '@edx/frontend-platform/react';
-import { subscribe, initialize, APP_INIT_ERROR, APP_READY, mergeConfig, getConfig } from '@edx/frontend-platform';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Route, Switch } from 'react-router-dom';
+import {
+  configureAnalytics,
+  identifyAnonymousUser,
+  identifyAuthenticatedUser,
+  initializeSegment,
+  sendPageEvent,
+  sendTrackingLogEvent,
+} from '@edx/frontend-analytics';
+import { configureLoggingService, NewRelicLoggingService } from '@edx/frontend-logging';
+import { getAuthenticatedAPIClient } from '@edx/frontend-auth';
+import { configure as configureI18n } from '@edx/frontend-i18n';

-import Header, { messages as headerMessages } from '@edx/frontend-component-header';
-import Footer, { messages as footerMessages } from '@edx/frontend-component-footer';
-
-import configureStore from './data/configureStore';
-import AccountSettingsPage, { NotFoundPage } from './account-settings';
-import LoginPage from './registration/LoginPage';
-import RegistrationPage from './registration/RegistrationPage';
-import appMessages from './i18n';
+import { configuration } from './environment';
+import configureStore from './store';
+import { configureUserAccountApiService } from './common';
+import { configureService as configureAccountSettingsApiService } from './account-settings';
+import messages from './i18n';

 import './index.scss';
-import './assets/favicon.ico';
-import logo from './assets/headerlogo.svg';
+import App from './components/App';

-subscribe(APP_READY, () => {
-  ReactDOM.render(
-    <AppProvider store={configureStore()}>
-      <Switch>
-        <AuthenticatedPageRoute exact path="/">
-          <Header />
-          <main>
-            <AccountSettingsPage />
-          </main>
-        </AuthenticatedPageRoute>
-        <Route path="/notfound">
-          <Header />
-          <main>
-            <NotFoundPage />
-          </main>
-        </Route>
-        {
-          getConfig().ENABLE_LOGIN_AND_REGISTRATION &&
-          <>
-            <Route path="/login" >
-              <div className="registration-header">
-                <img src={logo} alt="edX" className="logo" />
-              </div>
-              <main>
-                <LoginPage />
-              </main>
-            </Route>
-            <Route path="/registration">
-              <div className="registration-header">
-                <img src={logo} alt="edX" className="logo" />
-              </div>
-              <main>
-                <RegistrationPage />
-              </main>
-            </Route>
-          </>
-        }
-        <Route path="*">
-          <Header />
-          <main>
-            <NotFoundPage />
-          </main>
-        </Route>
-      </Switch>
-      <Footer />
-    </AppProvider>,
-    document.getElementById('root'),
-  );
+const apiClient = getAuthenticatedAPIClient({
+  appBaseUrl: configuration.BASE_URL,
+  authBaseUrl: configuration.LMS_BASE_URL,
+  loginUrl: configuration.LOGIN_URL,
+  logoutUrl: configuration.LOGOUT_URL,
+  csrfTokenApiPath: configuration.CSRF_TOKEN_API_PATH,
+  refreshAccessTokenEndpoint: configuration.REFRESH_ACCESS_TOKEN_ENDPOINT,
+  accessTokenCookieName: configuration.ACCESS_TOKEN_COOKIE_NAME,
+  userInfoCookieName: configuration.USER_INFO_COOKIE_NAME,
+  csrfCookieName: configuration.CSRF_COOKIE_NAME,
+  loggingService: NewRelicLoggingService,
 });

-subscribe(APP_INIT_ERROR, (error) => {
-  ReactDOM.render(<ErrorPage message={error.message} />, document.getElementById('root'));
-});
+/**
+ * We need to merge the application configuration with the authentication state
+ * so that we can hand it all to the redux store's initializer.
+ */
+function createInitialState() {
+  const errors = {};
+  const url = new URL(window.location.href);

-initialize({
-  messages: [
-    appMessages,
-    headerMessages,
-    footerMessages,
-  ],
-  requireAuthenticatedUser: false,
-  hydrateAuthenticatedUser: true,
-  handlers: {
-    config: () => {
-      mergeConfig({
-        SUPPORT_URL: process.env.SUPPORT_URL,
-        ENABLE_LOGIN_AND_REGISTRATION: process.env.ENABLE_LOGIN_AND_REGISTRATION,
-      }, 'App loadConfig override handler');
-    },
+  // Extract duplicate third-party auth provider message from query string
+  errors.duplicateTpaProvider = url.searchParams.get('duplicate_provider');
+  if (errors.duplicateTpaProvider) {
+    // Remove the duplicate_provider query param to avoid bookmarking.
+    window.history.replaceState(null, '', `${url.protocol}//${url.host}${url.pathname}`);
+  }
+
+  return Object.assign({}, { configuration }, apiClient.getAuthenticationState(), { errors });
+}
+
+function configure() {
+  configureI18n(configuration, messages);
+
+  const { store, history } = configureStore(createInitialState(), configuration.ENVIRONMENT);
+
+  configureLoggingService(NewRelicLoggingService);
+  configureAccountSettingsApiService(configuration, apiClient);
+  configureUserAccountApiService(configuration, apiClient);
+  initializeSegment(configuration.SEGMENT_KEY);
+  configureAnalytics({
+    loggingService: NewRelicLoggingService,
+    authApiClient: apiClient,
+    analyticsApiBaseUrl: configuration.LMS_BASE_URL,
+  });
+
+  return {
+    store,
+    history,
+  };
+}
+
+apiClient.ensurePublicOrAuthenticationAndCookies(
+  window.location.pathname,
+  (accessToken) => {
+    const { store, history } = configure();
+
+    ReactDOM.render(<App store={store} history={history} />, document.getElementById('root'));
+
+    if (accessToken) {
+      identifyAuthenticatedUser(accessToken.userId);
+    } else {
+      identifyAnonymousUser();
+    }
+    sendPageEvent();
+
+    sendTrackingLogEvent('edx.user.settings.viewed', {
+      page: 'account',
+      visibility: null,
+      user_id: accessToken ? accessToken.userId : null,
+    });
  },
-});
+);
--- a/Show More
+++ b/Show More