From b57707de2695a1459e8d108fa787dcc7d2e2ad2e Mon Sep 17 00:00:00 2001 From: Aleksey Popov Date: Mon, 11 Sep 2017 16:02:59 +0300 Subject: [PATCH] review fixes --- src/components/login/login.js | 6 +++++- src/components/login/login.test.js | 7 +++++++ src/utils/similarWord.js | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/components/login/login.js b/src/components/login/login.js index e25d1a19b..be7d9732b 100644 --- a/src/components/login/login.js +++ b/src/components/login/login.js @@ -105,9 +105,13 @@ class Login extends React.Component { const invalidWord = mnemonic.find(word => !inDictionary(word)); if (invalidWord && (invalidWord.length >= 2 && invalidWord.length <= 8)) { const validWord = findSimilarWord(invalidWord); + let message; if (validWord) { - return `Word "${invalidWord}" is not on the passphrase Word List. Most similar word on the list is "${findSimilarWord(invalidWord)}"`; + message = `Word "${invalidWord}" is not on the passphrase Word List. Most similar word on the list is "${findSimilarWord(invalidWord)}"`; + } else { + message = `Word "${invalidWord}" is not on the passphrase Word List.`; } + return message; } return 'Passphrase is not valid'; diff --git a/src/components/login/login.test.js b/src/components/login/login.test.js index aca9f9970..d5e27a1e3 100644 --- a/src/components/login/login.test.js +++ b/src/components/login/login.test.js @@ -62,6 +62,13 @@ describe('Login', () => { expect(wrapper.find('.passphrase').text()).to.contain(expectedError); }); + it('should show error about incoret word if passphrase is have word not from dictionary', () => { + const passphrase = 'sdasd bomb asset salon coil symbol tiger engine assist pact pumpkin visit'; + const expectedError = 'Word "sdasd" is not on the passphrase Word List.'; + wrapper.find('.passphrase input').simulate('change', { target: { value: passphrase } }); + expect(wrapper.find('.passphrase').text()).to.contain(expectedError); + }); + it('should show error about invalid passhprase if it is incorrect', () => { const passphrase = 'recipe bomb asset salon coil symbol apple engine assist pact pumpkin visit'; const expectedError = 'Passphrase is not valid'; diff --git a/src/utils/similarWord.js b/src/utils/similarWord.js index 5785ea7fe..a0e88f7e1 100644 --- a/src/utils/similarWord.js +++ b/src/utils/similarWord.js @@ -1,4 +1,4 @@ -const mnemonic = require('bitcore-mnemonic'); +import mnemonic from 'bitcore-mnemonic'; const MAX_WORD_LENGTH = 8;