The buttons for selecting the type of entry and setting the limit and trigger prices have been updated.

app/telegram/Keyboards/inline_keyboards.py

@@ -30,13 +30,11 @@ special_settings_markup = InlineKeyboardMarkup(inline_keyboard=[
      InlineKeyboardButton(text="Риск-менеджмент", callback_data='clb_change_risk_management_settings')],
 
     [InlineKeyboardButton(text="Условия запуска", callback_data='clb_change_condition_settings')],
-     # InlineKeyboardButton(text="Дополнительные параметры", callback_data='clb_change_additional_settings')],
+    # InlineKeyboardButton(text="Дополнительные параметры", callback_data='clb_change_additional_settings')],
     [InlineKeyboardButton(text="Подключить Bybit", callback_data='clb_new_user_connect_bybit_api_message')],
     back_btn_to_main
 ])
 
-
-
 connect_bybit_api_markup = InlineKeyboardMarkup(inline_keyboard=[
     [InlineKeyboardButton(text="Подключить Bybit", callback_data='clb_new_user_connect_bybit_api')]
 ])
@@ -45,7 +43,7 @@ trading_markup = InlineKeyboardMarkup(inline_keyboard=[
     [InlineKeyboardButton(text="Настройки", callback_data='clb_settings_message')],
     [InlineKeyboardButton(text="Мои сделки", callback_data='clb_my_deals')],
     [InlineKeyboardButton(text="Указать торговую пару", callback_data='clb_update_trading_pair')],
-    [InlineKeyboardButton(text="Начать торговать", callback_data='clb_update_entry_type')],
+    [InlineKeyboardButton(text="Начать торговать", callback_data='clb_start_chatbot_trading')],
     [InlineKeyboardButton(text="Остановить торговлю", callback_data='clb_stop_trading')],
 ])
 
