From 4eebb39b8d0da3f97547009d38fb53ec566d6137 Mon Sep 17 00:00:00 2001
From: defkev <defkev@gmail.com>
Date: Fri, 19 Jan 2018 23:18:12 +0100
Subject: [PATCH 01/10] Multiple Web UI improvements

* Add momentjs (mainly for date/time humanization)
* More precise bot uptime (seconds, minutes, hours, days instead of just days)
* Display trading chart in server time (for consistence with "My Trades" dates)
* Reduce default trading chart range to 30 minutes (from 60)
* Sort "My Trades" by date (descending)
* Change "Executed Date" to "Execution Time"
---
 extensions/output/api.js |  2 ++
 lib/engine.js            |  2 ++
 templates/dashboard.ejs  | 25 +++++++++++++------------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/extensions/output/api.js b/extensions/output/api.js
index 97fbe33d80..4624e19498 100644
--- a/extensions/output/api.js
+++ b/extensions/output/api.js
@@ -6,6 +6,7 @@ module.exports = function container (get) {
   let app = express()
   let random_port = require('random-port')
   let path = require('path')
+  let moment = require('moment');
 
   let run = function(reporter, tradeObject) {
     if (!reporter.port || reporter.port === 0) {
@@ -33,6 +34,7 @@ module.exports = function container (get) {
     app.use('/assets-zenbot', express.static(__dirname+'/../../assets'));
 
     app.get('/', function (req, res) {
+      app.locals.moment = moment;
       let datas = objectWithoutKey(tradeObject, 'options');
       datas = objectWithoutKey(tradeObject);
       res.render('dashboard', datas);
diff --git a/lib/engine.js b/lib/engine.js
index 7f540de7ad..670a966c42 100644
--- a/lib/engine.js
+++ b/lib/engine.js
@@ -68,6 +68,8 @@ module.exports = function container (get, set, clear) {
     let currency_col_width = 0
     s.lookback = []
     s.day_count = 1
+    s.boot_time = (new Date).getTime()
+    s.tz_offset = new Date().getTimezoneOffset()
     s.my_trades = []
     s.trades = []
     s.vol_since_last_blink = 0
diff --git a/templates/dashboard.ejs b/templates/dashboard.ejs
index bfcc8ad446..04d4862f1e 100644
--- a/templates/dashboard.ejs
+++ b/templates/dashboard.ejs
@@ -55,7 +55,7 @@
                 </div>
                 <div class="col-lg-9 col-sm-8 col-md-8 col-12">
                     <ol class="breadcrumb">
-                        <li>Running since <%= day_count %> days</li>
+                        <li>Running since <%= moment(boot_time).toNow(true) %></li>
                     </ol>
                 </div>
                 <!-- /.col-lg-12 -->
@@ -153,11 +153,11 @@
                         <script src="/assets-wp/plotly.bundle.js" charset="utf8"></script>
                         <script type="text/javascript">
 
-                            function unpack(rows, key) {
+                            function unpack(rows, key, offset) {
                                 return rows.map(function(row) {
                                     if (key == 'time') {
                                         // Plotly’s date format is 'yyyy-mm-dd HH:MM:SS.ssssss'
-                                        return new Date(row.time - ((new Date()).getTimezoneOffset() * 60000)).toISOString().replace(/T/g, ' ').replace(/Z/g, '');
+                                        return new Date(row.time - offset * 60000).toISOString().replace(/T/g, ' ').replace(/Z/g, '');
                                     } else {
                                         return row[key];
                                     }
@@ -171,12 +171,13 @@
                                     var trades = tradeData.trades;
                                     var lookback = tradeData.lookback;
                                     var my_trades = tradeData.my_trades;
+                                    var offset = tradeData.tz_offset;
 
                                     var price = {
                                         type: "scatter",
                                         name: 'Price',
                                         mode: 'lines+markers',
-                                        x: unpack(trades, 'time'),
+                                        x: unpack(trades, 'time', offset),
                                         y: unpack(trades, 'price')
                                     };
 
@@ -185,7 +186,7 @@
                                         name: 'Volume',
                                         yaxis: 'y2',
                                         opacity: '0.25',
-                                        x: unpack(trades, 'time'),
+                                        x: unpack(trades, 'time', offset),
                                         y: unpack(trades, 'size'),
                                         width: 3600*4
                                     };
@@ -193,7 +194,7 @@
                                     var ohlc = {
                                         type: 'ohlc',
                                         name: 'OHLC',
-                                        x: unpack(lookback, 'time'),
+                                        x: unpack(lookback, 'time', offset),
                                         open: unpack(lookback, 'open'),
                                         high: unpack(lookback, 'high'),
                                         low: unpack(lookback, 'low'),
@@ -205,7 +206,7 @@
                                     var lastTrade = new Date(price.x[price.x.length - 1]);
                                     lastTrade.setMinutes(lastTrade.getMinutes() + 1);
                                     var rangeEnd = new Date(lastTrade - ((new Date()).getTimezoneOffset() * 60000)).toISOString().replace(/T/g, ' ').replace(/Z/g, '');
-                                    lastTrade.setMinutes(lastTrade.getMinutes() - 61);
+                                    lastTrade.setMinutes(lastTrade.getMinutes() - 31);
                                     var rangeStart = new Date(lastTrade - ((new Date()).getTimezoneOffset() * 60000)).toISOString().replace(/T/g, ' ').replace(/Z/g, '');
 
                                     var layout = {
@@ -254,7 +255,7 @@
 
                                     for (i = 0; i < my_trades.length; i++) {
                                         layout.annotations.push({
-                                            x: new Date(my_trades[i].time - ((new Date()).getTimezoneOffset() * 60000)).toISOString().replace(/T/g, ' ').replace(/Z/g, ''),
+                                            x: new Date(my_trades[i].time - offset * 60000).toISOString().replace(/T/g, ' ').replace(/Z/g, ''),
                                             y: my_trades[i].price,
                                             xref: 'x',
                                             yref: 'y',
@@ -294,7 +295,7 @@
                                     <th>PRICE</th>
                                     <th>SLIPPAGE</th>
                                     <th>DATE</th>
-                                    <th>EXECUTED DATE</th>
+                                    <th>EXECUTION TIME</th>
                                 </tr>
                                 </thead>
                                 <tbody>
@@ -319,14 +320,14 @@
                                 </tr>
                                 <% } %>
                                 <% if (my_trades) { %>
-                                <% my_trades.reverse().forEach(function(trade){ %>
+                                <% my_trades.sort(function(a,b){return a.time > b.time ? -1 : 1;}).forEach(function(trade){ %>
                                 <tr>
                                     <td><span class='text-<% if (trade.type == "buy") { %>success<% } else { %>danger<% } %>'><%= trade.type.toUpperCase() %></td>
                                     <td><%= trade.size %> <%= asset.toUpperCase() %></td>
                                     <td><%= trade.price %> <%= currency.toUpperCase() %></td>
                                     <td><%= new Intl.NumberFormat("en-US", {style: "percent", maximumSignificantDigits: 4}).format(trade.slippage) %></td>
-                                    <td><%= new Date(trade.time).toLocaleString("en-US", { year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' }) %></td>
-                                    <td><%= new Date(trade.time + trade.execution_time).toLocaleString("en-US", { year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' })  %></td>
+                                    <td><%= moment(trade.time).format('YYYY-MM-DD HH:mm:ss') %></td>
+                                    <td><%= moment.duration(trade.execution_time).humanize() %></td>
                                 </tr>
                                 <% }); %>
                                 <% } %>

From 227a393d2dc0cf2f2d789f7d8bbbe49e62735e5a Mon Sep 17 00:00:00 2001
From: defkev <defkev@gmail.com>
Date: Sat, 20 Jan 2018 17:58:24 +0100
Subject: [PATCH 02/10] Web UI: Add Total to My Trades

Total = Size * Price
---
 templates/dashboard.ejs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/dashboard.ejs b/templates/dashboard.ejs
index 04d4862f1e..058a4dbdff 100644
--- a/templates/dashboard.ejs
+++ b/templates/dashboard.ejs
@@ -293,6 +293,7 @@
                                     <th>TYPE</th>
                                     <th>AMOUNT</th>
                                     <th>PRICE</th>
+                                    <th>TOTAL</th>
                                     <th>SLIPPAGE</th>
                                     <th>DATE</th>
                                     <th>EXECUTION TIME</th>
@@ -304,7 +305,8 @@
                                     <td><span class='text-success'>BUY</span></td>
                                     <td><%= buy_order.size %> <%= asset.toUpperCase() %></td>
                                     <td><%= buy_order.price %> <%= currency.toUpperCase() %></td>
-                                    <td></td>
+                                    <td>-</td>
+                                    <td>-</td>
                                     <td><%= new Date(buy_order.time).toLocaleString("en-US", { year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' }) %></td>
                                     <td><span class='text-info'>Waiting</span></td>
                                 </tr>
@@ -314,7 +316,8 @@
                                     <td><span class='text-danger'>SELL</span></td>
                                     <td><%= sell_order.size %> <%= asset.toUpperCase() %></td>
                                     <td><%= sell_order.price %> <%= currency.toUpperCase() %></td>
-                                    <td></td>
+                                    <td>-</td>
+                                    <td>-</td>
                                     <td><%= new Date(sell_order.time).toLocaleString("en-US", { year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' }) %></td>
                                     <td><span class='text-info'>Waiting</span></td>
                                 </tr>
@@ -325,6 +328,7 @@
                                     <td><span class='text-<% if (trade.type == "buy") { %>success<% } else { %>danger<% } %>'><%= trade.type.toUpperCase() %></td>
                                     <td><%= trade.size %> <%= asset.toUpperCase() %></td>
                                     <td><%= trade.price %> <%= currency.toUpperCase() %></td>
+                                    <td><%= trade.size * trade.price %> <%= currency.toUpperCase() %></td>
                                     <td><%= new Intl.NumberFormat("en-US", {style: "percent", maximumSignificantDigits: 4}).format(trade.slippage) %></td>
                                     <td><%= moment(trade.time).format('YYYY-MM-DD HH:mm:ss') %></td>
                                     <td><%= moment.duration(trade.execution_time).humanize() %></td>

From bb8be9e6fd7215c0ec96ef7a6c0f09d50333aa9c Mon Sep 17 00:00:00 2001
From: defkev <defkev@gmail.com>
Date: Sat, 20 Jan 2018 17:54:05 +0100
Subject: [PATCH 03/10] Reduce memory util if API is off

Populate objects used exclusively by the API only if the API is actually enabled.
---
 lib/engine.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/engine.js b/lib/engine.js
index 670a966c42..6160830a95 100644
--- a/lib/engine.js
+++ b/lib/engine.js
@@ -68,11 +68,13 @@ module.exports = function container (get, set, clear) {
     let currency_col_width = 0
     s.lookback = []
     s.day_count = 1
-    s.boot_time = (new Date).getTime()
-    s.tz_offset = new Date().getTimezoneOffset()
     s.my_trades = []
-    s.trades = []
     s.vol_since_last_blink = 0
+    if (c.output.api.on) {
+      s.boot_time = (new Date).getTime()
+      s.tz_offset = new Date().getTimezoneOffset()
+      s.trades = []
+    }
     if (so.strategy) {
       s.strategy = get('strategies.' + so.strategy)
       if (s.strategy.getOptions) {
@@ -152,7 +154,7 @@ module.exports = function container (get, set, clear) {
       s.period.close_time = trade.time
       s.strategy.calculate(s)
       s.vol_since_last_blink += trade.size
-      s.trades.push(trade)
+      s.trades && s.trades.push(trade)
     }
 
     function executeStop (do_sell_stop) {

From cb253fc219b374386a48425891fdfe2404cd526f Mon Sep 17 00:00:00 2001
From: defkev <defkev@gmail.com>
Date: Sat, 20 Jan 2018 21:56:11 +0100
Subject: [PATCH 04/10] Web UI: Update Stats & Fix Chart

* Color profits (last balance and buy hold) green/red based on win/loss
* Use singular and plural for trade(s) and day(s)
* Fix chart 1 hour range selector button
---
 templates/dashboard.ejs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/dashboard.ejs b/templates/dashboard.ejs
index 058a4dbdff..4106a1764c 100644
--- a/templates/dashboard.ejs
+++ b/templates/dashboard.ejs
@@ -106,8 +106,8 @@
                     <div class="white-box analytics-info">
                         <h3 class="box-title">Last balance ( <%= new Intl.NumberFormat("en-US", {style: "percent", minimumSignificantDigits:2}).format( (parseFloat(stats.profit)/100)-(parseFloat(stats.buy_hold_profit)/100) ) %> vs buy hold)</h3>
                         <ul class="list-inline one-part">
-                            <li class="text-right"><i class="ti-arrow-up text-success"></i> <span class="counter text-success"><%= stats.tmp_balance %></span> <small class="text-success"><%= currency.toUpperCase() %></small></li>
-                            <li class="text-right"><i class="ti-arrow-up text-success"></i> <span class="text-success"><%= stats.profit %></span> <small class="text-success">of profit</small></li>
+                            <li class="text-right text-success"><i class="ti-arrow-up"></i> <span class="counter"><%= stats.tmp_balance %></span> <small><%= currency.toUpperCase() %></small></li>
+                            <li class="text-right text-<% if (parseFloat(stats.profit) < 0) { %>danger<% } else { %>success<% } %>""><i class="ti-arrow-up"></i> <span><%= stats.profit %></span> <small>of profit</small></li>
                         </ul>
                     </div>
                 </div>
@@ -115,8 +115,8 @@
                     <div class="white-box analytics-info">
                         <h3 class="box-title">Buy hold</h3>
                         <ul class="list-inline one-part">
-                            <li class="text-right"><i class="ti-arrow-up text-info"></i> <span class="counter text-info"><%= stats.buy_hold %></span> <small class="text-info"><%= currency.toUpperCase() %></small></li>
-                            <li class="text-right"><i class="ti-arrow-up text-info"></i> <span class="text-info"><%= stats.buy_hold_profit %></span> <small class="text-info">of profit</small></li>
+                            <li class="text-right text-info"><i class="ti-arrow-up"></i> <span class="counter"><%= stats.buy_hold %></span> <small><%= currency.toUpperCase() %></small></li>
+                            <li class="text-right text-<% if (parseFloat(stats.buy_hold_profit) < 0) { %>danger<% } else { %>success<% } %>""><i class="ti-arrow-up"></i> <span><%= stats.buy_hold_profit %></span> <small>of profit</small></li>
                         </ul>
                     </div>
                 </div>
@@ -125,7 +125,7 @@
                         <h3 class="box-title">Trades per day</h3>
                         <ul class="list-inline one-part">
                             <li class="text-right"><i class="ti-arrow-up text-purple"></i> <span class="counter text-purple"><%= stats.trade_per_day %></span></li>
-                            <li class="text-right"><i class="ti-arrow-up text-purple"></i> <span class="text-purple"><%= my_trades.length %> trades over <%= day_count %> days</span></li>
+                            <li class="text-right"><i class="ti-arrow-up text-purple"></i> <span class="text-purple"><%= my_trades.length %> trade<% if (my_trades.length != 1) { %>s<% } %> over <%= day_count %> day<% if (day_count != 1) { %>s<% } %></span></li>
                         </ul>
                     </div>
                 </div>
@@ -231,7 +231,7 @@
                                                         count: 1,
                                                         label: '1h',
                                                         step: 'hour',
-                                                        stepmode: 'todate'
+                                                        stepmode: 'backward'
                                                     },
                                                     {
                                                         step: 'all'

From bdaf552d0cba47e21388dbafb61fc7eaafc77129 Mon Sep 17 00:00:00 2001
From: defkev <defkev@gmail.com>
Date: Sat, 20 Jan 2018 21:47:09 +0100
Subject: [PATCH 05/10] API: Populate stats on every new period

Instead of having to manually "print statistical output" in the console to get them updated.
---
 commands/trade.js | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/commands/trade.js b/commands/trade.js
index 305d9c2d87..371dd5dc0d 100644
--- a/commands/trade.js
+++ b/commands/trade.js
@@ -138,9 +138,7 @@ module.exports = function container (get, set, clear) {
         }              
 
         /* Implementing statistical Exit */
-        function printTrade (quit, dump) {
-          console.log()
-          var output_lines = []
+        function printTrade (quit, dump, statsonly = false) {
           var tmp_balance = n(s.balance.currency).add(n(s.period.close).multiply(s.balance.asset)).format('0.00000000')
           if (quit) {
             if (s.my_trades.length) {
@@ -156,12 +154,16 @@ module.exports = function container (get, set, clear) {
             s.lookback.unshift(s.period)
           }
           var profit = s.start_capital ? n(tmp_balance).subtract(s.start_capital).divide(s.start_capital) : n(0)
-          output_lines.push('last balance: ' + n(tmp_balance).format('0.00000000').yellow + ' (' + profit.format('0.00%') + ')')
           var buy_hold = s.start_price ? n(s.period.close).multiply(n(s.start_capital).divide(s.start_price)) : n(tmp_balance)
           var buy_hold_profit = s.start_capital ? n(buy_hold).subtract(s.start_capital).divide(s.start_capital) : n(0)
-          output_lines.push('buy hold: ' + buy_hold.format('0.00000000').yellow + ' (' + n(buy_hold_profit).format('0.00%') + ')')
-          output_lines.push('vs. buy hold: ' + n(tmp_balance).subtract(buy_hold).divide(buy_hold).format('0.00%').yellow)
-          output_lines.push(s.my_trades.length + ' trades over ' + s.day_count + ' days (avg ' + n(s.my_trades.length / s.day_count).format('0.00') + ' trades/day)')
+          if (!statsonly) {
+            console.log()
+            var output_lines = []
+            output_lines.push('last balance: ' + n(tmp_balance).format('0.00000000').yellow + ' (' + profit.format('0.00%') + ')')
+            output_lines.push('buy hold: ' + buy_hold.format('0.00000000').yellow + ' (' + n(buy_hold_profit).format('0.00%') + ')')
+            output_lines.push('vs. buy hold: ' + n(tmp_balance).subtract(buy_hold).divide(buy_hold).format('0.00%').yellow)
+            output_lines.push(s.my_trades.length + ' trades over ' + s.day_count + ' days (avg ' + n(s.my_trades.length / s.day_count).format('0.00') + ' trades/day)')
+          }
           // Build stats for UI
           s.stats = {
             profit: profit.format('0.00%'),
@@ -186,17 +188,21 @@ module.exports = function container (get, set, clear) {
             }
           })
           if (s.my_trades.length && sells > 0) {
-            output_lines.push('win/loss: ' + (sells - losses) + '/' + losses)
-            output_lines.push('error rate: ' + (sells ? n(losses).divide(sells).format('0.00%') : '0.00%').yellow)
+            if (!statsonly) {
+              output_lines.push('win/loss: ' + (sells - losses) + '/' + losses)
+              output_lines.push('error rate: ' + (sells ? n(losses).divide(sells).format('0.00%') : '0.00%').yellow)
+            }
 
             //for API
             s.stats.win = (sells - losses)
             s.stats.losses = losses
             s.stats.error_rate = (sells ? n(losses).divide(sells).format('0.00%') : '0.00%')
           }
-          output_lines.forEach(function (line) {
-            console.log(line)
-          })
+          if (!statsonly) {
+            output_lines.forEach(function (line) {
+              console.log(line)
+            })
+          }
           if (quit || dump) {
             var html_output = output_lines.map(function (line) {
               return colors.stripColors(line)
@@ -542,6 +548,7 @@ module.exports = function container (get, set, clear) {
                 b.buy_hold = s.period.close * (session.orig_capital / session.orig_price)
                 b.buy_hold_profit = (b.buy_hold - session.orig_capital) / session.orig_capital
                 b.vs_buy_hold = (b.consolidated - b.buy_hold) / b.buy_hold
+                c.output.api.on && printTrade(false, false, true)
                 if (so.mode === 'live') {
                   balances.save(b, function (err) {
                     if (err) {

From d4197ef0de28951b99e357808abb1d72abb6482b Mon Sep 17 00:00:00 2001
From: defkev <defkev@gmail.com>
Date: Sun, 21 Jan 2018 00:00:14 +0100
Subject: [PATCH 06/10] Web UI: Widgets

* Rename "Asset / Currency" widget to "Capital" and move it up to Market row
* Remove leading space from "Last Balance" widget
* Limit "vs buy hold" to 10 digits
* Add "Error Rate" widget including Win/Loss
---
 templates/dashboard.ejs | 56 ++++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/templates/dashboard.ejs b/templates/dashboard.ejs
index 4106a1764c..44de5a9507 100644
--- a/templates/dashboard.ejs
+++ b/templates/dashboard.ejs
@@ -66,45 +66,59 @@
             <!-- ============================================================== -->
             <!-- .row -->
             <div class="row">
-                <div class="col-12">
+                <div class="col-6">
                     <div class="white-box analytics-info">
                         <h3 class="box-title">Current Market</h3>
-
-                        <div  class="row">
-
-                            <div class="col-sm-4 col-12">
+                        <div class="row">
+                            <div class="col-sm-4 col-6">
                                 <ul class="list-inline two-part">
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up"></i> <span class="text-info">Price</span></li>
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up text-info"></i> <span><%= period.close %></span> <small><%= asset.toUpperCase() %></small></li>
                                 </ul>
                             </div>
                             <% if (typeof quote != "undefined") { %>
-                            <div class="col-sm-4 col-12">
+                            <div class="col-sm-4 col-6">
                                 <ul class="list-inline two-part">
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up"></i> <span class="text-success">ASK</span></li>
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up text-success"></i> <span><%= quote.ask %></span> <small><%= asset.toUpperCase() %></small></li>
                                 </ul>
                             </div>
-
-                            <div class="col-sm-4 col-12">
+                            <div class="col-sm-4 col-6">
                                 <ul class="list-inline two-part">
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up"></i> <span class="text-danger">BID</span></li>
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up text-danger"></i> <span><%= quote.bid %></span> <small><%= asset.toUpperCase() %></small></li>
                                 </ul>
                             </div>
                             <% } %>
-
+                        </div>
+                    </div>
+                </div>
+                <div class="col-6">
+                    <div class="white-box analytics-info">
+                        <h3 class="box-title">Captial</h3>
+                        <div class="row">
+                            <div class="col-sm-6 col-6">
+                                <ul class="list-inline two-part">
+                                    <li class="text-left" style="display:inline"><i class="ti-arrow-up text-purple"></i> <span class="text-purple">Asset</span></li>
+                                    <li class="text-left" style="display:inline"><i class="ti-arrow-up text-purple"></i> <span><%= balance.asset %></span> <small><%= asset.toUpperCase() %></small></li>
+                                </ul>
+                            </div>
+                            <div class="col-sm-6 col-6">
+                                <ul class="list-inline two-part">
+                                    <li class="text-left" style="display:inline"><i class="ti-arrow-up text-purple"></i> <span class="text-purple">Currency</span></li>
+                                    <li class="text-left" style="display:inline"><i class="ti-arrow-up text-purple"></i> <span><%= balance.currency %></span> <small><%= currency.toUpperCase() %></small></li>
+                                </ul>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
 
-
             <div class="row">
                 <% if (typeof stats != "undefined") { %>
                 <div class="col-lg-3 col-sm-6 col-12">
                     <div class="white-box analytics-info">
-                        <h3 class="box-title">Last balance ( <%= new Intl.NumberFormat("en-US", {style: "percent", minimumSignificantDigits:2}).format( (parseFloat(stats.profit)/100)-(parseFloat(stats.buy_hold_profit)/100) ) %> vs buy hold)</h3>
+                        <h3 class="box-title">Last balance (<%= new Intl.NumberFormat("en-US", {style: "percent", minimumSignificantDigits:2, maximumSignificantDigits: 10}).format( (parseFloat(stats.profit)/100)-(parseFloat(stats.buy_hold_profit)/100) ) %> vs buy hold)</h3>
                         <ul class="list-inline one-part">
                             <li class="text-right text-success"><i class="ti-arrow-up"></i> <span class="counter"><%= stats.tmp_balance %></span> <small><%= currency.toUpperCase() %></small></li>
                             <li class="text-right text-<% if (parseFloat(stats.profit) < 0) { %>danger<% } else { %>success<% } %>""><i class="ti-arrow-up"></i> <span><%= stats.profit %></span> <small>of profit</small></li>
@@ -129,16 +143,18 @@
                         </ul>
                     </div>
                 </div>
-                <% } %>
-                <div class="col-lg-3 col-sm-6 col-12">
-                    <div class="white-box analytics-info">
-                        <h3 class="box-title">Asset / Currency</h3>
-                        <ul class="list-inline one-part">
-                            <li class="text-right"><i class="ti-arrow-up text-purple"></i> <span class="counter text-purple"><%= balance.asset %></span> <small class="text-purple"><%= asset.toUpperCase() %></small></li>
-                            <li class="text-right"><i class="ti-arrow-up text-purple"></i> <span class="counter text-purple"><%= balance.currency %></span> <small class="text-purple"><%= currency.toUpperCase() %></small></li>
-                        </ul>
+                    <% if (typeof stats.error_rate != "undefined") { %>
+                    <div class="col-lg-3 col-sm-6 col-12">
+                        <div class="white-box analytics-info">
+                            <h3 class="box-title">Error Rate</h3>
+                            <ul class="list-inline one-part">
+                                <li class="text-right text-<% if (parseFloat(stats.error_rate) > 0) { %>danger<% } else { %>success<% } %>""><i class="ti-arrow-up"></i> <span><%= stats.error_rate %></span></li>
+                                <li class="text-right"><i class="ti-arrow-up text-purple"></i> <span class="counter text-purple">Win/Loss: <%= stats.win %>/<%= stats.losses %></span></li>
+                            </ul>
+                        </div>
                     </div>
-                </div>
+                    <% } %>
+                <% } %>
             </div>
 
             <!--/.row -->

From 52c4febcdcea3e28fe9dbcb7117f96c351631ecf Mon Sep 17 00:00:00 2001
From: defkev <defkev@gmail.com>
Date: Sun, 21 Jan 2018 02:43:28 +0100
Subject: [PATCH 07/10] Web UI: Format open order dates like complete

Looks like i forgot something...
---
 templates/dashboard.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/dashboard.ejs b/templates/dashboard.ejs
index 44de5a9507..e2b294db4e 100644
--- a/templates/dashboard.ejs
+++ b/templates/dashboard.ejs
@@ -323,7 +323,7 @@
                                     <td><%= buy_order.price %> <%= currency.toUpperCase() %></td>
                                     <td>-</td>
                                     <td>-</td>
-                                    <td><%= new Date(buy_order.time).toLocaleString("en-US", { year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' }) %></td>
+                                    <td><%= moment(buy_order.time).format('YYYY-MM-DD HH:mm:ss') %></td>
                                     <td><span class='text-info'>Waiting</span></td>
                                 </tr>
                                 <% } %>
@@ -334,7 +334,7 @@
                                     <td><%= sell_order.price %> <%= currency.toUpperCase() %></td>
                                     <td>-</td>
                                     <td>-</td>
-                                    <td><%= new Date(sell_order.time).toLocaleString("en-US", { year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' }) %></td>
+                                    <td><%= moment(sell_order.time).format('YYYY-MM-DD HH:mm:ss') %></td>
                                     <td><span class='text-info'>Waiting</span></td>
                                 </tr>
                                 <% } %>

From e76bc0f38f467f819c14c4254918342234661a4c Mon Sep 17 00:00:00 2001
From: defkev <defkev@gmail.com>
Date: Sun, 21 Jan 2018 22:20:58 +0100
Subject: [PATCH 08/10] Web UI: Fix Market/Capital row layout on mobile

---
 templates/dashboard.ejs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/dashboard.ejs b/templates/dashboard.ejs
index e2b294db4e..926deb545d 100644
--- a/templates/dashboard.ejs
+++ b/templates/dashboard.ejs
@@ -66,24 +66,24 @@
             <!-- ============================================================== -->
             <!-- .row -->
             <div class="row">
-                <div class="col-6">
+                <div class="col-lg-6 col-sm-6 col-12">
                     <div class="white-box analytics-info">
                         <h3 class="box-title">Current Market</h3>
                         <div class="row">
-                            <div class="col-sm-4 col-6">
+                            <div class="col-lg-4 col-12">
                                 <ul class="list-inline two-part">
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up"></i> <span class="text-info">Price</span></li>
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up text-info"></i> <span><%= period.close %></span> <small><%= asset.toUpperCase() %></small></li>
                                 </ul>
                             </div>
                             <% if (typeof quote != "undefined") { %>
-                            <div class="col-sm-4 col-6">
+                            <div class="col-lg-4 col-12">
                                 <ul class="list-inline two-part">
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up"></i> <span class="text-success">ASK</span></li>
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up text-success"></i> <span><%= quote.ask %></span> <small><%= asset.toUpperCase() %></small></li>
                                 </ul>
                             </div>
-                            <div class="col-sm-4 col-6">
+                            <div class="col-lg-4 col-12">
                                 <ul class="list-inline two-part">
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up"></i> <span class="text-danger">BID</span></li>
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up text-danger"></i> <span><%= quote.bid %></span> <small><%= asset.toUpperCase() %></small></li>
@@ -93,17 +93,17 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-6">
+                <div class="col-lg-6 col-sm-6 col-12">
                     <div class="white-box analytics-info">
                         <h3 class="box-title">Captial</h3>
                         <div class="row">
-                            <div class="col-sm-6 col-6">
+                            <div class="col-lg-6 col-12">
                                 <ul class="list-inline two-part">
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up text-purple"></i> <span class="text-purple">Asset</span></li>
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up text-purple"></i> <span><%= balance.asset %></span> <small><%= asset.toUpperCase() %></small></li>
                                 </ul>
                             </div>
-                            <div class="col-sm-6 col-6">
+                            <div class="col-lg-6 col-12">
                                 <ul class="list-inline two-part">
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up text-purple"></i> <span class="text-purple">Currency</span></li>
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up text-purple"></i> <span><%= balance.currency %></span> <small><%= currency.toUpperCase() %></small></li>

From 56f9e056e4a8e4df5bff748fb10773b5f8f4df9b Mon Sep 17 00:00:00 2001
From: defkev <defkev@gmail.com>
Date: Mon, 22 Jan 2018 22:03:32 +0100
Subject: [PATCH 09/10] Profit & Fees

* API: Add profit calculation (buy/sell, sell/buy) to my_trades, profit won't be calculated unless there was a previous opposide order (buy profit on previos sell, sell profit on previous buy)
* Web UI: Add Fee and Profit column (Closes #1192)
* Normalize number formating for consistence and to remove clutter
---
 lib/engine.js           |  4 +++-
 templates/dashboard.ejs | 42 ++++++++++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/lib/engine.js b/lib/engine.js
index 6160830a95..cdbc9cb0da 100644
--- a/lib/engine.js
+++ b/lib/engine.js
@@ -608,6 +608,7 @@ module.exports = function container (get, set, clear) {
             fee: fee,
             price: price,
             order_type: so.order_type || 'taker',
+            profit: s.last_sell_price && (price - s.last_sell_price) / s.last_sell_price,
             cancel_after: so.cancel_after || 'day'
           }
           s.my_trades.push(my_trade)
@@ -658,7 +659,8 @@ module.exports = function container (get, set, clear) {
             size: s.sell_order.orig_size,
             fee: fee,
             price: price,
-            order_type: so.order_type
+            order_type: so.order_type,
+            profit: s.last_buy_price && (price - s.last_buy_price) / s.last_buy_price
           }
           s.my_trades.push(my_trade)
           if (so.stats) {
diff --git a/templates/dashboard.ejs b/templates/dashboard.ejs
index 926deb545d..f4b01bdf1e 100644
--- a/templates/dashboard.ejs
+++ b/templates/dashboard.ejs
@@ -73,20 +73,20 @@
                             <div class="col-lg-4 col-12">
                                 <ul class="list-inline two-part">
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up"></i> <span class="text-info">Price</span></li>
-                                    <li class="text-left" style="display:inline"><i class="ti-arrow-up text-info"></i> <span><%= period.close %></span> <small><%= asset.toUpperCase() %></small></li>
+                                    <li class="text-left" style="display:inline"><i class="ti-arrow-up text-info"></i> <span><%= new Intl.NumberFormat("en-US", {useGrouping: false, minimumFractionDigits: 2, maximumFractionDigits: 7}).format(period.close) %></span> <small><%= asset.toUpperCase() %></small></li>
                                 </ul>
                             </div>
                             <% if (typeof quote != "undefined") { %>
                             <div class="col-lg-4 col-12">
                                 <ul class="list-inline two-part">
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up"></i> <span class="text-success">ASK</span></li>
-                                    <li class="text-left" style="display:inline"><i class="ti-arrow-up text-success"></i> <span><%= quote.ask %></span> <small><%= asset.toUpperCase() %></small></li>
+                                    <li class="text-left" style="display:inline"><i class="ti-arrow-up text-success"></i> <span><%= new Intl.NumberFormat("en-US", {useGrouping: false, minimumFractionDigits: 2, maximumFractionDigits: 7}).format(quote.ask) %></span> <small><%= asset.toUpperCase() %></small></li>
                                 </ul>
                             </div>
                             <div class="col-lg-4 col-12">
                                 <ul class="list-inline two-part">
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up"></i> <span class="text-danger">BID</span></li>
-                                    <li class="text-left" style="display:inline"><i class="ti-arrow-up text-danger"></i> <span><%= quote.bid %></span> <small><%= asset.toUpperCase() %></small></li>
+                                    <li class="text-left" style="display:inline"><i class="ti-arrow-up text-danger"></i> <span><%= new Intl.NumberFormat("en-US", {useGrouping: false, minimumFractionDigits: 2, maximumFractionDigits: 7}).format(quote.bid) %></span> <small><%= asset.toUpperCase() %></small></li>
                                 </ul>
                             </div>
                             <% } %>
@@ -100,13 +100,13 @@
                             <div class="col-lg-6 col-12">
                                 <ul class="list-inline two-part">
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up text-purple"></i> <span class="text-purple">Asset</span></li>
-                                    <li class="text-left" style="display:inline"><i class="ti-arrow-up text-purple"></i> <span><%= balance.asset %></span> <small><%= asset.toUpperCase() %></small></li>
+                                    <li class="text-left" style="display:inline"><i class="ti-arrow-up text-purple"></i> <span><%= new Intl.NumberFormat("en-US", {useGrouping: false,  minimumFractionDigits: 2, maximumFractionDigits: 8}).format(balance.asset) %></span> <small><%= asset.toUpperCase() %></small></li>
                                 </ul>
                             </div>
                             <div class="col-lg-6 col-12">
                                 <ul class="list-inline two-part">
                                     <li class="text-left" style="display:inline"><i class="ti-arrow-up text-purple"></i> <span class="text-purple">Currency</span></li>
-                                    <li class="text-left" style="display:inline"><i class="ti-arrow-up text-purple"></i> <span><%= balance.currency %></span> <small><%= currency.toUpperCase() %></small></li>
+                                    <li class="text-left" style="display:inline"><i class="ti-arrow-up text-purple"></i> <span><%= new Intl.NumberFormat("en-US", {useGrouping: false, minimumFractionDigits: 2, maximumFractionDigits: 8}).format(balance.currency) %></span> <small><%= currency.toUpperCase() %></small></li>
                                 </ul>
                             </div>
                         </div>
@@ -118,9 +118,9 @@
                 <% if (typeof stats != "undefined") { %>
                 <div class="col-lg-3 col-sm-6 col-12">
                     <div class="white-box analytics-info">
-                        <h3 class="box-title">Last balance (<%= new Intl.NumberFormat("en-US", {style: "percent", minimumSignificantDigits:2, maximumSignificantDigits: 10}).format( (parseFloat(stats.profit)/100)-(parseFloat(stats.buy_hold_profit)/100) ) %> vs buy hold)</h3>
+                        <h3 class="box-title">Last balance (<%= new Intl.NumberFormat("en-US", {style: "percent", minimumFractionDigits: 2, maximumFractionDigits: 2}).format((parseFloat(stats.profit)/100)-(parseFloat(stats.buy_hold_profit)/100) ) %> vs buy hold)</h3>
                         <ul class="list-inline one-part">
-                            <li class="text-right text-success"><i class="ti-arrow-up"></i> <span class="counter"><%= stats.tmp_balance %></span> <small><%= currency.toUpperCase() %></small></li>
+                            <li class="text-right text-success"><i class="ti-arrow-up"></i> <span class="counter"><%= new Intl.NumberFormat("en-US", {useGrouping: false, minimumFractionDigits: 8, maximumFractionDigits: 8}).format(stats.tmp_balance) %></span> <small><%= currency.toUpperCase() %></small></li>
                             <li class="text-right text-<% if (parseFloat(stats.profit) < 0) { %>danger<% } else { %>success<% } %>""><i class="ti-arrow-up"></i> <span><%= stats.profit %></span> <small>of profit</small></li>
                         </ul>
                     </div>
@@ -129,7 +129,7 @@
                     <div class="white-box analytics-info">
                         <h3 class="box-title">Buy hold</h3>
                         <ul class="list-inline one-part">
-                            <li class="text-right text-info"><i class="ti-arrow-up"></i> <span class="counter"><%= stats.buy_hold %></span> <small><%= currency.toUpperCase() %></small></li>
+                            <li class="text-right text-info"><i class="ti-arrow-up"></i> <span class="counter"><%= new Intl.NumberFormat("en-US", {useGrouping: false, minimumFractionDigits: 8, maximumFractionDigits: 8}).format(stats.buy_hold) %></span> <small><%= currency.toUpperCase() %></small></li>
                             <li class="text-right text-<% if (parseFloat(stats.buy_hold_profit) < 0) { %>danger<% } else { %>success<% } %>""><i class="ti-arrow-up"></i> <span><%= stats.buy_hold_profit %></span> <small>of profit</small></li>
                         </ul>
                     </div>
@@ -310,44 +310,52 @@
                                     <th>AMOUNT</th>
                                     <th>PRICE</th>
                                     <th>TOTAL</th>
+                                    <th>FEE</th>
                                     <th>SLIPPAGE</th>
                                     <th>DATE</th>
                                     <th>EXECUTION TIME</th>
+                                    <th>PROFIT</th>
                                 </tr>
                                 </thead>
                                 <tbody>
                                 <% if (typeof buy_order != "undefined") { %>
                                 <tr>
                                     <td><span class='text-success'>BUY</span></td>
-                                    <td><%= buy_order.size %> <%= asset.toUpperCase() %></td>
-                                    <td><%= buy_order.price %> <%= currency.toUpperCase() %></td>
+                                    <td><%= new Intl.NumberFormat("en-US", {useGrouping: false, minimumFractionDigits: 8, maximumFractionDigits: 8}).format(buy_order.size) %> <%= asset.toUpperCase() %></td>
+                                    <td><%= new Intl.NumberFormat("en-US", {useGrouping: false, minimumFractionDigits: 2, maximumFractionDigits: 2}).format(buy_order.price) %> <%= currency.toUpperCase() %></td>
+                                    <td>-</td>
                                     <td>-</td>
                                     <td>-</td>
                                     <td><%= moment(buy_order.time).format('YYYY-MM-DD HH:mm:ss') %></td>
                                     <td><span class='text-info'>Waiting</span></td>
+                                    <td>-</td>
                                 </tr>
                                 <% } %>
                                 <% if (typeof sell_order != "undefined") { %>
                                 <tr>
                                     <td><span class='text-danger'>SELL</span></td>
-                                    <td><%= sell_order.size %> <%= asset.toUpperCase() %></td>
-                                    <td><%= sell_order.price %> <%= currency.toUpperCase() %></td>
+                                    <td><%= new Intl.NumberFormat("en-US", {useGrouping: false, minimumFractionDigits: 8, maximumFractionDigits: 8}).format(sell_order.size) %> <%= asset.toUpperCase() %></td>
+                                    <td><%= new Intl.NumberFormat("en-US", {useGrouping: false, minimumFractionDigits: 2, maximumFractionDigits: 2}).format(sell_order.price) %> <%= currency.toUpperCase() %></td>
+                                    <td>-</td>
                                     <td>-</td>
                                     <td>-</td>
                                     <td><%= moment(sell_order.time).format('YYYY-MM-DD HH:mm:ss') %></td>
                                     <td><span class='text-info'>Waiting</span></td>
+                                    <td>-</td>
                                 </tr>
                                 <% } %>
                                 <% if (my_trades) { %>
                                 <% my_trades.sort(function(a,b){return a.time > b.time ? -1 : 1;}).forEach(function(trade){ %>
                                 <tr>
-                                    <td><span class='text-<% if (trade.type == "buy") { %>success<% } else { %>danger<% } %>'><%= trade.type.toUpperCase() %></td>
-                                    <td><%= trade.size %> <%= asset.toUpperCase() %></td>
-                                    <td><%= trade.price %> <%= currency.toUpperCase() %></td>
-                                    <td><%= trade.size * trade.price %> <%= currency.toUpperCase() %></td>
-                                    <td><%= new Intl.NumberFormat("en-US", {style: "percent", maximumSignificantDigits: 4}).format(trade.slippage) %></td>
+                                    <td><span class='text-<% if (trade.type == "buy") { %>success<% } else { %>danger<% } %>'><%= trade.type.toUpperCase() %></span></td>
+                                    <td><%= new Intl.NumberFormat("en-US", {useGrouping: false, minimumFractionDigits: 8, maximumFractionDigits: 8}).format(trade.size) %> <%= asset.toUpperCase() %></td>
+                                    <td><%= new Intl.NumberFormat("en-US", {useGrouping: false, minimumFractionDigits: 2, maximumFractionDigits: 2}).format(trade.price) %> <%= currency.toUpperCase() %></td>
+                                    <td><%= new Intl.NumberFormat("en-US", {useGrouping: false, minimumFractionDigits: 2, maximumFractionDigits: 2}).format(trade.size * trade.price) %> <%= currency.toUpperCase() %></td>
+                                    <td><%= new Intl.NumberFormat("en-US", {useGrouping: false, minimumFractionDigits: 2, maximumFractionDigits: 8}).format(trade.fee) %> <% if (trade.type == "buy") { %> <%= asset.toUpperCase() %> <% } else { %> <%= currency.toUpperCase() %> <% } %></td>
+                                    <td><span class="text-<% if (trade.slippage > 0) { %>danger<% } else { %>success<% } %>"><%= new Intl.NumberFormat("en-US", {style: "percent", useGrouping: false, minimumFractionDigits: 4, maximumFractionDigits: 4}).format(trade.slippage) %></span></td>
                                     <td><%= moment(trade.time).format('YYYY-MM-DD HH:mm:ss') %></td>
                                     <td><%= moment.duration(trade.execution_time).humanize() %></td>
+                                    <td><% if (trade.profit) { %><span class="text-<% if(trade.profit < 0) { %>danger<% } else { %>success<% } %>"><%= new Intl.NumberFormat("en-US", {style: "percent", useGrouping: false, minimumFractionDigits: 2, maximumFractionDigits: 2}).format(trade.profit) %></span><% } else { %>-<% } %></td>
                                 </tr>
                                 <% }); %>
                                 <% } %>

From b354f211150df6b71c0dff570c0a616228a8893a Mon Sep 17 00:00:00 2001
From: defkev <defkev@gmail.com>
Date: Mon, 22 Jan 2018 17:24:53 +0100
Subject: [PATCH 10/10] API: Always calculate fees

Fixes #1193
---
 lib/engine.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/engine.js b/lib/engine.js
index cdbc9cb0da..ee29902dd2 100644
--- a/lib/engine.js
+++ b/lib/engine.js
@@ -579,6 +579,16 @@ module.exports = function container (get, set, clear) {
       if (s.buy_order) {
         if (so.mode === 'live' || trade.price <= Number(s.buy_order.price)) {
           price = s.buy_order.price
+          if (so.order_type === 'maker') {
+            if (s.exchange.makerFee) {
+              fee = n(s.buy_order.size).multiply(s.exchange.makerFee / 100).value()
+            }
+          }
+          if (so.order_type === 'taker') {
+            if (s.exchange.takerFee) {
+              fee = n(s.buy_order.size).multiply(s.exchange.takerFee / 100).value()
+            }
+          }
           if (so.mode !== 'live') {
             s.balance.asset = n(s.balance.asset).add(s.buy_order.size).format('0.00000000')
             let total = n(price).multiply(s.buy_order.size)
@@ -586,13 +596,11 @@ module.exports = function container (get, set, clear) {
             if (so.order_type === 'maker') {
               price = n(s.buy_order.price).add(n(s.buy_order.price).multiply(so.avg_slippage_pct / 100)).format('0.00000000')
               if (s.exchange.makerFee) {
-                fee = n(s.buy_order.size).multiply(s.exchange.makerFee / 100).value()
                 s.balance.asset = n(s.balance.asset).subtract(fee).format('0.00000000')
               }
             }
             if (so.order_type === 'taker') {
               if (s.exchange.takerFee) {
-                fee = n(s.buy_order.size).multiply(s.exchange.takerFee / 100).value()
                 s.balance.asset = n(s.balance.asset).subtract(fee).format('0.00000000')
               }
             }
@@ -631,6 +639,16 @@ module.exports = function container (get, set, clear) {
       else if (s.sell_order) {
         if (so.mode === 'live' || trade.price >= s.sell_order.price) {
           price = s.sell_order.price
+          if (so.order_type === 'maker') {
+            if (s.exchange.makerFee) {
+              fee = n(s.sell_order.size).multiply(s.exchange.makerFee / 100).multiply(price).value()
+            }
+          }
+          if (so.order_type === 'taker') {
+            if (s.exchange.takerFee) {
+              fee = n(s.sell_order.size).multiply(s.exchange.takerFee / 100).multiply(price).value()
+            }
+          }
           if (so.mode !== 'live') {
             s.balance.asset = n(s.balance.asset).subtract(s.sell_order.size).value()
             let total = n(price).multiply(s.sell_order.size)
@@ -638,13 +656,11 @@ module.exports = function container (get, set, clear) {
             if (so.order_type === 'maker') {
               price = n(s.sell_order.price).subtract(n(s.sell_order.price).multiply(so.avg_slippage_pct / 100)).format('0.00000000')
               if (s.exchange.makerFee) {
-                fee = n(s.sell_order.size).multiply(s.exchange.makerFee / 100).multiply(price).value()
                 s.balance.currency = n(s.balance.currency).subtract(fee).format('0.00000000')
               }
             }
             if (so.order_type === 'taker') {
               if (s.exchange.takerFee) {
-                fee = n(s.sell_order.size).multiply(s.exchange.takerFee / 100).multiply(price).value()
                 s.balance.currency = n(s.balance.currency).subtract(fee).format('0.00000000')
               }
             }