From c51914c1a5262a7e5844bcf72f6d137f0a097559 Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Sun, 24 Nov 2019 01:28:32 -0330 Subject: [PATCH] Convert the RevealSeedPage component to use JSX (#7536) --- ui/app/pages/keychains/reveal-seed.js | 171 +++++++++++++------------- 1 file changed, 88 insertions(+), 83 deletions(-) diff --git a/ui/app/pages/keychains/reveal-seed.js b/ui/app/pages/keychains/reveal-seed.js index e83e3fd98..0e842594f 100644 --- a/ui/app/pages/keychains/reveal-seed.js +++ b/ui/app/pages/keychains/reveal-seed.js @@ -1,7 +1,6 @@ -const { Component } = require('react') +import React, { Component } from 'react' const { connect } = require('react-redux') const PropTypes = require('prop-types') -const h = require('react-hyperscript') const classnames = require('classnames') const { requestRevealSeedWords } = require('../../store/actions') @@ -14,15 +13,11 @@ const PASSWORD_PROMPT_SCREEN = 'PASSWORD_PROMPT_SCREEN' const REVEAL_SEED_SCREEN = 'REVEAL_SEED_SCREEN' class RevealSeedPage extends Component { - constructor (props) { - super(props) - - this.state = { - screen: PASSWORD_PROMPT_SCREEN, - password: '', - seedWords: null, - error: null, - } + state = { + screen: PASSWORD_PROMPT_SCREEN, + password: '', + seedWords: null, + error: null, } componentDidMount () { @@ -42,15 +37,17 @@ class RevealSeedPage extends Component { renderWarning () { return ( - h('.page-container__warning-container', [ - h('img.page-container__warning-icon', { - src: 'images/warning.svg', - }), - h('.page-container__warning-message', [ - h('.page-container__warning-title', [this.context.t('revealSeedWordsWarningTitle')]), - h('div', [this.context.t('revealSeedWordsWarning')]), - ]), - ]) +
+ +
+
+ {this.context.t('revealSeedWordsWarningTitle')} +
+
+ {this.context.t('revealSeedWordsWarning')} +
+
+
) } @@ -64,24 +61,25 @@ class RevealSeedPage extends Component { const { t } = this.context return ( - h('form', { - onSubmit: event => this.handleSubmit(event), - }, [ - h('label.input-label', { - htmlFor: 'password-box', - }, t('enterPasswordContinue')), - h('.input-group', [ - h('input.form-control', { - type: 'password', - placeholder: t('password'), - id: 'password-box', - value: this.state.password, - onChange: event => this.setState({ password: event.target.value }), - className: classnames({ 'form-control--error': this.state.error }), - }), - ]), - this.state.error && h('.reveal-seed__error', this.state.error), - ]) +
this.handleSubmit(event)}> + +
+ this.setState({ password: event.target.value })} + className={classnames('form-control', { 'form-control--error': this.state.error })} + /> +
+ { + this.state.error && ( +
+ {this.state.error} +
+ )} +
) } @@ -89,13 +87,10 @@ class RevealSeedPage extends Component { const { t } = this.context return ( - h('div', [ - h('label.reveal-seed__label', t('yourPrivateSeedPhrase')), - h(ExportTextContainer, { - text: this.state.seedWords, - filename: t('metamaskSeedWords'), - }), - ]) +
+ + +
) } @@ -107,54 +102,64 @@ class RevealSeedPage extends Component { renderPasswordPromptFooter () { return ( - h('.page-container__footer', [ - h('header', [ - h(Button, { - type: 'default', - large: true, - className: 'page-container__footer-button', - onClick: () => this.props.history.push(DEFAULT_ROUTE), - }, this.context.t('cancel')), - h(Button, { - type: 'secondary', - large: true, - className: 'page-container__footer-button', - onClick: event => this.handleSubmit(event), - disabled: this.state.password === '', - }, this.context.t('next')), - ]), - ]) +
+
+ + +
+
) } renderRevealSeedFooter () { return ( - h('.page-container__footer', [ - h(Button, { - type: 'default', - large: true, - className: 'page-container__footer-button', - onClick: () => this.props.history.push(DEFAULT_ROUTE), - }, this.context.t('close')), - ]) +
+ +
) } render () { return ( - h('.page-container', [ - h('.page-container__header', [ - h('.page-container__title', this.context.t('revealSeedWordsTitle')), - h('.page-container__subtitle', this.context.t('revealSeedWordsDescription')), - ]), - h('.page-container__content', [ - this.renderWarning(), - h('.reveal-seed__content', [ - this.renderContent(), - ]), - ]), - this.renderFooter(), - ]) +
+
+
+ {this.context.t('revealSeedWordsTitle')} +
+
+ {this.context.t('revealSeedWordsDescription')} +
+
+
+ {this.renderWarning()} +
+ {this.renderContent()} +
+
+ {this.renderFooter()} +
) } }