From 0e5b0ebda6fa26aab71a877a6c62616110a46d7d Mon Sep 17 00:00:00 2001
From: Misagh <mishaker.code@gmail.com>
Date: Thu, 28 Mar 2019 12:09:07 +0100
Subject: [PATCH] adding SL and SL percentage to telegram msg

---
 freqtrade/rpc/rpc.py                     | 8 ++++++--
 freqtrade/rpc/telegram.py                | 3 ++-
 freqtrade/tests/rpc/test_rpc_telegram.py | 2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py
index 3272059a9..553e66d85 100644
--- a/freqtrade/rpc/rpc.py
+++ b/freqtrade/rpc/rpc.py
@@ -97,9 +97,13 @@ class RPC(object):
                     current_rate = self._freqtrade.get_sell_rate(trade.pair, False)
                 except DependencyException:
                     current_rate = NAN
+
                 current_profit = trade.calc_profit_percent(current_rate)
                 fmt_close_profit = (f'{round(trade.close_profit * 100, 2):.2f}%'
                                     if trade.close_profit else None)
+                sl_percentage = round(((trade.stop_loss - current_rate) / current_rate) * 100, 2)
+                txt_sl_percentage = f'{sl_percentage}%'
+
                 results.append(dict(
                     trade_id=trade.id,
                     pair=trade.pair,
@@ -110,8 +114,8 @@ class RPC(object):
                     amount=round(trade.amount, 8),
                     close_profit=fmt_close_profit,
                     current_profit=round(current_profit * 100, 2),
-                    initial_stoploss=trade.initial_stop_loss,
-                    stoploss=trade.stop_loss,
+                    stop_loss=trade.stop_loss,
+                    stop_loss_percentage=txt_sl_percentage,
                     open_order='({} {} rem={:.8f})'.format(
                       order['type'], order['side'], order['remaining']
                     ) if order else None,
diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py
index 2ba431b07..8bec8e6cd 100644
--- a/freqtrade/rpc/telegram.py
+++ b/freqtrade/rpc/telegram.py
@@ -204,9 +204,10 @@ class Telegram(RPC):
                     "*Current Rate:* `{current_rate:.8f}`",
                     "*Close Profit:* `{close_profit}`" if r['close_profit'] else "",
                     "*Current Profit:* `{current_profit:.2f}%`",
+                    "*Stoploss:* `{stop_loss:.8f}` ({stop_loss_percentage})",
                     "*Open Order:* `{open_order}`" if r['open_order'] else "",
                 ]
-                messages.append("\n".join(filter(None ,lines)).format(**r))
+                messages.append("\n".join(filter(None, lines)).format(**r))
 
             for msg in messages:
                 self._send_msg(msg, bot=bot)
diff --git a/freqtrade/tests/rpc/test_rpc_telegram.py b/freqtrade/tests/rpc/test_rpc_telegram.py
index d1a068100..edd099dc4 100644
--- a/freqtrade/tests/rpc/test_rpc_telegram.py
+++ b/freqtrade/tests/rpc/test_rpc_telegram.py
@@ -201,6 +201,8 @@ def test_status(default_conf, update, mocker, fee, ticker, markets) -> None:
             'amount': 90.99181074,
             'close_profit': None,
             'current_profit': -0.59,
+            'stop_loss': 1.099e-05,
+            'stop_loss_percentage': '-2%',
             'open_order': '(limit buy rem=0.00000000)'
         }]),
         _status_table=status_table,