Merge branch 'master' into ella-support

2 files changed, 16 insertions, 0 deletions

diff --git a/src/js/index.js b/src/js/index.js
index 6428aa7..8dd553d 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -920,6 +920,7 @@
                     || (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');
@@ -2002,6 +2003,14 @@
             },
         },
         {
+            name: "ESN - Ethersocial Network",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.bitcoin;
+                setHdCoin(31102);
+            },
+        },
+        {
             name: "ETC - Ethereum Classic",
             segwitAvailable: false,
             onSelect: function() {
diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index 6c98091..88c91a3 100644
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1441,6 +1441,13 @@ it('Allows selection of Ellaism', function(done) {
     };
     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) {