m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #4960 from whymarrh/import-account-error

Browse Source 
Show invalid seed phrase error when importing new account
This commit is contained in:
Whymarrh Whitby 2018-08-07 02:37:14 -02:30 committed by GitHub
commit 564fb9f563
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/_locales/en/messages.json
View File

@ -510,6 +510,9 @@
"invalidRPC": { "invalidRPC": {
"message": "Invalid RPC URI" "message": "Invalid RPC URI"
}, },
"invalidSeedPhrase": {
"message": "Invalid seed phrase"
},
"jsonFail": { "jsonFail": {
"message": "Something went wrong. Please make sure your JSON file is properly formatted." "message": "Something went wrong. Please make sure your JSON file is properly formatted."
}, },

9
mascara/src/app/first-time/import-seed-phrase-screen.js
View File

@ -1,3 +1,4 @@
import {validateMnemonic} from 'bip39'
import React, { Component } from 'react' import React, { Component } from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import {connect} from 'react-redux' import {connect} from 'react-redux'
@ -39,8 +40,12 @@ class ImportSeedPhraseScreen extends Component {
handleSeedPhraseChange (seedPhrase) { handleSeedPhraseChange (seedPhrase) {
let seedPhraseError = null let seedPhraseError = null
if (seedPhrase && this.parseSeedPhrase(seedPhrase).split(' ').length !== 12) { if (seedPhrase) {
seedPhraseError = this.context.t('seedPhraseReq') if (this.parseSeedPhrase(seedPhrase).split(' ').length !== 12) {
seedPhraseError = this.context.t('seedPhraseReq')
} else if (!validateMnemonic(seedPhrase)) {
seedPhraseError = this.context.t('invalidSeedPhrase')
}
} }
this.setState({ seedPhrase, seedPhraseError }) this.setState({ seedPhrase, seedPhraseError })