nexus/bip39
2
0
Fork 0
mirror of https://github.com/OneKeyHQ/bip39.git synced 2026-04-28 13:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve showing feedback for pending calculations

Browse Source
This commit is contained in:
Ian Coleman
2017-08-16 11:04:13 +10:00
parent ed6d9d3905
commit 0eda54f5a7
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/js/index.js
+8 -7
View File
@@ -188,7 +188,6 @@
function phraseChanged() { function phraseChanged() {
showPending(); showPending();
hideValidationError();
setMnemonicLanguage(); setMnemonicLanguage();
// Get the mnemonic phrase // Get the mnemonic phrase
var phrase = DOM.phrase.val(); var phrase = DOM.phrase.val();
@@ -201,7 +200,6 @@
var passphrase = DOM.passphrase.val(); var passphrase = DOM.passphrase.val();
calcBip32RootKeyFromSeed(phrase, passphrase); calcBip32RootKeyFromSeed(phrase, passphrase);
calcForDerivationPath(); calcForDerivationPath();
hidePending();
} }
function delayedEntropyChanged() { function delayedEntropyChanged() {
@@ -277,10 +275,9 @@
} }
function calcForDerivationPath() { function calcForDerivationPath() {
showPending();
clearDerivedKeys(); clearDerivedKeys();
clearAddressesList(); clearAddressesList();
hideValidationError(); showPending();
// Don't show bip49 if it's selected but network doesn't support it // Don't show bip49 if it's selected but network doesn't support it
if (bip49TabSelected() && !networkHasBip49()) { if (bip49TabSelected() && !networkHasBip49()) {
return; return;
@@ -300,7 +297,6 @@
displayBip49Info(); displayBip49Info();
} }
displayBip32Info(); displayBip32Info();
hidePending();
} }
function generateClicked() { function generateClicked() {
@@ -607,17 +603,19 @@
for (var i=0; i<rows.length; i++) { for (var i=0; i<rows.length; i++) {
rows[i].shouldGenerate = false; rows[i].shouldGenerate = false;
} }
hidePending();
} }
for (var i=0; i<total; i++) { for (var i=0; i<total; i++) {
var index = i + start; var index = i + start;
rows.push(new TableRow(index)); var isLast = i == total - 1;
rows.push(new TableRow(index, isLast));
} }
})()); })());
} }
function TableRow(index) { function TableRow(index, isLast) {
var self = this; var self = this;
this.shouldGenerate = true; this.shouldGenerate = true;
@@ -679,6 +677,9 @@
address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network) address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network)
} }
addAddressToList(indexText, address, pubkey, privkey); addAddressToList(indexText, address, pubkey, privkey);
if (isLast) {
hidePending();
}
}, 50) }, 50)
} }