From de7b5ce5573bbcce97c2fb9c672940babbc1596b Mon Sep 17 00:00:00 2001
From: algizn97 <algiz_n@mail.ru>
Date: Thu, 21 Aug 2025 13:23:17 +0500
Subject: [PATCH] Update

---
 app/telegram/Keyboards/inline_keyboards.py | 42 +++++++++++++++++-----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/app/telegram/Keyboards/inline_keyboards.py b/app/telegram/Keyboards/inline_keyboards.py
index c979706..ae11135 100644
--- a/app/telegram/Keyboards/inline_keyboards.py
+++ b/app/telegram/Keyboards/inline_keyboards.py
@@ -28,12 +28,29 @@ connect_bybit_api_markup = InlineKeyboardMarkup(inline_keyboard=[
 ])
 
 trading_markup = InlineKeyboardMarkup(inline_keyboard=[
-    [InlineKeyboardButton(text="Указать торговую пару", callback_data='clb_update_trading_pair')],        
-    [InlineKeyboardButton(text="Совершить сделку", callback_data='clb_open_deal')]        
-]) 
+    [InlineKeyboardButton(text="Указать торговую пару", callback_data='clb_update_trading_pair')],
+    [InlineKeyboardButton(text="Выбрать тип входа", callback_data='clb_update_entry_type')],
+    # [InlineKeyboardButton(text="Совершить сделку", callback_data='clb_open_deal')]
+])
+
+open_deal_markup = InlineKeyboardMarkup(inline_keyboard=[
+    [InlineKeyboardButton(text="Открыть сделку", callback_data="clb_open_deal")],
+])
+
+
+
+entry_order_type_markup = InlineKeyboardMarkup(
+    inline_keyboard=[
+        [
+            InlineKeyboardButton(text="Market (текущая цена)", callback_data="entry_order_type:Market"),
+            InlineKeyboardButton(text="Limit (фиксированная цена)", callback_data="entry_order_type:Limit"),
+        ]
+    ]
+)
 
 back_btn_list_settings = [InlineKeyboardButton(text="Назад", callback_data='clb_back_to_special_settings_message')] # Кнопка для возврата к списку каталога настроек
 back_btn_list_settings_markup = InlineKeyboardMarkup(inline_keyboard=[[InlineKeyboardButton(text="Назад", callback_data='clb_back_to_special_settings_message')]]) # Клавиатура для возврата к списку каталога настроек
+back_btn_to_main = [InlineKeyboardButton(text="На главную", callback_data='clb_back_to_main')]
 
 main_settings_markup = InlineKeyboardMarkup(inline_keyboard=[
     [InlineKeyboardButton(text='Режим торговли', callback_data='clb_change_trading_mode'), 
@@ -45,7 +62,8 @@ main_settings_markup = InlineKeyboardMarkup(inline_keyboard=[
     [InlineKeyboardButton(text='Коэффициент Мартингейла', callback_data='clb_change_martingale_factor'), 
      InlineKeyboardButton(text='Максимльное кол-во ставок', callback_data='clb_change_maximum_quantity')],
 
-     back_btn_list_settings
+     back_btn_list_settings,
+    back_btn_to_main
 ])
 
 risk_management_settings_markup = InlineKeyboardMarkup(inline_keyboard=[
@@ -53,8 +71,10 @@ risk_management_settings_markup = InlineKeyboardMarkup(inline_keyboard=[
      InlineKeyboardButton(text='Изм. цены убытков', callback_data='clb_change_price_loss')],
 
     [InlineKeyboardButton(text='Макс. риск на сделку', callback_data='clb_change_max_risk_deal')],
+    [InlineKeyboardButton(text='Комиссия биржи', callback_data='commission_fee')],
 
-    back_btn_list_settings
+    back_btn_list_settings,
+    back_btn_to_main
 ])
 
 condition_settings_markup = InlineKeyboardMarkup(inline_keyboard=[
@@ -69,7 +89,8 @@ condition_settings_markup = InlineKeyboardMarkup(inline_keyboard=[
      
     [InlineKeyboardButton(text='AI - аналитика', callback_data='clb_change_ai_analytics')],
 
-    back_btn_list_settings
+    back_btn_list_settings,
+    back_btn_to_main
 ])
 
 additional_settings_markup = InlineKeyboardMarkup(inline_keyboard=[
@@ -78,7 +99,8 @@ additional_settings_markup = InlineKeyboardMarkup(inline_keyboard=[
 
     [InlineKeyboardButton(text='Уведомления', callback_data='clb_change_notifications')],
 
-    back_btn_list_settings
+    back_btn_list_settings,
+    back_btn_to_main
 ])
 
 trading_mode_markup = InlineKeyboardMarkup(inline_keyboard=[
@@ -88,14 +110,16 @@ trading_mode_markup = InlineKeyboardMarkup(inline_keyboard=[
     [InlineKeyboardButton(text="Свитч", callback_data="trade_mode_switch"),
     InlineKeyboardButton(text="Смарт", callback_data="trade_mode_smart")],
 
-    back_btn_list_settings
+    back_btn_list_settings,
+    back_btn_to_main
 ])
 
 margin_type_markup = InlineKeyboardMarkup(inline_keyboard=[
     [InlineKeyboardButton(text="Изолированный", callback_data="margin_type_isolated"),
     InlineKeyboardButton(text="Кросс", callback_data="margin_type_cross")],
 
-    back_btn_list_settings
+    back_btn_list_settings,
+    back_btn_to_main
 ])
 
 trigger_markup = InlineKeyboardMarkup(inline_keyboard=[ # ИЗМЕНИТЬ НА INLINE