develop #3

Open
Alex wants to merge 77 commits from Alex/stcs:develop into stable
36 changed files with 2590 additions and 536 deletions
Showing only changes of commit 8bc4c634fe - Show all commits

View File

@@ -1,18 +1,17 @@
import logging.config
from aiogram import F, Router
from aiogram.filters import CommandStart, Command
from aiogram.filters import CommandStart
from aiogram.types import Message, CallbackQuery
from aiogram.fsm.context import FSMContext
import app.telegram.functions.functions as func # functions
import app.telegram.functions.functions as func
import app.telegram.functions.main_settings.settings as func_main_settings
import app.telegram.functions.risk_management_settings.settings as func_rmanagement_settings
import app.telegram.functions.condition_settings.settings as func_condition_settings
import app.telegram.functions.additional_settings.settings as func_additional_settings
import app.telegram.database.requests as rq
import app.telegram.Keyboards.inline_keyboards as inline_markup
import app.telegram.Keyboards.reply_keyboards as reply_markup
from logger_helper.logger_helper import LOGGING_CONFIG
@@ -99,8 +98,8 @@ async def clb_change_main_settings_message(callback: CallbackQuery, state: FSMCo
@router.callback_query(F.data == "clb_change_risk_management_settings")
async def clb_change_risk_management_message(callback: CallbackQuery, state: FSMContext):
await func_rmanagement_settings.main_settings_message(callback.from_user.id, callback.message, state)
async def clb_change_risk_management_message(callback: CallbackQuery):
await func_rmanagement_settings.main_settings_message(callback.from_user.id, callback.message)
await callback.answer()