Merge remote-tracking branch 'upstream/main' into issue-1062

Reviewed-on: eatvio/eatvio_app#1066

android/app/src/main/kotlin/com/eatvioapp/app/EatvioFcmMessagingService.kt

@@ -24,11 +24,9 @@ class EatvioFcmMessagingService : FirebaseMessagingService() {
             return
         }
 
-        if (MainActivity.isInForeground) {
-            Log.i(TAG, "App in foreground, deferring incoming call to Flutter handler")
-            return
-        }
-
+        // Data-only call pushes are delivered only to this service.
+        // FlutterFirebaseMessagingService is removed, so the Dart listener does
+        // not see them. Show the incoming UI here for both foreground and background.
         VideoCallPushBridge.showIncomingCall(this, message.data)
     }
 

android/app/src/main/kotlin/com/eatvioapp/app/VideoCallPushBridge.kt

@@ -264,7 +264,7 @@ object VideoCallPushBridge {
             putString(CallkitConstants.EXTRA_CALLKIT_APP_NAME, "Итвио")
             putString(CallkitConstants.EXTRA_CALLKIT_HANDLE, conversationUuid)
             putString(CallkitConstants.EXTRA_CALLKIT_AVATAR, avatarUrl)
-            putInt(CallkitConstants.EXTRA_CALLKIT_TYPE, 0)
+            putInt(CallkitConstants.EXTRA_CALLKIT_TYPE, 1)
             putLong(CallkitConstants.EXTRA_CALLKIT_DURATION, 45000L)
             putString(CallkitConstants.EXTRA_CALLKIT_TEXT_ACCEPT, "Answer")
             putString(CallkitConstants.EXTRA_CALLKIT_TEXT_DECLINE, "Decline")

ios/Runner/AppDelegate.swift

@@ -146,6 +146,35 @@ import flutter_foreground_task
     )
   }
 
+  /// Same derivation as [VideoCallKitId.iosUuid]: one CallKit UUID per message,
+  /// so the next call in this chat is not rejected as a duplicate UUID.
+  private func derivedCallKitId(conversationUuid: String, messageId: UInt64?) -> String? {
+    guard let messageId, messageId > 0 else { return nil }
+    let pattern =
+      #"^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-)[0-9a-fA-F]{12}$"#
+    guard let regex = try? NSRegularExpression(pattern: pattern) else { return nil }
+    let range = NSRange(conversationUuid.startIndex..., in: conversationUuid)
+    guard let match = regex.firstMatch(in: conversationUuid, range: range),
+      let prefixRange = Range(match.range(at: 1), in: conversationUuid)
+    else { return nil }
+    let suffix = String(format: "%012llx", messageId)
+    guard suffix.count == 12 else { return nil }
+    return (String(conversationUuid[prefixRange]) + suffix).lowercased()
+  }
+
+  private func voipMessageId(_ value: Any?) -> UInt64? {
+    if let number = value as? NSNumber {
+      let parsed = number.uint64Value
+      return parsed > 0 ? parsed : nil
+    }
+    if let text = value as? String {
+      let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines)
+      guard let parsed = UInt64(trimmed), parsed > 0 else { return nil }
+      return parsed
+    }
+    return nil
+  }
+
   private func conversationUuid(fromActionUrl actionUrl: String?) -> String? {
     guard
       let actionUrl = actionUrl,
@@ -369,13 +398,16 @@ import flutter_foreground_task
       return
     }
 
-    let nameCaller = (dict["nameCaller"] as? String)
+    let rawNameCaller = (dict["nameCaller"] as? String)
       ?? (dict["counterpartName"] as? String)
       ?? (dict["counterpart_name"] as? String)
       ?? (dict["caller_name"] as? String)
       ?? (dict["callerName"] as? String)
       ?? (dict["caller"] as? String)
       ?? ""
+    let nameCaller = rawNameCaller.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+      ? "Итвио"
+      : rawNameCaller.trimmingCharacters(in: .whitespacesAndNewlines)
     let conversationUuid = (dict["conversation_uuid"] as? String)
       ?? (dict["conversationUuid"] as? String)
       ?? (dict["conversation_id"] as? String)
@@ -384,26 +416,27 @@ import flutter_foreground_task
       ?? conversationUuid(fromActionUrl: dict["action_url"] as? String)
       ?? (dict["handle"] as? String)
       ?? ""
-    let callKitIdSource = [
-      (key: "call_id", value: dict["call_id"] as? String),
-      (key: "id", value: dict["id"] as? String),
-      (key: "message_id", value: dict["message_id"] as? String),
-    ]
-      .first { item in
-        guard let trimmed = item.value?.trimmingCharacters(in: .whitespacesAndNewlines) else {
-          return false
-        }
-        return !trimmed.isEmpty && UUID(uuidString: trimmed) != nil
-      }
-    let id = callKitIdSource?.value?.trimmingCharacters(in: .whitespacesAndNewlines) ?? UUID().uuidString
-    let callKitIdSourceName = callKitIdSource?.key ?? "generated"
+    let trimmedConversationUuid = conversationUuid.trimmingCharacters(in: .whitespacesAndNewlines)
+    let parsedMessageId = voipMessageId(dict["message_id"])
+    let id: String
+    let callKitIdSourceName: String
+    if let derived = derivedCallKitId(
+      conversationUuid: trimmedConversationUuid,
+      messageId: parsedMessageId
+    ) {
+      id = derived
+      callKitIdSourceName = "conversation_and_message"
+    } else {
+      id = UUID().uuidString
+      callKitIdSourceName = "generated"
+    }
     let isVideo = (dict["isVideo"] as? Bool)
       ?? (dict["is_video"] as? Bool)
       ?? true
 
     var extra: [String: Any] = [:]
