From 40d514e0f0d5af91ff23d0ac15e17baefd9c87c5 Mon Sep 17 00:00:00 2001
From: OutCast3k <OutCast3k@gmail.com>
Date: Thu, 11 Jan 2018 16:54:27 +0000
Subject: [PATCH] couple of minor updates

---
 index.html    | 26 +++++++++++++++++++-------
 js/coin.js    |  2 +-
 js/coinbin.js | 11 ++++++++---
 sha1sum       |  8 ++++----
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/index.html b/index.html
index ad8334c..46bfe13 100644
--- a/index.html
+++ b/index.html
@@ -152,6 +152,7 @@
 										<input id="openPass" type="password" class="form-control" placeholder="Password" required>
 										<input id="openPassConfirm" type="password" class="form-control" placeholder="Password confirm" required>
 										<br>
+
 										<div>
 											<a href="javascript:;" class="optionsCollapse"><div class="well well-sm"><span class="glyphicon glyphicon-collapse-down" id="glyphcollapse"></span> Advanced Options</div></a>
 											<div class="hidden optionsAdvanced">
@@ -162,10 +163,11 @@
 
 												<label>Enable Replace by Fee (RBF)</label>
 												<p class="checkbox">
-													<label><input type="checkbox" id="walletRBF" class="checkbox-inline" checked> Enable RBF on all transactions, allowing the user to manually bump the transaction later if required. <span class="text-muted"><i>(recommended)</i></span></label></label>
+													<label><input type="checkbox" id="walletRBF" class="checkbox-inline" checked> Enable RBF on all transactions, allowing you to manually raise the transaction fee later if required. <span class="text-muted"><i>(recommended)</i></span></label></label>
 												</p>
 											</div>
 										</div>
+
 										<div id="openLoginStatus" class="alert alert-danger hidden"></div>
 										<button id="openBtn" class="btn btn-primary" type="submit">Submit</button>
 									</form>
@@ -1082,10 +1084,20 @@
 						<div class="hidden verifyData" id="verifyPubKey">
 							<h4>Public key</h4>
 							<p><span style="float:right"><a href="" target="_blank" class="verifyLink" title="Link to this page"><span class="glyphicon glyphicon-link"></span></a></span>The above public key has been encoded to its address</p>
-							<p><b>Address</b>:<span class="text-muted">(Legacy)</span>: <input type="text" class="form-control address" readonly></p>
-							<br>
-							<p><b>Segwit Address</b>: <input type="text" class="form-control addressSegWit" readonly></p>
-							<p><b>Segwit Redeem Script</b>: <input type="text" class="form-control addressSegWitRedeemScript" readonly></p>
+							<p><b>Legacy Address</b>: <input type="text" class="form-control address" readonly></p>
+
+							<div class="hidden verifyDataSw">
+								<hr>
+								<div class="row">
+									<div class="col-md-6">
+										<p><b>Segwit Address</b>: <input type="text" class="form-control addressSegWit" readonly></p>
+									</div>
+
+									<div class="col-md-6">
+										<p><b>Segwit Redeem Script</b>: <input type="text" class="form-control addressSegWitRedeemScript" readonly></p>
+									</div>
+								</div>
+							</div>
 						</div>
 
 						<div class="hidden verifyData" id="verifyHDaddress">
@@ -1275,7 +1287,7 @@
 					<div class="tab-pane tab-content" id="about">
 						<h2>About <small>open source bitcoin wallet</small></h2>
 						<p>Version 1.3</p>
-						<p>Compatible with bitcoin-qt</p>
+						<p>Compatible with bitcoin core</p>
 						<p>Github <a href="https://github.com/OutCast3k/coinbin/">https://github.com/OutCast3k/coinbin/</a></p>
 						<p>TOR <a href="http://4zpinp6gdkjfplhk.onion">4zpinp6gdkjfplhk.onion</a></p>
 						<h3>What is Bitcoin?</h3>
@@ -1289,7 +1301,7 @@
 						<h3>Support</h3>
 						<p>We recommend that you first check our <a href="https://status.coinb.in/" target="_blank">service status</a> page and then <a href="https://blog.coinb.in/" target="_blank">blog</a> page which has multiple <a href="https://blog.coinb.in/guides" target="_blank">guides</a>. However if the problem persists you can contact us by emailing support{at}coinb.in.</p>
 						<h3>Donate</h3>
