refactoring

bot/handlers/menu/settings.py

@@ -6,7 +6,6 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder
 from logging import getLogger
 from sqlmodel.ext.asyncio.session import AsyncSession
 
-from ....main import QBotApp
 from ....model.settings import Settings
 from ....model.user import UserBase
 from ..context import ContextData, CallbackCommand
@@ -20,7 +19,12 @@ router = Router()
 @router.callback_query(ContextData.filter(F.command == CallbackCommand.MENU_ENTRY_SETTINGS))
 async def menu_entry_settings(message: CallbackQuery, **kwargs):
 
-    stack = await save_navigation_context(callback_data = kwargs["callback_data"], state = kwargs["state"])
+    callback_data: ContextData = kwargs["callback_data"]
+    state: FSMContext = kwargs["state"]
+    state_data = await state.get_data()
+    kwargs["state_data"] = state_data
+
+    stack = save_navigation_context(callback_data = callback_data, state_data = state_data)
 
     await settings_menu(message, navigation_stack = stack, **kwargs)
 
@@ -49,9 +53,15 @@ async def settings_menu(message: Message | CallbackQuery,
             InlineKeyboardButton(
                 text = (await Settings.get(Settings.APP_STRINGS_BACK_BTN)),
                 callback_data = context.pack()))
+        
+    state: FSMContext = kwargs["state"]
+    state_data = kwargs["state_data"]
+    await state.set_data(state_data)
     
     send_message = get_send_message(message)
 
+
+
     await send_message(text = (await Settings.get(Settings.APP_STRINGS_SETTINGS)), reply_markup = keyboard_builder.as_markup())