Merge branch 'master' into i#1203MainNetSwitch

2 files changed, 9 insertions, 34 deletions

diff --git a/ui/app/keychains/hd/create-vault-complete.js b/ui/app/keychains/hd/create-vault-complete.js
index 7272ebdbd..5230797ad 100644
--- a/ui/app/keychains/hd/create-vault-complete.js
+++ b/ui/app/keychains/hd/create-vault-complete.js
@@ -45,12 +45,17 @@ CreateVaultCompleteScreen.prototype.render = function () {
         'Vault Created',
       ]),
 
-      h('span.error', { // Error for the right red
+      h('div', {
         style: {
-          padding: '12px 20px 0px 20px',
+          width: '360px',
+          height: '78px',
+          fontSize: '1em',
+          marginTop: '10px',
           textAlign: 'center',
         },
-      }, 'These 12 words can restore all of your MetaMask accounts for this vault.\nSave them somewhere safe and secret.'),
+      }, [
+        h('span.error', 'These 12 words can restore all of your MetaMask accounts for this vault.\nSave them somewhere safe and secret.'),
+      ]),
 
       h('textarea.twelve-word-phrase', {
         readOnly: true,
diff --git a/ui/app/keychains/hd/recover-seed/confirmation.js b/ui/app/keychains/hd/recover-seed/confirmation.js
index 56ac461ea..4ccbec9fc 100644
--- a/ui/app/keychains/hd/recover-seed/confirmation.js
+++ b/ui/app/keychains/hd/recover-seed/confirmation.js
@@ -18,11 +18,8 @@ function mapStateToProps (state) {
   }
 }
 
-RevealSeedConfirmation.prototype.confirmationPhrase = 'I understand'
-
 RevealSeedConfirmation.prototype.render = function () {
   const props = this.props
-  const state = this.state
 
   return (
 
@@ -64,31 +61,13 @@ RevealSeedConfirmation.prototype.render = function () {
           },
         }),
 
-        h(`h4${state && state.confirmationWrong ? '.error' : ''}`, {
-          style: {
-            marginTop: '12px',
-          },
-        }, `Enter the phrase "${this.confirmationPhrase}" to proceed.`),
-
-        // confirm confirmation
-        h('input.large-input.letter-spacey', {
-          type: 'text',
-          id: 'confirm-box',
-          placeholder: this.confirmationPhrase,
-          onKeyPress: this.checkConfirmation.bind(this),
-          style: {
-            width: 260,
-            marginTop: 16,
-          },
-        }),
-
         h('.flex-row.flex-space-between', {
           style: {
             marginTop: 30,
             width: '50%',
           },
         }, [
-// cancel
+          // cancel
           h('button.primary', {
             onClick: this.goHome.bind(this),
           }, 'CANCEL'),
@@ -134,15 +113,6 @@ RevealSeedConfirmation.prototype.checkConfirmation = function (event) {
 }
 
 RevealSeedConfirmation.prototype.revealSeedWords = function () {
-  this.setState({ confirmationWrong: false })
-
-  const confirmBox = document.getElementById('confirm-box')
-  const confirmation = confirmBox.value
-  if (confirmation !== this.confirmationPhrase) {
-    confirmBox.value = ''
-    return this.setState({ confirmationWrong: true })
-  }
-
   var password = document.getElementById('password-box').value
   this.props.dispatch(actions.requestRevealSeed(password))
 }