From 6b7b1f2d18e3d8a4f578bdd153835fb04461317e Mon Sep 17 00:00:00 2001
From: Username1548 <mikhail_zakharov_15482356@mail.ru>
Date: Wed, 10 Sep 2025 15:19:49 +0300
Subject: [PATCH] feat(deepLinks): added diary deep link and improved profile
 and chat deep links

---
 android/app/src/main/AndroidManifest.xml      |  10 +-
 lib/core/app_router.dart                      |  92 +++++++----
 .../chat/presentation/pages/chat_screen.dart  |   1 -
 .../presentation/pages/empty_chat_screen.dart | 149 +++++-------------
 .../widgets/blog_post_widget.dart             |   1 -
 .../presentation/widgets/comments_widget.dart |   1 -
 .../widgets/consultant_widget.dart            |   4 -
 .../presentation/widgets/plan_widget.dart     |   1 -
 .../widgets/blocked_user_widget.dart          |   1 -
 .../bloc/profile_cubit/profile_cubit.dart     |   7 +-
 .../presentation/pages/profile_screen.dart    |  20 ++-
 .../widgets/sub_action_button_widget.dart     |  45 +-----
 12 files changed, 126 insertions(+), 206 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index ec1ef42b..31151753 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -57,8 +57,14 @@
                 <data android:pathPattern="/ru/chat/.*" />
                 <data android:pathPattern="/en/chat/.*" />
 
-                <data android:pathPattern="/ru/chat/" />
-                <data android:pathPattern="/en/chat/" />
+                <data android:pathPattern="/ru/chat" />
+                <data android:pathPattern="/en/chat" />
+
+                <data android:pathPattern="/ru/profile/.*" />
+                <data android:pathPattern="/en/profile/.*" />
+
+                <data android:pathPattern="/ru/diary/.*" />
+                <data android:pathPattern="/en/diary/.*" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/lib/core/app_router.dart b/lib/core/app_router.dart
index af2ebdf4..6214ab4e 100644
--- a/lib/core/app_router.dart
+++ b/lib/core/app_router.dart
@@ -46,6 +46,7 @@ import 'package:eatvio_app/features/my_finance/presentation/pages/user_finance_s
 import 'package:eatvio_app/features/my_plans/presentation/my_plans_screen.dart';
 import 'package:eatvio_app/features/notifications/presentation/notifications_screen.dart';
 import 'package:eatvio_app/features/plans/presentation/pages/about_plan_screen.dart';
+import 'package:eatvio_app/features/profile/models/profile_model.dart';
 import 'package:eatvio_app/features/profile/presentation/pages/profile_screen.dart';
 import 'package:eatvio_app/features/profile/presentation/pages/subs_screen.dart';
 import 'package:eatvio_app/features/recipe/presentation/pages/about_recipe_screen.dart';
