Merge pull request #3 from robjohnson189/coin_selection

Coin selection

diff --git a/bip39-standalone.html b/bip39-standalone.html
index ce82c30d7f8bb9d99357199cdb03901bf110abda..2769ec38e7d80a278f8d38d6852eb9710f35290c 100644 (file)
--- a/bip39-standalone.html
+++ b/bip39-standalone.html
@@ -6409,6 +6409,17 @@ button.close {
                 <div class="col-md-12">
                     <h2>Derived Addresses</h2>
                     <p>Note these addreses are derived from the <strong>BIP32 Extended Key</strong></p>
+                    <div class="form-group">
+                        <label for="network-address-type" class="col-sm-2 control-label">Coin</label>
+                        <div class="col-sm-10">
+                            <select id="network-address-type" class="network form-control">
+                                <option value="bitcoin">Bitcoin</option>
+                                <option value="bitcoin-testnet">Bitcoin Testnet</option>
+                                <option value="litecoin">Litecoin</option>
+                                <option value="dogecoin">Dogecoin</option>
+                            </select>
+                        </div>
+                    <div>
                     <table class="table table-striped">
                         <thead>
                             <th>
@@ -33845,6 +33856,7 @@ var Mnemonic = function(language) {
     DOM.network = $(".network");
     DOM.phraseNetwork = $("#network-phrase");
     DOM.bip44Network = $("#network-bip44");
+    DOM.addressNetwork = $("#network-address-type");
     DOM.phrase = $(".phrase");
     DOM.passphrase = $(".passphrase");
     DOM.generate = $(".generate");
@@ -33918,10 +33930,13 @@ var Mnemonic = function(language) {
         }
         else if (n == "dogecoin") {
             network = Bitcoin.networks.dogecoin;
-            disableBip44Tab();
+            //disableBip44Tab();
         }
         DOM.phraseNetwork.val(n);
         DOM.bip44Network.val(n);
+        if(e.target != DOM.addressNetwork.dom){
+            DOM.addressNetwork.val(n);
+        }
         delayedPhraseChanged();
     }
 

diff --git a/src/index.html b/src/index.html
index 837c7353c73d8e6d3585064bf9e7069eb430c95c..5ff997b72bdb1ea838e5ac7829ea55f491be6816 100644 (file)
--- a/src/index.html
+++ b/src/index.html
@@ -205,6 +205,17 @@
                 <div class="col-md-12">
                     <h2>Derived Addresses</h2>
                     <p>Note these addreses are derived from the <strong>BIP32 Extended Key</strong></p>
+                    <div class="form-group">
+                        <label for="network-address-type" class="col-sm-2 control-label">Coin</label>
+                        <div class="col-sm-10">
+                            <select id="network-address-type" class="network form-control">
+                                <option value="bitcoin">Bitcoin</option>
+                                <option value="bitcoin-testnet">Bitcoin Testnet</option>
+                                <option value="litecoin">Litecoin</option>
+                                <option value="dogecoin">Dogecoin</option>
+                            </select>
+                        </div>
+                    </div>
                     <table class="table table-striped">
                         <thead>
                             <th>

diff --git a/src/js/index.js b/src/js/index.js
index 09bcdd9505d7d979086d8c87a2e381df58fe66f8..c610d29d436cb38e98293357c573a674901c19ed 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -16,6 +16,7 @@
     DOM.network = $(".network");
     DOM.phraseNetwork = $("#network-phrase");
     DOM.bip44Network = $("#network-bip44");
+    DOM.addressNetwork = $("#network-address-type");
     DOM.phrase = $(".phrase");
     DOM.passphrase = $(".passphrase");
     DOM.generate = $(".generate");
@@ -89,10 +90,13 @@
         }
         else if (n == "dogecoin") {
             network = Bitcoin.networks.dogecoin;
-            disableBip44Tab();
+            //disableBip44Tab();
         }
         DOM.phraseNetwork.val(n);
         DOM.bip44Network.val(n);
+        if(e.target != DOM.addressNetwork.dom){
+            DOM.addressNetwork.val(n);
+        }
         delayedPhraseChanged();
     }