From fba17d77de9e60de0e02e90dc6dbcbbf7454158a Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@users.noreply.github.com>
Date: Wed, 23 Jan 2019 07:25:34 -0800
Subject: Refactor first time flow, remove seed phrase from state (#5994)

* Refactor and fix styling for first time flow. Remove seed phrase from persisted metamask state

* Fix linting and tests

* Fix translations, initialization notice routing

* Fix drizzle tests

* Fix e2e tests

* Fix integration tests

* Fix styling

* Fix migration naming from 030 to 031

* Open extension in browser when user has not completed onboarding
---
 .../authenticated/authenticated.component.js       | 22 ++++++++++++++++++++++
 .../authenticated/authenticated.container.js       | 12 ++++++++++++
 .../higher-order-components/authenticated/index.js |  1 +
 .../higher-order-components/initialized/index.js   |  1 +
 .../initialized/initialized.component.js           | 14 ++++++++++++++
 .../initialized/initialized.container.js           | 12 ++++++++++++
 6 files changed, 62 insertions(+)
 create mode 100644 ui/app/higher-order-components/authenticated/authenticated.component.js
 create mode 100644 ui/app/higher-order-components/authenticated/authenticated.container.js
 create mode 100644 ui/app/higher-order-components/authenticated/index.js
 create mode 100644 ui/app/higher-order-components/initialized/index.js
 create mode 100644 ui/app/higher-order-components/initialized/initialized.component.js
 create mode 100644 ui/app/higher-order-components/initialized/initialized.container.js

(limited to 'ui/app/higher-order-components')

diff --git a/ui/app/higher-order-components/authenticated/authenticated.component.js b/ui/app/higher-order-components/authenticated/authenticated.component.js
new file mode 100644
index 000000000..7b64d4895
--- /dev/null
+++ b/ui/app/higher-order-components/authenticated/authenticated.component.js
@@ -0,0 +1,22 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { Redirect, Route } from 'react-router-dom'
+import { UNLOCK_ROUTE, INITIALIZE_ROUTE } from '../../routes'
+
+export default function Authenticated (props) {
+  const { isUnlocked, completedOnboarding } = props
+
+  switch (true) {
+    case isUnlocked && completedOnboarding:
+      return <Route { ...props } />
+    case !completedOnboarding:
+      return <Redirect to={{ pathname: INITIALIZE_ROUTE }} />
+    default:
+      return <Redirect to={{ pathname: UNLOCK_ROUTE }} />
+  }
+}
+
+Authenticated.propTypes = {
+  isUnlocked: PropTypes.bool,
+  completedOnboarding: PropTypes.bool,
+}
diff --git a/ui/app/higher-order-components/authenticated/authenticated.container.js b/ui/app/higher-order-components/authenticated/authenticated.container.js
new file mode 100644
index 000000000..6124b0fcd
--- /dev/null
+++ b/ui/app/higher-order-components/authenticated/authenticated.container.js
@@ -0,0 +1,12 @@
+import { connect } from 'react-redux'
+import Authenticated from './authenticated.component'
+
+const mapStateToProps = state => {
+  const { metamask: { isUnlocked, completedOnboarding } } = state
+  return {
+    isUnlocked,
+    completedOnboarding,
+  }
+}
+
+export default connect(mapStateToProps)(Authenticated)
diff --git a/ui/app/higher-order-components/authenticated/index.js b/ui/app/higher-order-components/authenticated/index.js
new file mode 100644
index 000000000..05632ed21
--- /dev/null
+++ b/ui/app/higher-order-components/authenticated/index.js
@@ -0,0 +1 @@
+export { default } from './authenticated.container'
diff --git a/ui/app/higher-order-components/initialized/index.js b/ui/app/higher-order-components/initialized/index.js
new file mode 100644
index 000000000..863fcb389
--- /dev/null
+++ b/ui/app/higher-order-components/initialized/index.js
@@ -0,0 +1 @@
+export { default } from './initialized.container.js'
diff --git a/ui/app/higher-order-components/initialized/initialized.component.js b/ui/app/higher-order-components/initialized/initialized.component.js
new file mode 100644
index 000000000..0736ceff4
--- /dev/null
+++ b/ui/app/higher-order-components/initialized/initialized.component.js
@@ -0,0 +1,14 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { Redirect, Route } from 'react-router-dom'
+import { INITIALIZE_ROUTE } from '../../routes'
+
+export default function Initialized (props) {
+  return props.completedOnboarding
+    ? <Route { ...props } />
+    : <Redirect to={{ pathname: INITIALIZE_ROUTE }} />
+}
+
+Initialized.propTypes = {
+  completedOnboarding: PropTypes.bool,
+}
diff --git a/ui/app/higher-order-components/initialized/initialized.container.js b/ui/app/higher-order-components/initialized/initialized.container.js
new file mode 100644
index 000000000..0e7f72bcb
--- /dev/null
+++ b/ui/app/higher-order-components/initialized/initialized.container.js
@@ -0,0 +1,12 @@
+import { connect } from 'react-redux'
+import Initialized from './initialized.component'
+
+const mapStateToProps = state => {
+  const { metamask: { completedOnboarding } } = state
+
+  return {
+    completedOnboarding,
+  }
+}
+
+export default connect(mapStateToProps)(Initialized)
-- 
cgit