-						<p>Please donate to <a href="bitcoin:1CWHWkTWaq1K5hevimJia3cyinQsrgXUvg">1CWHWkTWaq1K5hevimJia3cyinQsrgXUvg</a> if you found this project useful or want to see more features!</p>
+						<p>Please donate to <a href="bitcoin:3K1oFZMks41C7qDYBsr72SYjapLqDuSYuN">3K1oFZMks41C7qDYBsr72SYjapLqDuSYuN</a> if you found this project useful or want to see more features!</p>
 					</div>
 
 					<div class="tab-pane tab-content" id="settings">
diff --git a/js/coin.js b/js/coin.js
index 0b7cd7b..33cc88e 100644
--- a/js/coin.js
+++ b/js/coin.js
@@ -18,7 +18,7 @@
 	coinjs.compressed = false;
 
 	/* other vars */
-	coinjs.developer = '1CWHWkTWaq1K5hevimJia3cyinQsrgXUvg'; // bitcoin
+	coinjs.developer = '3K1oFZMks41C7qDYBsr72SYjapLqDuSYuN'; //bitcoin
 
 	/* bit(coinb.in) api vars */
 	coinjs.host = ('https:'==document.location.protocol?'https://':'http://')+'coinb.in/api/';
diff --git a/js/coinbin.js b/js/coinbin.js
index f91ab6f..b4cc492 100644
--- a/js/coinbin.js
+++ b/js/coinbin.js
@@ -1475,10 +1475,15 @@ $(document).ready(function() {
 		var pubkey = $("#verifyScript").val();
 		if(pubkey.length==66 || pubkey.length==130){
 			try {
+				$("#verifyPubKey .verifyDataSw").addClass('hidden');
 				$("#verifyPubKey .address").val(coinjs.pubkey2address(pubkey));
-				var sw = coinjs.segwitAddress(pubkey);
-				$("#verifyPubKey .addressSegWit").val(sw.address);
-				$("#verifyPubKey .addressSegWitRedeemScript").val(sw.redeemscript);
+				if(pubkey.length == 66){
+					var sw = coinjs.segwitAddress(pubkey);
+					$("#verifyPubKey .addressSegWit").val(sw.address);
+					$("#verifyPubKey .addressSegWitRedeemScript").val(sw.redeemscript);
+
+					$("#verifyPubKey .verifyDataSw").removeClass('hidden');
+				}
 				$("#verifyPubKey").removeClass("hidden");
 				$(".verifyLink").attr('href','?verify='+$("#verifyScript").val());
 				return true;
diff --git a/sha1sum b/sha1sum
index 18fe0fa..c92c2e5 100644
--- a/sha1sum
+++ b/sha1sum
@@ -1,9 +1,9 @@
----- Version 1.3 2018.01.06 ---
+---- Version 1.3 2018.01.11 ---
 77e4519962e2f6a9fc93342137dbb31c33b76b04  ./js/aes.js
 3a09a8fc0cfe828b57fc798d668234d0490ee1a6  ./js/bootstrap-datetimepicker.min.js
 253711c6d825de55a8360552573be950da180614  ./js/bootstrap.min.js
-de4506d9cfb7b524d1ab86db8833b07f9aac44a6  ./js/coinbin.js
-cb2843fe530d575cc29b83f9761a2920259fc8a7  ./js/coin.js
+3da25f92194894512a5793a14f9180e7a273de0f  ./js/coinbin.js
+2d48b86fe5c7d485c6613afcb0d52d5352ecf01b  ./js/coin.js
 988565bc2cb402d63ed5c5fd7ff47c4278efc2c5  ./js/collapse.js
 9ba5ede3d7f9d4c8fd623395f196adfdcf7e970f  ./js/crypto-min.js
 f7c09f2f5a721371e7d478050119f7e2d58e3ef9  ./js/crypto-sha256-hmac.js
@@ -31,4 +31,4 @@ de51a8494180a6db074af2dee2383f0a363c5b08  ./fonts/glyphicons-halflings-regular.s
 278e49a86e634da6f2a02f3b47dd9d2a8f26210f  ./fonts/glyphicons-halflings-regular.woff
 44bc1850f570972267b169ae18f1cb06b611ffa2  ./fonts/glyphicons-halflings-regular.ttf
 d8a324a13501cd5705dc26b945fc8088f00907ae  ./README.md
-a75a6c24108b8ad126d815e8a83316d17e0f1899  ./index.html
+f79b6378651ba17f3179cc7b62435ee30852cfec  ./index.html