Fix parsing of seed phrases on import and restore (#8721)

MetaMask · Jun 3, 2020 · b902839 · b902839
1 parent c6b77c9
commit b902839
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/...st-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.component.js b/...st-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.component.js
@@ -31,23 +31,7 @@ export default class ImportWithSeedPhrase extends PureComponent {
     termsChecked: false,
   }
 
-  parseSeedPhrase = (seedPhrase) => {
-    if (!seedPhrase) {
-      return ''
-    }
-
-    const trimmed = seedPhrase.trim()
-    if (!trimmed) {
-      return ''
-    }
-
-    const words = trimmed.toLowerCase().match(/\w+/g)
-    if (!words) {
-      return ''
-    }
-
-    return words.join(' ')
-  }
+  parseSeedPhrase = (seedPhrase) => (seedPhrase || '').trim().toLowerCase().match(/\w+/gu)?.join(' ') || ''
 
   UNSAFE_componentWillMount () {
     this._onBeforeUnload = () => this.context.metricsEvent({
@@ -73,7 +57,7 @@ export default class ImportWithSeedPhrase extends PureComponent {
 
     if (seedPhrase) {
       const parsedSeedPhrase = this.parseSeedPhrase(seedPhrase)
-      const wordCount = parsedSeedPhrase.split(new RegExp('\\s')).length
+      const wordCount = parsedSeedPhrase.split(/\s/u).length
       if (wordCount % 3 !== 0 || wordCount > 24 || wordCount < 12) {
         seedPhraseError = this.context.t('seedPhraseReq')
       } else if (!validateMnemonic(parsedSeedPhrase)) {

diff --git a/ui/app/pages/keychains/restore-vault.js b/ui/app/pages/keychains/restore-vault.js
@@ -33,16 +33,12 @@ class RestoreVaultPage extends Component {
     confirmPasswordError: null,
   }
 
-  parseSeedPhrase = (seedPhrase) => {
-    return seedPhrase
-      .match(/\w+/g)
-      .join(' ')
-  }
+  parseSeedPhrase = (seedPhrase) => (seedPhrase || '').trim().toLowerCase().match(/\w+/gu)?.join(' ') || ''
 
   handleSeedPhraseChange (seedPhrase) {
     let seedPhraseError = null
 
-    const wordCount = this.parseSeedPhrase(seedPhrase).split(new RegExp('\\s')).length
+    const wordCount = this.parseSeedPhrase(seedPhrase).split(/\s/u).length
     if (seedPhrase && (wordCount % 3 !== 0 || wordCount < 12 || wordCount > 24)) {
       seedPhraseError = this.context.t('seedPhraseReq')
     }