grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3599 from ethcore/jg-phrase-whitespace

Browse Source 
Trim whitespace from input recovery phrase
This commit is contained in:
Nicolas Gotchac 2016-11-24 16:22:56 +01:00 committed by GitHub
commit d449b3c3f1
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
View File

@ -54,8 +54,6 @@ export default class RecoveryPhrase extends Component {
<Input <Input
hint='the account recovery phrase' hint='the account recovery phrase'
label='account recovery phrase' label='account recovery phrase'
multiLine
rows={ 1 }
value={ recoveryPhrase } value={ recoveryPhrase }
onChange={ this.onEditPhrase } /> onChange={ this.onEditPhrase } />
<Input <Input
@ -112,17 +110,23 @@ export default class RecoveryPhrase extends Component {
} }
onEditPhrase = (event) => { onEditPhrase = (event) => {
const value = event.target.value; const recoveryPhrase = event.target.value
let error = null; .toLowerCase() // wordlists are lowercase
.trim() // remove whitespace at both ends
.replace(/\s/g, ' ') // replace any whitespace with single space
.replace(/ +/g, ' '); // replace multiple spaces with a single space
if (!value || value.trim().length < 25) { const parts = recoveryPhrase.split(' ');
error = ERRORS.noPhrase; let recoveryPhraseError = null;
if (!recoveryPhrase || recoveryPhrase.length < 25 || parts.length < 8) {
recoveryPhraseError = ERRORS.noPhrase;
} }
this.setState({ this.setState({
recoveryPhrase: value, recoveryPhrase,
recoveryPhraseError: error, recoveryPhraseError,
isValidPhrase: !error isValidPhrase: !recoveryPhraseError
}, this.updateParent); }, this.updateParent);
} }