Fix merge conflicts from uat-next

3 files changed, 20 insertions, 13 deletions

diff --git a/ui/app/components/pages/create-account/import-account/index.js b/ui/app/components/pages/create-account/import-account/index.js
index 0c901c09b..71eb9ae23 100644
--- a/ui/app/components/pages/create-account/import-account/index.js
+++ b/ui/app/components/pages/create-account/import-account/index.js
@@ -37,7 +37,7 @@ AccountImportSubview.prototype.render = function () {
 
       h('div.new-account-import-form__select-section', [
 
-        h('div.new-account-import-form__select-label', 'SELECT TYPE'),
+        h('div.new-account-import-form__select-label', 'Select Type'),
 
         h(Select, {
           className: 'new-account-import-form__select',
diff --git a/ui/app/components/pages/create-account/import-account/private-key.js b/ui/app/components/pages/create-account/import-account/private-key.js
index 785bf2cb6..fb10bdb48 100644
--- a/ui/app/components/pages/create-account/import-account/private-key.js
+++ b/ui/app/components/pages/create-account/import-account/private-key.js
@@ -37,15 +37,20 @@ PrivateKeyImportView.prototype.render = function () {
 
   return (
     h('div.new-account-import-form__private-key', [
-      h('span.new-account-create-form__instruction', 'Paste your private key string here:'),
 
-      h('input.new-account-import-form__input-password', {
-        type: 'password',
-        id: 'private-key-box',
-        onKeyPress: () => this.createKeyringOnEnter(),
-      }),
+      h('div.new-account-import-form__private-key-password-container', [
 
-      h('div.new-account-create-form__buttons', {}, [
+        h('span.new-account-import-form__instruction', 'Paste your private key string here:'),
+
+        h('input.new-account-import-form__input-password', {
+          type: 'password',
+          id: 'private-key-box',
+          onKeyPress: () => this.createKeyringOnEnter(),
+        }),
+
+      ]),
+
+      h('div.new-account-import-form__buttons', {}, [
 
         h('button.new-account-create-form__button-cancel', {
           onClick: () => this.props.history.push(DEFAULT_ROUTE),
diff --git a/ui/app/components/pages/create-account/new-account.js b/ui/app/components/pages/create-account/new-account.js
index a3bfefc84..fbd456a75 100644
--- a/ui/app/components/pages/create-account/new-account.js
+++ b/ui/app/components/pages/create-account/new-account.js
@@ -8,16 +8,18 @@ const { DEFAULT_ROUTE } = require('../../../routes')
 class NewAccountCreateForm extends Component {
   constructor (props) {
     super(props)
+
     const { numberOfExistingAccounts = 0 } = props
     const newAccountNumber = numberOfExistingAccounts + 1
 
     this.state = {
-      newAccountName: `Account ${newAccountNumber}`,
+      newAccountName: '',
+      defaultAccountName: `Account ${newAccountNumber}`,
     }
   }
 
   render () {
-    const { newAccountName } = this.state
+    const { newAccountName, defaultAccountName } = this.state
     const { history, createAccount } = this.props
 
     return h('div.new-account-create-form', [
@@ -28,8 +30,8 @@ class NewAccountCreateForm extends Component {
 
       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',
+          value: newAccountName,
+          placeholder: defaultAccountName,
           onChange: event => this.setState({ newAccountName: event.target.value }),
         }, []),
       ]),
@@ -44,7 +46,7 @@ class NewAccountCreateForm extends Component {
 
         h('button.new-account-create-form__button-create', {
           onClick: () => {
-            createAccount(newAccountName)
+            createAccount(newAccountName || defaultAccountName)
               .then(() => history.push(DEFAULT_ROUTE))
           },
         }, [