From 43e62fdeff5c10990873ee0ed33efbc435590bff Mon Sep 17 00:00:00 2001 From: algizn97 Date: Tue, 26 Aug 2025 19:11:53 +0500 Subject: [PATCH] Update keyboards --- app/telegram/Keyboards/inline_keyboards.py | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/app/telegram/Keyboards/inline_keyboards.py b/app/telegram/Keyboards/inline_keyboards.py index c0acda3..39b953a 100644 --- a/app/telegram/Keyboards/inline_keyboards.py +++ b/app/telegram/Keyboards/inline_keyboards.py @@ -1,4 +1,5 @@ from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup +from aiogram.utils.keyboard import InlineKeyboardBuilder start_markup = InlineKeyboardMarkup(inline_keyboard=[ [InlineKeyboardButton(text="🔥 Начать торговлю", callback_data="clb_start_chatbot_message")] @@ -37,6 +38,7 @@ trading_markup = InlineKeyboardMarkup(inline_keyboard=[ start_trading_markup = InlineKeyboardMarkup(inline_keyboard=[ [InlineKeyboardButton(text="На главную", callback_data='back_to_main')], [InlineKeyboardButton(text="Начать торговлю", callback_data="clb_start_chatbot_trading")], + [InlineKeyboardButton(text="Установить таймер", callback_data="clb_set_timer")], ]) @@ -83,7 +85,7 @@ 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')], + [InlineKeyboardButton(text='Учитывать комиссию биржи (Да/Нет)', callback_data='commission_fee')], back_btn_list_settings, back_btn_to_main @@ -140,9 +142,9 @@ trigger_markup = InlineKeyboardMarkup(inline_keyboard=[ # ИЗМЕНИТЬ НА [InlineKeyboardButton(text="Автоматический", callback_data="clb_trigger_auto")] ]) -buttons_yes_no_markup = InlineKeyboardMarkup(inline_keyboard=[ # ИЗМЕНИТЬ НА INLINE +buttons_yes_no_markup = InlineKeyboardMarkup(inline_keyboard=[ [InlineKeyboardButton(text='Да', callback_data="clb_yes"), - InlineKeyboardButton(text='Нет', callback_data="clb_yes")] + InlineKeyboardButton(text='Нет', callback_data="clb_no")], ]) buttons_on_off_markup = InlineKeyboardMarkup(inline_keyboard=[ # ИЗМЕНИТЬ НА INLINE @@ -150,21 +152,26 @@ buttons_on_off_markup = InlineKeyboardMarkup(inline_keyboard=[ # ИЗМЕНИТ InlineKeyboardButton(text='Выключить', callback_data="clb_off")] ]) +my_deals_select_markup = InlineKeyboardMarkup(inline_keyboard=[ + [InlineKeyboardButton(text='Открытые сделки', callback_data="clb_open_deals"), + InlineKeyboardButton(text='Открытые ордера', callback_data="clb_open_orders")], + back_btn_to_main +]) def create_trades_inline_keyboard(trades): - buttons = [] + builder = InlineKeyboardBuilder() for trade in trades: symbol = trade['symbol'] if isinstance(trade, dict) else trade.symbol - buttons.append([ - InlineKeyboardButton(text=f"{symbol}", callback_data=f"show_deal_{symbol}") - ]) - return InlineKeyboardMarkup(inline_keyboard=buttons) + builder.button(text=symbol, callback_data=f"show_deal_{symbol}") + builder.adjust(2) + return builder.as_markup() def create_close_deal_markup(symbol: str) -> InlineKeyboardMarkup: return InlineKeyboardMarkup(inline_keyboard=[ [InlineKeyboardButton(text="Закрыть сделку", callback_data=f"close_deal:{symbol}")], [InlineKeyboardButton(text="Закрыть по таймеру", callback_data=f"close_deal_by_timer:{symbol}")], + [InlineKeyboardButton(text="Установить TP/SL", callback_data="clb_set_tp_sl")], back_btn_to_main ]) @@ -175,5 +182,5 @@ timer_markup = InlineKeyboardMarkup(inline_keyboard=[ ]) cancel_start_markup = InlineKeyboardMarkup(inline_keyboard=[ - [InlineKeyboardButton(text="Отменить запуск", callback_data="clb_stop_timer")] + [InlineKeyboardButton(text="Отменить таймер", callback_data="clb_stop_timer")] ])