From: iancoleman <1281387+iancoleman@users.noreply.github.com>
Date: Mon, 10 Jun 2019 23:37:53 +0000 (+1000)
Subject: Merge branch 'master' into eosio-support
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=7d68d5474e9354699b05637a8645a0b749e52c81

Merge branch 'master' into eosio-support
---

7d68d5474e9354699b05637a8645a0b749e52c81
diff --cc src/js/index.js
index 3b3ebed,7e65434..f54ff71
--- a/src/js/index.js
+++ b/src/js/index.js
@@@ -984,12 -984,7 +984,13 @@@
                  if ((networks[DOM.network.val()].name == "CRW - Crown")) {
                      address = bitcoinjs.bitcoin.networks.crown.toNewAddress(address);
                  }
-                 if (networks[DOM.network.val()].name == "EOS - EOSIO") {
+ 
++              if (networks[DOM.network.val()].name == "EOS - EOSIO") {
 +                    address = ""
 +                    pubkey = eosUtil.bufferToPublic(keyPair.getPublicKeyBuffer());
 +                    privkey = eosUtil.bufferToPrivate(keyPair.d.toBuffer(32));
 +                }
 +                
                  addAddressToList(indexText, address, pubkey, privkey);
                  if (isLast) {
                      hidePending();