Handle importing more invalid seed phrases

MetaMask · Jun 26, 2019 · b5763fa · b5763fa
1 parent 017a7e1
commit b5763fa
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
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
@@ -30,12 +30,21 @@ export default class ImportWithSeedPhrase extends PureComponent {
   }
 
   parseSeedPhrase = (seedPhrase) => {
+    if (!seedPhrase) {
+      return ''
+    }
+
     const trimmed = seedPhrase.trim()
     if (!trimmed) {
       return ''
     }
 
-    return trimmed.match(/\w+/g).join(' ')
+    const words = trimmed.match(/\w+/g)
+    if (!words) {
+      return ''
+    }
+
+    return words.join(' ')
   }
 
   componentWillMount () {

diff --git a/...w/create-password/import-with-seed-phrase/tests/import-with-seed-phrase.component.test.js b/...w/create-password/import-with-seed-phrase/tests/import-with-seed-phrase.component.test.js
@@ -53,5 +53,26 @@ describe('ImportWithSeedPhrase Component', () => {
 
       assert.deepEqual(parseSeedPhrase('   '), '')
     })
+
+    it('should return an empty string when given a string with only symbols', () => {
+      const root = shallowRender({
+        onSubmit: sinon.spy(),
+      })
+
+      const {parseSeedPhrase} = root.instance()
+
+      assert.deepEqual(parseSeedPhrase('$'), '')
+    })
+
+    it('should return an empty string for both null and undefined', () => {
+      const root = shallowRender({
+        onSubmit: sinon.spy(),
+      })
+
+      const {parseSeedPhrase} = root.instance()
+
+      assert.deepEqual(parseSeedPhrase(undefined), '')
+      assert.deepEqual(parseSeedPhrase(null), '')
+    })
   })
 })