From 057722b034672d240eea2ff01a7a5a01a4706e00 Mon Sep 17 00:00:00 2001 From: Ian Coleman Date: Mon, 7 Nov 2016 11:51:12 +1100 Subject: Blank entropy does not generate addresses --- src/js/index.js | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/js/index.js b/src/js/index.js index cd7f281..1cc77d3 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -109,6 +109,7 @@ DOM.entropyContainer.addClass("hidden"); DOM.generateContainer.removeClass("hidden"); DOM.phrase.prop("readonly", false); + hidePending(); } } @@ -149,8 +150,31 @@ } function entropyChanged() { + // If blank entropy, clear mnemonic, addresses, errors + if (DOM.entropy.val().trim().length == 0) { + clearDisplay(); + hideEntropyError(); + DOM.phrase.val(""); + showValidationError("Blank entropy"); + return; + } + // Get the current phrase to detect changes + var phrase = DOM.phrase.val(); + // Set the phrase from the entropy setMnemonicFromEntropy(); - phraseChanged(); + // Recalc addresses if the phrase has changed + var newPhrase = DOM.phrase.val(); + if (newPhrase != phrase) { + if (newPhrase.length == 0) { + clearDisplay(); + } + else { + phraseChanged(); + } + } + else { + hidePending(); + } } function delayedRootKeyChanged() { @@ -311,10 +335,13 @@ } function findPhraseErrors(phrase) { - // TODO make this right // Preprocess the words phrase = mnemonic.normalizeString(phrase); var words = phraseToWordArray(phrase); + // Detect blank phrase + if (words.length == 0) { + return "Blank mnemonic"; + } // Check each word for (var i=0; i