@@ -83,39 +84,7 @@ class AppRouter {
     initialLocation: '/update-screen',
     navigatorKey: navigatorKey,
     redirect: (context, state) {
-      final segments = state.uri.pathSegments;
-      if (segments.length == 3) {
-        final type = segments[1];
-        final contentIdentifier = segments[2];
-
-        switch (type) {
-          case 'recipe':
-            FlutterNativeSplash.remove();
-            return '/about-recipes-screen?slug=$contentIdentifier';
-          case 'blog_post':
-            FlutterNativeSplash.remove();
-            return '/blog-post-screen?id=$contentIdentifier';
-          case 'plan':
-            FlutterNativeSplash.remove();
-            return '/about-plan-screen?slug=$contentIdentifier';
-          case 'diet':
-            FlutterNativeSplash.remove();
-            return '/about-diet-screen?slug=$contentIdentifier';
-          case 'chat':
-            FlutterNativeSplash.remove();
-            return '/chat-screen';
-        }
-      }
-      if (segments.length == 2) {
-        final type = segments[1];
-        switch (type) {
-          case 'chat':
-            FlutterNativeSplash.remove();
-            return '/chat-screen';
-        }
-      }
-
-      return null;
+      return _parseDeepLink(state.uri);
     },
     routes: [
       GoRoute(
@@ -290,7 +259,13 @@ class AppRouter {
       GoRoute(
         path: '/profile-screen',
         name: 'profileScreen',
-        builder: (context, state) => ProfileScreen(slug: state.extra as String),
+        builder: (context, state) {
+          final slug = state.uri.queryParameters['slug'];
+          if (slug != null) {
+            return ProfileScreen(slug: slug);
+          }
+          return ProfileScreen(slug: state.extra as String);
+        },
       ),
       GoRoute(
         path: '/subs-screen/:slug',
@@ -340,7 +315,7 @@ class AppRouter {
       GoRoute(
         path: '/empty-chat-screen',
         name: 'emptyChatScreen',
-        builder: (context, state) => EmptyChatScreen(author: state.extra as Author),
+        builder: (context, state) => EmptyChatScreen(user: state.extra as ProfileModel),
       ),
       GoRoute(
         path: '/settings-screen',
@@ -464,3 +439,50 @@ class AppRouter {
     ],
   );
 }
+
+String? _parseDeepLink(Uri uri) {
+  final segments = uri.pathSegments;
+  if (segments.length == 4) {
+    final type = segments[1];
+    switch (type) {
+      case 'diary':
+        FlutterNativeSplash.remove();
+        return '/diary-screen';
+    }
+  }
+  if (segments.length == 3) {
+    final type = segments[1];
+    final contentIdentifier = segments[2];
+
+    switch (type) {
+      case 'recipe':
+        FlutterNativeSplash.remove();
+        return '/about-recipes-screen?slug=$contentIdentifier';
+      case 'blog_post':
+        FlutterNativeSplash.remove();
+        return '/blog-post-screen?id=$contentIdentifier';
+      case 'plan':
+        FlutterNativeSplash.remove();
+        return '/about-plan-screen?slug=$contentIdentifier';
+      case 'diet':
+        FlutterNativeSplash.remove();
+        return '/about-diet-screen?slug=$contentIdentifier';
+      case 'chat':
+        FlutterNativeSplash.remove();
+        return '/chat-select-screen';
+      case 'profile':
+        FlutterNativeSplash.remove();
+        return '/profile-screen?slug=$contentIdentifier';
+    }
+  }
+  if (segments.length == 2) {
+    final type = segments[1];
+    switch (type) {
+      case 'chat':
+        FlutterNativeSplash.remove();
+        return '/chat-select-screen';
+    }
+  }
+
+  return null;
+}
diff --git a/lib/features/chat/presentation/pages/chat_screen.dart b/lib/features/chat/presentation/pages/chat_screen.dart
index 7a462905..c22ddbd3 100644
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -18,7 +18,6 @@ import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/notification_banner.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
 import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
 import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
diff --git a/lib/features/chat/presentation/pages/empty_chat_screen.dart b/lib/features/chat/presentation/pages/empty_chat_screen.dart
index 908189a3..cd37535f 100644
--- a/lib/features/chat/presentation/pages/empty_chat_screen.dart
+++ b/lib/features/chat/presentation/pages/empty_chat_screen.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
+import 'package:eatvio_app/features/profile/models/profile_model.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -16,12 +16,9 @@ import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked
 import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_state.dart';
 
 class EmptyChatScreen extends StatefulWidget {
-  final Author author;
+  final ProfileModel user;
 
-  const EmptyChatScreen({
-    super.key,
-    required this.author,
-  });
+  const EmptyChatScreen({super.key, required this.user});
 
   @override
   State<EmptyChatScreen> createState() => _EmptyChatScreenState();
@@ -40,29 +37,19 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
         centerTitle: false,
         title: GestureDetector(
           onTap: () {
-            GoRouter.of(context).pushNamed(
-              'profileScreen',
-              extra: widget.author.authorSlug,
-            );
+            GoRouter.of(context).pushNamed('profileScreen', extra: widget.user.slug);
           },
           child: Row(
             children: [
               CircleAvatar(
                 radius: 20,
-                foregroundImage: NetworkImage(widget.author.authorProfileIcon),
+                foregroundImage: NetworkImage(widget.user.profilePhotoUrl),
                 backgroundImage: const AssetImage('assets/images/no_avatar.png'),
               ),
               const SizedBox(width: 16),
               Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    widget.author.authorName,
-                    style: CustomTextStyles.titleSmallBold.copyWith(
-                      color: PrimaryColors().black,
-                    ),
-                  ),
-                ],
+                children: [Text(widget.user.name, style: CustomTextStyles.titleSmallBold.copyWith(color: PrimaryColors().black))],
               ),
             ],
           ),
@@ -79,18 +66,14 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                 children: [
                   const SizedBox(width: 8),
                   InkWell(
-                    onTap: () => showImagePicker(widget.author.authorSlug),
+                    onTap: () => showImagePicker(widget.user.slug),
                     customBorder: const CircleBorder(),
                     child: Ink(
                       height: 40,
                       width: 40,
                       child: Transform.rotate(
                         angle: pi / 4,
-                        child: const Icon(
-                          Icons.attach_file_rounded,
-                          size: 30,
-                          color: Color(0xFF858E99),
-                        ),
+                        child: const Icon(Icons.attach_file_rounded, size: 30, color: Color(0xFF858E99)),
                       ),
                     ),
                   ),
@@ -112,8 +95,10 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                           hintText: 'Сообщение',
                           hintStyle: const TextStyle(fontSize: 14, fontWeight: FontWeight.w400, height: 1, color: Color(0xFFAEAEB2)),
                           filled: true,
-                          border:
-                              OutlineInputBorder(borderRadius: BorderRadius.circular(100), borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1)),
+                          border: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(100),
+                            borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
+                          ),
                           enabledBorder: OutlineInputBorder(
                             borderRadius: BorderRadius.circular(100),
                             borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
@@ -134,40 +119,29 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                       final blockedUsersCubit = sl<BlockedUsersCubit>();
                       await blockedUsersCubit.getBlockedUsers();
                       final blockedState = blockedUsersCubit.state;
-                      
+
                       if (blockedState is BlockedUsersStateLoaded) {
-                        final isBlocked = blockedState.profilesList.any((profile) => profile.slug == widget.author.authorSlug);
+                        final isBlocked = blockedState.profilesList.any((profile) => profile.slug == widget.user.slug);
                         if (isBlocked) {
                           if (context.mounted) {
                             ScaffoldMessenger.of(context).showSnackBar(
-                              const SnackBar(
-                                content: Text('Вы не можете отправить сообщение заблокированному пользователю'),
-                                backgroundColor: Colors.red,
-                              ),
+                              const SnackBar(content: Text('Вы не можете отправить сообщение заблокированному пользователю'), backgroundColor: Colors.red),
                             );
                           }
                           return;
                         }
                       }
-                      
+
                       if (textEditingController.text.isNotEmpty) {
-                        await sl<ChatRepository>().sendMessage(
-                          data: textEditingController.text.trim(),
-                          slug: widget.author.authorSlug,
-                        );
+                        await sl<ChatRepository>().sendMessage(data: textEditingController.text.trim(), slug: widget.user.slug);
                         if (mounted) {
                           setState(() {
                             textEditingController.clear();
                           });
                         }
-                        final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
+                        final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
                         if (context.mounted) {
-                          AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                            'chatScreen',
-                            extra: {
-                              'uuid': chatIdOrError,
-                            },
-                          );
+                          AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatIdOrError});
                         }
                       }
                     },
