Coin selection is done from a single control

There were three places to select the coin type, which was getting
confusing. Only one place to select it is needed.

diff --git a/src/index.html b/src/index.html
index 5ff997b72bdb1ea838e5ac7829ea55f491be6816..0e552fc5d4d63bf71b27981a2ecd814e0e29809e 100644 (file)
--- a/src/index.html
+++ b/src/index.html
@@ -116,16 +116,6 @@
                                 <div class="col-sm-10">
                                     <p>For more info see the <a href="https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki" target="_blank">BIP44 spec</a></p>
                                 </div>
-                                <div class="form-group">
-                                    <label for="network-bip44" class="col-sm-2 control-label">Coin</label>
-                                    <div class="col-sm-10">
-                                        <select id="network-bip44" class="network form-control">
-                                            <option value="bitcoin">Bitcoin</option>
-                                            <option value="bitcoin-testnet">Bitcoin Testnet</option>
-                                            <option value="litecoin">Litecoin</option>
-                                        </select>
-                                    </div>
-                                </div>
                                 <div class="form-group">
                                     <label for="purpose" class="col-sm-2 control-label">
                                         <a href="https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki#purpose" target="_blank">Purpose</a>
@@ -205,17 +195,6 @@
                 <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 bad4cfb12a11e53487aa1f99fcf8e3f65c2cdd83..0ce039a0ab05d27a3cc93f28fce5c784d70bbc04 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -15,8 +15,6 @@
     var DOM = {};
     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");
@@ -84,15 +82,10 @@
         }
         else if (n == "dogecoin") {
             network = Bitcoin.networks.dogecoin;
-            var NO_BIP44_VALUE = 9999;
-            DOM.bip44coin.val(NO_BIP44_VALUE); // This coin is not in BIP44
+            var UNOFFICIAL_BIP44_COIN = 9999;
+            DOM.bip44coin.val(UNOFFICIAL_BIP44_COIN); // This coin is not in BIP44
         }
         setBip44DerivationPath();
-        DOM.phraseNetwork.val(n);
-        DOM.bip44Network.val(n);
-        if(e.target != DOM.addressNetwork.dom){
-            DOM.addressNetwork.val(n);
-        }
         delayedPhraseChanged();
     }