diff --git a/freqtrade/rpc/api_server/api_schemas.py b/freqtrade/rpc/api_server/api_schemas.py index 0e3ac78bf..e5d76a62e 100644 --- a/freqtrade/rpc/api_server/api_schemas.py +++ b/freqtrade/rpc/api_server/api_schemas.py @@ -328,8 +328,6 @@ class OpenTradeSchema(TradeSchema): total_profit_fiat: Optional[float] = None total_profit_ratio: Optional[float] = None - open_order: Optional[str] = None - class TradeResponse(BaseModel): trades: List[TradeSchema] diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index aced89d7a..dc4ec45b5 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -662,9 +662,9 @@ class Telegram(RPCHandler): ("`({stop_loss_ratio:.2%})`" if r['stop_loss_ratio'] else "")) lines.append("*Stoploss distance:* `{stoploss_current_dist:.8g}` " "`({stoploss_current_dist_ratio:.2%})`") - if r['open_order']: + for order in r.get('open_orders', []): lines.append( - "*Open Order:* `{open_order}`" + f"*Open Order:* `{order}`" + "- `{exit_order_status}`" if r['exit_order_status'] else "") lines_detail = self._prepare_order_details( diff --git a/tests/rpc/test_rpc_apiserver.py b/tests/rpc/test_rpc_apiserver.py index a0b6e2220..20fc87ae9 100644 --- a/tests/rpc/test_rpc_apiserver.py +++ b/tests/rpc/test_rpc_apiserver.py @@ -1063,7 +1063,6 @@ def test_api_status(botclient, mocker, ticker, fee, markets, is_short, 'current_rate': current_rate, 'open_date': ANY, 'open_timestamp': ANY, - 'open_order': None, 'open_rate': 0.123, 'pair': 'ETH/BTC', 'base_currency': 'ETH',