From: iancoleman <1281387+iancoleman@users.noreply.github.com>
Date: Tue, 30 Apr 2019 01:07:12 +0000 (+1000)
Subject: Merge branch 'master' into ella-support
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=8cb07685fd1faf519cb1b02024b7320d0c19ce4b

Merge branch 'master' into ella-support
---

8cb07685fd1faf519cb1b02024b7320d0c19ce4b
diff --cc src/js/index.js
index 6428aa7,67dde1c..8dd553d
--- a/src/js/index.js
+++ b/src/js/index.js
@@@ -919,7 -919,7 +919,8 @@@
                      || (networks[DOM.network.val()].name == "EXP - Expanse")
                      || (networks[DOM.network.val()].name == "CLO - Callisto")
                      || (networks[DOM.network.val()].name == "DXN - DEXON")
 +                    || (networks[DOM.network.val()].name == "ELLA - Ellaism")
+                     || (networks[DOM.network.val()].name == "ESN - Ethersocial Network")
                  ) {
                      var privKeyBuffer = keyPair.d.toBuffer(32);
                      privkey = privKeyBuffer.toString('hex');
diff --cc tests/spec/tests.js
index 6c98091,83fc949..88c91a3
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@@ -1434,13 -1434,13 +1434,20 @@@ it('Allows selection of DEXON', functio
      };
      testNetwork(done, params);
  });
 +it('Allows selection of Ellaism', function(done) {
 +    var params = {
 +        selectText: "ELLA - Ellaism",
 +        firstAddress: "0xa8B0BeA09eeBc41062308546a01d6E544277e2Ca",
 +    };
 +    testNetwork(done, params);
 +});
+ it('Allows selection of Ethersocial Network', function(done) {
+     var params = {
+         selectText: "ESN - Ethersocial Network",
+         firstAddress: "0x6EE99Be2A0C7F887a71e21C8608ACF0aa0D2b767",
+     };
+     testNetwork(done, params);
+ });
  
  // BIP39 seed is set from phrase
  it('Sets the bip39 seed from the prhase', function(done) {