@@ -196,53 +170,36 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
           CupertinoActionSheetAction(
             onPressed: () async {
               Navigator.of(context).pop();
-              
+
               // Проверяем, заблокирован ли пользователь
               final blockedUsersCubit = sl<BlockedUsersCubit>();
               await blockedUsersCubit.getBlockedUsers();
               final blockedState = blockedUsersCubit.state;
-              
+
               if (blockedState is BlockedUsersStateLoaded) {
-                final isBlocked = blockedState.profilesList.any((profile) => profile.slug == widget.author.authorSlug);
+                final isBlocked = blockedState.profilesList.any((profile) => profile.slug == widget.user.slug);
                 if (isBlocked) {
                   if (context.mounted) {
                     ScaffoldMessenger.of(context).showSnackBar(
-                      const SnackBar(
-                        content: Text('Вы не можете отправить сообщение заблокированному пользователю'),
-                        backgroundColor: Colors.red,
-                      ),
+                      const SnackBar(content: Text('Вы не можете отправить сообщение заблокированному пользователю'), backgroundColor: Colors.red),
                     );
                   }
                   return;
                 }
               }
-              
+
               final picker = ImagePicker();
               List<XFile>? images = await picker.pickMultiImage();
               if (images.isNotEmpty) {
                 List<File> files = images.map((image) => File(image.path)).toList();
-                await sl<ChatRepository>().sendMessage(
-                  files: files,
-                  slug: widget.author.authorSlug,
-                );
-                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
+                await sl<ChatRepository>().sendMessage(files: files, slug: widget.user.slug);
+                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
                 if (mounted) {
-                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                    'chatScreen',
-                    extra: {
-                      'uuid': chatIdOrError,
-                    },
-                  );
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatIdOrError});
                 }
               }
             },
