From b393b54e35091efd3f49e9eccaf472c91f5bd0d1 Mon Sep 17 00:00:00 2001 From: criw Date: Tue, 6 Mar 2018 04:43:12 +0100 Subject: FIX #3440 improved verification of restore from seed phrase --- old-ui/app/keychains/hd/restore-vault.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'old-ui') diff --git a/old-ui/app/keychains/hd/restore-vault.js b/old-ui/app/keychains/hd/restore-vault.js index 222172dfd..dcadcccad 100644 --- a/old-ui/app/keychains/hd/restore-vault.js +++ b/old-ui/app/keychains/hd/restore-vault.js @@ -140,6 +140,19 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () { // check seed var seedBox = document.querySelector('textarea.twelve-word-phrase') var seed = seedBox.value.trim() + + // true if the string has more than a space between words. + if (seed.split(' ').length > 1) { + this.warning = 'there can only a space between words' + this.props.dispatch(actions.displayWarning(this.warning)) + return + } + // true if seed contains a character that is not between a-z or a space + if(!seed.match(/^[a-z ]+$/)) { + this.warning = 'seed words only have lowercase characters' + this.props.dispatch(actions.displayWarning(this.warning)) + return + } if (seed.split(' ').length !== 12) { this.warning = 'seed phrases are 12 words long' this.props.dispatch(actions.displayWarning(this.warning)) -- cgit From 4b2e52795d52cfcf227ee56fba9f975e057e846d Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Fri, 9 Mar 2018 16:30:31 +0100 Subject: Explicitly define state in import account from json component (#3491) --- old-ui/app/accounts/import/json.js | 168 +++++++++++++++++++++---------------- 1 file changed, 95 insertions(+), 73 deletions(-) (limited to 'old-ui') diff --git a/old-ui/app/accounts/import/json.js b/old-ui/app/accounts/import/json.js index 8d6bd7f7b..3ee3b95df 100644 --- a/old-ui/app/accounts/import/json.js +++ b/old-ui/app/accounts/import/json.js @@ -1,100 +1,122 @@ -const inherits = require('util').inherits const Component = require('react').Component const h = require('react-hyperscript') const connect = require('react-redux').connect const actions = require('../../../../ui/app/actions') const FileInput = require('react-simple-file-input').default +const PropTypes = require('prop-types') const HELP_LINK = 'https://github.com/MetaMask/faq/blob/master/README.md#q-i-cant-use-the-import-feature-for-uploading-a-json-file-the-window-keeps-closing-when-i-try-to-select-a-file' -module.exports = connect(mapStateToProps)(JsonImportSubview) +class JsonImportSubview extends Component { + constructor (props) { + super(props) -function mapStateToProps (state) { - return { - error: state.appState.warning, + this.state = { + file: null, + fileContents: '', + } } -} -inherits(JsonImportSubview, Component) -function JsonImportSubview () { - Component.call(this) -} + render () { + const { error } = this.props -JsonImportSubview.prototype.render = function () { - const { error } = this.props - - return ( - h('div', { - style: { - display: 'flex', - flexDirection: 'column', - alignItems: 'center', - padding: '5px 15px 0px 15px', - }, - }, [ - - h('p', 'Used by a variety of different clients'), - h('a.warning', { href: HELP_LINK, target: '_blank' }, 'File import not working? Click here!'), - - h(FileInput, { - readAs: 'text', - onLoad: this.onLoad.bind(this), + return ( + h('div', { style: { - margin: '20px 0px 12px 20px', - fontSize: '15px', + display: 'flex', + flexDirection: 'column', + alignItems: 'center', + padding: '5px 15px 0px 15px', }, - }), + }, [ + + h('p', 'Used by a variety of different clients'), + h('a.warning', { + href: HELP_LINK, + target: '_blank', + }, 'File import not working? Click here!'), + + h(FileInput, { + readAs: 'text', + onLoad: this.onLoad.bind(this), + style: { + margin: '20px 0px 12px 20px', + fontSize: '15px', + }, + }), + + h('input.large-input.letter-spacey', { + type: 'password', + placeholder: 'Enter password', + id: 'json-password-box', + onKeyPress: this.createKeyringOnEnter.bind(this), + style: { + width: 260, + marginTop: 12, + }, + }), + + h('button.primary', { + onClick: this.createNewKeychain.bind(this), + style: { + margin: 12, + }, + }, 'Import'), + + error ? h('span.error', error) : null, + ]) + ) + } - h('input.large-input.letter-spacey', { - type: 'password', - placeholder: 'Enter password', - id: 'json-password-box', - onKeyPress: this.createKeyringOnEnter.bind(this), - style: { - width: 260, - marginTop: 12, - }, - }), + onLoad (event, file) { + this.setState({file: file, fileContents: event.target.result}) + } - h('button.primary', { - onClick: this.createNewKeychain.bind(this), - style: { - margin: 12, - }, - }, 'Import'), + createKeyringOnEnter (event) { + if (event.key === 'Enter') { + event.preventDefault() + this.createNewKeychain() + } + } - error ? h('span.error', error) : null, - ]) - ) -} + createNewKeychain () { + const { fileContents } = this.state -JsonImportSubview.prototype.onLoad = function (event, file) { - this.setState({file: file, fileContents: event.target.result}) -} + if (!fileContents) { + const message = 'You must select a file to import.' + return this.props.displayWarning(message) + } -JsonImportSubview.prototype.createKeyringOnEnter = function (event) { - if (event.key === 'Enter') { - event.preventDefault() - this.createNewKeychain() - } -} + const passwordInput = document.getElementById('json-password-box') + const password = passwordInput.value -JsonImportSubview.prototype.createNewKeychain = function () { - const state = this.state - const { fileContents } = state + if (!password) { + const message = 'You must enter a password for the selected file.' + return this.props.displayWarning(message) + } - if (!fileContents) { - const message = 'You must select a file to import.' - return this.props.dispatch(actions.displayWarning(message)) + this.props.importNewAccount([ fileContents, password ]) } +} - const passwordInput = document.getElementById('json-password-box') - const password = passwordInput.value +JsonImportSubview.propTypes = { + error: PropTypes.string, + displayWarning: PropTypes.func, + importNewAccount: PropTypes.func, +} - if (!password) { - const message = 'You must enter a password for the selected file.' - return this.props.dispatch(actions.displayWarning(message)) +const mapStateToProps = state => { + return { + error: state.appState.warning, } +} - this.props.dispatch(actions.importNewAccount('JSON File', [ fileContents, password ])) +const mapDispatchToProps = dispatch => { + return { + goHome: () => dispatch(actions.goHome()), + displayWarning: warning => dispatch(actions.displayWarning(warning)), + importNewAccount: options => dispatch(actions.importNewAccount('JSON File', options)), + } } + +module.exports = connect(mapStateToProps, mapDispatchToProps)(JsonImportSubview) -- cgit From a52ef7a06a04888d2de1246c0896f86f59a3f153 Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 13 Mar 2018 14:41:54 -0700 Subject: ui - lint fix --- old-ui/app/keychains/hd/restore-vault.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'old-ui') diff --git a/old-ui/app/keychains/hd/restore-vault.js b/old-ui/app/keychains/hd/restore-vault.js index dcadcccad..ce39a1e7c 100644 --- a/old-ui/app/keychains/hd/restore-vault.js +++ b/old-ui/app/keychains/hd/restore-vault.js @@ -148,7 +148,7 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () { return } // true if seed contains a character that is not between a-z or a space - if(!seed.match(/^[a-z ]+$/)) { + if (!seed.match(/^[a-z ]+$/)) { this.warning = 'seed words only have lowercase characters' this.props.dispatch(actions.displayWarning(this.warning)) return -- cgit From 26231a42b64dc1d5987717994e1de6a9ec43e250 Mon Sep 17 00:00:00 2001 From: Dan Finlay <542863+danfinlay@users.noreply.github.com> Date: Tue, 13 Mar 2018 15:24:35 -0700 Subject: Fix grammar --- old-ui/app/keychains/hd/restore-vault.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'old-ui') diff --git a/old-ui/app/keychains/hd/restore-vault.js b/old-ui/app/keychains/hd/restore-vault.js index ce39a1e7c..d334d8e5f 100644 --- a/old-ui/app/keychains/hd/restore-vault.js +++ b/old-ui/app/keychains/hd/restore-vault.js @@ -143,7 +143,7 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () { // true if the string has more than a space between words. if (seed.split(' ').length > 1) { - this.warning = 'there can only a space between words' + this.warning = 'there can only be a space between words' this.props.dispatch(actions.displayWarning(this.warning)) return } -- cgit