fix: fixed analyzer issues and merge conflicts

lib/features/chat/presentation/pages/chat_screen.dart

@@ -69,7 +69,7 @@ class _ChatScreenState extends State<ChatScreen> {
     _listener = AppLifecycleListener(onHide: _onHide, onResume: _onResume);
   }
 
-  _onScroll() {
+  void _onScroll() {
     if (scrollController.offset >= scrollController.position.maxScrollExtent && !scrollController.position.outOfRange) {
       chatRoomCubit.loadNextPage(widget.chatId);
     }
@@ -102,7 +102,7 @@ class _ChatScreenState extends State<ChatScreen> {
     );
   }
 
-  _buildChat(BuildContext context, ChatRoomStateLoaded state) {
+  Scaffold _buildChat(BuildContext context, ChatRoomStateLoaded state) {
     final chosenPlan = state.chatRoom.chosenPlan;
     final amIConsultant = chosenPlan?.consultantId == state.chatRoom.users.sender.id;
     final showUserDetailsButton = [
@@ -560,7 +560,7 @@ class _ChatScreenState extends State<ChatScreen> {
     return 0;
   }
 
-  showImagePicker(String slug) {
+  void showImagePicker(String slug) {
     showCupertinoModalPopup<void>(
       context: context,
       builder: (context) => CupertinoActionSheet(
@@ -661,7 +661,7 @@ class _ChatScreenState extends State<ChatScreen> {
     );
   }
 
-  _messageDate(DateTime date) {
+  Center _messageDate(DateTime date) {
     return Center(
       child: Padding(
         padding: const EdgeInsets.only(top: 32),

lib/features/chat/presentation/pages/chats_screen.dart

@@ -83,7 +83,7 @@ class _ChatsScreenState extends State<ChatsScreen> {
     );
   }
 
-  _buildChatList(BuildContext context, ChatsState state) {
+  NotificationListener<ScrollNotification> _buildChatList(BuildContext context, ChatsState state) {
     return NotificationListener<ScrollNotification>(
       onNotification: (notification) {
         loadNewContent(notification, context.read<ChatsCubit>().loadMoreChatRooms);

lib/features/chat/presentation/pages/empty_chat_screen.dart

@@ -167,7 +167,7 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
     );
   }
 
-  showImagePicker(String slug) {
+  void showImagePicker(String slug) {
     showCupertinoModalPopup<void>(
       context: context,
       builder: (context) => CupertinoActionSheet(