-            child: const Row(
-              children: [
-                Icon(Icons.photo_library_rounded),
-                SizedBox(width: 8),
-                Text('Галерея'),
-              ],
-            ),
+            child: const Row(children: [Icon(Icons.photo_library_rounded), SizedBox(width: 8), Text('Галерея')]),
           ),
           CupertinoActionSheetAction(
             onPressed: () async {
@@ -251,28 +208,14 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
               List<XFile>? images = await picker.pickMultiImage();
               if (images.isNotEmpty) {
                 List<File> files = images.map((image) => File(image.path)).toList();
-                await sl<ChatRepository>().sendMessage(
-                  files: files,
-                  slug: widget.author.authorSlug,
-                );
-                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
+                await sl<ChatRepository>().sendMessage(files: files, slug: widget.user.slug);
+                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
                 if (mounted) {
-                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                    'chatScreen',
-                    extra: {
-                      'uuid': chatIdOrError,
-                    },
-                  );
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatIdOrError});
                 }
               }
             },
-            child: const Row(
-              children: [
-                Icon(Icons.photo_camera),
-                SizedBox(width: 8),
-                Text('Фото'),
-              ],
-            ),
+            child: const Row(children: [Icon(Icons.photo_camera), SizedBox(width: 8), Text('Фото')]),
           ),
           CupertinoActionSheetAction(
             onPressed: () async {
@@ -303,35 +246,17 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
               );
               if (result != null) {
                 List<File> files = result.paths.map((path) => File(path!)).toList();
-                await sl<ChatRepository>().sendMessage(
-                  files: files,
-                  slug: widget.author.authorSlug,
-                );
-                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
+                await sl<ChatRepository>().sendMessage(files: files, slug: widget.user.slug);
+                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
                 if (mounted) {
-                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                    'chatScreen',
-                    extra: {
-                      'uuid': chatIdOrError,
-                    },
-                  );
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatIdOrError});
                 }
               }
             },
-            child: const Row(
-              children: [
-                Icon(Icons.file_present_rounded),
-                SizedBox(width: 8),
-                Text('Файлы'),
-              ],
-            ),
+            child: const Row(children: [Icon(Icons.file_present_rounded), SizedBox(width: 8), Text('Файлы')]),
           ),
         ],
-        cancelButton: CupertinoActionSheetAction(
-          onPressed: () => Navigator.of(context).pop(),
-          isDestructiveAction: true,
-          child: const Text('Отмена'),
-        ),
+        cancelButton: CupertinoActionSheetAction(onPressed: () => Navigator.of(context).pop(), isDestructiveAction: true, child: const Text('Отмена')),
       ),
     );
   }
diff --git a/lib/features/feed/presentation/widgets/blog_post_widget.dart b/lib/features/feed/presentation/widgets/blog_post_widget.dart
index 2bb2599e..b28dd7d5 100644
--- a/lib/features/feed/presentation/widgets/blog_post_widget.dart
+++ b/lib/features/feed/presentation/widgets/blog_post_widget.dart
@@ -7,7 +7,6 @@ import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/core/widgets/custom_popup.dart';
 import 'package:eatvio_app/core/widgets/feed_icon_button.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/subscribe_button_widget.dart';
diff --git a/lib/features/feed/presentation/widgets/comments_widget.dart b/lib/features/feed/presentation/widgets/comments_widget.dart
index d5d74bda..17f33089 100644
--- a/lib/features/feed/presentation/widgets/comments_widget.dart
+++ b/lib/features/feed/presentation/widgets/comments_widget.dart
@@ -8,7 +8,6 @@ import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/prof
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_state.dart';
 import 'package:eatvio_app/features/complaining/presentation/complaining_bottom_sheet.dart';
 import 'package:eatvio_app/features/feed/models/comment_model.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
