From d530dd5900ccb2d8a87551dd16298efa9e776ae3 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 3 Feb 2024 13:10:42 +0100 Subject: [PATCH] Improve formatting of leverage closes #9759 --- freqtrade/rpc/telegram.py | 4 ++-- tests/rpc/test_rpc_telegram.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index e2fbe1529..f42e3ab51 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -353,7 +353,7 @@ class Telegram(RPCHandler): message += f"*Amount:* `{round_value(msg['amount'], 8)}`\n" message += f"*Direction:* `{msg['direction']}" if msg.get('leverage') and msg.get('leverage', 1.0) != 1.0: - message += f" ({msg['leverage']:.1g}x)" + message += f" ({msg['leverage']:.3g}x)" message += "`\n" message += f"*Open Rate:* `{fmt_coin(msg['open_rate'], msg['quote_currency'])}`\n" if msg['type'] == RPCMessageType.ENTRY and msg['current_rate']: @@ -371,7 +371,7 @@ class Telegram(RPCHandler): microsecond=0) - msg['open_date'].replace(microsecond=0) duration_min = duration.total_seconds() / 60 - leverage_text = (f" ({msg['leverage']:.1g}x)" + leverage_text = (f" ({msg['leverage']:.3g}x)" if msg.get('leverage') and msg.get('leverage', 1.0) != 1.0 else "") diff --git a/tests/rpc/test_rpc_telegram.py b/tests/rpc/test_rpc_telegram.py index f85b19a01..2e6852876 100644 --- a/tests/rpc/test_rpc_telegram.py +++ b/tests/rpc/test_rpc_telegram.py @@ -2017,7 +2017,7 @@ def test_send_msg_enter_notification(default_conf, mocker, caplog, message_type, telegram, freqtradebot, msg_mock = get_telegram_testobject(mocker, default_conf) telegram.send_msg(msg) - leverage_text = f' ({leverage:.1g}x)' if leverage and leverage != 1.0 else '' + leverage_text = f' ({leverage:.3g}x)' if leverage and leverage != 1.0 else '' assert msg_mock.call_args[0][0] == ( f'\N{LARGE BLUE CIRCLE} *Binance (dry):* New Trade (#1)\n' @@ -2126,7 +2126,7 @@ def test_send_msg_entry_fill_notification(default_conf, mocker, message_type, en 'amount': 1333.3333333333335, 'open_date': dt_now() - timedelta(hours=1) }) - leverage_text = f' ({leverage:.1g}x)' if leverage != 1.0 else '' + leverage_text = f' ({leverage:.3g}x)' if leverage != 1.0 else '' assert msg_mock.call_args[0][0] == ( f'\N{CHECK MARK} *Binance (dry):* New Trade filled (#1)\n' f'*Pair:* `ETH/BTC`\n' @@ -2365,7 +2365,7 @@ def test_send_msg_exit_fill_notification(default_conf, mocker, direction, 'close_date': dt_now(), }) - leverage_text = f' ({leverage:.1g}x)`\n' if leverage and leverage != 1.0 else '`\n' + leverage_text = f' ({leverage:.3g}x)`\n' if leverage and leverage != 1.0 else '`\n' assert msg_mock.call_args[0][0] == ( '\N{WARNING SIGN} *Binance (dry):* Exited KEY/ETH (#1)\n' '*Profit:* `-57.41% (loss: -0.05746 ETH)`\n' @@ -2458,7 +2458,7 @@ def test_send_msg_buy_notification_no_fiat( 'open_date': dt_now() - timedelta(hours=1) }) - leverage_text = f' ({leverage:.1g}x)' if leverage and leverage != 1.0 else '' + leverage_text = f' ({leverage:.3g}x)' if leverage and leverage != 1.0 else '' assert msg_mock.call_args[0][0] == ( f'\N{LARGE BLUE CIRCLE} *Binance:* New Trade (#1)\n' '*Pair:* `ETH/BTC`\n' @@ -2510,7 +2510,7 @@ def test_send_msg_exit_notification_no_fiat( 'close_date': dt_now(), }) - leverage_text = f' ({leverage:.1g}x)' if leverage and leverage != 1.0 else '' + leverage_text = f' ({leverage:.3g}x)' if leverage and leverage != 1.0 else '' assert msg_mock.call_args[0][0] == ( '\N{WARNING SIGN} *Binance (dry):* Exiting KEY/ETH (#1)\n' '*Unrealized Profit:* `-57.41% (loss: -0.05746 ETH)`\n'