@@ -61,14 +59,12 @@ cancel = InlineKeyboardMarkup(inline_keyboard=[
 entry_order_type_markup = InlineKeyboardMarkup(
     inline_keyboard=[
         [
-            InlineKeyboardButton(text="Текущая цена", callback_data="entry_order_type:Market"),
-            InlineKeyboardButton(text="Триггер цена", callback_data="entry_order_type:Limit"),
+            InlineKeyboardButton(text="Маркет", callback_data="entry_order_type:Market"),
+            InlineKeyboardButton(text="Лимит", callback_data="entry_order_type:Limit"),
         ], back_btn_to_main
     ]
 )
 
-
-
 back_to_main = InlineKeyboardMarkup(inline_keyboard=[
     [InlineKeyboardButton(text="На главную", callback_data='back_to_main')],
 ])
@@ -83,7 +79,7 @@ main_settings_markup = InlineKeyboardMarkup(inline_keyboard=[
 
     [InlineKeyboardButton(text='Коэффициент Мартингейла', callback_data='clb_change_martingale_factor'),
      InlineKeyboardButton(text='Сбросить шаги Мартингейла', callback_data='clb_change_martingale_reset')],
-     [InlineKeyboardButton(text='Максимальное кол-во ставок', callback_data='clb_change_maximum_quantity')],
+    [InlineKeyboardButton(text='Максимальное кол-во ставок', callback_data='clb_change_maximum_quantity')],
 
     back_btn_list_settings,
     back_btn_to_main
@@ -101,8 +97,10 @@ risk_management_settings_markup = InlineKeyboardMarkup(inline_keyboard=[
 ])
 
 condition_settings_markup = InlineKeyboardMarkup(inline_keyboard=[
-    [InlineKeyboardButton(text='Режим торговли', callback_data='clb_change_mode'),
-     InlineKeyboardButton(text='Таймер', callback_data='clb_change_timer')],
+    [InlineKeyboardButton(text='Таймер', callback_data='clb_change_timer'),
+     InlineKeyboardButton(text='Тип позиции', callback_data='clb_update_entry_type')],
+    [InlineKeyboardButton(text='Триггер цена', callback_data='clb_change_trigger_price'),
+     InlineKeyboardButton(text='Лимит цена', callback_data='clb_change_limit_price')],
     #
     # [InlineKeyboardButton(text='Фильтр волатильности', callback_data='clb_change_filter_volatility'),
     #  InlineKeyboardButton(text='Внешние сигналы', callback_data='clb_change_external_cues')],
@@ -116,6 +114,11 @@ condition_settings_markup = InlineKeyboardMarkup(inline_keyboard=[
     back_btn_to_main
 ])
 
+back_to_condition_settings = InlineKeyboardMarkup(inline_keyboard=[
+    [InlineKeyboardButton(text='Назад', callback_data='clb_change_condition_settings')],
+    back_btn_to_main
+])
+
 additional_settings_markup = InlineKeyboardMarkup(inline_keyboard=[
     [InlineKeyboardButton(text='Сохранить шаблон', callback_data='clb_change_save_pattern'),
      InlineKeyboardButton(text='Автозапуск', callback_data='clb_change_auto_start')],
@@ -130,7 +133,7 @@ trading_mode_markup = InlineKeyboardMarkup(inline_keyboard=[
     [InlineKeyboardButton(text="Лонг", callback_data="trade_mode_long"),
      InlineKeyboardButton(text="Шорт", callback_data="trade_mode_short"),
      InlineKeyboardButton(text="Свитч", callback_data="trade_mode_switch")],
-     # InlineKeyboardButton(text="Смарт", callback_data="trade_mode_smart")],
+    # InlineKeyboardButton(text="Смарт", callback_data="trade_mode_smart")],
 
     back_btn_list_settings,
     back_btn_to_main
@@ -145,7 +148,7 @@ margin_type_markup = InlineKeyboardMarkup(inline_keyboard=[
 
 trigger_markup = InlineKeyboardMarkup(inline_keyboard=[  # ИЗМЕНИТЬ НА INLINE
     [InlineKeyboardButton(text='Ручной', callback_data="clb_trigger_manual")],
-     # [InlineKeyboardButton(text='TradingView', callback_data="clb_trigger_tradingview")],
+    # [InlineKeyboardButton(text='TradingView', callback_data="clb_trigger_tradingview")],
     [InlineKeyboardButton(text="Автоматический", callback_data="clb_trigger_auto")],
     back_btn_list_settings,
     back_btn_to_main
@@ -162,11 +165,12 @@ buttons_on_off_markup = InlineKeyboardMarkup(inline_keyboard=[  # ИЗМЕНИТ
 ])
 
 my_deals_select_markup = InlineKeyboardMarkup(inline_keyboard=[
-    [InlineKeyboardButton(text='Открытые сделки', callback_data="clb_open_deals"),
-     InlineKeyboardButton(text='Лимитные ордера', callback_data="clb_open_orders")],
+    [InlineKeyboardButton(text='Позиции', callback_data="clb_open_deals"),
+     InlineKeyboardButton(text='Ордера', callback_data="clb_open_orders")],
     back_btn_to_main
 ])
 
+
 def create_trades_inline_keyboard(trades):
     builder = InlineKeyboardBuilder()
     for trade in trades:
@@ -174,6 +178,7 @@ def create_trades_inline_keyboard(trades):
     builder.adjust(2)
     return builder.as_markup()
 
+
 def create_trades_inline_keyboard_limits(trades):
     builder = InlineKeyboardBuilder()
     for trade in trades:
@@ -190,12 +195,14 @@ def create_close_deal_markup(symbol: str) -> InlineKeyboardMarkup:
         back_btn_to_main
     ])
 
+
 def create_close_limit_markup(symbol: str) -> InlineKeyboardMarkup:
     return InlineKeyboardMarkup(inline_keyboard=[
-        [InlineKeyboardButton(text="Закрыть лимитный ордер", callback_data=f"close_limit:{symbol}")],
+        [InlineKeyboardButton(text="Закрыть ордер", callback_data=f"close_limit:{symbol}")],
         back_btn_to_main
     ])
 
+
 timer_markup = InlineKeyboardMarkup(inline_keyboard=[
     [InlineKeyboardButton(text="Установить таймер", callback_data="clb_set_timer")],
     [InlineKeyboardButton(text="Удалить таймер", callback_data="clb_delete_timer")],
@@ -214,4 +221,4 @@ stop_choice_markup = InlineKeyboardMarkup(
 switch_state_markup = InlineKeyboardMarkup(inline_keyboard=[
     [InlineKeyboardButton(text='По направлению', callback_data="clb_long_switch"),
      InlineKeyboardButton(text='Против направления', callback_data="clb_short_switch")],
-])
+])