From 699148b20228e0796082eb79a205bc28a762b3f5 Mon Sep 17 00:00:00 2001
From: misha <mikhail_zakharov_15482356@mail.ru>
Date: Mon, 16 Feb 2026 15:33:15 +0300
Subject: [PATCH] feat(my_diets): fixed navigation to diet creation screen

---
 lib/core/routing/other_routes.dart                        | 8 ++++----
 .../create_diet/presentation/create_diet_screen.dart      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/core/routing/other_routes.dart b/lib/core/routing/other_routes.dart
index 0e30336e..7c16bf74 100644
--- a/lib/core/routing/other_routes.dart
+++ b/lib/core/routing/other_routes.dart
@@ -159,9 +159,9 @@ class OtherRoutes {
         path: CreateDietScreen.path,
         name: CreateDietScreen.name,
         builder: (context, state) {
-          final data = state.extra as Map<String, dynamic>;
-          final diet = data['diet'] as Diet?;
-          final isEditing = data['isEditing'] as bool?;
+          final data = state.extra as Map<String, dynamic>?;
+          final diet = data?['diet'] as Diet?;
+          final isEditing = data?['isEditing'] as bool?;
           return CreateDietScreen(diet: diet, isEditing: isEditing);
         },
       ),
@@ -172,7 +172,7 @@ class OtherRoutes {
           final data = state.extra as Map<String, dynamic>;
           final diet = data['diet'] as Diet;
           final isImageInBase64 = data['isImageInBase64'] as bool;
-          return DietPreviewScreen(diet: diet, isImageInBase64: isImageInBase64,);
+          return DietPreviewScreen(diet: diet, isImageInBase64: isImageInBase64);
         },
       ),
       GoRoute(path: RouteConstants.createPlanScreen, name: 'createPlanScreen', builder: (context, state) => const CreatePlanScreen()),
diff --git a/lib/features/create_diet/presentation/create_diet_screen.dart b/lib/features/create_diet/presentation/create_diet_screen.dart
index 4678f989..5d95e783 100644
--- a/lib/features/create_diet/presentation/create_diet_screen.dart
+++ b/lib/features/create_diet/presentation/create_diet_screen.dart
@@ -274,7 +274,7 @@ class _CreateDietScreenContentState extends State<CreateDietScreenContent> {
                                   : () async {
                                       final diet = await context.read<CreateDietCubit>().getDietForPreview();
                                       if (diet == null) {
-                                        // ignore: use_build_context_synchronously
+                                        if (!context.mounted) return;  
                                         _scrollToFirstError(context.read<CreateDietCubit>().state);
                                         return;
                                       }
@@ -315,7 +315,7 @@ class _CreateDietScreenContentState extends State<CreateDietScreenContent> {
                                 } else {
                                   final result = await context.read<CreateDietCubit>().createDiet();
                                   if (result == 'validation') {
-                                    // ignore: use_build_context_synchronously
+                                    if (!context.mounted) return;
                                     _scrollToFirstError(context.read<CreateDietCubit>().state);
                                   } else if (result == 'error') {
                                     if (!context.mounted) return;