Partially revert Pull 371 BIP44 Default Change

diff --git a/src/index.html b/src/index.html
index 10e4a95a96b3016e81bc2a6ae8a128e11ae915c8..cc257edcbd99c9bc757a5097ad929ce66ea57139 100644 (file)
--- a/src/index.html
+++ b/src/index.html
@@ -282,10 +282,7 @@
                                         <a href="https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki#change" target="_blank">External / Internal</a>
                                     </label>
                                     <div class="col-sm-10">
-                                        <div class="input-group">
-                                          <input id="change-bip44" type="text" class="change form-control" value="0">
-                                          <a class="default-bip44-change-value btn btn-primary input-group-addon" role="button">Default</a>
-                                        </div>
+                                      <input id="change-bip44" type="text" class="change form-control" value="0">
                                     </div>
                                 </div>
                                 <div class="form-group">

diff --git a/src/js/index.js b/src/js/index.js
index 5b61f1d2ccbb413769027d4cbea0db76b8f42264..0b34ade3b2bf17c432a5d4a71895cd76384da629 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -15,7 +15,6 @@
     var showPrivKey = true;
     var showQr = false;
     var litecoinUseLtub = true;
-    var isDefaultBip44ChangeValue = true;
 
     var entropyChangeTimeoutEvent = null;
     var phraseChangeTimeoutEvent = null;
@@ -72,7 +71,6 @@
     DOM.bip44accountXprv = $("#bip44 .account-xprv");
     DOM.bip44accountXpub = $("#bip44 .account-xpub");
     DOM.bip44change = $("#bip44 .change");
-    DOM.defaultBip44ChangeValue = $("#bip44 .default-bip44-change-value");
     DOM.bip49unavailable = $("#bip49 .unavailable");
     DOM.bip49available = $("#bip49 .available");
     DOM.bip49path = $("#bip49-path");
@@ -138,9 +136,7 @@
         DOM.litecoinUseLtub.on("change", litecoinUseLtubChanged);
         DOM.bip32path.on("input", calcForDerivationPath);
         DOM.bip44account.on("input", calcForDerivationPath);
-        DOM.bip44change.on("input", modifiedDefaultBip44ChangeValue);
         DOM.bip44change.on("input", calcForDerivationPath);
-        DOM.defaultBip44ChangeValue.on("click", resetDefaultBip44ChangeValue);
         DOM.bip49account.on("input", calcForDerivationPath);
         DOM.bip49change.on("input", calcForDerivationPath);
         DOM.bip84account.on("input", calcForDerivationPath);
@@ -742,14 +738,12 @@
             var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44);
             var coin = parseIntNoNaN(DOM.bip44coin.val(), 0);
             var account = parseIntNoNaN(DOM.bip44account.val(), 0);
-            var change = parseIntNoNaN(DOM.bip44change.val(), "");
-            var path = "m";
-            path += "/" + purpose + "'";
-            path += "/" + coin + "'";
-            path += "/" + account + "'";
-            if (change !== "") {
-              path += "/" + change;
-            }
+            var change = parseIntNoNaN(DOM.bip44change.val(), 0);
+            var path = "m/";
+            path += purpose + "'/";
+            path += coin + "'/";
+            path += account + "'/";
+            path += change;
             DOM.bip44path.val(path);
             var derivationPath = DOM.bip44path.val();
             console.log("Using derivation path from BIP44 tab: " + derivationPath);
@@ -1758,30 +1752,10 @@
         return DOM.bip141tab.hasClass("active");
     }
 
-    function setBip44ChangeValue() {
-        if (isDefaultBip44ChangeValue) {
-            if (networkIsEthereum()) {
-                DOM.bip44change.val("");
-            } else {
-                DOM.bip44change.val(0);
-            }
-        }
-    }
-
-    function modifiedDefaultBip44ChangeValue() {
-        isDefaultBip44ChangeValue = false;
-    }
-
-    function resetDefaultBip44ChangeValue() {
-        isDefaultBip44ChangeValue = true;
-        setBip44ChangeValue();
-    }
-
     function setHdCoin(coinValue) {
         DOM.bip44coin.val(coinValue);
         DOM.bip49coin.val(coinValue);
         DOM.bip84coin.val(coinValue);
-        setBip44ChangeValue();
     }
 
     function showSegwitAvailable() {