diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 0d239126..ec1ef42b 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -53,6 +53,12 @@
 
                 <data android:pathPattern="/ru/plan/.*" />
                 <data android:pathPattern="/en/plan/.*" />
+
+                <data android:pathPattern="/ru/chat/.*" />
+                <data android:pathPattern="/en/chat/.*" />
+
+                <data android:pathPattern="/ru/chat/" />
+                <data android:pathPattern="/en/chat/" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 7d740632..f9efba06 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -410,6 +410,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -560,6 +561,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -598,6 +600,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
diff --git a/lib/core/app_router.dart b/lib/core/app_router.dart
index cc028255..af2ebdf4 100644
--- a/lib/core/app_router.dart
+++ b/lib/core/app_router.dart
@@ -84,7 +84,7 @@ class AppRouter {
     navigatorKey: navigatorKey,
     redirect: (context, state) {
       final segments = state.uri.pathSegments;
-      if (segments.length >= 3) {
+      if (segments.length == 3) {
         final type = segments[1];
         final contentIdentifier = segments[2];
 
@@ -101,6 +101,17 @@ class AppRouter {
           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';
         }
       }
 
@@ -279,7 +290,7 @@ class AppRouter {
       GoRoute(
         path: '/profile-screen',
         name: 'profileScreen',
-        builder: (context, state) => ProfileScreen(author: state.extra as Author),
+        builder: (context, state) => ProfileScreen(slug: state.extra as String),
       ),
       GoRoute(
         path: '/subs-screen/:slug',
diff --git a/lib/core/const.dart b/lib/core/const.dart
index 98f7bc4a..a5f06149 100644
--- a/lib/core/const.dart
+++ b/lib/core/const.dart
@@ -1,6 +1,6 @@
 import 'package:eatvio_app/core/env_config.dart';
 
-String baseUrl = EnvConfig.baseUrl;
+String baseUrl = EnvConfig.devBaseUrl;
 bool hidePlans = const bool.fromEnvironment('HIDE_PLANS', defaultValue: false);
 const buildDate = String.fromEnvironment('BUILD_DATE', defaultValue: '');
 
diff --git a/lib/features/blog_post/presentation/pages/blog_post_screen.dart b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
index 25636a57..dec29033 100644
--- a/lib/features/blog_post/presentation/pages/blog_post_screen.dart
+++ b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
@@ -206,7 +206,7 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
                     child: Column(
                       children: [
                         GestureDetector(
-                          onTap: () => GoRouter.of(context).pushNamed('profileScreen', extra: blogPostState.blogPostModel?.author),
+                          onTap: () => GoRouter.of(context).pushNamed('profileScreen', extra: blogPostState.blogPostModel?.author.authorSlug),
                           child: Ink(
                             padding: const EdgeInsets.symmetric(horizontal: 16),
                             child: Row(
diff --git a/lib/features/chat/presentation/pages/chat_screen.dart b/lib/features/chat/presentation/pages/chat_screen.dart
index 97a574ee..7a462905 100644
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -152,12 +152,7 @@ class _ChatScreenState extends State<ChatScreen> {
           onTap: () {
             GoRouter.of(context).pushNamed(
               'profileScreen',
-              extra: Author(
-                authorSlug: state.chatRoom.users.receiver.slug,
-                authorName: state.chatRoom.users.receiver.name,
-                authorProfileIcon: state.chatRoom.users.receiver.profilePhotoUrl ?? '',
-                authorIsMe: false,
-              ),
+              extra: state.chatRoom.users.receiver.slug,
             );
           },
           child: Row(
diff --git a/lib/features/chat/presentation/pages/empty_chat_screen.dart b/lib/features/chat/presentation/pages/empty_chat_screen.dart
index d6a87c46..908189a3 100644
--- a/lib/features/chat/presentation/pages/empty_chat_screen.dart
+++ b/lib/features/chat/presentation/pages/empty_chat_screen.dart
@@ -42,12 +42,7 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
           onTap: () {
             GoRouter.of(context).pushNamed(
               'profileScreen',
-              extra: Author(
-                authorSlug: widget.author.authorSlug,
-                authorName: widget.author.authorName,
-                authorProfileIcon: widget.author.authorProfileIcon,
-                authorIsMe: false,
-              ),
+              extra: widget.author.authorSlug,
             );
           },
           child: Row(
diff --git a/lib/features/diets/presentation/widgets/author_card.dart b/lib/features/diets/presentation/widgets/author_card.dart
index 6fff0b93..14fe07a6 100644
--- a/lib/features/diets/presentation/widgets/author_card.dart
+++ b/lib/features/diets/presentation/widgets/author_card.dart
@@ -18,7 +18,7 @@ class AuthorCard extends StatelessWidget {
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: () {
-        GoRouter.of(context).pushNamed('profileScreen', extra: author);
+        GoRouter.of(context).pushNamed('profileScreen', extra: author.authorSlug);
       },
       child: Container(
         width: MediaQuery.sizeOf(context).width,
diff --git a/lib/features/feed/presentation/widgets/blog_post_widget.dart b/lib/features/feed/presentation/widgets/blog_post_widget.dart
index 23eaeded..2bb2599e 100644
--- a/lib/features/feed/presentation/widgets/blog_post_widget.dart
+++ b/lib/features/feed/presentation/widgets/blog_post_widget.dart
@@ -65,14 +65,7 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
                           onTap: () {
                             GoRouter.of(context).pushNamed(
                               'profileScreen',
-                              extra: Author(
-                                authorSlug: state.feedBlogPostList[widget.index].author.authorSlug,
-                                authorName: state.feedBlogPostList[widget.index].author.authorName,
-                                authorProfileIcon: state.feedBlogPostList[widget.index].author.authorProfileIcon.contains('https')
-                                    ? state.feedBlogPostList[widget.index].author.authorProfileIcon
-                                    : baseUrl + state.feedBlogPostList[widget.index].author.authorProfileIcon,
-                                authorIsMe: state.feedBlogPostList[widget.index].author.authorIsMe,
-                              ),
+                              extra: state.feedBlogPostList[widget.index].author.authorSlug,
                             );
                           },
                           child: CircleAvatar(
diff --git a/lib/features/feed/presentation/widgets/comments_widget.dart b/lib/features/feed/presentation/widgets/comments_widget.dart
index e36bdf52..d5d74bda 100644
--- a/lib/features/feed/presentation/widgets/comments_widget.dart
+++ b/lib/features/feed/presentation/widgets/comments_widget.dart
@@ -108,12 +108,7 @@ class _CommentsWidgetState extends State<CommentsWidget> {
                 onTap: () {
                   GoRouter.of(context).pushNamed(
                     'profileScreen',
-                    extra: Author(
-                      authorSlug: comment.authorSlug,
-                      authorName: comment.authorName,
-                      authorProfileIcon: comment.authorProfileIcon.contains('https') ? comment.authorProfileIcon : baseUrl + comment.authorProfileIcon,
-                      authorIsMe: isMe,
-                    ),
+                    extra: comment.authorSlug,
                   );
                 },
                 child: CircleAvatar(
diff --git a/lib/features/feed/presentation/widgets/consultant_widget.dart b/lib/features/feed/presentation/widgets/consultant_widget.dart
index 3b4a4b80..7fd9caef 100644
--- a/lib/features/feed/presentation/widgets/consultant_widget.dart
+++ b/lib/features/feed/presentation/widgets/consultant_widget.dart
@@ -25,12 +25,7 @@ class ConsultantWidget extends StatelessWidget {
       onTap: () {
         GoRouter.of(context).pushNamed(
           'profileScreen',
-          extra: Author(
-            authorSlug: consultant.slug,
-            authorName: consultant.name,
-            authorProfileIcon: consultant.photo,
-            authorIsMe: (sl<ProfileAvatarCubit>().state as ProfileAvatarStateLoaded).profile.slug == consultant.slug ? true : false,
-          ),
+          extra: consultant.slug,
         );
       },
       borderRadius: BorderRadius.circular(20),
diff --git a/lib/features/feed/presentation/widgets/plan_widget.dart b/lib/features/feed/presentation/widgets/plan_widget.dart
index 588d61d0..689a1954 100644
--- a/lib/features/feed/presentation/widgets/plan_widget.dart
+++ b/lib/features/feed/presentation/widgets/plan_widget.dart
@@ -169,12 +169,7 @@ class _PlanWidgetState extends State<PlanWidget> {
               onTap: () {
                 GoRouter.of(context).pushNamed(
                   'profileScreen',
-                  extra: Author(
-                    authorSlug: widget.plan.author.authorSlug,
-                    authorName: widget.plan.author.authorName,
-                    authorProfileIcon: widget.plan.author.authorProfileIcon,
-                    authorIsMe: widget.plan.author.authorIsMe,
-                  ),
+                  extra: widget.plan.author.authorSlug,
                 );
               },
               child: Padding(
diff --git a/lib/features/menu/presentation/widgets/blocked_user_widget.dart b/lib/features/menu/presentation/widgets/blocked_user_widget.dart
index 494df21c..8fd4da85 100644
--- a/lib/features/menu/presentation/widgets/blocked_user_widget.dart
+++ b/lib/features/menu/presentation/widgets/blocked_user_widget.dart
@@ -20,13 +20,7 @@ class _BlockedUserWidgetState extends State<BlockedUserWidget> {
     return InkWell(
       onTap: () => GoRouter.of(context).pushNamed(
         'profileScreen',
-        extra: Author(
-          authorSlug: widget.profile.slug,
-          authorName: widget.profile.name,
-          authorProfileIcon: widget.profile.profilePhotoUrl,
-          authorIsMe: false,
-          isEntitySubscribedByMe: false,
-        ),
+        extra: widget.profile.slug,
       ),
       child: Ink(
         padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
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 d0d7a932..a012a5d5 100644
--- a/lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart
+++ b/lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart
@@ -16,21 +16,18 @@ class ProfileCubit extends Cubit<ProfileState> {
   final ProfileRepository profileRepository;
   final ChatRepository chatRepository;
   final ConsultantRepository consultantRepository;
-  String _currentPeriod = '1';
-
-  ProfileCubit({
-    required this.profileRepository,
-    required this.chatRepository,
-    required this.consultantRepository,
-  }) : super(const ProfileState.loading());
+  String _currentPeriod = '1';  
+  ProfileCubit({required this.profileRepository, required this.chatRepository, required this.consultantRepository}) : super(const ProfileState.loading());
 
   Future<void> getProfileBySlug(String slug) async {
     emit(const ProfileState.loading());
     try {
       final profile = await profileRepository.getProfileBySlug(slug);
+      final myProfile = await profileRepository.getMyProfile();
       emit(
         ProfileState.loaded(
           profile: profile,
+          isMyProfile: myProfile.slug == profile.slug,
           profileDetails: await profileRepository.getProfileDetailsBySlug(slug),
           blogPosts: await profileRepository.getBlogPostsByAuthorSlug(slug: slug),
           consultantInfo: profile.roles.contains('consultant') ? await consultantRepository.getConsultantRequestStatus(slug) : null,
@@ -42,9 +39,8 @@ class ProfileCubit extends Cubit<ProfileState> {
     }
   }
 
-  Future<void> getMyProfile({
-    String period = '1',
-  }) async {
+
+  Future<void> getMyProfile({String period = '1'}) async {
     emit(const ProfileState.loading());
     _currentPeriod = period;
     try {
@@ -52,6 +48,7 @@ class ProfileCubit extends Cubit<ProfileState> {
       emit(
         ProfileState.loaded(
           profile: profile,
+          isMyProfile: true,
           profileDetails: await profileRepository.getMyProfileDetails(),
           blogPosts: await profileRepository.getBlogPostsByAuthorSlug(slug: profile.slug),
           weightPoints: await profileRepository.getWeight(period: period),
@@ -77,15 +74,12 @@ class ProfileCubit extends Cubit<ProfileState> {
         profile: (state as ProfileStateLoaded).profile,
         profileDetails: (state as ProfileStateLoaded).profileDetails,
         blogPosts: feedBlogPostList,
+        isMyProfile: (state as ProfileStateLoaded).isMyProfile,
       ),
     );
   }
 
-  Future<void> addCircumference({
-    required int chestCircumference,
-    required int waistCircumference,
-    required int hipCircumference,
-  }) async {
+  Future<void> addCircumference({required int chestCircumference, required int waistCircumference, required int hipCircumference}) async {
     try {
       await profileRepository.addCircumference(
         chestCircumference: chestCircumference,
@@ -98,9 +92,7 @@ class ProfileCubit extends Cubit<ProfileState> {
     }
   }
 
-  Future<void> addWeight({
-    required double weight,
-  }) async {
+  Future<void> addWeight({required double weight}) async {
     try {
       await profileRepository.addWeight(weight: weight);
       await getMyProfile(period: _currentPeriod);
@@ -109,25 +101,15 @@ class ProfileCubit extends Cubit<ProfileState> {
     }
   }
 
-  Future<String?> getChatRoomIdBySlug({
-    required Author author,
-  }) async {
+  Future<String?> getChatRoomIdBySlug({required String slug}) async {
     try {
-      final chatIdOrError = await chatRepository.getChatByUserSlug(author.authorSlug);
+      final chatIdOrError = await chatRepository.getChatByUserSlug(slug);
       if (chatIdOrError == '404') {
-        AppRouter.navigatorKey.currentContext?.pushNamed(
-          'emptyChatScreen',
-          extra: author,
-        );
+        AppRouter.navigatorKey.currentContext?.pushNamed('emptyChatScreen', extra: author);
       } else if (chatIdOrError == 'error') {
         showErrorToast('Ошибка создания чата');
       } else {
-        AppRouter.navigatorKey.currentContext?.pushNamed(
-          'chatScreen',
-          extra: {
-            'uuid': chatIdOrError,
-          },
-        );
+        AppRouter.navigatorKey.currentContext?.pushNamed('chatScreen', extra: {'uuid': chatIdOrError});
         return chatIdOrError;
       }
     } catch (e, st) {
diff --git a/lib/features/profile/presentation/bloc/profile_cubit/profile_state.dart b/lib/features/profile/presentation/bloc/profile_cubit/profile_state.dart
index 6e8154fc..e20ba9b5 100644
--- a/lib/features/profile/presentation/bloc/profile_cubit/profile_state.dart
+++ b/lib/features/profile/presentation/bloc/profile_cubit/profile_state.dart
@@ -14,9 +14,10 @@ abstract class ProfileState with _$ProfileState {
   const factory ProfileState.loading() = ProfileStateLoading;
 
   const factory ProfileState.loaded({
-    required ProfileModel profile,
+    required ProfileModel profile,    
     required ProfileDetailsModel profileDetails,
     required List<FeedBlogPostModel> blogPosts,
+    required bool isMyProfile,
     List<WeightModel>? weightPoints,
     List<CircumferenceModel>? circumferencePoints,
     ConsultationRequestModel? consultantInfo,
diff --git a/lib/features/profile/presentation/pages/profile_screen.dart b/lib/features/profile/presentation/pages/profile_screen.dart
index 990beed1..47b89471 100644
--- a/lib/features/profile/presentation/pages/profile_screen.dart
+++ b/lib/features/profile/presentation/pages/profile_screen.dart
@@ -12,7 +12,6 @@ import 'package:eatvio_app/core/widgets/loader.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
 import 'package:eatvio_app/features/complaining/presentation/complaining_bottom_sheet.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/plan_widget.dart';
 import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
 import 'package:eatvio_app/features/profile/models/circumference_model.dart';
@@ -43,9 +42,9 @@ import 'package:share_plus/share_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class ProfileScreen extends StatefulWidget {
-  final Author? author;
+  final String? slug;
 
-  const ProfileScreen({super.key, this.author});
+  const ProfileScreen({super.key, this.slug});
 
   @override
   State<ProfileScreen> createState() => _ProfileScreenState();
@@ -70,7 +69,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
   @override
   void initState() {
     super.initState();
-    widget.author == null || widget.author!.authorIsMe ? profileCubit.getMyProfile() : profileCubit.getProfileBySlug(widget.author!.authorSlug);
+    widget.slug == null ? profileCubit.getMyProfile() : profileCubit.getProfileBySlug(widget.slug!);
   }
 
   @override
@@ -93,7 +92,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
               }
               isFirstFetch = false;
             }
-            
+
             // Проверяем, заблокировал ли пользователь меня
             if (state.profile.isBlockedByUser) {
               return Scaffold(
@@ -104,20 +103,12 @@ class _ProfileScreenState extends State<ProfileScreen> {
                     child: Column(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
-                        Icon(
-                          Icons.block,
-                          size: 64,
-                          color: Colors.grey[400],
-                        ),
+                        Icon(Icons.block, size: 64, color: Colors.grey[400]),
                         const SizedBox(height: 16),
                         Text(
                           'Пользователь ограничил доступ к своей странице',
                           textAlign: TextAlign.center,
-                          style: TextStyle(
-                            fontSize: 18,
-                            fontWeight: FontWeight.w500,
-                            color: Colors.grey[600],
-                          ),
+                          style: TextStyle(fontSize: 18, fontWeight: FontWeight.w500, color: Colors.grey[600]),
                         ),
                       ],
                     ),
@@ -125,16 +116,14 @@ class _ProfileScreenState extends State<ProfileScreen> {
                 ),
               );
             }
-            
-            return widget.author == null || widget.author!.authorIsMe ? _myProfileScreen(state) : _profileScreen(state);
+
+            return state.isMyProfile ? _myProfileScreen(state) : _profileScreen(state);
           } else if (state is ProfileStateError) {
             return Scaffold(
               appBar: AppBar(),
               body: DataErrorWidget(
                 onReload: () async {
-                  widget.author == null || widget.author!.authorIsMe
-                      ? await profileCubit.getMyProfile()
-                      : await profileCubit.getProfileBySlug(widget.author!.authorSlug);
+                  widget.slug == null ? await profileCubit.getMyProfile() : await profileCubit.getProfileBySlug(widget.slug!);
                 },
               ),
             );
@@ -221,7 +210,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
   Scaffold _myProfileScreen(ProfileStateLoaded state) {
     return Scaffold(
       backgroundColor: Colors.grey.shade200,
-      appBar: AppBar(toolbarHeight: widget.author == null ? 0 : null),
+      appBar: AppBar(toolbarHeight: widget.slug == null ? 0 : null),
       body: SingleChildScrollView(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -415,7 +404,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                     GoRouter.of(context).pushNamed('stepperBecomeConsultantScreen', extra: state.profile.slug);
                   },
                   child: Text(
-                    widget.author == null || widget.author!.authorIsMe ? 'Редактировать' : '',
+                    state.isMyProfile ? 'Редактировать' : '',
                     style: const TextStyle(color: Color(0xFF2F80ED), fontSize: 16, fontWeight: FontWeight.w500),
                   ),
                 ),
@@ -493,7 +482,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                     GoRouter.of(context).pushNamed('stepperBecomeConsultantScreen', extra: state.profile.slug);
                   },
                   child: Text(
-                    widget.author == null || widget.author!.authorIsMe ? 'Редактировать' : '',
+                    state.isMyProfile ? 'Редактировать' : '',
                     style: const TextStyle(color: Color(0xFF2F80ED), fontSize: 16, fontWeight: FontWeight.w500),
                   ),
                 ),
@@ -806,7 +795,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   context.pushTransparentRoute(rootNavigator: true, PhotoViewScreen(imageUrls: [baseUrl + state.profile.profilePhotoUrl], index: 0));
                 },
               ),
-              if (widget.author == null || widget.author!.authorIsMe) ...[
+              if (state.isMyProfile) ...[
                 _buildDivider(),
                 _buildCompactItem(
                   icon: 'assets/icons/edit_paint.svg',
@@ -964,7 +953,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   );
                 },
               ),
-              if (widget.author != null) ...[
+              if (!state.isMyProfile ) ...[
                 _buildDivider(),
                 _buildCompactItem(
                   icon: 'assets/icons/complain.svg',
@@ -973,12 +962,12 @@ class _ProfileScreenState extends State<ProfileScreen> {
                     showModalBottomSheet(
                       context: context,
                       isScrollControlled: true,
-                      builder: (context) => ComplainingBottomSheet(complainedContentType: ComplainedContent.profile, slug: widget.author?.authorSlug),
+                      builder: (context) => ComplainingBottomSheet(complainedContentType: ComplainedContent.profile, slug: widget.slug),
                     );
                   },
                 ),
               ],
-              if (widget.author != null && !state.profile.isBlockedByMe) ...[
+              if (!state.isMyProfile  && !state.profile.isBlockedByMe) ...[
                 _buildDivider(),
                 _buildCompactItem(
                   icon: 'assets/icons/complain.svg',
@@ -986,7 +975,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   onTap: () {
                     isFirstFetch = true;
                     sl<BlockedUsersCubit>().blockUser(state.profile.slug);
-                    widget.author == null || widget.author!.authorIsMe ? profileCubit.getMyProfile() : profileCubit.getProfileBySlug(widget.author!.authorSlug);
+                    state.isMyProfile  ? profileCubit.getMyProfile() : profileCubit.getProfileBySlug(state.profile.slug);
                     if (state.profile.roles.contains('consultant')) {
                       plansCubit.getPlans(state.profile.slug);
                     }
@@ -994,7 +983,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   },
                 ),
               ],
-              if (widget.author != null && state.profile.isBlockedByMe) ...[
+              if (!state.isMyProfile && state.profile.isBlockedByMe) ...[
                 _buildDivider(),
                 _buildCompactItem(
                   icon: 'assets/icons/complain.svg',
@@ -1002,7 +991,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   onTap: () {
                     isFirstFetch = true;
                     sl<BlockedUsersCubit>().unblockUser(state.profile.slug);
-                    widget.author == null || widget.author!.authorIsMe ? profileCubit.getMyProfile() : profileCubit.getProfileBySlug(widget.author!.authorSlug);
+                    state.isMyProfile  ? profileCubit.getMyProfile() : profileCubit.getProfileBySlug(state.profile.slug);
                     if (state.profile.roles.contains('consultant')) {
                       plansCubit.getPlans(state.profile.slug);
                     }
@@ -1065,7 +1054,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
       children: [
         const SizedBox(width: 16),
         GestureDetector(
-          onTap: () async => await profileCubit.getChatRoomIdBySlug(author: widget.author!),
+          onTap: () async => await profileCubit.getChatRoomIdBySlug(slug: widget.slug!),
           child: Container(
             alignment: Alignment.center,
             padding: const EdgeInsets.all(8),
diff --git a/lib/features/profile/presentation/widgets/sub_widget.dart b/lib/features/profile/presentation/widgets/sub_widget.dart
index 27365fd2..32b905a5 100644
--- a/lib/features/profile/presentation/widgets/sub_widget.dart
+++ b/lib/features/profile/presentation/widgets/sub_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/profile/models/sub_model.dart';
 import 'package:eatvio_app/features/profile/presentation/widgets/sub_action_button_widget.dart';
 import 'package:flutter/material.dart';
@@ -23,13 +22,7 @@ class _SubWidgetState extends State<SubWidget> {
     return InkWell(
       onTap: () => GoRouter.of(context).pushNamed(
         'profileScreen',
-        extra: Author(
-          authorSlug: widget.subModel.slug,
-          authorName: widget.subModel.name,
-          authorProfileIcon: widget.subModel.profilePhotoUrl,
-          authorIsMe: false,
-          isEntitySubscribedByMe: false,
-        ),
+        extra: widget.subModel.slug,
       ),
       child: Ink(
         padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),