Add create new account routes, fix conflicts from uat updates

3 files changed, 0 insertions, 257 deletions

diff --git a/ui/app/accounts/import/index.js b/ui/app/accounts/import/index.js
deleted file mode 100644
index 0c901c09b..000000000
--- a/ui/app/accounts/import/index.js
+++ /dev/null
@@ -1,80 +0,0 @@
-const inherits = require('util').inherits
-const Component = require('react').Component
-const h = require('react-hyperscript')
-const connect = require('react-redux').connect
-import Select from 'react-select'
-
-// Subviews
-const JsonImportView = require('./json.js')
-const PrivateKeyImportView = require('./private-key.js')
-
-const menuItems = [
-  'Private Key',
-  'JSON File',
-]
-
-module.exports = connect(mapStateToProps)(AccountImportSubview)
-
-function mapStateToProps (state) {
-  return {
-    menuItems,
-  }
-}
-
-inherits(AccountImportSubview, Component)
-function AccountImportSubview () {
-  Component.call(this)
-}
-
-AccountImportSubview.prototype.render = function () {
-  const props = this.props
-  const state = this.state || {}
-  const { menuItems } = props
-  const { type } = state
-
-  return (
-    h('div.new-account-import-form', [
-
-      h('div.new-account-import-form__select-section', [
-
-        h('div.new-account-import-form__select-label', 'SELECT TYPE'),
-
-        h(Select, {
-          className: 'new-account-import-form__select',
-          name: 'import-type-select',
-          clearable: false,
-          value: type || menuItems[0],
-          options: menuItems.map((type) => {
-            return {
-              value: type,
-              label: type,
-            }
-          }),
-          onChange: (opt) => {
-            this.setState({ type: opt.value })
-          },
-        }),
-
-      ]),
-
-      this.renderImportView(),
-    ])
-  )
-}
-
-AccountImportSubview.prototype.renderImportView = function () {
-  const props = this.props
-  const state = this.state || {}
-  const { type } = state
-  const { menuItems } = props
-  const current = type || menuItems[0]
-
-  switch (current) {
-    case 'Private Key':
-      return h(PrivateKeyImportView)
-    case 'JSON File':
-      return h(JsonImportView)
-    default:
-      return h(JsonImportView)
-  }
-}
diff --git a/ui/app/accounts/new-account/create-form.js b/ui/app/accounts/new-account/create-form.js
deleted file mode 100644
index 494726ae4..000000000
--- a/ui/app/accounts/new-account/create-form.js
+++ /dev/null
@@ -1,96 +0,0 @@
-const { Component } = require('react')
-const PropTypes = require('prop-types')
-const h = require('react-hyperscript')
-const { connect } = require('react-redux')
-const actions = require('../../actions')
-
-class NewAccountCreateForm extends Component {
-  constructor (props) {
-    super(props)
-    const { numberOfExistingAccounts = 0 } = props
-    const newAccountNumber = numberOfExistingAccounts + 1
-
-    this.state = {
-      newAccountName: `Account ${newAccountNumber}`,
-    }
-  }
-
-  render () {
-    const { newAccountName } = this.state
-
-    return h('div.new-account-create-form', [
-
-      h('div.new-account-create-form__input-label', {}, [
-        'Account Name',
-      ]),
-
-      h('div.new-account-create-form__input-wrapper', {}, [
-        h('input.new-account-create-form__input', {
-          value: this.state.newAccountName,
-          placeholder: 'E.g. My new account',
-          onChange: event => this.setState({ newAccountName: event.target.value }),
-        }, []),
-      ]),
-
-      h('div.new-account-create-form__buttons', {}, [
-
-        h('button.new-account-create-form__button-cancel', {
-          onClick: () => this.props.goHome(),
-        }, [
-          'CANCEL',
-        ]),
-
-        h('button.new-account-create-form__button-create', {
-          onClick: () => this.props.createAccount(newAccountName),
-        }, [
-          'CREATE',
-        ]),
-
-      ]),
-
-    ])
-  }
-}
-
-NewAccountCreateForm.propTypes = {
-  hideModal: PropTypes.func,
-  showImportPage: PropTypes.func,
-  createAccount: PropTypes.func,
-  goHome: PropTypes.func,
-  numberOfExistingAccounts: PropTypes.number,
-}
-
-const mapStateToProps = state => {
-  const { metamask: { network, selectedAddress, identities = {} } } = state
-  const numberOfExistingAccounts = Object.keys(identities).length
-
-  return {
-    network,
-    address: selectedAddress,
-    numberOfExistingAccounts,
-  }
-}
-
-const mapDispatchToProps = dispatch => {
-  return {
-    toCoinbase: (address) => {
-      dispatch(actions.buyEth({ network: '1', address, amount: 0 }))
-    },
-    hideModal: () => {
-      dispatch(actions.hideModal())
-    },
-    createAccount: (newAccountName) => {
-      dispatch(actions.addNewAccount())
-        .then((newAccountAddress) => {
-          if (newAccountName) {
-            dispatch(actions.saveAccountLabel(newAccountAddress, newAccountName))
-          }
-          dispatch(actions.goHome())
-        })
-    },
-    showImportPage: () => dispatch(actions.showImportPage()),
-    goHome: () => dispatch(actions.goHome()),
-  }
-}
-
-module.exports = connect(mapStateToProps, mapDispatchToProps)(NewAccountCreateForm)
diff --git a/ui/app/accounts/new-account/index.js b/ui/app/accounts/new-account/index.js
deleted file mode 100644
index acf0dc6e4..000000000
--- a/ui/app/accounts/new-account/index.js
+++ /dev/null
@@ -1,81 +0,0 @@
-const Component = require('react').Component
-const h = require('react-hyperscript')
-const inherits = require('util').inherits
-const connect = require('react-redux').connect
-const actions = require('../../actions')
-const { getCurrentViewContext } = require('../../selectors')
-const classnames = require('classnames')
-
-const NewAccountCreateForm = require('./create-form')
-const NewAccountImportForm = require('../import')
-
-function mapStateToProps (state) {
-  return {
-    displayedForm: getCurrentViewContext(state),
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return {
-    displayForm: form => dispatch(actions.setNewAccountForm(form)),
-    showQrView: (selected, identity) => dispatch(actions.showQrView(selected, identity)),
-    showExportPrivateKeyModal: () => {
-      dispatch(actions.showModal({ name: 'EXPORT_PRIVATE_KEY' }))
-    },
-    hideModal: () => dispatch(actions.hideModal()),
-    saveAccountLabel: (address, label) => dispatch(actions.saveAccountLabel(address, label)),
-  }
-}
-
-inherits(AccountDetailsModal, Component)
-function AccountDetailsModal (props) {
-  Component.call(this)
-
-  this.state = {
-    displayedForm: props.displayedForm,
-  }
-}
-
-module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountDetailsModal)
-
-AccountDetailsModal.prototype.render = function () {
-  const { displayedForm, displayForm } = this.props
-
-  return h('div.new-account', {}, [
-    
-    h('div.new-account__header', [
-
-      h('div.new-account__title', 'New Account'),
-
-      h('div.new-account__tabs', [
-
-        h('div.new-account__tabs__tab', {
-          className: classnames('new-account__tabs__tab', {
-            'new-account__tabs__selected': displayedForm === 'CREATE',
-            'new-account__tabs__unselected cursor-pointer': displayedForm !== 'CREATE',
-          }),
-          onClick: () => displayForm('CREATE'),
-        }, 'Create'),
-
-        h('div.new-account__tabs__tab', {
-          className: classnames('new-account__tabs__tab', {
-            'new-account__tabs__selected': displayedForm === 'IMPORT',
-            'new-account__tabs__unselected cursor-pointer': displayedForm !== 'IMPORT',
-          }),
-          onClick: () => displayForm('IMPORT'),
-        }, 'Import'),
-
-      ]),
-
-    ]),
-
-    h('div.new-account__form', [
-
-      displayedForm === 'CREATE'
-        ? h(NewAccountCreateForm)
-        : h(NewAccountImportForm),
-
-    ]),
-
-  ])
-}