-    if !conversationUuid.isEmpty {
-      extra["conversationUuid"] = conversationUuid
+    if !trimmedConversationUuid.isEmpty {
+      extra["conversationUuid"] = trimmedConversationUuid
     }
     if let avatar = dict["caller_avatar"] as? String ?? dict["avatar"] as? String
       ?? dict["avatarUrl"] as? String
@@ -435,9 +468,10 @@ import flutter_foreground_task
     let data = flutter_callkit_incoming.Data(
       id: id,
       nameCaller: nameCaller,
-      handle: conversationUuid.isEmpty ? nameCaller : conversationUuid,
+      handle: trimmedConversationUuid.isEmpty ? nameCaller : trimmedConversationUuid,
       type: isVideo ? 1 : 0
     )
+    data.duration = 45000
     data.extra = extra as NSDictionary
 
     NSLog(

lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart

@@ -5,9 +5,14 @@ import 'dart:developer';
 import 'package:eatvio_app/core/enums/base_state.dart';
 import 'package:eatvio_app/core/websockets/ws_manager.dart';
 import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
+import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_state.dart';
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
 import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_chat_signal.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_ended_push_handler.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_incoming_push_presenter.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_push_payload.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:eatvio_app/core/error_reporting/report_from.dart';
 
@@ -18,13 +23,22 @@ class ChatsCubit extends Cubit<ChatsState> {
   StreamSubscription? newIncomingMessagesSubscription;
   StreamSubscription? newLastMessageSubscription;
   StreamSubscription<void>? reconnectedSubscription;
+  final Set<int> _presentedVideoCallMessageIds = {};
+
+  /// Test seam. Production uses CallKit.
+  Future<void> Function(VideoCallPushPayload payload)? presentIncomingVideoCall;
+  Future<void> Function()? dismissIncomingVideoCall;
 
   ChatsCubit({
     required this.chatRepository,
     required this.wsManager,
     required this.profileRepository,
+    this.presentIncomingVideoCall,
+    this.dismissIncomingVideoCall,
   }) : super(ChatsState()) {
-    newLastMessageSubscription = chatRepository.newUserMessagesStream.listen((message) {
+    newLastMessageSubscription = chatRepository.newUserMessagesStream.listen((
+      message,
+    ) {
       _setNewLastMessage(message);
     });
   }
@@ -35,7 +49,9 @@ class ChatsCubit extends Cubit<ChatsState> {
   Future<void> connectToWebSocket() async {
     try {
       await newIncomingMessagesSubscription?.cancel();
-      newIncomingMessagesSubscription = wsManager.newMessagesStream?.listen((event) {
+      newIncomingMessagesSubscription = wsManager.newMessagesStream?.listen((
+        event,
+      ) {
         _handleNewMessageViaSocket(event.data);
       });
 
@@ -53,7 +69,9 @@ class ChatsCubit extends Cubit<ChatsState> {
     _query = query;
     emit(state.copyWith(state: BaseState.loading));
     try {
-      final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: query);
+      final chatRoomsPaginationModel = await chatRepository.getChatRooms(
+        query: query,
+      );
       final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
       lastPage = chatRoomsPaginationModel.meta.lastPage + 1;
       emit(
@@ -66,9 +84,7 @@ class ChatsCubit extends Cubit<ChatsState> {
       page++;
     } catch (e, st) {
       await reportFrom(e, st, this);
-      emit(
-        state.copyWith(errorMessage: e.toString(), state: BaseState.error),
-      );
+      emit(state.copyWith(errorMessage: e.toString(), state: BaseState.error));
     }
   }
 
@@ -76,7 +92,9 @@ class ChatsCubit extends Cubit<ChatsState> {
     page = 1;
     _query = query;
     try {
-      final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: query);
+      final chatRoomsPaginationModel = await chatRepository.getChatRooms(
+        query: query,
+      );
       final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
       lastPage = chatRoomsPaginationModel.meta.lastPage + 1;
       emit(
@@ -90,9 +108,7 @@ class ChatsCubit extends Cubit<ChatsState> {
     } catch (e, st) {
       await reportFrom(e, st, this);
       log(e.toString(), stackTrace: st);
-      emit(
-        state.copyWith(errorMessage: e.toString(), state: BaseState.error),
-      );
+      emit(state.copyWith(errorMessage: e.toString(), state: BaseState.error));
     }
   }
 
@@ -100,7 +116,10 @@ class ChatsCubit extends Cubit<ChatsState> {
     try {
       if (state.isLoadingMoreChats || lastPage == page) return;
       emit(state.copyWith(isLoadingMoreChats: true));
-      final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: _query, page: page);
+      final chatRoomsPaginationModel = await chatRepository.getChatRooms(
+        query: _query,
+        page: page,
+      );
       final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
       emit(
         state.copyWith(
@@ -140,7 +159,9 @@ class ChatsCubit extends Cubit<ChatsState> {
     emit(
       state.copyWith(
         chatRooms: updatedChatRooms,
-        chatsWithUnreadMessagesCount: isChatRead ? state.chatsWithUnreadMessagesCount - 1 : state.chatsWithUnreadMessagesCount,
+        chatsWithUnreadMessagesCount: isChatRead
+            ? state.chatsWithUnreadMessagesCount - 1
+            : state.chatsWithUnreadMessagesCount,
       ),
     );
   }
@@ -162,7 +183,8 @@ class ChatsCubit extends Cubit<ChatsState> {
           wasChanged = true;
           // Идемпотентность: повторная доставка того же message.id (реконнект,
           // доставка по нескольким каналам) не начисляет непрочитанное дважды.
-          final isDuplicate = message.id != 0 && chatRoom.lastMessage?.id == message.id;
+          final isDuplicate =
+              message.id != 0 && chatRoom.lastMessage?.id == message.id;
           // Собственное сообщение (второе устройство автора) обновляет
           // lastMessage, но не создаёт непрочитанное (S3).
           if (!isOwn && !isDuplicate && chatRoom.unreadMessagesCount == 0) {
@@ -170,7 +192,9 @@ class ChatsCubit extends Cubit<ChatsState> {
           }
           return chatRoom.copyWith(
             lastMessage: message,
-            unreadMessagesCount: isOwn || isDuplicate ? chatRoom.unreadMessagesCount : chatRoom.unreadMessagesCount + 1,
+            unreadMessagesCount: isOwn || isDuplicate
+                ? chatRoom.unreadMessagesCount
+                : chatRoom.unreadMessagesCount + 1,
           );
         }
         return chatRoom;
@@ -182,15 +206,83 @@ class ChatsCubit extends Cubit<ChatsState> {
         emit(
           state.copyWith(
             chatRooms: updatedChatRooms,
-            chatsWithUnreadMessagesCount: willIncrementUnreadChats ? state.chatsWithUnreadMessagesCount + 1 : state.chatsWithUnreadMessagesCount,
+            chatsWithUnreadMessagesCount: willIncrementUnreadChats
+                ? state.chatsWithUnreadMessagesCount + 1
+                : state.chatsWithUnreadMessagesCount,
           ),
         );
       }
+
+      _presentVideoCallFromMessage(
+        message,
+        isOwn: isOwn,
+        chatRooms: currentChatRooms,
+      );
     } catch (e, st) {
       await reportFrom(e, st, this);
     }
   }
 
+  void _presentVideoCallFromMessage(
+    ChatMessageModel message, {
+    required bool isOwn,
+    required List<ChatRoom> chatRooms,
+  }) {
+    final kind = VideoCallChatSignal.kindOf(message);
+    if (kind == VideoCallChatSignalKind.ended) {
+      unawaited(_dismissIncomingVideoCallUi());
+      return;
+    }
+    if (isOwn || kind != VideoCallChatSignalKind.started) return;
+    if (message.id != 0 && !_presentedVideoCallMessageIds.add(message.id)) {
+      return;
+    }
+
+    final caller = _callerFromRooms(message, chatRooms);
+    final payload = VideoCallChatSignal.incomingPayload(
+      message: message,
+      callerName: caller?.name,
+      callerAvatarUrl: caller?.profilePhotoUrl,
+    );
+    if (payload == null) return;
+    unawaited(_showIncomingVideoCall(payload));
+  }
+
+  Future<void> _showIncomingVideoCall(VideoCallPushPayload payload) async {
+    try {
+      await (presentIncomingVideoCall ??
+          VideoCallIncomingPushPresenter.showIncomingCall)(payload);
+    } catch (e, st) {
+      log('ChatsCubit: failed to show incoming video call: $e', stackTrace: st);
+    }
+  }
+
+  Future<void> _dismissIncomingVideoCallUi() async {
+    try {
+      await (dismissIncomingVideoCall ??
+          VideoCallEndedPushHandler.dismissIncomingCallUi)();
+    } catch (e, st) {
+      log(
+        'ChatsCubit: failed to dismiss incoming video call: $e',
+        stackTrace: st,
+      );
+    }
+  }
+
+  ChatUser? _callerFromRooms(
+    ChatMessageModel message,
+    List<ChatRoom> chatRooms,
+  ) {
+    for (final room in chatRooms) {
+      if (room.id != message.roomId) continue;
+      final from = room.users.fromChatUser;
+      final to = room.users.toChatUser;
+      if (from.id == message.authorId) return from;
+      if (to.id == message.authorId) return to;
+    }
+    return null;
+  }
+
   void _setNewLastMessage(ChatMessageModel message) {
     final chats = state.chatRooms.map((chat) {
       if (chat.id == message.roomId) {

lib/features/diary/presentation/bloc/diary_state.dart

@@ -2,6 +2,7 @@ import 'package:eatvio_app/features/diary/entities/diary_day_entity.dart';
 import 'package:eatvio_app/features/diary/entities/diary_future_diet_day_entity.dart';
 import 'package:eatvio_app/features/diary/models/consultant_review_model.dart';
 import 'package:eatvio_app/features/diary/models/nutrition_model.dart';
+import 'package:eatvio_app/features/diary/presentation/diary_edit_access.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'diary_state.freezed.dart';
@@ -12,7 +13,8 @@ abstract class DiaryState with _$DiaryState {
 
   const factory DiaryState.loading() = DiaryStateLoading;
 
-  const factory DiaryState.error({required String errorMessage}) = DiaryStateError;
+  const factory DiaryState.error({required String errorMessage}) =
+      DiaryStateError;
 
   const factory DiaryState.loaded({
     required DiaryDayEntity diary,
@@ -31,6 +33,19 @@ abstract class DiaryState with _$DiaryState {
     @Default(false) bool isLoadingAddingProductInMeal,
   }) = DiaryStateLoaded;
 
-  const factory DiaryState.loadedTomorrowWithDiet({required DiaryFutureDietDayEntity diary, required DateTime selectedDay, required int selectedMeal}) =
-      DiaryStateLoadedTomorrowWithDiet;
+  const factory DiaryState.loadedTomorrowWithDiet({
+    required DiaryFutureDietDayEntity diary,
+    required DateTime selectedDay,
+    required int selectedMeal,
+  }) = DiaryStateLoadedTomorrowWithDiet;
+}
+
+extension DiaryStateLoadedEditAccess on DiaryStateLoaded {
+  bool get canEditDiary => canEditDiaryDay(
+    isConsultantView: isConsultantView,
+    isDiaryCommented: isDiaryCommented,
+    isDiaryFinished: isDiaryFinished,
+    closed: diary.closed,
+    diaryDate: diary.date,
+  );
 }

lib/features/diary/presentation/diary_edit_access.dart

@@ -0,0 +1,38 @@
+/// Finished and last-day-finished diaries stay editable on the calendar day
+/// itself and on the next calendar day. Older finished days stay read-only.
+const int diaryFinishedEditWindowInDays = 1;
+
+bool canEditDiaryDay({
+  required bool isConsultantView,
+  required bool isDiaryCommented,
+  required bool isDiaryFinished,
+  required int closed,
+  required String diaryDate,
+  DateTime? now,
+}) {
+  if (isConsultantView || isDiaryCommented || closed != 0) {
+    return false;
+  }
+  if (!isDiaryFinished) {
+    return true;
+  }
+  final day = _calendarDate(diaryDate);
+  if (day == null) {
+    return false;
+  }
+  final clock = now ?? DateTime.now();
+  final today = DateTime(clock.year, clock.month, clock.day);
+  final oldestEditableDay = today.subtract(
+    const Duration(days: diaryFinishedEditWindowInDays),
+  );
+  return !day.isBefore(oldestEditableDay) && !day.isAfter(today);
+}
+
+DateTime? _calendarDate(String raw) {
+  final parsed = DateTime.tryParse(raw);
+  if (parsed == null) {
+    return null;
+  }
+  final local = parsed.toLocal();
+  return DateTime(local.year, local.month, local.day);
+}

lib/features/diary/presentation/pages/diary_screen.dart

@@ -74,7 +74,12 @@ class _DiaryScreenContentState extends State<DiaryScreenContent> {
           }
           if (state is DiaryStateError) {
             return Scaffold(
-              body: DataErrorWidget(onReload: () => context.read<DiaryCubit>().fetchDiaryV2(needLoading: false, diaryId: widget.diaryId)),
+              body: DataErrorWidget(
+                onReload: () => context.read<DiaryCubit>().fetchDiaryV2(
+                  needLoading: false,
+                  diaryId: widget.diaryId,
+                ),
+              ),
             );
           }
 
@@ -84,8 +89,14 @@ class _DiaryScreenContentState extends State<DiaryScreenContent> {
                 ? AppBar(toolbarHeight: 0)
                 : AppBar(
                     title: Text(
-                      state is DiaryStateLoaded ? DateTime.parse(state.diary.date).toLocal().format('d MMMM') : '',
-                      style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+                      state is DiaryStateLoaded
+                          ? DateTime.parse(
+                              state.diary.date,
+                            ).toLocal().format('d MMMM')
+                          : '',
+                      style: TextStyles.headingXLSemibold.copyWith(
+                        color: appTheme.black,
+                      ),
                     ),
                     centerTitle: true,
                   ),
@@ -95,26 +106,39 @@ class _DiaryScreenContentState extends State<DiaryScreenContent> {
               child: Column(
                 children: [
                   if (widget.diaryId == null) CalendarWidget(date: widget.date),
-                  if (state is DiaryStateLoading) ...[const SizedBox(height: 60), const Loader()],
+                  if (state is DiaryStateLoading) ...[
+                    const SizedBox(height: 60),
+                    const Loader(),
+                  ],
                   if (state is DiaryStateLoaded)
                     WakeupAndRetireWidget(
-                      isEnabled: state.diary.typeOfDiary.hasChosenPlan || state.isConsultantView || state.isWakeUpAndRetireEnabled,
-                      disable: state.isConsultantView || state.isDiaryFinished || state.isDiaryCommented,
+                      isEnabled:
+                          state.diary.typeOfDiary.hasChosenPlan ||
+                          state.isConsultantView ||
+                          state.isWakeUpAndRetireEnabled,
+                      disable: !state.canEditDiary,
                     ),
                   const SizedBox(height: 12),
                   if (state is DiaryStateLoaded)
                     MealWidget(
-                      showMood: state.diary.typeOfDiary.hasChosenPlan || state.isConsultantView || state.isMoodEnabled,
-                      showAddButton: !state.isConsultantView && !state.isDiaryFinished && !state.isDiaryCommented,
+                      showMood:
+                          state.diary.typeOfDiary.hasChosenPlan ||
+                          state.isConsultantView ||
+                          state.isMoodEnabled,
+                      showAddButton: state.canEditDiary,
                     ),
-                  if (state is DiaryStateLoadedTomorrowWithDiet) const MealWidget(showMood: false, showAddButton: false),
+                  if (state is DiaryStateLoadedTomorrowWithDiet)
+                    const MealWidget(showMood: false, showAddButton: false),
                   if (state is DiaryStateLoaded) const CaloriesChartWidget(),
                   const SizedBox(height: 12),
                   Builder(
                     builder: (context) {
-                      if (state is DiaryStateLoaded && state.diary.typeOfDiary.hasChosenPlan) {
+                      if (state is DiaryStateLoaded &&
+                          state.diary.typeOfDiary.hasChosenPlan) {
                         if (state.diary.comment.isNotEmpty) {
-                          return CommentForConsultantWidget(comment: state.diary.comment);
+                          return CommentForConsultantWidget(
+                            comment: state.diary.comment,
+                          );
                         }
                         if (state.isDiaryCommented || state.isDiaryFinished) {
                           return const SizedBox.shrink();
@@ -124,7 +148,10 @@ class _DiaryScreenContentState extends State<DiaryScreenContent> {
                       return const SizedBox.shrink();
                     },
                   ),
-                  if (state is DiaryStateLoaded && !state.isConsultantView && !state.isDiaryFinished && !state.isDiaryCommented)
+                  if (state is DiaryStateLoaded &&
+                      !state.isConsultantView &&
+                      !state.isDiaryFinished &&
+                      !state.isDiaryCommented)
                     Padding(
                       padding: const EdgeInsets.only(top: 12),
                       child: _isDiaryFinishing
@@ -135,11 +162,13 @@ class _DiaryScreenContentState extends State<DiaryScreenContent> {
                                 setState(() {
                                   _isDiaryFinishing = true;
                                 });
-                                final isFinished = await context.read<DiaryCubit>().finishDiaryDay(
-                                  diaryId: state.diary.id,
-                                  wakeUp: state.diary.wakeup.toString(),
-                                  retire: state.diary.retire.toString(),
-                                );
+                                final isFinished = await context
+                                    .read<DiaryCubit>()
+                                    .finishDiaryDay(
+                                      diaryId: state.diary.id,
+                                      wakeUp: state.diary.wakeup.toString(),
+                                      retire: state.diary.retire.toString(),
+                                    );
                                 if (!isFinished && context.mounted) {
                                   showErrorDialog(context);
                                 }
@@ -149,33 +178,64 @@ class _DiaryScreenContentState extends State<DiaryScreenContent> {
                               },
                             ),
                     ),
-                  if (state is DiaryStateLoaded && state.isConsultantView && !state.isDiaryCommented) ...[
+                  if (state is DiaryStateLoaded &&
+                      state.isConsultantView &&
+                      !state.isDiaryCommented) ...[
                     const SizedBox(height: 16),
-                    const MainBackgroundBouble(padding: EdgeInsets.all(16), child: DayCommentWidget()),
+                    const MainBackgroundBouble(
+                      padding: EdgeInsets.all(16),
+                      child: DayCommentWidget(),
+                    ),
                   ],
-                  if (state is DiaryStateLoaded && state.consultantReview?.consultantComments.dayComment != null) ...[
+                  if (state is DiaryStateLoaded &&
+                      state.consultantReview?.consultantComments.dayComment !=
+                          null) ...[
                     const SizedBox(height: 12),
                     MainBackgroundBouble(
                       padding: const EdgeInsets.all(16),
                       child: Column(
                         children: [
-                          Text(s.dayComment, style: TextStyles.textLSemibold.copyWith(color: appTheme.black)),
+                          Text(
+                            s.dayComment,
+                            style: TextStyles.textLSemibold.copyWith(
+                              color: appTheme.black,
+                            ),
+                          ),
                           const SizedBox(height: 12),
-                          CommentContainer(comment: state.consultantReview?.consultantComments.dayComment ?? ''),
+                          CommentContainer(
+                            comment:
+                                state
+                                    .consultantReview
+                                    ?.consultantComments
+                                    .dayComment ??
+                                '',
+                          ),
                         ],
                       ),
                     ),
                     const SizedBox(height: 28),
                   ],
-                  if (state is DiaryStateLoaded && state.isConsultantView && state.isDiaryFinished && !state.isDiaryCommented) ...[
+                  if (state is DiaryStateLoaded &&
+                      state.isConsultantView &&
+                      state.isDiaryFinished &&
+                      !state.isDiaryCommented) ...[
                     const SizedBox(height: 16),
                     CustomOutlinedButton(
                       text: s.send,
                       height: 52,
-                      buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
-                      buttonStyle: ButtonStyle(side: const WidgetStatePropertyAll(BorderSide.none), backgroundColor: WidgetStatePropertyAll(appTheme.blueA400)),
+                      buttonTextStyle: TextStyles.textMSemibold.copyWith(
+                        color: appTheme.whiteA700,
+                      ),
+                      buttonStyle: ButtonStyle(
+                        side: const WidgetStatePropertyAll(BorderSide.none),
+                        backgroundColor: WidgetStatePropertyAll(
+                          appTheme.blueA400,
+                        ),
+                      ),
                       onPressed: () async {
-                        await context.read<ConsultantCommentsCubit>().submitComments(state.diary.id);
+                        await context
+                            .read<ConsultantCommentsCubit>()
+                            .submitComments(state.diary.id);
                       },
                     ),
                     const SizedBox(height: 16),

lib/features/diary/presentation/widgets/mood_rating_widget.dart

@@ -26,7 +26,8 @@ class _MoodRatingWidgetState extends State<MoodRatingWidget> {
           final meals = state.diary.meals;
           if (selectedIndex >= 0 && selectedIndex < meals.length) {
             if (isFirstFetch[selectedIndex]) {
-              currentSelectedRating[selectedIndex] = meals[selectedIndex].mood.toDouble() + 1;
+              currentSelectedRating[selectedIndex] =
+                  meals[selectedIndex].mood.toDouble() + 1;
               isFirstFetch[selectedIndex] = false;
             }
           }
@@ -36,21 +37,30 @@ class _MoodRatingWidgetState extends State<MoodRatingWidget> {
               mainAxisSize: MainAxisSize.min,
               children: [
                 Text(
-                  state.isConsultantView ? 'Настроение пользователя после приема пищи' : 'Ваше настроение после приёма пищи',
+                  state.isConsultantView
+                      ? 'Настроение пользователя после приема пищи'
+                      : 'Ваше настроение после приёма пищи',
                   textAlign: TextAlign.center,
                   style: const TextStyle(fontSize: 16),
                 ),
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
-                    SvgPicture.asset('assets/icons/mood_1.svg', height: 32, width: 32),
+                    SvgPicture.asset(
+                      'assets/icons/mood_1.svg',
+                      height: 32,
+                      width: 32,
+                    ),
                     RatingBar.builder(
-                      ignoreGestures: state.isConsultantView || state.isDiaryFinished || state.isDiaryCommented,
-                      initialRating: (selectedIndex >= 0 && selectedIndex < state.diary.meals.length)
+                      ignoreGestures: !state.canEditDiary,
+                      initialRating:
+                          (selectedIndex >= 0 &&
+                              selectedIndex < state.diary.meals.length)
                           ? state.diary.meals[selectedIndex].mood.toDouble() + 1
                           : 3,
                       itemCount: 6,
-                      itemSize: MediaQuery.of(context).size.width / 6 - (124 / 6),
+                      itemSize:
+                          MediaQuery.of(context).size.width / 6 - (124 / 6),
                       updateOnDrag: true,
                       itemBuilder: (context, index) {
                         switch (index) {
@@ -58,82 +68,154 @@ class _MoodRatingWidgetState extends State<MoodRatingWidget> {
                             return Container(
                               width: MediaQuery.of(context).size.width / 6,
                               height: 24,
-                              margin: currentSelectedRating[selectedIndex] == 1 ? const EdgeInsets.symmetric(horizontal: 2) : null,
+                              margin: currentSelectedRating[selectedIndex] == 1
+                                  ? const EdgeInsets.symmetric(horizontal: 2)
+                                  : null,
                               decoration: BoxDecoration(
                                 color: const Color(0xFFC82222),
-                                border: currentSelectedRating[selectedIndex] == 1
-                                    ? Border.all(width: 2, color: const Color(0xFFAA3333), strokeAlign: BorderSide.strokeAlignOutside)
+                                border:
+                                    currentSelectedRating[selectedIndex] == 1
+                                    ? Border.all(
+                                        width: 2,
+                                        color: const Color(0xFFAA3333),
+                                        strokeAlign:
+                                            BorderSide.strokeAlignOutside,
+                                      )
                                     : null,
-                                borderRadius: currentSelectedRating[selectedIndex] == 1
-                                    ? const BorderRadius.horizontal(left: Radius.circular(8), right: Radius.circular(2))
-                                    : const BorderRadius.horizontal(left: Radius.circular(8)),
+                                borderRadius:
+                                    currentSelectedRating[selectedIndex] == 1
+                                    ? const BorderRadius.horizontal(
+                                        left: Radius.circular(8),
+                                        right: Radius.circular(2),
+                                      )
+                                    : const BorderRadius.horizontal(
+                                        left: Radius.circular(8),
+                                      ),
                               ),
                             );
                           case 1:
                             return Container(
                               width: MediaQuery.of(context).size.width / 6,
                               height: 24,
-                              margin: currentSelectedRating[selectedIndex] == 2 ? const EdgeInsets.symmetric(horizontal: 2) : null,
+                              margin: currentSelectedRating[selectedIndex] == 2
+                                  ? const EdgeInsets.symmetric(horizontal: 2)
+                                  : null,
                               decoration: BoxDecoration(
                                 color: const Color(0xFFFF3E3E),
-                                border: currentSelectedRating[selectedIndex] == 2
-                                    ? Border.all(width: 2, color: const Color(0xFF550000), strokeAlign: BorderSide.strokeAlignOutside)
+                                border:
+                                    currentSelectedRating[selectedIndex] == 2
+                                    ? Border.all(
+                                        width: 2,
+                                        color: const Color(0xFF550000),
+                                        strokeAlign:
+                                            BorderSide.strokeAlignOutside,
+                                      )
+                                    : null,
+                                borderRadius:
+                                    currentSelectedRating[selectedIndex] == 2
+                                    ? BorderRadius.circular(2)
                                     : null,
-                                borderRadius: currentSelectedRating[selectedIndex] == 2 ? BorderRadius.circular(2) : null,
                               ),
                             );
                           case 2:
                             return Container(
                               width: MediaQuery.of(context).size.width / 6,
                               height: 24,
-                              margin: currentSelectedRating[selectedIndex] == 3 ? const EdgeInsets.symmetric(horizontal: 2) : null,
+                              margin: currentSelectedRating[selectedIndex] == 3
+                                  ? const EdgeInsets.symmetric(horizontal: 2)
+                                  : null,
                               decoration: BoxDecoration(
                                 color: const Color(0xFFF8C926),
-                                border: currentSelectedRating[selectedIndex] == 3
-                                    ? Border.all(width: 2, color: const Color(0xFF8C5D00), strokeAlign: BorderSide.strokeAlignOutside)
+                                border:
+                                    currentSelectedRating[selectedIndex] == 3
+                                    ? Border.all(
+                                        width: 2,
+                                        color: const Color(0xFF8C5D00),
+                                        strokeAlign:
+                                            BorderSide.strokeAlignOutside,
+                                      )
+                                    : null,
+                                borderRadius:
+                                    currentSelectedRating[selectedIndex] == 3
+                                    ? BorderRadius.circular(2)
                                     : null,
-                                borderRadius: currentSelectedRating[selectedIndex] == 3 ? BorderRadius.circular(2) : null,
                               ),
                             );
                           case 3:
                             return Container(
                               width: MediaQuery.of(context).size.width / 6,
                               height: 24,
-                              margin: currentSelectedRating[selectedIndex] == 4 ? const EdgeInsets.symmetric(horizontal: 2) : null,
+                              margin: currentSelectedRating[selectedIndex] == 4
+                                  ? const EdgeInsets.symmetric(horizontal: 2)
+                                  : null,
                               decoration: BoxDecoration(
                                 color: const Color(0xFFFFF3BF),
-                                border: currentSelectedRating[selectedIndex] == 4
-                                    ? Border.all(width: 2, color: const Color(0xFFB5911B), strokeAlign: BorderSide.strokeAlignOutside)
+                                border:
+                                    currentSelectedRating[selectedIndex] == 4
+                                    ? Border.all(
+                                        width: 2,
+                                        color: const Color(0xFFB5911B),
+                                        strokeAlign:
+                                            BorderSide.strokeAlignOutside,
+                                      )
+                                    : null,
+                                borderRadius:
+                                    currentSelectedRating[selectedIndex] == 4
+                                    ? BorderRadius.circular(2)
                                     : null,
-                                borderRadius: currentSelectedRating[selectedIndex] == 4 ? BorderRadius.circular(2) : null,
                               ),
                             );
                           case 4:
                             return Container(
                               width: MediaQuery.of(context).size.width / 6,
                               height: 24,
-                              margin: currentSelectedRating[selectedIndex] == 5 ? const EdgeInsets.symmetric(horizontal: 2) : null,
+                              margin: currentSelectedRating[selectedIndex] == 5
+                                  ? const EdgeInsets.symmetric(horizontal: 2)
+                                  : null,
                               decoration: BoxDecoration(
                                 color: const Color(0xFF62E833),
-                                border: currentSelectedRating[selectedIndex] == 5
-                                    ? Border.all(width: 2, color: const Color(0xFF276918), strokeAlign: BorderSide.strokeAlignOutside)
+                                border:
+                                    currentSelectedRating[selectedIndex] == 5
+                                    ? Border.all(
+                                        width: 2,
+                                        color: const Color(0xFF276918),
+                                        strokeAlign:
+                                            BorderSide.strokeAlignOutside,
+                                      )
+                                    : null,
+                                borderRadius:
+                                    currentSelectedRating[selectedIndex] == 5
+                                    ? BorderRadius.circular(2)
                                     : null,
-                                borderRadius: currentSelectedRating[selectedIndex] == 5 ? BorderRadius.circular(2) : null,
                               ),
                             );
                           default:
                             return Container(
                               width: MediaQuery.of(context).size.width / 6,
                               height: 24,
-                              margin: currentSelectedRating[selectedIndex] == 6 ? const EdgeInsets.symmetric(horizontal: 2) : null,
+                              margin: currentSelectedRating[selectedIndex] == 6
+                                  ? const EdgeInsets.symmetric(horizontal: 2)
+                                  : null,
                               decoration: BoxDecoration(
                                 color: const Color(0xFF4DCE20),
-                                border: currentSelectedRating[selectedIndex] == 6
-                                    ? Border.all(width: 2, color: const Color(0xFF184D12), strokeAlign: BorderSide.strokeAlignOutside)
+                                border:
+                                    currentSelectedRating[selectedIndex] == 6
+                                    ? Border.all(
+                                        width: 2,
+                                        color: const Color(0xFF184D12),
+                                        strokeAlign:
+                                            BorderSide.strokeAlignOutside,
+                                      )
                                     : null,
-                                borderRadius: currentSelectedRating[selectedIndex] == 6
-                                    ? const BorderRadius.horizontal(left: Radius.circular(2), right: Radius.circular(8))
-                                    : const BorderRadius.horizontal(right: Radius.circular(8)),
+                                borderRadius:
+                                    currentSelectedRating[selectedIndex] == 6
+                                    ? const BorderRadius.horizontal(
+                                        left: Radius.circular(2),
+                                        right: Radius.circular(8),
+                                      )
+                                    : const BorderRadius.horizontal(
+                                        right: Radius.circular(8),
+                                      ),
                               ),
                             );
                         }
@@ -142,12 +224,25 @@ class _MoodRatingWidgetState extends State<MoodRatingWidget> {
                         setState(() {
                           currentSelectedRating[selectedIndex] = value;
                         });
-                        EasyDebounce.debounce('change-satiety', const Duration(milliseconds: 250), () {
-                          context.read<DiaryCubit>().fillMood(diaryId: state.diary.id, mood: currentSelectedRating[selectedIndex].toInt() - 1);
-                        });
+                        EasyDebounce.debounce(
+                          'change-satiety',
+                          const Duration(milliseconds: 250),
+                          () {
+                            context.read<DiaryCubit>().fillMood(
+                              diaryId: state.diary.id,
+                              mood:
+                                  currentSelectedRating[selectedIndex].toInt() -
+                                  1,
+                            );
+                          },
+                        );
                       },
                     ),
-                    SvgPicture.asset('assets/icons/mood_2.svg', height: 32, width: 32),
+                    SvgPicture.asset(
+                      'assets/icons/mood_2.svg',
+                      height: 32,
+                      width: 32,
+                    ),
                   ],
                 ),
               ],

lib/features/diary/presentation/widgets/photo_gallery_widget.dart

@@ -52,7 +52,9 @@ class _PhotoGalleryWidgetState extends State<PhotoGalleryWidget> {
                     AppRouter.navigatorKey.currentContext?.pop();
 
                     final picker = ImagePicker();
-                    XFile? image = await picker.pickImage(source: ImageSource.camera);
+                    XFile? image = await picker.pickImage(
+                      source: ImageSource.camera,
+                    );
                     if (image != null) {
                       diaryCubit.uploadPhotos(
                         files: [File(image.path)],
@@ -116,7 +118,8 @@ class _PhotoGalleryWidgetState extends State<PhotoGalleryWidget> {
       builder: (context, state) {
         if (state is DiaryStateLoaded) {
           int mealIndex = state.selectedMeal - 1;
-          if (state.diary.meals[mealIndex].photos.isEmpty && !state.isConsultantView && !state.isDiaryFinished && !state.isDiaryCommented) {
+          if (state.diary.meals[mealIndex].photos.isEmpty &&
+              state.canEditDiary) {
             return GestureDetector(
               onTap: () async {
                 showImagePicker(state.diary);
@@ -140,10 +143,11 @@ class _PhotoGalleryWidgetState extends State<PhotoGalleryWidget> {
                     ClipRRect(
                       borderRadius: BorderRadius.circular(12),
                       child: CachedNetworkImage(
-                        imageUrl: '${sl<AppConfig>().baseUrl}/storage/${state.diary.meals[mealIndex].photos[currentSelectedPhotoIndex].path}',
+                        imageUrl:
+                            '${sl<AppConfig>().baseUrl}/storage/${state.diary.meals[mealIndex].photos[currentSelectedPhotoIndex].path}',
                       ),
                     ),
-                    if (!state.isConsultantView && !state.isDiaryFinished && !state.isDiaryCommented)
+                    if (state.canEditDiary)
                       Padding(
                         padding: const EdgeInsets.all(12),
                         child: IconButton.filled(
@@ -153,12 +157,24 @@ class _PhotoGalleryWidgetState extends State<PhotoGalleryWidget> {
                           ),
                           onPressed: () async {
                             await diaryCubit.deletePhoto(
-                              photo: state.diary.meals[mealIndex].photos[currentSelectedPhotoIndex],
+                              photo: state
+                                  .diary
+                                  .meals[mealIndex]
+                                  .photos[currentSelectedPhotoIndex],
                               diaryId: state.diary.id,
                             );
                             setState(() {
-                              if (currentSelectedPhotoIndex == state.diary.meals[mealIndex].photos.length - 1 && currentSelectedPhotoIndex != 0) {
-                                currentSelectedPhotoIndex = state.diary.meals[mealIndex].photos.length - 2;
+                              if (currentSelectedPhotoIndex ==
+                                      state
+                                              .diary
+                                              .meals[mealIndex]
+                                              .photos
+                                              .length -
+                                          1 &&
+                                  currentSelectedPhotoIndex != 0) {
+                                currentSelectedPhotoIndex =
+                                    state.diary.meals[mealIndex].photos.length -
+                                    2;
                               }
                             });
                           },
@@ -178,8 +194,13 @@ class _PhotoGalleryWidgetState extends State<PhotoGalleryWidget> {
                     mainAxisSize: MainAxisSize.min,
                     mainAxisAlignment: MainAxisAlignment.start,
                     children: [
-                      for (int i = 0; i < state.diary.meals[mealIndex].photos.length + 1; i++) ...[
-                        if (i == state.diary.meals[mealIndex].photos.length && !state.isConsultantView && !state.isDiaryFinished && !state.isDiaryCommented)
+                      for (
+                        int i = 0;
+                        i < state.diary.meals[mealIndex].photos.length + 1;
+                        i++
+                      ) ...[
+                        if (i == state.diary.meals[mealIndex].photos.length &&
+                            state.canEditDiary)
                           Padding(
                             padding: const EdgeInsets.only(left: 8),
                             child: InkWell(
@@ -212,13 +233,15 @@ class _PhotoGalleryWidgetState extends State<PhotoGalleryWidget> {
                                 height: 52,
                                 width: 52,
                                 child: CachedNetworkImage(
-                                  imageUrl: '${sl<AppConfig>().baseUrl}/storage/${state.diary.meals[mealIndex].photos[i].path}',
+                                  imageUrl:
+                                      '${sl<AppConfig>().baseUrl}/storage/${state.diary.meals[mealIndex].photos[i].path}',
                                   fit: BoxFit.fitWidth,
                                 ),
                               ),
                             ),
                           ),
-                        if (i < state.diary.meals[mealIndex].photos.length - 1) const SizedBox(width: 8),
+                        if (i < state.diary.meals[mealIndex].photos.length - 1)
+                          const SizedBox(width: 8),
                       ],
                     ],
                   ),

lib/features/diary/presentation/widgets/product_widget.dart

@@ -1,8 +1,6 @@
-
 import 'package:collection/collection.dart';
 import 'package:dotted_border/dotted_border.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/features/consultations/models/consultation_model.dart';
 import 'package:eatvio_app/features/diary/models/consultant_review_model.dart';
 import 'package:eatvio_app/features/diary/models/diary_day_model.dart';
 import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
@@ -32,17 +30,26 @@ class _ProductWidgetState extends State<ProductWidget> {
     super.initState();
     diaryCubit = context.read<DiaryCubit>();
     portionName = widget.portion.portion == 'gr' ? 'гр' : 'шт';
-    isEaten = widget.portion.portionState == PortionState.eatenFromDiet ? true : false;
+    isEaten = widget.portion.portionState == PortionState.eatenFromDiet
+        ? true
+        : false;
   }
 
   Widget _buildNutritionalInfo() {
     if (widget.portion.productNutritionalValueId == null) {
       return Container(
         padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-        decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(12)),
+        decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.circular(12),
+        ),
         child: const Text(
           'Продукт отправлен на модерацию',
-          style: TextStyle(color: Color(0xFF2F80ED), fontSize: 12, fontWeight: FontWeight.w500),
+          style: TextStyle(
+            color: Color(0xFF2F80ED),
+            fontSize: 12,
+            fontWeight: FontWeight.w500,
+          ),
         ),
       );
     }
@@ -57,7 +64,8 @@ class _ProductWidgetState extends State<ProductWidget> {
       calories = (caloriesInfo.calories * widget.portion.quantity) / 100;
       proteins = (caloriesInfo.proteins * widget.portion.quantity) / 100;
       fats = (caloriesInfo.fats * widget.portion.quantity) / 100;
-      carbohydrates = (caloriesInfo.carbohydrates * widget.portion.quantity) / 100;
+      carbohydrates =
+          (caloriesInfo.carbohydrates * widget.portion.quantity) / 100;
     } else {
       calories = caloriesInfo.energyOnPortion;
       proteins = caloriesInfo.proteinsOnPortion;
@@ -81,10 +89,17 @@ class _ProductWidgetState extends State<ProductWidget> {
   Widget _buildNutritionChip(String label, int value) {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
-      decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(8)),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(8),
+      ),
       child: Text(
         '$label $value',
-        style: const TextStyle(color: Color(0xFF6D6F71), fontSize: 12, fontWeight: FontWeight.w500),
+        style: const TextStyle(
+          color: Color(0xFF6D6F71),
+          fontSize: 12,
+          fontWeight: FontWeight.w500,
+        ),
       ),
     );
   }
@@ -93,16 +108,24 @@ class _ProductWidgetState extends State<ProductWidget> {
   void didUpdateWidget(ProductWidget oldWidget) {
     super.didUpdateWidget(oldWidget);
     portionName = widget.portion.portion == 'gr' ? 'гр' : 'шт';
-    isEaten = widget.portion.portionState == PortionState.eatenFromDiet ? true : false;
+    isEaten = widget.portion.portionState == PortionState.eatenFromDiet
+        ? true
+        : false;
   }
 
   Future updateProductInMeal(DiaryStateLoaded state, PortionModel portion) {
     return showModalBottomSheet(
       useRootNavigator: true,
       context: context,
-      shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(12))),
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(12)),
+      ),
       isScrollControlled: true,
-      builder: (context) => AddProductModal(state: state, portion: portion, diaryCubit: diaryCubit),
+      builder: (context) => AddProductModal(
+        state: state,
+        portion: portion,
+        diaryCubit: diaryCubit,
+      ),
     );
   }
 
@@ -113,33 +136,36 @@ class _ProductWidgetState extends State<ProductWidget> {
         if (state is DiaryStateLoadedTomorrowWithDiet) {
           return ListTile(
             horizontalTitleGap: 0,
-            contentPadding: widget.portion.fromDiet ? const EdgeInsets.only(right: 24, left: 12) : null,
+            contentPadding: widget.portion.fromDiet
+                ? const EdgeInsets.only(right: 24, left: 12)
+                : null,
             title: Text(widget.portion.productName),
             subtitle: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text('${widget.portion.quantity} ${widget.portion.portion == 'gr' ? 'гр' : 'шт'}'),
+                Text(
+                  '${widget.portion.quantity} ${widget.portion.portion == 'gr' ? 'гр' : 'шт'}',
+                ),
                 const SizedBox(height: 4),
                 _buildNutritionalInfo(),
               ],
             ),
-            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(20),
+            ),
             tileColor: const Color(0xFFF6FAFF),
           );
         }
         if (state is DiaryStateLoaded) {
-          final isDiaryCommented =
-              state.diary.typeOfDiary.diaryState == DiaryStateEnum.commented ||
-              state.diary.typeOfDiary.diaryState == DiaryStateEnum.lastDayCommented ||
-              state.diary.typeOfDiary.diaryState == DiaryStateEnum.reviewedByUser;
-          final isDiaryFinished =
-              state.diary.typeOfDiary.diaryState == DiaryStateEnum.finished || state.diary.typeOfDiary.diaryState == DiaryStateEnum.lastDayFinished;
-          final canEditPortion = !state.isConsultantView && !isDiaryCommented && !isDiaryFinished && !widget.portion.fromDiet;
+          final canEditPortion = state.canEditDiary && !widget.portion.fromDiet;
           final consultantComments = state.consultantReview?.consultantComments;
-          final canMarkAsEaten = !state.isConsultantView && !isDiaryCommented && !isDiaryFinished;
+          final canMarkAsEaten = state.canEditDiary;
           PortionComment? portionComment;
           if (consultantComments != null) {
-            portionComment = consultantComments.portionsComments.firstWhereOrNull((elem) => elem.portionId == widget.portion.id);
+            portionComment = consultantComments.portionsComments
+                .firstWhereOrNull(
+                  (elem) => elem.portionId == widget.portion.id,
+                );
           }
           if (widget.portion.portionState == PortionState.eatenDeleted) {
             return DottedBorder(
@@ -151,27 +177,41 @@ class _ProductWidgetState extends State<ProductWidget> {
                 color: Color(0xFF6D6F71),
               ),
               child: ListTile(
-                onTap: () => diaryCubit.restore(diaryId: state.diary.id, mealId: state.selectedMeal, portionId: widget.portion.id),
-                trailing: SvgPicture.asset('assets/icons/revert_product.svg'),
+                onTap: state.canEditDiary
+                    ? () => diaryCubit.restore(
+                        diaryId: state.diary.id,
+                        mealId: state.selectedMeal,
+                        portionId: widget.portion.id,
+                      )
+                    : null,
+                trailing: state.canEditDiary
+                    ? SvgPicture.asset('assets/icons/revert_product.svg')
+                    : null,
                 horizontalTitleGap: 0,
-                contentPadding: widget.portion.fromDiet ? const EdgeInsets.only(right: 24, left: 4) : null,
+                contentPadding: widget.portion.fromDiet
+                    ? const EdgeInsets.only(right: 24, left: 4)
+                    : null,
                 title: Text(widget.portion.productName),
                 subtitle: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    Text('${widget.portion.quantity} ${widget.portion.portion == 'gr' ? 'гр' : 'шт'}'),
+                    Text(
+                      '${widget.portion.quantity} ${widget.portion.portion == 'gr' ? 'гр' : 'шт'}',
+                    ),
                     const SizedBox(height: 4),
                     _buildNutritionalInfo(),
                   ],
                 ),
-                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(20),
+                ),
                 // ignore: use_full_hex_values_for_flutter_colors
                 tileColor: const Color(0xfff6faff03).withValues(alpha: 0.01),
               ),
             );
           } else {
             Widget? trailing;
-            if (state.isConsultantView && !isDiaryCommented) {
+            if (state.isConsultantView && !state.isDiaryCommented) {
               trailing = GestureDetector(
                 onTap: () {
                   setState(() {
@@ -180,13 +220,15 @@ class _ProductWidgetState extends State<ProductWidget> {
                 },
                 child: SvgPicture.asset('assets/icons/edit.svg'),
               );
-            } else if (!isDiaryCommented && !widget.portion.fromDiet) {
+            } else if (canEditPortion) {
               trailing = const Icon(Icons.more_vert_rounded);
             }
             return Column(
               children: [
                 ListTile(
-                  onTap: canEditPortion ? () => updateProductInMeal(state, widget.portion) : null,
+                  onTap: canEditPortion
+                      ? () => updateProductInMeal(state, widget.portion)
+                      : null,
                   trailing: trailing,
                   leading: widget.portion.fromDiet
                       ? Transform.scale(
@@ -199,35 +241,55 @@ class _ProductWidgetState extends State<ProductWidget> {
                                       isEaten = value!;
                                     });
                                     if (isEaten) {
-                                      diaryCubit.markEaten(diaryId: state.diary.id, mealId: state.selectedMeal, portionId: widget.portion.id);
+                                      diaryCubit.markEaten(
+                                        diaryId: state.diary.id,
+                                        mealId: state.selectedMeal,
+                                        portionId: widget.portion.id,
+                                      );
                                     } else {
-                                      diaryCubit.unmarkEaten(diaryId: state.diary.id, mealId: state.selectedMeal, portionId: widget.portion.id);
+                                      diaryCubit.unmarkEaten(
+                                        diaryId: state.diary.id,
+                                        mealId: state.selectedMeal,
+                                        portionId: widget.portion.id,
+                                      );
                                     }
                                   }
                                 : null,
                             activeColor: appTheme.blueA400,
-                            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4)),
+                            shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(4),
+                            ),
                             side: const BorderSide(color: Color(0xFF809CB9)),
                           ),
                         )
                       : null,
                   horizontalTitleGap: 0,
-                  contentPadding: widget.portion.fromDiet ? const EdgeInsets.only(right: 24, left: 4) : null,
+                  contentPadding: widget.portion.fromDiet
+                      ? const EdgeInsets.only(right: 24, left: 4)
+                      : null,
                   title: Text(widget.portion.productName),
                   subtitle: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      Text('${widget.portion.quantity} ${widget.portion.portion == 'gr' ? 'гр' : 'шт'}'),
+                      Text(
+                        '${widget.portion.quantity} ${widget.portion.portion == 'gr' ? 'гр' : 'шт'}',
+                      ),
                       const SizedBox(height: 4),
                       _buildNutritionalInfo(),
                     ],
                   ),
-                  shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(20),
+                  ),
                   tileColor: const Color(0xFFF6FAFF),
                 ),
                 Padding(
                   padding: const EdgeInsets.only(top: 8.0),
-                  child: PortionCommentWidget(enabled: showCommentWidget, portionId: widget.portion.id, comment: portionComment?.comment),
+                  child: PortionCommentWidget(
+                    enabled: showCommentWidget,
+                    portionId: widget.portion.id,
+                    comment: portionComment?.comment,
+                  ),
                 ),
               ],
             );

lib/features/diary/presentation/widgets/satiety_rating_widget.dart

@@ -26,7 +26,8 @@ class _SatietyRatingWidgetState extends State<SatietyRatingWidget> {
           final meals = state.diary.meals;
           if (selectedIndex >= 0 && selectedIndex < meals.length) {
             if (isFirstFetch[selectedIndex]) {
-              currentSelectedRating[selectedIndex] = meals[selectedIndex].satiety.toDouble() + 1;
+              currentSelectedRating[selectedIndex] =
+                  meals[selectedIndex].satiety.toDouble() + 1;
               isFirstFetch[selectedIndex] = false;
             }
           }
@@ -36,21 +37,32 @@ class _SatietyRatingWidgetState extends State<SatietyRatingWidget> {
               mainAxisSize: MainAxisSize.min,
               children: [
                 Text(
-                  state.isConsultantView ? 'Сытость пользователя после приема пищи' : 'Ваша сытость после приёма пищи',
+                  state.isConsultantView
+                      ? 'Сытость пользователя после приема пищи'
+                      : 'Ваша сытость после приёма пищи',
                   textAlign: TextAlign.center,
                   style: const TextStyle(fontSize: 16),
                 ),
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
-                    SvgPicture.asset('assets/icons/satiety_emoji_left.svg', height: 32, width: 32),
+                    SvgPicture.asset(
+                      'assets/icons/satiety_emoji_left.svg',
+                      height: 32,
+                      width: 32,
+                    ),
                     RatingBar.builder(
-                      ignoreGestures: state.isConsultantView || state.isDiaryFinished || state.isDiaryCommented,
-                      initialRating: (selectedIndex >= 0 && selectedIndex < state.diary.meals.length)
-                          ? state.diary.meals[selectedIndex].satiety.toDouble() + 1
+                      ignoreGestures: !state.canEditDiary,
+                      initialRating:
+                          (selectedIndex >= 0 &&
+                              selectedIndex < state.diary.meals.length)
+                          ? state.diary.meals[selectedIndex].satiety
+                                    .toDouble() +
+                                1
                           : 3,
                       itemCount: 6,
-                      itemSize: MediaQuery.of(context).size.width / 6 - (124 / 6),
+                      itemSize:
+                          MediaQuery.of(context).size.width / 6 - (124 / 6),
                       updateOnDrag: true,
                       itemBuilder: (context, index) {
                         switch (index) {
@@ -58,82 +70,154 @@ class _SatietyRatingWidgetState extends State<SatietyRatingWidget> {
                             return Container(
                               width: MediaQuery.of(context).size.width / 6,
                               height: 24,
-                              margin: currentSelectedRating[selectedIndex] == 1 ? const EdgeInsets.symmetric(horizontal: 2) : null,
+                              margin: currentSelectedRating[selectedIndex] == 1
+                                  ? const EdgeInsets.symmetric(horizontal: 2)
+                                  : null,
                               decoration: BoxDecoration(
                                 color: const Color(0xFFC82222),
-                                border: currentSelectedRating[selectedIndex] == 1
-                                    ? Border.all(width: 2, color: const Color(0xFFAA3333), strokeAlign: BorderSide.strokeAlignOutside)
+                                border:
+                                    currentSelectedRating[selectedIndex] == 1
+                                    ? Border.all(
+                                        width: 2,
+                                        color: const Color(0xFFAA3333),
+                                        strokeAlign:
+                                            BorderSide.strokeAlignOutside,
+                                      )
                                     : null,
-                                borderRadius: currentSelectedRating[selectedIndex] == 1
-                                    ? const BorderRadius.horizontal(left: Radius.circular(8), right: Radius.circular(2))
-                                    : const BorderRadius.horizontal(left: Radius.circular(8)),
+                                borderRadius:
+                                    currentSelectedRating[selectedIndex] == 1
+                                    ? const BorderRadius.horizontal(
+                                        left: Radius.circular(8),
+                                        right: Radius.circular(2),
+                                      )
+                                    : const BorderRadius.horizontal(
+                                        left: Radius.circular(8),
+                                      ),
                               ),
                             );
                           case 1:
                             return Container(
                               width: MediaQuery.of(context).size.width / 6,
                               height: 24,
-                              margin: currentSelectedRating[selectedIndex] == 2 ? const EdgeInsets.symmetric(horizontal: 2) : null,
+                              margin: currentSelectedRating[selectedIndex] == 2
+                                  ? const EdgeInsets.symmetric(horizontal: 2)
+                                  : null,
                               decoration: BoxDecoration(
                                 color: const Color(0xFFFF3E3E),
-                                border: currentSelectedRating[selectedIndex] == 2
-                                    ? Border.all(width: 2, color: const Color(0xFF550000), strokeAlign: BorderSide.strokeAlignOutside)
+                                border:
+                                    currentSelectedRating[selectedIndex] == 2
+                                    ? Border.all(
+                                        width: 2,
+                                        color: const Color(0xFF550000),
+                                        strokeAlign:
+                                            BorderSide.strokeAlignOutside,
+                                      )
+                                    : null,
+                                borderRadius:
+                                    currentSelectedRating[selectedIndex] == 2
+                                    ? BorderRadius.circular(2)
                                     : null,
-                                borderRadius: currentSelectedRating[selectedIndex] == 2 ? BorderRadius.circular(2) : null,
                               ),
                             );
                           case 2:
                             return Container(
                               width: MediaQuery.of(context).size.width / 6,
                               height: 24,
-                              margin: currentSelectedRating[selectedIndex] == 3 ? const EdgeInsets.symmetric(horizontal: 2) : null,
+                              margin: currentSelectedRating[selectedIndex] == 3
+                                  ? const EdgeInsets.symmetric(horizontal: 2)
+                                  : null,
                               decoration: BoxDecoration(
                                 color: const Color(0xFFF8C926),
-                                border: currentSelectedRating[selectedIndex] == 3
-                                    ? Border.all(width: 2, color: const Color(0xFF8C5D00), strokeAlign: BorderSide.strokeAlignOutside)
+                                border:
+                                    currentSelectedRating[selectedIndex] == 3
+                                    ? Border.all(
+                                        width: 2,
+                                        color: const Color(0xFF8C5D00),
+                                        strokeAlign:
+                                            BorderSide.strokeAlignOutside,
+                                      )
+                                    : null,
+                                borderRadius:
+                                    currentSelectedRating[selectedIndex] == 3
+                                    ? BorderRadius.circular(2)
                                     : null,
-                                borderRadius: currentSelectedRating[selectedIndex] == 3 ? BorderRadius.circular(2) : null,
                               ),
                             );
                           case 3:
                             return Container(
                               width: MediaQuery.of(context).size.width / 6,
                               height: 24,
-                              margin: currentSelectedRating[selectedIndex] == 4 ? const EdgeInsets.symmetric(horizontal: 2) : null,
+                              margin: currentSelectedRating[selectedIndex] == 4
+                                  ? const EdgeInsets.symmetric(horizontal: 2)
+                                  : null,
                               decoration: BoxDecoration(
                                 color: const Color(0xFFFFF3BF),
-                                border: currentSelectedRating[selectedIndex] == 4
-                                    ? Border.all(width: 2, color: const Color(0xFFB5911B), strokeAlign: BorderSide.strokeAlignOutside)
+                                border:
+                                    currentSelectedRating[selectedIndex] == 4
+                                    ? Border.all(
+                                        width: 2,
+                                        color: const Color(0xFFB5911B),
+                                        strokeAlign:
+                                            BorderSide.strokeAlignOutside,
+                                      )
+                                    : null,
+                                borderRadius:
+                                    currentSelectedRating[selectedIndex] == 4
+                                    ? BorderRadius.circular(2)
                                     : null,
-                                borderRadius: currentSelectedRating[selectedIndex] == 4 ? BorderRadius.circular(2) : null,
                               ),
                             );
                           case 4:
                             return Container(
                               width: MediaQuery.of(context).size.width / 6,
                               height: 24,
-                              margin: currentSelectedRating[selectedIndex] == 5 ? const EdgeInsets.symmetric(horizontal: 2) : null,
+                              margin: currentSelectedRating[selectedIndex] == 5
+                                  ? const EdgeInsets.symmetric(horizontal: 2)
+                                  : null,
                               decoration: BoxDecoration(
                                 color: const Color(0xFF62E833),
-                                border: currentSelectedRating[selectedIndex] == 5
-                                    ? Border.all(width: 2, color: const Color(0xFF276918), strokeAlign: BorderSide.strokeAlignOutside)
+                                border:
+                                    currentSelectedRating[selectedIndex] == 5
+                                    ? Border.all(
+                                        width: 2,
+                                        color: const Color(0xFF276918),
+                                        strokeAlign:
+                                            BorderSide.strokeAlignOutside,
+                                      )
+                                    : null,
+                                borderRadius:
+                                    currentSelectedRating[selectedIndex] == 5
+                                    ? BorderRadius.circular(2)
                                     : null,
-                                borderRadius: currentSelectedRating[selectedIndex] == 5 ? BorderRadius.circular(2) : null,
                               ),
                             );
                           default:
                             return Container(
                               width: MediaQuery.of(context).size.width / 6,
                               height: 24,
-                              margin: currentSelectedRating[selectedIndex] == 6 ? const EdgeInsets.symmetric(horizontal: 2) : null,
+                              margin: currentSelectedRating[selectedIndex] == 6
+                                  ? const EdgeInsets.symmetric(horizontal: 2)
+                                  : null,
                               decoration: BoxDecoration(
                                 color: const Color(0xFF4DCE20),
-                                border: currentSelectedRating[selectedIndex] == 6
-                                    ? Border.all(width: 2, color: const Color(0xFF184D12), strokeAlign: BorderSide.strokeAlignOutside)
+                                border:
+                                    currentSelectedRating[selectedIndex] == 6
+                                    ? Border.all(
+                                        width: 2,
+                                        color: const Color(0xFF184D12),
+                                        strokeAlign:
+                                            BorderSide.strokeAlignOutside,
+                                      )
                                     : null,
-                                borderRadius: currentSelectedRating[selectedIndex] == 6
-                                    ? const BorderRadius.horizontal(left: Radius.circular(2), right: Radius.circular(8))
-                                    : const BorderRadius.horizontal(right: Radius.circular(8)),
+                                borderRadius:
+                                    currentSelectedRating[selectedIndex] == 6
+                                    ? const BorderRadius.horizontal(
+                                        left: Radius.circular(2),
+                                        right: Radius.circular(8),
+                                      )
+                                    : const BorderRadius.horizontal(
+                                        right: Radius.circular(8),
+                                      ),
                               ),
                             );
                         }
@@ -143,12 +227,25 @@ class _SatietyRatingWidgetState extends State<SatietyRatingWidget> {
                         setState(() {
                           currentSelectedRating[selectedIndex] = value;
                         });
-                        EasyDebounce.debounce('change-satiety', const Duration(milliseconds: 250), () {
-                          context.read<DiaryCubit>().fillSatiety(diaryId: state.diary.id, satiety: currentSelectedRating[selectedIndex].toInt() - 1);
-                        });
+                        EasyDebounce.debounce(
+                          'change-satiety',
+                          const Duration(milliseconds: 250),
+                          () {
+                            context.read<DiaryCubit>().fillSatiety(
+                              diaryId: state.diary.id,
+                              satiety:
+                                  currentSelectedRating[selectedIndex].toInt() -
+                                  1,
+                            );
+                          },
+                        );
                       },
                     ),
-                    SvgPicture.asset('assets/icons/satiety_emoji_right.svg', height: 32, width: 32),
+                    SvgPicture.asset(
+                      'assets/icons/satiety_emoji_right.svg',
+                      height: 32,
+                      width: 32,
+                    ),
                   ],
                 ),
               ],

lib/features/diary/presentation/widgets/time_of_meal_picker_widget.dart

@@ -46,7 +46,8 @@ class _TimeOfMealPickerWidgetState extends State<TimeOfMealPickerWidget> {
                 Navigator.of(context).pop();
                 diaryCubit.fillTime(
                   diaryId: diaryId,
-                  time: '${value.hour.toString().padLeft(2, '0')}:${value.minute.toString().padLeft(2, '0')}:00',
+                  time:
+                      '${value.hour.toString().padLeft(2, '0')}:${value.minute.toString().padLeft(2, '0')}:00',
                 );
               },
               borderRadius: BorderRadius.circular(20),
@@ -69,7 +70,7 @@ class _TimeOfMealPickerWidgetState extends State<TimeOfMealPickerWidget> {
                 ),
               ),
             ),
-            const SizedBox(height: 30)
+            const SizedBox(height: 30),
           ],
         ),
       ),
@@ -98,7 +99,9 @@ class _TimeOfMealPickerWidgetState extends State<TimeOfMealPickerWidget> {
                       ),
                     ),
                     InkWell(
-                      onTap: state.isConsultantView || state.isDiaryFinished || state.isDiaryCommented ? null : () => showTimePicker(state.diary.id),
+                      onTap: state.canEditDiary
+                          ? () => showTimePicker(state.diary.id)
+                          : null,
                       borderRadius: BorderRadius.circular(100),
                       child: Ink(
                         height: 32,
@@ -110,7 +113,16 @@ class _TimeOfMealPickerWidgetState extends State<TimeOfMealPickerWidget> {
                           alignment: Alignment.center,
                           padding: const EdgeInsets.symmetric(horizontal: 16),
                           child: Text(
-                            state.diary.meals[state.selectedMeal - 1].time.substring(0, state.diary.meals[state.selectedMeal - 1].time.length - 3),
+                            state.diary.meals[state.selectedMeal - 1].time
+                                .substring(
+                                  0,
+                                  state
+                                          .diary
+                                          .meals[state.selectedMeal - 1]
+                                          .time
+                                          .length -
+                                      3,
+                                ),
                             style: const TextStyle(
                               color: Color(0xFF6D6F71),
                               fontSize: 17,

lib/features/video_calls/managers/video_call_manager.dart

@@ -932,7 +932,13 @@ class VideoCallManager {
       _preparedWsUrl = tokenResponse.wsUrl;
       _preparedToken = tokenResponse.token;
 
-      await room.prepareConnection(tokenResponse.wsUrl, tokenResponse.token);
+      // Warmup must not keep the enter button disabled. Joining the room
+      // connects with the token even if prepareConnection hangs or fails.
+      try {
+        await room
+            .prepareConnection(tokenResponse.wsUrl, tokenResponse.token)
+            .timeout(const Duration(seconds: 5));
+      } catch (_) {}
       if (_liveKitDisposed) return;
 
       _emitSnapshot(

lib/features/video_calls/services/video_call_chat_signal.dart

@@ -0,0 +1,85 @@
+import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_push_payload.dart';
+
+enum VideoCallChatSignalKind { none, started, ended }
+
+/// Detects a video-call system message.
+///
+/// The realtime `ChatMessageUpdated` payload does not include `type`, so an
+/// open app has to recognize the system text. Messages that already have
+/// another type are ignored.
+abstract final class VideoCallChatSignal {
+  static final RegExp _startedRu = RegExp(
+    r'начал\(а\) видеозвонок\.?\s*$',
+    caseSensitive: false,
+  );
+  static final RegExp _startedEn = RegExp(
+    r'started a video call\.?\s*$',
+    caseSensitive: false,
+  );
+  static final RegExp _endedRu = RegExp(
+    r'завершил\(а\) видеозвонок\.?\s*$',
+    caseSensitive: false,
+  );
+  static final RegExp _endedEn = RegExp(
+    r'ended a video call\.?\s*$',
+    caseSensitive: false,
+  );
+  static final RegExp _callerRu = RegExp(
+    r'^(.*) начал\(а\) видеозвонок\.?\s*$',
+    caseSensitive: false,
+  );
+  static final RegExp _callerEn = RegExp(
+    r'^(.*) started a video call\.?\s*$',
+    caseSensitive: false,
+  );
+
+  static VideoCallChatSignalKind kindOf(ChatMessageModel message) {
+    if (message.type == ChatMessageType.videoCallEnded) {
+      return VideoCallChatSignalKind.ended;
+    }
+    if (message.type == ChatMessageType.videoCallStarted) {
+      return VideoCallChatSignalKind.started;
+    }
+    if (message.type != null) return VideoCallChatSignalKind.none;
+
+    final text = message.data.trim();
+    if (_endedRu.hasMatch(text) || _endedEn.hasMatch(text)) {
+      return VideoCallChatSignalKind.ended;
+    }
+    if (_startedRu.hasMatch(text) || _startedEn.hasMatch(text)) {
+      return VideoCallChatSignalKind.started;
+    }
+    return VideoCallChatSignalKind.none;
+  }
+
+  static VideoCallPushPayload? incomingPayload({
+    required ChatMessageModel message,
+    String? callerName,
+    String? callerAvatarUrl,
+  }) {
+    if (kindOf(message) != VideoCallChatSignalKind.started) return null;
+    final conversationUuid = message.roomId?.trim();
+    if (conversationUuid == null || conversationUuid.isEmpty) return null;
+
+    final resolvedName = callerName?.trim();
+    final avatar = callerAvatarUrl?.trim();
+    return VideoCallPushPayload(
+      conversationUuid: conversationUuid,
+      counterpartName: resolvedName != null && resolvedName.isNotEmpty
+          ? resolvedName
+          : callerNameFromBody(message.data),
+      counterpartAvatarUrl: avatar != null && avatar.isNotEmpty ? avatar : null,
+      messageId: message.id > 0 ? message.id : null,
+    );
+  }
+
+  static String? callerNameFromBody(String body) {
+    final text = body.trim();
+    for (final pattern in [_callerRu, _callerEn]) {
+      final name = pattern.firstMatch(text)?.group(1)?.trim();
+      if (name != null && name.isNotEmpty) return name;
+    }
+    return null;
+  }
+}

lib/features/video_calls/services/video_call_incoming_push_presenter.dart

@@ -1,3 +1,6 @@
+import 'dart:io';
+
+import 'package:eatvio_app/features/video_calls/services/video_call_kit_id.dart';
 import 'package:eatvio_app/features/video_calls/services/video_call_push_payload.dart';
 import 'package:flutter_callkit_incoming/entities/entities.dart';
 import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
@@ -6,18 +9,25 @@ abstract final class VideoCallIncomingPushPresenter {
   static const String _androidAccentColor = '#2787F5';
 
   static Future<void> showIncomingCall(VideoCallPushPayload payload) async {
-    final callerName =
-        payload.counterpartName?.trim().isNotEmpty == true
-            ? payload.counterpartName!.trim()
-            : 'Итвио';
+    final callerName = payload.counterpartName?.trim().isNotEmpty == true
+        ? payload.counterpartName!.trim()
+        : 'Итвио';
+
+    final callId = Platform.isIOS
+        ? VideoCallKitId.iosUuid(
+                conversationUuid: payload.conversationUuid,
+                messageId: payload.messageId,
+              ) ??
+              payload.conversationUuid
+        : payload.conversationUuid;
 
     final params = CallKitParams(
-      id: payload.conversationUuid,
+      id: callId,
       nameCaller: callerName,
       appName: 'Итвио',
       avatar: payload.counterpartAvatarUrl,
       handle: payload.conversationUuid,
-      type: 0,
+      type: 1,
       duration: 45000,
       extra: <String, dynamic>{
         'conversationUuid': payload.conversationUuid,

lib/features/video_calls/services/video_call_kit_id.dart

@@ -0,0 +1,23 @@
+/// CallKit on iOS rejects a second incoming call that reuses a UUID.
+///
+/// The conversation uuid stays in the call payload for navigation. The CallKit
+/// id is derived from that uuid plus the chat message id, so one ring is one
+/// call and the next ring in the same chat still appears. Android notifications
+/// keep the conversation uuid: the same id updates one incoming notification.
+abstract final class VideoCallKitId {
+  static final RegExp _uuidPrefix = RegExp(
+    r'^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-)[0-9a-fA-F]{12}$',
+  );
+
+  static String? iosUuid({
+    required String conversationUuid,
+    required int? messageId,
+  }) {
+    if (messageId == null || messageId <= 0) return null;
+    final prefix = _uuidPrefix.firstMatch(conversationUuid.trim())?.group(1);
+    if (prefix == null) return null;
+    final suffix = messageId.toRadixString(16).padLeft(12, '0');
+    if (suffix.length != 12) return null;
+    return '$prefix$suffix'.toLowerCase();
+  }
+}

lib/features/video_calls/services/video_call_push_payload.dart

@@ -5,6 +5,7 @@ class VideoCallPushPayload {
     this.counterpartAvatarUrl,
     this.localParticipantName,
     this.counterpartIsConsultant,
+    this.messageId,
   });
 
   final String conversationUuid;
@@ -12,6 +13,7 @@ class VideoCallPushPayload {
   final String? counterpartAvatarUrl;
   final String? localParticipantName;
   final bool? counterpartIsConsultant;
+  final int? messageId;
 
   static VideoCallPushPayload? tryParse(Map<String, dynamic> data) {
     if (!isIncomingVideoCall(data)) return null;
@@ -49,6 +51,7 @@ class VideoCallPushPayload {
         'is_consultant',
         'isConsultant',
       ]),
+      messageId: _messageId(data),
     );
   }
 
@@ -132,7 +135,8 @@ class VideoCallPushPayload {
     final uri = Uri.tryParse(actionUrl);
     if (uri == null) return null;
 
-    final fromQuery = uri.queryParameters['uuid'] ??
+    final fromQuery =
+        uri.queryParameters['uuid'] ??
         uri.queryParameters['conversationUuid'] ??
         uri.queryParameters['conversation_uuid'];
     if (fromQuery != null && fromQuery.trim().isNotEmpty) {
@@ -167,14 +171,22 @@ class VideoCallPushPayload {
     return null;
   }
 
+  static int? _messageId(Map<String, dynamic> data) {
+    final value = data['message_id'] ?? data['messageId'];
+    if (value is int) return value > 0 ? value : null;
+    if (value is String) {
+      final parsed = int.tryParse(value.trim());
+      if (parsed != null && parsed > 0) return parsed;
+    }
+    return null;
+  }
+
   static bool _isTruthy(Object? value) {
     if (value == null) return false;
     if (value is bool) return value;
     if (value is num) return value != 0;
     final normalized = value.toString().trim().toLowerCase();
-    return normalized == '1' ||
-        normalized == 'true' ||
-        normalized == 'yes';
+    return normalized == '1' || normalized == 'true' || normalized == 'yes';
   }
 
   static String? _resolveAvatarUrl(String? raw) {

pubspec.yaml

@@ -1,6 +1,6 @@
 name: eatvio_app
 description: A new Flutter project.
-version: 1.3.46+135
+version: 1.3.47+136
 publish_to: 'none'
 
 environment:

test/features/diary/presentation/diary_edit_access_test.dart

@@ -0,0 +1,59 @@
+import 'package:eatvio_app/features/diary/presentation/diary_edit_access.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  final now = DateTime(2026, 9, 30, 12);
+
+  bool canEdit({
+    bool isConsultantView = false,
+    bool isDiaryCommented = false,
+    bool isDiaryFinished = false,
+    int closed = 0,
+    String diaryDate = '2026-09-28',
+  }) {
+    return canEditDiaryDay(
+      isConsultantView: isConsultantView,
+      isDiaryCommented: isDiaryCommented,
+      isDiaryFinished: isDiaryFinished,
+      closed: closed,
+      diaryDate: diaryDate,
+      now: now,
+    );
+  }
+
+  test('finished today and yesterday stay editable', () {
+    expect(canEdit(isDiaryFinished: true, diaryDate: '2026-09-30'), isTrue);
+    expect(canEdit(isDiaryFinished: true, diaryDate: '2026-09-29'), isTrue);
+  });
+
+  test('finished days older than yesterday stay read-only', () {
+    expect(canEdit(isDiaryFinished: true, diaryDate: '2026-09-28'), isFalse);
+  });
+
+  test('commented days stay read-only inside the window', () {
+    expect(canEdit(isDiaryCommented: true, diaryDate: '2026-09-30'), isFalse);
+    expect(
+      canEdit(
+        isDiaryCommented: true,
+        isDiaryFinished: true,
+        diaryDate: '2026-09-29',
+      ),
+      isFalse,
+    );
+  });
+
+  test('an open day outside the window stays editable', () {
+    expect(canEdit(diaryDate: '2026-09-01'), isTrue);
+  });
+
+  test('a closed flag blocks editing even inside the window', () {
+    expect(
+      canEdit(isDiaryFinished: true, closed: 1, diaryDate: '2026-09-30'),
+      isFalse,
+    );
+  });
+
+  test('consultant view stays read-only', () {
+    expect(canEdit(isConsultantView: true, diaryDate: '2026-09-30'), isFalse);
+  });
+}

test/features/diary/presentation/pages/diary_screen_smoke_test.dart

@@ -25,16 +25,25 @@ import 'package:mockito/mockito.dart';
 
 import 'diary_screen_smoke_test.mocks.dart';
 
-@GenerateNiceMocks([MockSpec<DiaryCubit>(), MockSpec<ConsultantCommentsCubit>()])
+@GenerateNiceMocks([
+  MockSpec<DiaryCubit>(),
+  MockSpec<ConsultantCommentsCubit>(),
+])
 void main() {
   group('DiaryScreen smoke', () {
     setUpAll(() async {
-      dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
+      dotenv.loadFromString(
+        envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost',
+      );
     });
 
     setUp(() async {
       await sl.reset();
-      sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
+      sl.registerLazySingleton<AppConfig>(
+        () =>
+            AppConfig(buildType: AppBuildType.tests)
+              ..setBaseUrl('http://localhost'),
+      );
     });
 
     Widget wrap(Widget child) {
@@ -51,23 +60,53 @@ void main() {
       );
     }
 
-    DiaryStateLoaded loadedState({required bool hasChosenPlan}) {
+    DiaryStateLoaded loadedState({
+      required bool hasChosenPlan,
+      String date = '2025-01-01',
+      bool isDiaryFinished = false,
+      bool isDiaryCommented = false,
+      int closed = 0,
+    }) {
       final diary = DiaryDayEntity(
         id: 1,
-        date: '2025-01-01',
+        date: date,
         wakeup: '07:00',
         retire: '23:00',
-        closed: 0,
+        closed: closed,
         comment: '',
-        typeOfDiary: TypeOfDiaryModel(hasChosenDiet: false, hasChosenPlan: hasChosenPlan, diaryState: null),
-        meals: const [MealModel(id: 1, time: '08:00', typeNumber: 1, satiety: 0, mood: 0, portions: [], photos: [])],
+        typeOfDiary: TypeOfDiaryModel(
+          hasChosenDiet: false,
+          hasChosenPlan: hasChosenPlan,
+          diaryState: null,
+        ),
+        meals: const [
+          MealModel(
+            id: 1,
+            time: '08:00',
+            typeNumber: 1,
+            satiety: 0,
+            mood: 0,
+            portions: [],
+            photos: [],
+          ),
+        ],
         chosenPlanId: hasChosenPlan ? 10 : null,
         dayOfChosenDiet: null,
         diet: null,
       );
       const nutrition = NutritionDataModel(
-        dailyNutritionIntake: NutritionModel(energy: 0, proteins: 0, fats: 0, carbohydrates: 0),
-        dailyNutritionRecommendation: NutritionModel(energy: 0, proteins: 0, fats: 0, carbohydrates: 0),
+        dailyNutritionIntake: NutritionModel(
+          energy: 0,
+          proteins: 0,
+          fats: 0,
+          carbohydrates: 0,
+        ),
+        dailyNutritionRecommendation: NutritionModel(
+          energy: 0,
+          proteins: 0,
+          fats: 0,
+          carbohydrates: 0,
+        ),
       );
       return DiaryState.loaded(
             diary: diary,
@@ -75,8 +114,8 @@ void main() {
             selectedDay: DateTime(2025, 1, 1),
             selectedMeal: 1,
             isConsultantView: false,
-            isDiaryFinished: false,
-            isDiaryCommented: false,
+            isDiaryFinished: isDiaryFinished,
+            isDiaryCommented: isDiaryCommented,
             isWakeUpAndRetireEnabled: true,
             isMoodEnabled: true,
           )
@@ -86,13 +125,26 @@ void main() {
     testWidgets('renders loading state', (tester) async {
       final diaryCubit = MockDiaryCubit();
       when(diaryCubit.state).thenReturn(const DiaryState.loading());
-      when(diaryCubit.stream).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
       when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(diaryCubit.fetchDiaryV2(needLoading: anyNamed('needLoading'), diaryId: anyNamed('diaryId'))).thenAnswer((_) async => true);
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);
 
       final commentsCubit = MockConsultantCommentsCubit();
-      when(commentsCubit.state).thenReturn(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: '')));
-      when(commentsCubit.stream).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
       when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());
 
       sl.registerFactory<DiaryCubit>(() => diaryCubit);
@@ -107,13 +159,27 @@ void main() {
     testWidgets('renders loaded state (chosen plan)', (tester) async {
       final diaryCubit = MockDiaryCubit();
       when(diaryCubit.state).thenReturn(loadedState(hasChosenPlan: true));
-      when(diaryCubit.stream).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
       when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(diaryCubit.fetchDiaryV2(needLoading: anyNamed('needLoading'), diaryId: anyNamed('diaryId'))).thenAnswer((_) async => true);
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);
 
       final commentsCubit = MockConsultantCommentsCubit();
-      when(commentsCubit.state).thenReturn(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: ''), dayCommentNeedsToBeFilled: false));
-      when(commentsCubit.stream).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+          dayCommentNeedsToBeFilled: false,
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
       when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());
 
       sl.registerFactory<DiaryCubit>(() => diaryCubit);
@@ -124,19 +190,37 @@ void main() {
 
       expect(find.byType(DiaryScreen), findsOneWidget);
 
-      expect(find.text('Дополнительная информация для консультанта'), findsOneWidget);
+      expect(
+        find.text('Дополнительная информация для консультанта'),
+        findsOneWidget,
+      );
     });
 
     testWidgets('renders error state and reload button', (tester) async {
       final diaryCubit = MockDiaryCubit();
-      when(diaryCubit.state).thenReturn(const DiaryState.error(errorMessage: 'err'));
-      when(diaryCubit.stream).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(
+        diaryCubit.state,
+      ).thenReturn(const DiaryState.error(errorMessage: 'err'));
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
       when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(diaryCubit.fetchDiaryV2(needLoading: anyNamed('needLoading'), diaryId: anyNamed('diaryId'))).thenAnswer((_) async => true);
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);
 
       final commentsCubit = MockConsultantCommentsCubit();
-      when(commentsCubit.state).thenReturn(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: '')));
-      when(commentsCubit.stream).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
       when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());
 
       sl.registerFactory<DiaryCubit>(() => diaryCubit);
@@ -153,19 +237,52 @@ void main() {
       final diaryCubit = MockDiaryCubit();
       const futureDiary = DiaryFutureDietDayEntity(
         date: '2025-01-02',
-        typeOfDiary: TypeOfDiaryModel(hasChosenDiet: true, hasChosenPlan: false, diaryState: null),
-        meals: [MealModel(id: 1, time: '08:00', typeNumber: 1, satiety: 0, mood: 0, portions: [], photos: [])],
+        typeOfDiary: TypeOfDiaryModel(
+          hasChosenDiet: true,
+          hasChosenPlan: false,
+          diaryState: null,
+        ),
+        meals: [
+          MealModel(
+            id: 1,
+            time: '08:00',
+            typeNumber: 1,
+            satiety: 0,
+            mood: 0,
+            portions: [],
+            photos: [],
+          ),
+        ],
         diet: null,
         dayOfChosenDiet: 1,
       );
-      when(diaryCubit.state).thenReturn(DiaryState.loadedTomorrowWithDiet(diary: futureDiary, selectedDay: DateTime(2025, 1, 2), selectedMeal: 1));
-      when(diaryCubit.stream).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(diaryCubit.state).thenReturn(
+        DiaryState.loadedTomorrowWithDiet(
+          diary: futureDiary,
+          selectedDay: DateTime(2025, 1, 2),
+          selectedMeal: 1,
+        ),
+      );
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
       when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(diaryCubit.fetchDiaryV2(needLoading: anyNamed('needLoading'), diaryId: anyNamed('diaryId'))).thenAnswer((_) async => true);
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);
 
       final commentsCubit = MockConsultantCommentsCubit();
-      when(commentsCubit.state).thenReturn(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: '')));
-      when(commentsCubit.stream).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
       when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());
 
       sl.registerFactory<DiaryCubit>(() => diaryCubit);
@@ -187,17 +304,35 @@ void main() {
           planName: 'Plan',
           planDuration: 30,
           currentPlanDay: 1,
-          consultantComments: ConsultantComments(dayComment: 'Nice', mealsComments: const [], portionsComments: const []),
+          consultantComments: ConsultantComments(
+            dayComment: 'Nice',
+            mealsComments: const [],
+            portionsComments: const [],
+          ),
         ),
       );
       when(diaryCubit.state).thenReturn(state);
-      when(diaryCubit.stream).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
       when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(diaryCubit.fetchDiaryV2(needLoading: anyNamed('needLoading'), diaryId: anyNamed('diaryId'))).thenAnswer((_) async => true);
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);
 
       final commentsCubit = MockConsultantCommentsCubit();
-      when(commentsCubit.state).thenReturn(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: ''), dayCommentNeedsToBeFilled: false));
-      when(commentsCubit.stream).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+          dayCommentNeedsToBeFilled: false,
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
       when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());
       when(commentsCubit.submitComments(any)).thenAnswer((_) async => true);
 
@@ -215,13 +350,26 @@ void main() {
       final diaryCubit = MockDiaryCubit();
       final state = loadedState(hasChosenPlan: false);
       when(diaryCubit.state).thenReturn(state);
-      when(diaryCubit.stream).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
       when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(diaryCubit.fetchDiaryV2(needLoading: anyNamed('needLoading'), diaryId: anyNamed('diaryId'))).thenAnswer((_) async => true);
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);
 
       final commentsCubit = MockConsultantCommentsCubit();
-      when(commentsCubit.state).thenReturn(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: '')));
-      when(commentsCubit.stream).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
       when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());
 
       sl.registerFactory<DiaryCubit>(() => diaryCubit);
@@ -234,5 +382,96 @@ void main() {
 
       expect(find.byType(Text), findsWidgets);
     });
+
+    testWidgets('shows add button for a finished day inside the edit window', (
+      tester,
+    ) async {
+      final yesterday = DateTime.now().subtract(const Duration(days: 1));
+      final diaryCubit = MockDiaryCubit();
+      when(diaryCubit.state).thenReturn(
+        loadedState(
+          hasChosenPlan: false,
+          date: _calendarDate(yesterday),
+          isDiaryFinished: true,
+        ),
+      );
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);
+
+      final commentsCubit = MockConsultantCommentsCubit();
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());
+
+      sl.registerFactory<DiaryCubit>(() => diaryCubit);
+      sl.registerFactory<ConsultantCommentsCubit>(() => commentsCubit);
+
+      await tester.pumpWidget(wrap(DiaryScreen(date: yesterday)));
+      await tester.pump(const Duration(milliseconds: 200));
+
+      expect(find.text('Добавить'), findsOneWidget);
+      expect(find.text('Закончить день'), findsNothing);
+    });
+
+    testWidgets('hides add button for a commented day', (tester) async {
+      final yesterday = DateTime.now().subtract(const Duration(days: 1));
+      final diaryCubit = MockDiaryCubit();
+      when(diaryCubit.state).thenReturn(
+        loadedState(
+          hasChosenPlan: false,
+          date: _calendarDate(yesterday),
+          isDiaryCommented: true,
+        ),
+      );
+      when(
+        diaryCubit.stream,
+      ).thenAnswer((_) => const Stream<DiaryState>.empty());
+      when(diaryCubit.close()).thenAnswer((_) async => Future<void>.value());
+      when(
+        diaryCubit.fetchDiaryV2(
+          needLoading: anyNamed('needLoading'),
+          diaryId: anyNamed('diaryId'),
+        ),
+      ).thenAnswer((_) async => true);
+
+      final commentsCubit = MockConsultantCommentsCubit();
+      when(commentsCubit.state).thenReturn(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
+      when(
+        commentsCubit.stream,
+      ).thenAnswer((_) => const Stream<ConsultantCommentsState>.empty());
+      when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());
+
+      sl.registerFactory<DiaryCubit>(() => diaryCubit);
+      sl.registerFactory<ConsultantCommentsCubit>(() => commentsCubit);
+
+      await tester.pumpWidget(wrap(DiaryScreen(date: yesterday)));
+      await tester.pump(const Duration(milliseconds: 200));
+
+      expect(find.text('Добавить'), findsNothing);
+    });
   });
 }
+
+String _calendarDate(DateTime date) {
+  final month = date.month.toString().padLeft(2, '0');
+  final day = date.day.toString().padLeft(2, '0');
+  return '${date.year}-$month-$day';
+}

test/features/diary/presentation/widgets/product_widget_smoke_test.dart

@@ -1,4 +1,3 @@
-
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/features/consultations/models/consultation_model.dart';
 import 'package:eatvio_app/features/diary/entities/diary_day_entity.dart';
@@ -27,7 +26,8 @@ class FakeDiaryCubit extends Cubit<DiaryState> implements DiaryCubit {
   dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }
 
-class FakeConsultantCommentsCubit extends Cubit<ConsultantCommentsState> implements ConsultantCommentsCubit {
+class FakeConsultantCommentsCubit extends Cubit<ConsultantCommentsState>
+    implements ConsultantCommentsCubit {
   FakeConsultantCommentsCubit(super.initialState);
   @override
   dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
@@ -60,9 +60,16 @@ void main() {
 </svg>
 ''';
 
-    final bundle = _FakeAssetBundle({'assets/icons/revert_product.svg': fakeSvg, 'assets/icons/edit.svg': fakeSvg});
+    final bundle = _FakeAssetBundle({
+      'assets/icons/revert_product.svg': fakeSvg,
+      'assets/icons/edit.svg': fakeSvg,
+    });
 
-    Widget wrap({required DiaryCubit diaryCubit, required ConsultantCommentsCubit consultantCommentsCubit, required Widget child}) {
+    Widget wrap({
+      required DiaryCubit diaryCubit,
+      required ConsultantCommentsCubit consultantCommentsCubit,
+      required Widget child,
+    }) {
       return DefaultAssetBundle(
         bundle: bundle,
         child: MaterialApp(
@@ -77,7 +84,9 @@ void main() {
           home: MultiBlocProvider(
             providers: [
               BlocProvider<DiaryCubit>.value(value: diaryCubit),
-              BlocProvider<ConsultantCommentsCubit>.value(value: consultantCommentsCubit),
+              BlocProvider<ConsultantCommentsCubit>.value(
+                value: consultantCommentsCubit,
+              ),
             ],
             child: Scaffold(body: child),
           ),
@@ -85,17 +94,36 @@ void main() {
       );
     }
 
-    DiaryStateLoaded loadedState({required PortionModel portion, required bool consultantView}) {
+    DiaryStateLoaded loadedState({
+      required PortionModel portion,
+      required bool consultantView,
+      String date = '2025-01-01',
+      bool isDiaryFinished = false,
+      bool isDiaryCommented = false,
+      int closed = 0,
+    }) {
       final diary = DiaryDayEntity(
         id: 1,
-        date: '2025-01-01',
+        date: date,
         wakeup: '07:00',
         retire: '23:00',
-        closed: 0,
+        closed: closed,
         comment: '',
-        typeOfDiary: const TypeOfDiaryModel(hasChosenDiet: false, hasChosenPlan: true, diaryState: DiaryStateEnum.started),
+        typeOfDiary: const TypeOfDiaryModel(
+          hasChosenDiet: false,
+          hasChosenPlan: true,
+          diaryState: DiaryStateEnum.started,
+        ),
         meals: [
-          MealModel(id: 1, time: '08:00', typeNumber: 1, satiety: 0, mood: 0, portions: [portion], photos: const []),
+          MealModel(
+            id: 1,
+            time: '08:00',
+            typeNumber: 1,
+            satiety: 0,
+            mood: 0,
+            portions: [portion],
+            photos: const [],
+          ),
         ],
         chosenPlanId: 1,
         dayOfChosenDiet: null,
@@ -103,8 +131,18 @@ void main() {
       );
 
       const nutrition = NutritionDataModel(
-        dailyNutritionIntake: NutritionModel(energy: 0, proteins: 0, fats: 0, carbohydrates: 0),
-        dailyNutritionRecommendation: NutritionModel(energy: 0, proteins: 0, fats: 0, carbohydrates: 0),
+        dailyNutritionIntake: NutritionModel(
+          energy: 0,
+          proteins: 0,
+          fats: 0,
+          carbohydrates: 0,
+        ),
+        dailyNutritionRecommendation: NutritionModel(
+          energy: 0,
+          proteins: 0,
+          fats: 0,
+          carbohydrates: 0,
+        ),
       );
 
       return DiaryState.loaded(
@@ -113,13 +151,17 @@ void main() {
             selectedDay: DateTime(2025, 1, 1),
             selectedMeal: 1,
             isConsultantView: consultantView,
-            isDiaryFinished: false,
-            isDiaryCommented: false,
+            isDiaryFinished: isDiaryFinished,
+            isDiaryCommented: isDiaryCommented,
             consultantReview: ConsultantReviewModel(
               planName: 'Plan',
               planDuration: 10,
               currentPlanDay: 1,
-              consultantComments: ConsultantComments(dayComment: null, mealsComments: const [], portionsComments: const []),
+              consultantComments: ConsultantComments(
+                dayComment: null,
+                mealsComments: const [],
+                portionsComments: const [],
+              ),
             ),
           )
           as DiaryStateLoaded;
@@ -140,9 +182,21 @@ void main() {
         DiaryState.loadedTomorrowWithDiet(
           diary: const DiaryFutureDietDayEntity(
             date: '2025-01-02',
-            typeOfDiary: TypeOfDiaryModel(hasChosenDiet: true, hasChosenPlan: false, diaryState: null),
+            typeOfDiary: TypeOfDiaryModel(
+              hasChosenDiet: true,
+              hasChosenPlan: false,
+              diaryState: null,
+            ),
             meals: [
-              MealModel(id: 1, time: '08:00', typeNumber: 1, satiety: 0, mood: 0, portions: [portion], photos: []),
+              MealModel(
+                id: 1,
+                time: '08:00',
+                typeNumber: 1,
+                satiety: 0,
+                mood: 0,
+                portions: [portion],
+                photos: [],
+              ),
             ],
             diet: null,
             dayOfChosenDiet: 1,
@@ -151,7 +205,11 @@ void main() {
           selectedMeal: 1,
         ),
       );
-      final commentsCubit = FakeConsultantCommentsCubit(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: '')));
+      final commentsCubit = FakeConsultantCommentsCubit(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
 
       await tester.pumpWidget(
         wrap(
@@ -177,8 +235,14 @@ void main() {
         fromDiet: false,
         portionState: PortionState.eatenDeleted,
       );
-      final diaryCubit = FakeDiaryCubit(loadedState(portion: portion, consultantView: false));
-      final commentsCubit = FakeConsultantCommentsCubit(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: '')));
+      final diaryCubit = FakeDiaryCubit(
+        loadedState(portion: portion, consultantView: false),
+      );
+      final commentsCubit = FakeConsultantCommentsCubit(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
 
       await tester.pumpWidget(
         wrap(
@@ -194,32 +258,89 @@ void main() {
       expect(find.byType(ProductWidget), findsOneWidget);
     });
 
-    testWidgets('consultant view toggles comment widget and shows existing comment container', (tester) async {
+    testWidgets(
+      'consultant view toggles comment widget and shows existing comment container',
+      (tester) async {
+        const portion = PortionModel(
+          id: 1,
+          productNutritionalValueId: null,
+          productCaloriesInfo: null,
+          productName: 'Portion',
+          quantity: 100,
+          portion: 'gr',
+          fromDiet: false,
+          portionState: PortionState.filledDiet,
+        );
+        final state = loadedState(portion: portion, consultantView: true)
+            .copyWith(
+              consultantReview: ConsultantReviewModel(
+                planName: 'Plan',
+                planDuration: 10,
+                currentPlanDay: 1,
+                consultantComments: ConsultantComments(
+                  dayComment: null,
+                  mealsComments: const [],
+                  portionsComments: [
+                    PortionComment(portionId: 1, comment: 'Looks good'),
+                  ],
+                ),
+              ),
+            );
+
+        final diaryCubit = FakeDiaryCubit(state);
+        final commentsCubit = FakeConsultantCommentsCubit(
+          ConsultantCommentsState(
+            commentsModel: ConsultantCommentModel(comment: ''),
+          ),
+        );
+
+        await tester.pumpWidget(
+          wrap(
+            diaryCubit: diaryCubit,
+            consultantCommentsCubit: commentsCubit,
+            child: const ProductWidget(portion: portion),
+          ),
+        );
+        await tester.pump();
+
+        expect(find.byType(CommentContainer), findsOneWidget);
+        expect(find.text('Looks good'), findsOneWidget);
+
+        // Tap edit icon to enable PortionCommentWidget.
+        await tester.tap(find.byType(GestureDetector).first);
+        await tester.pump();
+
+        expect(find.byType(PortionCommentWidget), findsOneWidget);
+      },
+    );
+
+    testWidgets('can edit a portion on a finished day inside the edit window', (
+      tester,
+    ) async {
       const portion = PortionModel(
         id: 1,
         productNutritionalValueId: null,
         productCaloriesInfo: null,
-        productName: 'Portion',
+        productName: 'Apple',
         quantity: 100,
         portion: 'gr',
         fromDiet: false,
-        portionState: PortionState.filledDiet,
+        portionState: PortionState.eaten,
       );
-      final state = loadedState(portion: portion, consultantView: true).copyWith(
-        consultantReview: ConsultantReviewModel(
-          planName: 'Plan',
-          planDuration: 10,
-          currentPlanDay: 1,
-          consultantComments: ConsultantComments(
-            dayComment: null,
-            mealsComments: const [],
-            portionsComments: [PortionComment(portionId: 1, comment: 'Looks good')],
-          ),
+      final yesterday = DateTime.now().subtract(const Duration(days: 1));
+      final diaryCubit = FakeDiaryCubit(
+        loadedState(
+          portion: portion,
+          consultantView: false,
+          date: _calendarDate(yesterday),
+          isDiaryFinished: true,
+        ),
+      );
+      final commentsCubit = FakeConsultantCommentsCubit(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
         ),
       );
-
-      final diaryCubit = FakeDiaryCubit(state);
-      final commentsCubit = FakeConsultantCommentsCubit(ConsultantCommentsState(commentsModel: ConsultantCommentModel(comment: '')));
 
       await tester.pumpWidget(
         wrap(
@@ -230,15 +351,51 @@ void main() {
       );
       await tester.pump();
 
+      expect(tester.widget<ListTile>(find.byType(ListTile)).onTap, isNotNull);
+    });
 
-      expect(find.byType(CommentContainer), findsOneWidget);
-      expect(find.text('Looks good'), findsOneWidget);
+    testWidgets('cannot edit a portion on a commented day', (tester) async {
+      const portion = PortionModel(
+        id: 1,
+        productNutritionalValueId: null,
+        productCaloriesInfo: null,
+        productName: 'Apple',
+        quantity: 100,
+        portion: 'gr',
+        fromDiet: false,
+        portionState: PortionState.eaten,
+      );
+      final yesterday = DateTime.now().subtract(const Duration(days: 1));
+      final diaryCubit = FakeDiaryCubit(
+        loadedState(
+          portion: portion,
+          consultantView: false,
+          date: _calendarDate(yesterday),
+          isDiaryCommented: true,
+        ),
+      );
+      final commentsCubit = FakeConsultantCommentsCubit(
+        ConsultantCommentsState(
+          commentsModel: ConsultantCommentModel(comment: ''),
+        ),
+      );
 
-      // Tap edit icon to enable PortionCommentWidget.
-      await tester.tap(find.byType(GestureDetector).first);
+      await tester.pumpWidget(
+        wrap(
+          diaryCubit: diaryCubit,
+          consultantCommentsCubit: commentsCubit,
+          child: const ProductWidget(portion: portion),
+        ),
+      );
       await tester.pump();
 
-      expect(find.byType(PortionCommentWidget), findsOneWidget);
+      expect(tester.widget<ListTile>(find.byType(ListTile)).onTap, isNull);
     });
   });
 }
+
+String _calendarDate(DateTime date) {
+  final month = date.month.toString().padLeft(2, '0');
+  final day = date.day.toString().padLeft(2, '0');
+  return '${date.year}-$month-$day';
+}

test/features/video_calls/services/video_call_chat_signal_test.dart

@@ -0,0 +1,77 @@
+import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_chat_signal.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  ChatMessageModel message({
+    String data = '',
+    String? roomId = 'room-1',
+    ChatMessageType? type,
+  }) {
+    return ChatMessageModel(
+      id: 1,
+      data: data,
+      mediaData: null,
+      authorId: 7,
+      updatedAt: DateTime.utc(2026, 1, 1),
+      isRead: false,
+      isCurrentUserAuthor: false,
+      roomId: roomId,
+      type: type,
+    );
+  }
+
+  group('VideoCallChatSignal', () {
+    test('recognizes a realtime video call start without type', () {
+      final payload = VideoCallChatSignal.incomingPayload(
+        message: message(data: 'Анна начал(а) видеозвонок.'),
+      );
+
+      expect(payload, isNotNull);
+      expect(payload!.conversationUuid, 'room-1');
+      expect(payload.counterpartName, 'Анна');
+      expect(payload.messageId, 1);
+    });
+
+    test('recognizes an english realtime video call start', () {
+      expect(
+        VideoCallChatSignal.kindOf(message(data: 'Anna started a video call.')),
+        VideoCallChatSignalKind.started,
+      );
+    });
+
+    test('recognizes a realtime video call end', () {
+      expect(
+        VideoCallChatSignal.kindOf(
+          message(data: 'Анна завершил(а) видеозвонок.'),
+        ),
+        VideoCallChatSignalKind.ended,
+      );
+    });
+
+    test('uses an explicit message type when the broadcast includes it', () {
+      expect(
+        VideoCallChatSignal.kindOf(
+          message(data: 'ignored', type: ChatMessageType.videoCallStarted),
+        ),
+        VideoCallChatSignalKind.started,
+      );
+    });
+
+    test('does not treat an ordinary chat message as a call', () {
+      expect(
+        VideoCallChatSignal.kindOf(
+          message(
+            data: 'я начал видеозвонок вручную',
+            type: ChatMessageType.text,
+          ),
+        ),
+        VideoCallChatSignalKind.none,
+      );
+      expect(
+        VideoCallChatSignal.incomingPayload(message: message(data: 'привет')),
+        isNull,
+      );
+    });
+  });
+}

test/features/video_calls/services/video_call_push_payload_test.dart

@@ -1,4 +1,5 @@
 import 'package:eatvio_app/features/video_calls/services/video_call_ended_push_payload.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_kit_id.dart';
 import 'package:eatvio_app/features/video_calls/services/video_call_push_payload.dart';
 import 'package:flutter_test/flutter_test.dart';
 
@@ -58,6 +59,23 @@ void main() {
       expect(payload, isNotNull);
     });
 
+    test('parses message id for a stable CallKit uuid', () {
+      final payload = VideoCallPushPayload.tryParse({
+        'type': 'video_call_started',
+        'conversation_uuid': '550e8400-e29b-41d4-a716-446655440000',
+        'message_id': '42',
+      });
+
+      expect(payload?.messageId, 42);
+      expect(
+        VideoCallKitId.iosUuid(
+          conversationUuid: payload!.conversationUuid,
+          messageId: payload.messageId,
+        ),
+        '550e8400-e29b-41d4-a716-00000000002a',
+      );
+    });
+
     test('ignores regular chat push', () {
       expect(
         VideoCallPushPayload.tryParse({