diff --git a/lib/features/feed/presentation/widgets/consultant_widget.dart b/lib/features/feed/presentation/widgets/consultant_widget.dart
index 7fd9caef..9eb35914 100644
--- a/lib/features/feed/presentation/widgets/consultant_widget.dart
+++ b/lib/features/feed/presentation/widgets/consultant_widget.dart
@@ -1,10 +1,6 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:eatvio_app/core/const.dart';
-import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
-import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_state.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_consultant_model.dart';
 import 'package:eatvio_app/features/profile/models/badge_model.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/features/feed/presentation/widgets/plan_widget.dart b/lib/features/feed/presentation/widgets/plan_widget.dart
index 689a1954..b49e8e98 100644
--- a/lib/features/feed/presentation/widgets/plan_widget.dart
+++ b/lib/features/feed/presentation/widgets/plan_widget.dart
@@ -7,7 +7,6 @@ import 'package:eatvio_app/core/widgets/custom_popup.dart';
 import 'package:eatvio_app/core/widgets/info_row.dart';
 import 'package:eatvio_app/core/widgets/feed_icon_button.dart';
 import 'package:eatvio_app/features/diets/presentation/widgets/info_bouble.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
diff --git a/lib/features/menu/presentation/widgets/blocked_user_widget.dart b/lib/features/menu/presentation/widgets/blocked_user_widget.dart
index 8fd4da85..43e4dd69 100644
--- a/lib/features/menu/presentation/widgets/blocked_user_widget.dart
+++ b/lib/features/menu/presentation/widgets/blocked_user_widget.dart
@@ -1,5 +1,4 @@
 import 'package:eatvio_app/core/const.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
 import 'package:eatvio_app/features/profile/models/profile_model.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart b/lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart
index a012a5d5..d3b82722 100644
--- a/lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart
+++ b/lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart
@@ -5,7 +5,6 @@ import 'package:eatvio_app/core/image_compressing/image_compress_utility.dart';
 import 'package:eatvio_app/core/utils/toasts.dart';
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_state.dart';
 import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
