minor currency formatting

MyEtherWallet · Jan 25, 2016 · a92b637 · a92b637
1 parent fb756ac
commit a92b637
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/index.html b/index.html
@@ -244,6 +244,8 @@ <h4> Account Information </h4>
               <strong class="text-success" id="accountBalanceUsd" style="margin-left: 1em"> loading... </strong>
               <br />
               <strong class="text-success" id="accountBalanceEur" style="margin-left: 1em"> loading... </strong>
+              <br />
+              <strong class="text-success" id="accountBalanceBtc" style="margin-left: 1em"> loading... </strong>
             </p>
           </div>
           <br />

diff --git a/js/etherwallet-master.min.js b/js/etherwallet-master.min.js
diff --git a/js/source/01_global.js b/js/source/01_global.js
@@ -2,6 +2,7 @@ var PrivKey = "";
 var decryptType = "";
 var usdval;
 var eurval;
+var btcval;
 var web3 = new Web3();
 $(document).ready(function() {
 	bindElements();
@@ -253,13 +254,17 @@ function setWalletBalance() {
 		if (!result.error) {
 			var bestCurAmount = getBestEtherKnownUnit(result.data.balance);
 			$("#accountBalance").html(bestCurAmount.amount + " " + bestCurAmount.unit);
-			getETHvalue('USD', function(value) {
+			getETHvalue('ZUSD', function(value) {
 				usdval = toFiat(bestCurAmount.amount, bestCurAmount.unit, value);
-				$("#accountBalanceUsd").html(usdval + " USD");
+				$("#accountBalanceUsd").html(formatCurrency(usdval,'$') + " USD");
 			});
-			getETHvalue('EUR', function(value) {
+			getETHvalue('ZEUR', function(value) {
 				eurval = toFiat(bestCurAmount.amount, bestCurAmount.unit, value);
-				$("#accountBalanceEur").html(eurval + " EUR");
+				$("#accountBalanceEur").html(formatCurrency(eurval,'')+ " EUR");
+			});
+            getETHvalue('XXBT', function(value) {
+				btcval = toFiat(bestCurAmount.amount, bestCurAmount.unit, value);
+				$("#accountBalanceBtc").html(btcval + " BTC");
 			});
 		} else
 		alert(result.msg);
@@ -278,6 +283,9 @@ function walletDecryptFailed(err) {
 	$("#wallettransactions").hide();
 }
 
+function formatCurrency(n, currency) {
+    return currency + " " + n.toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
+}
 function decryptFormData() {
 	PrivKey = "";
 	if (decryptType == 'fupload') {

diff --git a/js/source/02_ajax.js b/js/source/02_ajax.js
@@ -16,7 +16,7 @@ function getEthCall(txobj, callback){
     $.post( SERVERURL, { ethCall: txobj }).done(callback);
 }
 function getETHvalue(slavePair, callback){
-    var prefix = "XETHZ";
+    var prefix = "XETH";
     $.post( KRAKENAPI+"Ticker", { pair: prefix+slavePair }).done(function(data){
         callback(data['result'][prefix+slavePair]['o']);
     });

diff --git a/pages/index.html b/pages/index.html
@@ -202,6 +202,8 @@ <h4> Account Information </h4>
               <strong class="text-success" id="accountBalanceUsd" style="margin-left: 1em"> loading... </strong>
               <br />
               <strong class="text-success" id="accountBalanceEur" style="margin-left: 1em"> loading... </strong>
+              <br />
+              <strong class="text-success" id="accountBalanceBtc" style="margin-left: 1em"> loading... </strong>
             </p>
           </div>
           <br />