From 93cccbe6ac8dce92fcb5a9cdbcceb75f4c130474 Mon Sep 17 00:00:00 2001
From: Damian Jones <damianajones@yahoo.co.uk>
Date: Sat, 20 Apr 2019 15:56:42 +0100
Subject: [PATCH 1/2] Fixed comma replacement bug in wallet value

---
 index.html          |  8 ++++----
 views/balances.html | 27 ++++++++++++++-------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/index.html b/index.html
index 6614c35..7be52e5 100644
--- a/index.html
+++ b/index.html
@@ -21,10 +21,10 @@
 	<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
 	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
 
-	<script src="scripts/Config.js?v=190415"></script>
+	<script src="scripts/Config-Dev.js?v=190415"></script>
   <script src="scripts/utils.js?v=190415"></script>
-  <script src="scripts/SE.js?v=190415"></script>    
-  <link rel="stylesheet" href="styles/main.css?v=190415" />  
+  <script src="scripts/SE.js?v=190415"></script>
+  <link rel="stylesheet" href="styles/main.css?v=190415" />
 	<title>Steem Engine - Smart Contracts on the STEEM blockchain</title>
 
 	<script type="text/javascript">
@@ -119,4 +119,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/views/balances.html b/views/balances.html
index 7cfdedf..9e15f31 100644
--- a/views/balances.html
+++ b/views/balances.html
@@ -21,34 +21,34 @@ <h1><%= data.account == SE.User.name ? 'MY' : '@' + data.account + "'s" %> TOKEN
 </div>
 
 <script>
-	function IconColumn(value, options, rowdata) { 
+	function IconColumn(value, options, rowdata) {
 		return `<i class="fas fa-info-circle" onclick="SE.ShowDialog('token_info', SE.GetToken('${value}'));"></i>&nbsp;&nbsp;&nbsp;` +
-			`<i class="fas fa-exchange-alt" onclick="SE.ShowMarket('${value}');"></i>&nbsp;&nbsp;&nbsp;` + 
-			`<i class="fas fa-share-square" onclick="SE.ShowSendTokenDialog('${value}', ${rowdata.balance});"></i>&nbsp;&nbsp;&nbsp;` + 
-			`<i class="fas fa-list-ul" onclick="SE.ShowHistory('${value}', '${rowdata.name}')"></i>`; 
+			`<i class="fas fa-exchange-alt" onclick="SE.ShowMarket('${value}');"></i>&nbsp;&nbsp;&nbsp;` +
+			`<i class="fas fa-share-square" onclick="SE.ShowSendTokenDialog('${value}', ${rowdata.balance});"></i>&nbsp;&nbsp;&nbsp;` +
+			`<i class="fas fa-list-ul" onclick="SE.ShowHistory('${value}', '${rowdata.name}')"></i>`;
 	}
 
-	function SymbolColumn(value, options, rowdata) { 
+	function SymbolColumn(value, options, rowdata) {
 		var token = SE.GetToken(value);
 
 		if(token && token.metadata && token.metadata.icon)
 			return '<img class="icon" src="' + token.metadata.icon + '"/>';
 		else
-			return ''; 
+			return '';
 	}
 
 	function BalanceColumn(value, options, rowdata) { return addCommas(value) + ' ' + rowdata.symbol; }
 	function USDValueColumn(value, options, rowdata) { return '<span class="' + (rowdata.priceChangePercent > 0 ? 'green' : (rowdata.priceChangePercent < 0 ? 'red' : '')) + '">' + usdFormat(value * SE.Tokens.find(t => t.symbol == rowdata.symbol).lastPrice, 2) + '</span>'; }
 	function PctColumn(value, options, rowdata) { return '<span class="' + (value > 0 ? 'green' : (value < 0 ? 'red' : '')) + '">' + value.toFixed(2) + '%</span>'; }
-	
+
 	var data = <%= JSON.stringify(data.balances.filter(b => !Config.DISABLED_TOKENS.includes(b.symbol))) %>;
-	
+
 	data = data.map(d => {
 		var token = SE.Tokens.find(t => t.symbol == d.symbol);
 
-		return Object.assign(d, { 
-			name: token.name, 
-			lastPrice: token.lastPrice, 
+		return Object.assign(d, {
+			name: token.name,
+			lastPrice: token.lastPrice,
 			priceChangePercent: token.priceChangePercent,
 			usdValue: usdFormat(d.balance * token.lastPrice, 2)
 		});
@@ -58,7 +58,8 @@ <h1><%= data.account == SE.User.name ? 'MY' : '@' + data.account + "'s" %> TOKEN
 
 	var totalInUsd = 0.00;
 	data.forEach(function(o) {
-		var amount = parseFloat(o.usdValue.replace('$', '').replace(',', ''));
+		var raw = o.usdValue.replace('$', '').split(',').join('');
+		var amount = parseFloat(raw);
 		totalInUsd += amount;
 	});
 
@@ -76,4 +77,4 @@ <h1><%= data.account == SE.User.name ? 'MY' : '@' + data.account + "'s" %> TOKEN
 		],
 		"rows": data
 	});
-</script>
\ No newline at end of file
+</script>

From aa1419eff1b741d826ff61691f2f8389bb11129d Mon Sep 17 00:00:00 2001
From: Damian Jones <damianajones@yahoo.co.uk>
Date: Sat, 20 Apr 2019 16:20:16 +0100
Subject: [PATCH 2/2] Reverted config import

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index ad83c62..613f01f 100644
--- a/index.html
+++ b/index.html
@@ -21,7 +21,7 @@
 	<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
 	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
 
-	<script src="scripts/Config-Dev.js?v=190415"></script>
+	<script src="scripts/Config.js?v=190415"></script>
   <script src="scripts/utils.js?v=190415"></script>
   <script src="scripts/SE.js?v=190415"></script>
   <link rel="stylesheet" href="styles/main.css?v=190415" />