@@ -16,7 +15,7 @@ class ProfileCubit extends Cubit<ProfileState> {
   final ProfileRepository profileRepository;
   final ChatRepository chatRepository;
   final ConsultantRepository consultantRepository;
-  String _currentPeriod = '1';  
+  String _currentPeriod = '1';
   ProfileCubit({required this.profileRepository, required this.chatRepository, required this.consultantRepository}) : super(const ProfileState.loading());
 
   Future<void> getProfileBySlug(String slug) async {
@@ -39,7 +38,6 @@ class ProfileCubit extends Cubit<ProfileState> {
     }
   }
 
-
   Future<void> getMyProfile({String period = '1'}) async {
     emit(const ProfileState.loading());
     _currentPeriod = period;
@@ -104,8 +102,9 @@ class ProfileCubit extends Cubit<ProfileState> {
   Future<String?> getChatRoomIdBySlug({required String slug}) async {
     try {
       final chatIdOrError = await chatRepository.getChatByUserSlug(slug);
+      final userProfile = await profileRepository.getProfileBySlug(slug);
       if (chatIdOrError == '404') {
-        AppRouter.navigatorKey.currentContext?.pushNamed('emptyChatScreen', extra: author);
+        AppRouter.navigatorKey.currentContext?.pushNamed('emptyChatScreen', extra: userProfile);
       } else if (chatIdOrError == 'error') {
         showErrorToast('Ошибка создания чата');
       } else {
diff --git a/lib/features/profile/presentation/pages/profile_screen.dart b/lib/features/profile/presentation/pages/profile_screen.dart
index 47b89471..48709659 100644
--- a/lib/features/profile/presentation/pages/profile_screen.dart
+++ b/lib/features/profile/presentation/pages/profile_screen.dart
@@ -138,7 +138,17 @@ class _ProfileScreenState extends State<ProfileScreen> {
   Scaffold _profileScreen(ProfileStateLoaded state) {
     return Scaffold(
       backgroundColor: Colors.grey.shade200,
-      appBar: AppBar(),
+      appBar: AppBar(
+        leading: BackButton(
+          onPressed: () {
+            if (context.canPop()) {
+              GoRouter.of(context).pop();
+              return;
+            }
+            GoRouter.of(context).go('/feed-screen');
+          },
+        ),
+      ),
       body: SingleChildScrollView(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -953,7 +963,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   );
                 },
               ),
-              if (!state.isMyProfile ) ...[
+              if (!state.isMyProfile) ...[
                 _buildDivider(),
                 _buildCompactItem(
                   icon: 'assets/icons/complain.svg',
@@ -967,7 +977,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   },
                 ),
               ],
-              if (!state.isMyProfile  && !state.profile.isBlockedByMe) ...[
+              if (!state.isMyProfile && !state.profile.isBlockedByMe) ...[
                 _buildDivider(),
                 _buildCompactItem(
                   icon: 'assets/icons/complain.svg',
@@ -975,7 +985,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   onTap: () {
                     isFirstFetch = true;
                     sl<BlockedUsersCubit>().blockUser(state.profile.slug);
-                    state.isMyProfile  ? profileCubit.getMyProfile() : profileCubit.getProfileBySlug(state.profile.slug);
+                    state.isMyProfile ? profileCubit.getMyProfile() : profileCubit.getProfileBySlug(state.profile.slug);
                     if (state.profile.roles.contains('consultant')) {
                       plansCubit.getPlans(state.profile.slug);
                     }
@@ -991,7 +1001,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   onTap: () {
                     isFirstFetch = true;
                     sl<BlockedUsersCubit>().unblockUser(state.profile.slug);
-                    state.isMyProfile  ? profileCubit.getMyProfile() : profileCubit.getProfileBySlug(state.profile.slug);
+                    state.isMyProfile ? profileCubit.getMyProfile() : profileCubit.getProfileBySlug(state.profile.slug);
                     if (state.profile.roles.contains('consultant')) {
                       plansCubit.getPlans(state.profile.slug);
                     }
diff --git a/lib/features/profile/presentation/widgets/sub_action_button_widget.dart b/lib/features/profile/presentation/widgets/sub_action_button_widget.dart
index 55b4a095..0e3d0e50 100644
--- a/lib/features/profile/presentation/widgets/sub_action_button_widget.dart
+++ b/lib/features/profile/presentation/widgets/sub_action_button_widget.dart
@@ -1,6 +1,5 @@
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart';
 import 'package:flutter/material.dart';
@@ -15,13 +14,7 @@ class SubActionButtonWidget extends StatefulWidget {
   final String name;
   final String porfileIcon;
 
-  const SubActionButtonWidget({
-    super.key,
-    required this.subActionType,
-    required this.slug,
-    required this.name,
-    required this.porfileIcon,
-  });
+  const SubActionButtonWidget({super.key, required this.subActionType, required this.slug, required this.name, required this.porfileIcon});
 
   @override
   State<SubActionButtonWidget> createState() => _SubActionButtonWidgetState();
@@ -49,51 +42,25 @@ class _SubActionButtonWidgetState extends State<SubActionButtonWidget> {
         borderRadius: BorderRadius.circular(8),
         child: Ink(
           padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(8),
-            color: appTheme.blueA400,
-          ),
+          decoration: BoxDecoration(borderRadius: BorderRadius.circular(8), color: appTheme.blueA400),
           child: const Text(
             'Подписаться',
-            style: TextStyle(
-              fontSize: 13,
-              fontWeight: FontWeight.w500,
-              color: Colors.white,
-            ),
+            style: TextStyle(fontSize: 13, fontWeight: FontWeight.w500, color: Colors.white),
           ),
         ),
       );
     } else {
       return InkWell(
         onTap: () async {
-          GoRouter.of(context).pushNamed(
-            'chatScreen',
-            extra: {
-              'uuid': await sl<ProfileCubit>().getChatRoomIdBySlug(
-                author: Author(
-                  authorSlug: widget.slug,
-                  authorName: widget.name,
-                  authorProfileIcon: widget.porfileIcon,
-                  authorIsMe: false,
-                ),
-              ),
-            },
-          );
+          GoRouter.of(context).pushNamed('chatScreen', extra: {'uuid': await sl<ProfileCubit>().getChatRoomIdBySlug(slug: widget.slug)});
         },
         borderRadius: BorderRadius.circular(8),
         child: Ink(
           padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(8),
-            color: const Color(0xFFF1F2F6),
-          ),
+          decoration: BoxDecoration(borderRadius: BorderRadius.circular(8), color: const Color(0xFFF1F2F6)),
           child: const Text(
             'Сообщение',
-            style: TextStyle(
-              fontSize: 13,
-              fontWeight: FontWeight.w500,
-              color: Color(0xFF6D6F71),
-            ),
+            style: TextStyle(fontSize: 13, fontWeight: FontWeight.w500, color: Color(0xFF6D6F71)),
           ),
         ),
       );